patch 'net/vmxnet3: fix return code in initializing' has been queued to stable release 22.11.3

Xueming Li xuemingl at nvidia.com
Sun Jun 25 08:34:47 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 06/27/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=3a8502c73d11e7c2325a4e3db11244cc299fe5b7

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 3a8502c73d11e7c2325a4e3db11244cc299fe5b7 Mon Sep 17 00:00:00 2001
From: Kaijun Zeng <corezeng at gmail.com>
Date: Wed, 7 Jun 2023 13:57:25 -0400
Subject: [PATCH] net/vmxnet3: fix return code in initializing
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 8a2de735318b38ba93a041cb2f209889bde02689 ]

Improve error handling

Bugzilla ID: 1239
Fixes: dfaff37fc46d ("vmxnet3: import new vmxnet3 poll mode driver implementation")

Signed-off-by: Kaijun Zeng <corezeng at gmail.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 .mailmap                           |  1 +
 drivers/net/vmxnet3/vmxnet3_rxtx.c | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 44d9bd97c6..79553991de 100644
--- a/.mailmap
+++ b/.mailmap
@@ -675,6 +675,7 @@ Jun Yang <jun.yang at nxp.com>
 Junyu Jiang <junyux.jiang at intel.com>
 Juraj Linkeš <juraj.linkes at pantheon.tech>
 Kai Ji <kai.ji at intel.com>
+Kaijun Zeng <corezeng at gmail.com>
 Kaiwen Deng <kaiwenx.deng at intel.com>
 Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Kamalakannan R <kamalakannan.r at intel.com>
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index f4cade0954..14c6504505 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -1316,11 +1316,18 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev)
 		for (j = 0; j < VMXNET3_RX_CMDRING_SIZE; j++) {
 			/* Passing 0 as alloc_num will allocate full ring */
 			ret = vmxnet3_post_rx_bufs(rxq, j);
-			if (ret <= 0) {
+
+			/* Zero number of descriptors in the configuration of the RX queue */
+			if (ret == 0) {
 				PMD_INIT_LOG(ERR,
-					     "ERROR: Posting Rxq: %d buffers ring: %d",
-					     i, j);
-				return -ret;
+					"Invalid configuration in Rx queue: %d, buffers ring: %d\n",
+					i, j);
+				return -EINVAL;
+			}
+			/* Return the error number */
+			if (ret < 0) {
+				PMD_INIT_LOG(ERR, "Posting Rxq: %d buffers ring: %d", i, j);
+				return ret;
 			}
 			/*
 			 * Updating device with the index:next2fill to fill the
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-06-25 14:32:00.372827300 +0800
+++ 0069-net-vmxnet3-fix-return-code-in-initializing.patch	2023-06-25 14:31:58.425773900 +0800
@@ -1 +1 @@
-From 8a2de735318b38ba93a041cb2f209889bde02689 Mon Sep 17 00:00:00 2001
+From 3a8502c73d11e7c2325a4e3db11244cc299fe5b7 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 8a2de735318b38ba93a041cb2f209889bde02689 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 42f198f284..986ba9c988 100644
+index 44d9bd97c6..79553991de 100644
@@ -23 +25 @@
-@@ -687,6 +687,7 @@ Jun Yang <jun.yang at nxp.com>
+@@ -675,6 +675,7 @@ Jun Yang <jun.yang at nxp.com>
@@ -28 +29,0 @@
- Kaisen You <kaisenx.you at intel.com>
@@ -30,0 +32 @@
+ Kamalakannan R <kamalakannan.r at intel.com>
@@ -32 +34 @@
-index 148f65383e..380f41f98b 100644
+index f4cade0954..14c6504505 100644
@@ -35 +37 @@
-@@ -1337,11 +1337,18 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev)
+@@ -1316,11 +1316,18 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev)


More information about the stable mailing list