patch 'common/cnxk: fix CPT backpressure disable on LBK' has been queued to stable release 22.11.3

Xueming Li xuemingl at nvidia.com
Thu Aug 10 02:10:45 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/11/23. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=da3c4ce23806030441aca6b3557dd99d7b81cb2a

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From da3c4ce23806030441aca6b3557dd99d7b81cb2a Mon Sep 17 00:00:00 2001
From: Rahul Bhansali <rbhansali at marvell.com>
Date: Mon, 3 Jul 2023 18:58:21 +0530
Subject: [PATCH] common/cnxk: fix CPT backpressure disable on LBK
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 772e30281a1d686096b27e5926e2f369caa05cff ]

For LBK interfaces, roc_nix_inl_inb_is_enabled() is false, hence
backpressure on CPT is disabled and causing CQ full interrupt.

NIXX_AF_RX_CHAN[0x800]_CFG is global config for all PF, VF
of RPM/LBK, hence backpressure disable on CPT is not required.

Fixes: 0663a84524e5 ("common/cnxk: enable backpressure on CPT with inline inbound")

Signed-off-by: Rahul Bhansali <rbhansali at marvell.com>
---
 drivers/common/cnxk/roc_nix_fc.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/common/cnxk/roc_nix_fc.c b/drivers/common/cnxk/roc_nix_fc.c
index 033e17a4bf..5e8a01c775 100644
--- a/drivers/common/cnxk/roc_nix_fc.c
+++ b/drivers/common/cnxk/roc_nix_fc.c
@@ -88,17 +88,6 @@ nix_fc_rxchan_bpid_set(struct roc_nix *roc_nix, bool enable)
 		req->chan_cnt = 1;
 		req->bpid_per_chan = 0;
 
-		rc = mbox_process_msg(mbox, (void *)&rsp);
-		if (rc)
-			goto exit;
-	} else {
-		req = mbox_alloc_msg_nix_cpt_bp_disable(mbox);
-		if (req == NULL)
-			return rc;
-		req->chan_base = 0;
-		req->chan_cnt = 1;
-		req->bpid_per_chan = 0;
-
 		rc = mbox_process_msg(mbox, (void *)&rsp);
 		if (rc)
 			goto exit;
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-08-09 21:51:21.404246600 +0800
+++ 0128-common-cnxk-fix-CPT-backpressure-disable-on-LBK.patch	2023-08-09 21:51:18.304352000 +0800
@@ -1 +1 @@
-From 772e30281a1d686096b27e5926e2f369caa05cff Mon Sep 17 00:00:00 2001
+From da3c4ce23806030441aca6b3557dd99d7b81cb2a Mon Sep 17 00:00:00 2001
@@ -3 +3 @@
-Date: Thu, 25 May 2023 15:28:35 +0530
+Date: Mon, 3 Jul 2023 18:58:21 +0530
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 772e30281a1d686096b27e5926e2f369caa05cff ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -17,2 +19,2 @@
- drivers/common/cnxk/roc_nix_fc.c | 18 ++----------------
- 1 file changed, 2 insertions(+), 16 deletions(-)
+ drivers/common/cnxk/roc_nix_fc.c | 11 -----------
+ 1 file changed, 11 deletions(-)
@@ -21 +23 @@
-index 8feb773e1d..6d6997ed82 100644
+index 033e17a4bf..5e8a01c775 100644
@@ -24,4 +26,7 @@
-@@ -87,25 +87,11 @@ nix_fc_rxchan_bpid_set(struct roc_nix *roc_nix, bool enable)
- 		if (rc)
- 			goto exit;
- 		nix->cpt_lbpid = rsp->chan_bpid[0] & 0x1FF;
+@@ -88,17 +88,6 @@ nix_fc_rxchan_bpid_set(struct roc_nix *roc_nix, bool enable)
+ 		req->chan_cnt = 1;
+ 		req->bpid_per_chan = 0;
+ 
+-		rc = mbox_process_msg(mbox, (void *)&rsp);
+-		if (rc)
+-			goto exit;
@@ -31 +36 @@
--			goto exit;
+-			return rc;
@@ -33,4 +38 @@
--		if (roc_nix_is_lbk(roc_nix) || roc_nix_is_sdp(roc_nix))
--			req->chan_cnt = NIX_LBK_MAX_CHAN;
--		else
--			req->chan_cnt = NIX_CGX_MAX_CHAN;
+-		req->chan_cnt = 1;
@@ -39,13 +41,3 @@
--		rc = mbox_process_msg(mbox, (void *)&rsp);
--		if (rc)
--			goto exit;
--		nix->cpt_lbpid = 0;
- 	}
- 
- 	/* CPT to NIX BP on all channels */
--	if (!roc_feature_nix_has_rxchan_multi_bpid() || !nix->cpt_nixbpid)
-+	if (!roc_feature_nix_has_rxchan_multi_bpid() || !nix->cpt_nixbpid ||
-+	    !roc_nix_inl_inb_is_enabled(roc_nix))
- 		goto exit;
- 
- 	mbox_put(mbox);
+ 		rc = mbox_process_msg(mbox, (void *)&rsp);
+ 		if (rc)
+ 			goto exit;


More information about the stable mailing list