qed: iWARP - Add check for errors on a SYN packet

A SYN packet which arrives with errors from FW should be dropped.
This required adding an additional field to the ll2
rx completion data.

Signed-off-by: Michal Kalderon <[email protected]>
Signed-off-by: Ariel Elior <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c
index 568e9853cc8d75fecaab2a00488f0754f6bb8025..8fc9c811f6e32db2b022274ef88cf98cefa86b48 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c
@@ -1733,6 +1733,14 @@ qed_iwarp_ll2_comp_syn_pkt(void *cxt, struct qed_ll2_comp_rx_data *data)
 
        memset(&cm_info, 0, sizeof(cm_info));
        ll2_syn_handle = p_hwfn->p_rdma_info->iwarp.ll2_syn_handle;
+
+       /* Check if packet was received with errors... */
+       if (data->err_flags) {
+               DP_NOTICE(p_hwfn, "Error received on SYN packet: 0x%x\n",
+                         data->err_flags);
+               goto err;
+       }
+
        if (GET_FIELD(data->parse_flags,
                      PARSING_AND_ERR_FLAGS_L4CHKSMWASCALCULATED) &&
            GET_FIELD(data->parse_flags, PARSING_AND_ERR_FLAGS_L4CHKSMERROR)) {

diff --git a/drivers/net/ethernet/qlogic/qed/qed_ll2.c b/drivers/net/ethernet/qlogic/qed/qed_ll2.c
index c06ad4f0758eb755ad9d82ffccecc3def154fc6b..250afa5486cfaf5ffaa51a12698997740be57f4e 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_ll2.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.c
@@ -413,6 +413,7 @@ static void qed_ll2_rxq_parse_reg(struct qed_hwfn *p_hwfn,
                                  struct qed_ll2_comp_rx_data *data)
 {
        data->parse_flags = le16_to_cpu(p_cqe->rx_cqe_fp.parse_flags.flags);
+       data->err_flags = le16_to_cpu(p_cqe->rx_cqe_fp.err_flags.flags);
        data->length.packet_length =
            le16_to_cpu(p_cqe->rx_cqe_fp.packet_length);
        data->vlan = le16_to_cpu(p_cqe->rx_cqe_fp.vlan);

diff --git a/include/linux/qed/qed_ll2_if.h b/include/linux/qed/qed_ll2_if.h
index dd7a3b86bb9e515f45a9a2f17dac407f46f6ced2..89fa0bbd54f328bb507fab5e5cce5a4222dead58 100644 (file)
--- a/include/linux/qed/qed_ll2_if.h
+++ b/include/linux/qed/qed_ll2_if.h
@@ -101,6 +101,7 @@ struct qed_ll2_comp_rx_data {
        void *cookie;
        dma_addr_t rx_buf_addr;
        u16 parse_flags;
+       u16 err_flags;
        u16 vlan;
        bool b_last_packet;
        u8 connection_handle;