RDMA/bnxt_re: Check cqe flags to know imm_data vs inv_irkey

[ Upstream commit 808ca6de989c598bc5af1ae0ad971a66077efac0 ]

Invalidate rkey is cpu endian and immediate data is in big endian format.
Both immediate data and invalidate the remote key returned by
HW is in little endian format.

While handling the commit in fixes tag, the difference between
immediate data and invalidate rkey endianness was not considered.

Without changes of this patch, Kernel ULP was failing while processing
inv_rkey.

dmesg log snippet -
nvme nvme0: Bogus remote invalidation for rkey 0x2000019Fix in this patch

Do endianness conversion based on completion queue entry flag.
Also, the HW completions are already converted to host endianness in
bnxt_qplib_cq_process_res_rc and bnxt_qplib_cq_process_res_ud and there
is no need to convert it again in bnxt_re_poll_cq. Modified the union to
hold the correct data type.

Fixes: 95b087f87b78 ("bnxt_re: Fix imm_data endianness")
Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
Link: https://patch.msgid.link/1730110014-20755-1-git-send-email-selvin.xavier@broadcom.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index e2c93a50fe7629012ad5284597467c8f5e50dd18..9b6ebf6356983eee54ef81ce98073831cb9df4d0 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@ -3110,7 +3110,7 @@ static void bnxt_re_process_res_shadow_qp_wc(struct bnxt_re_qp *qp,
        wc->byte_len = orig_cqe->length;
        wc->qp = &qp1_qp->ib_qp;
 
-       wc->ex.imm_data = cpu_to_be32(le32_to_cpu(orig_cqe->immdata));
+       wc->ex.imm_data = cpu_to_be32(orig_cqe->immdata);
        wc->src_qp = orig_cqe->src_qp;
        memcpy(wc->smac, orig_cqe->smac, ETH_ALEN);
        if (bnxt_re_is_vlan_pkt(orig_cqe, &vlan_id, &sl)) {
@@ -3231,7 +3231,10 @@ int bnxt_re_poll_cq(struct ib_cq *ib_cq, int num_entries, struct ib_wc *wc)
                                continue;
                        }
                        wc->qp = &qp->ib_qp;
-                       wc->ex.imm_data = cpu_to_be32(le32_to_cpu(cqe->immdata));
+                       if (cqe->flags & CQ_RES_RC_FLAGS_IMM)
+                               wc->ex.imm_data = cpu_to_be32(cqe->immdata);
+                       else
+                               wc->ex.invalidate_rkey = cqe->invrkey;
                        wc->src_qp = cqe->src_qp;
                        memcpy(wc->smac, cqe->smac, ETH_ALEN);
                        wc->port_num = 1;

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.h b/drivers/infiniband/hw/bnxt_re/qplib_fp.h
index aed0c53d84be28a03e45a5665895e3daeee874ce..6c0129231c07b54293213b6a8b060ea24d80a187 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.h
+++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.h
@@ -349,7 +349,7 @@ struct bnxt_qplib_cqe {
        u32                             length;
        u64                             wr_id;
        union {
-               __le32                  immdata;
+               u32                     immdata;
                u32                     invrkey;
        };
        u64                             qp_handle;