[dpdk-stable] patch 'examples/kni: fix MTU change to setup Tx queue' has been queued to LTS release 18.11.9

Kevin Traynor ktraynor at redhat.com
Fri Jun 5 20:25:08 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.9

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/10/20. 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://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/1804a539faca3fb88608cc3d0b2501dc77a4eac7

Thanks.

Kevin.

---
>From 1804a539faca3fb88608cc3d0b2501dc77a4eac7 Mon Sep 17 00:00:00 2001
From: Rasesh Mody <rmody at marvell.com>
Date: Wed, 13 May 2020 21:09:38 -0700
Subject: [PATCH] examples/kni: fix MTU change to setup Tx queue

[ upstream commit a26b116749a38db09223cfbb18f4c349f2bbae8e ]

This patch adds a fix to setup Tx queue when changing KNI interface MTU.
It ensures device can safely start txq post MTU change operation.

Fixes: fc9ee41b7016 ("examples/kni: convert to new ethdev offloads API")

Signed-off-by: Rasesh Mody <rmody at marvell.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 examples/kni/main.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/examples/kni/main.c b/examples/kni/main.c
index 6c9f46e77e..4fbb860109 100644
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -745,7 +745,9 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
 	int ret;
 	uint16_t nb_rxd = NB_RXD;
+	uint16_t nb_txd = NB_TXD;
 	struct rte_eth_conf conf;
 	struct rte_eth_dev_info dev_info;
 	struct rte_eth_rxconf rxq_conf;
+	struct rte_eth_txconf txq_conf;
 
 	if (!rte_eth_dev_is_valid_port(port_id)) {
@@ -775,5 +777,5 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
 	}
 
-	ret = rte_eth_dev_adjust_nb_rx_tx_desc(port_id, &nb_rxd, NULL);
+	ret = rte_eth_dev_adjust_nb_rx_tx_desc(port_id, &nb_rxd, &nb_txd);
 	if (ret < 0)
 		rte_exit(EXIT_FAILURE, "Could not adjust number of descriptors "
@@ -792,4 +794,14 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
 	}
 
+	txq_conf = dev_info.default_txconf;
+	txq_conf.offloads = conf.txmode.offloads;
+	ret = rte_eth_tx_queue_setup(port_id, 0, nb_txd,
+		rte_eth_dev_socket_id(port_id), &txq_conf);
+	if (ret < 0) {
+		RTE_LOG(ERR, APP, "Fail to setup Tx queue of port %d\n",
+				port_id);
+		return ret;
+	}
+
 	/* Restart specific port */
 	ret = rte_eth_dev_start(port_id);
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.713523082 +0100
+++ 0071-examples-kni-fix-MTU-change-to-setup-Tx-queue.patch	2020-06-05 19:20:50.944037769 +0100
@@ -1 +1 @@
-From a26b116749a38db09223cfbb18f4c349f2bbae8e Mon Sep 17 00:00:00 2001
+From 1804a539faca3fb88608cc3d0b2501dc77a4eac7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a26b116749a38db09223cfbb18f4c349f2bbae8e ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 6b4ab3b5b5..7a927a50c0 100644
+index 6c9f46e77e..4fbb860109 100644
@@ -22 +23 @@
-@@ -775,7 +775,9 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
+@@ -745,7 +745,9 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
@@ -32 +33 @@
-@@ -805,5 +807,5 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
+@@ -775,5 +777,5 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
@@ -39 +40 @@
-@@ -830,4 +832,14 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
+@@ -792,4 +794,14 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)



More information about the stable mailing list