[dpdk-stable] patch 'ethdev: fix typo in queue setup error log' has been queued to LTS release 17.11.6

Yongseok Koh yskoh at mellanox.com
Fri Mar 8 18:46:44 CET 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 03/13/19. So please
shout if anyone has objection.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 4d5d1dfacf0bef79ff12736e6603576016235c0b Mon Sep 17 00:00:00 2001
From: Yaroslav Brustinov <ybrustin at cisco.com>
Date: Mon, 3 Dec 2018 11:54:04 +0200
Subject: [PATCH] ethdev: fix typo in queue setup error log

[ backported from upstream commit b4b896fcfe9bc9f079698442697aa8e1d4a6dc3f ]

'=' should be '>=" for '[rt]x_desc_lim.nb_min' check.

Fixes: 386c993e95f1 ("ethdev: add a missing sanity check for Tx queue setup")
Fixes: 80a1deb4c77a ("ethdev: add API to retrieve queue information")

Signed-off-by: Yaroslav Brustinov <ybrustin at cisco.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 lib/librte_ether/rte_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 096b35faf..edcf5bc86 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1198,7 +1198,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
 			nb_rx_desc % dev_info.rx_desc_lim.nb_align != 0) {
 
 		RTE_PMD_DEBUG_TRACE("Invalid value for nb_rx_desc(=%hu), "
-			"should be: <= %hu, = %hu, and a product of %hu\n",
+			"should be: <= %hu, >= %hu, and a product of %hu\n",
 			nb_rx_desc,
 			dev_info.rx_desc_lim.nb_max,
 			dev_info.rx_desc_lim.nb_min,
@@ -1320,7 +1320,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
 	    nb_tx_desc < dev_info.tx_desc_lim.nb_min ||
 	    nb_tx_desc % dev_info.tx_desc_lim.nb_align != 0) {
 		RTE_PMD_DEBUG_TRACE("Invalid value for nb_tx_desc(=%hu), "
-				"should be: <= %hu, = %hu, and a product of %hu\n",
+				"should be: <= %hu, >= %hu, and a product of %hu\n",
 				nb_tx_desc,
 				dev_info.tx_desc_lim.nb_max,
 				dev_info.tx_desc_lim.nb_min,
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-03-08 09:46:40.706540493 -0800
+++ 0006-ethdev-fix-typo-in-queue-setup-error-log.patch	2019-03-08 09:46:39.968398000 -0800
@@ -1,42 +1,43 @@
-From b4b896fcfe9bc9f079698442697aa8e1d4a6dc3f Mon Sep 17 00:00:00 2001
+From 4d5d1dfacf0bef79ff12736e6603576016235c0b Mon Sep 17 00:00:00 2001
 From: Yaroslav Brustinov <ybrustin at cisco.com>
 Date: Mon, 3 Dec 2018 11:54:04 +0200
 Subject: [PATCH] ethdev: fix typo in queue setup error log
 
+[ backported from upstream commit b4b896fcfe9bc9f079698442697aa8e1d4a6dc3f ]
+
 '=' should be '>=" for '[rt]x_desc_lim.nb_min' check.
 
 Fixes: 386c993e95f1 ("ethdev: add a missing sanity check for Tx queue setup")
 Fixes: 80a1deb4c77a ("ethdev: add API to retrieve queue information")
-Cc: stable at dpdk.org
 
 Signed-off-by: Yaroslav Brustinov <ybrustin at cisco.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
- lib/librte_ethdev/rte_ethdev.c | 4 ++--
+ lib/librte_ether/rte_ethdev.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
-index 5f858174b..9d5107dce 100644
---- a/lib/librte_ethdev/rte_ethdev.c
-+++ b/lib/librte_ethdev/rte_ethdev.c
-@@ -1594,7 +1594,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
+diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
+index 096b35faf..edcf5bc86 100644
+--- a/lib/librte_ether/rte_ethdev.c
++++ b/lib/librte_ether/rte_ethdev.c
+@@ -1198,7 +1198,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
  			nb_rx_desc % dev_info.rx_desc_lim.nb_align != 0) {
  
- 		RTE_ETHDEV_LOG(ERR,
--			"Invalid value for nb_rx_desc(=%hu), should be: <= %hu, = %hu, and a product of %hu\n",
-+			"Invalid value for nb_rx_desc(=%hu), should be: <= %hu, >= %hu, and a product of %hu\n",
- 			nb_rx_desc, dev_info.rx_desc_lim.nb_max,
+ 		RTE_PMD_DEBUG_TRACE("Invalid value for nb_rx_desc(=%hu), "
+-			"should be: <= %hu, = %hu, and a product of %hu\n",
++			"should be: <= %hu, >= %hu, and a product of %hu\n",
+ 			nb_rx_desc,
+ 			dev_info.rx_desc_lim.nb_max,
  			dev_info.rx_desc_lim.nb_min,
- 			dev_info.rx_desc_lim.nb_align);
-@@ -1698,7 +1698,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
+@@ -1320,7 +1320,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
  	    nb_tx_desc < dev_info.tx_desc_lim.nb_min ||
  	    nb_tx_desc % dev_info.tx_desc_lim.nb_align != 0) {
- 		RTE_ETHDEV_LOG(ERR,
--			"Invalid value for nb_tx_desc(=%hu), should be: <= %hu, = %hu, and a product of %hu\n",
-+			"Invalid value for nb_tx_desc(=%hu), should be: <= %hu, >= %hu, and a product of %hu\n",
- 			nb_tx_desc, dev_info.tx_desc_lim.nb_max,
- 			dev_info.tx_desc_lim.nb_min,
- 			dev_info.tx_desc_lim.nb_align);
+ 		RTE_PMD_DEBUG_TRACE("Invalid value for nb_tx_desc(=%hu), "
+-				"should be: <= %hu, = %hu, and a product of %hu\n",
++				"should be: <= %hu, >= %hu, and a product of %hu\n",
+ 				nb_tx_desc,
+ 				dev_info.tx_desc_lim.nb_max,
+ 				dev_info.tx_desc_lim.nb_min,
 -- 
 2.11.0
 


More information about the stable mailing list