From: Selvin Xavier <selvin.xavier@broadcom.com>

Date: Wed, 15 Sep 2021 05:32:42 -0700

Subject: RDMA/bnxt_re: Check if the vlan is valid before reporting

Patch-mainline: v5.16-rc1

Git-commit: 6bda39149d4b8920fdb8744090653aca3daa792d

References: jsc#SLE-18977

When VF is configured with default vlan, HW strips the vlan from the

packet and driver receives it in Rx completion. VLAN needs to be reported

for UD work completion only if the vlan is configured on the host. Add a

check for valid vlan in the UD receive path.

Link: https://lore.kernel.org/r/1631709163-2287-12-git-send-email-selvin.xavier@broadcom.com

Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/infiniband/hw/bnxt_re/ib_verbs.c |   12 +++++++++---

 1 file changed, 9 insertions(+), 3 deletions(-)

--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c

+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c

@@ -3365,8 +3365,11 @@ static void bnxt_re_process_res_ud_wc(st

 				      struct ib_wc *wc,

 				      struct bnxt_qplib_cqe *cqe)

 {

+	struct bnxt_re_dev *rdev;

+	u16 vlan_id = 0;

 	u8 nw_type;

+	rdev = qp->rdev;

 	wc->opcode = IB_WC_RECV;

 	wc->status = __rc_to_ib_wc_status(cqe->status);

@@ -3378,9 +3381,12 @@ static void bnxt_re_process_res_ud_wc(st

 		memcpy(wc->smac, cqe->smac, ETH_ALEN);

 		wc->wc_flags |= IB_WC_WITH_SMAC;

 		if (cqe->flags & CQ_RES_UD_FLAGS_META_FORMAT_VLAN) {

-			wc->vlan_id = (cqe->cfa_meta & 0xFFF);

-			if (wc->vlan_id < 0x1000)

-				wc->wc_flags |= IB_WC_WITH_VLAN;

+			vlan_id = (cqe->cfa_meta & 0xFFF);

+		}

+		/* Mark only if vlan_id is non zero */

+		if (vlan_id && bnxt_re_check_if_vlan_valid(rdev, vlan_id)) {

+			wc->vlan_id = vlan_id;

+			wc->wc_flags |= IB_WC_WITH_VLAN;

 		}

 		nw_type = (cqe->flags & CQ_RES_UD_FLAGS_ROCE_IP_VER_MASK) >>

 			   CQ_RES_UD_FLAGS_ROCE_IP_VER_SFT;