[dpdk-stable] patch 'net/null: fix secondary burst function selection' has been queued to LTS release 18.11.9

Kevin Traynor ktraynor at redhat.com
Thu May 28 18:22:57 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/03/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/1142c2f79991f12183278ddc81c71a2ce418b01e

Thanks.

Kevin.

---
>From 1142c2f79991f12183278ddc81c71a2ce418b01e Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Mon, 2 Mar 2020 17:36:40 +0000
Subject: [PATCH] net/null: fix secondary burst function selection

[ upstream commit e2f4b25063d7d06f004d0809c30bb616f5bca61b ]

Secondary process uses the primary process device and while setting the
Rx/Tx functions it uses the device arguments from the secondary process
instead of the primary ones.

This may cause primary and secondary process use different Rx/Tx
functions unintentionally.

Fixes: bccc77a6a74a ("net/null: fix multi-process Rx and Tx")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/null/rte_eth_null.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 1067e6e4ea..95314982c3 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -614,4 +614,5 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
 
 	if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+		struct pmd_internals *internals;
 		eth_dev = rte_eth_dev_attach_secondary(name);
 		if (!eth_dev) {
@@ -622,5 +623,6 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
 		eth_dev->dev_ops = &ops;
 		eth_dev->device = &dev->device;
-		if (packet_copy) {
+		internals = eth_dev->data->dev_private;
+		if (internals->packet_copy) {
 			eth_dev->rx_pkt_burst = eth_null_copy_rx;
 			eth_dev->tx_pkt_burst = eth_null_copy_tx;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:02.716767324 +0100
+++ 0070-net-null-fix-secondary-burst-function-selection.patch	2020-05-28 17:12:59.151555269 +0100
@@ -1 +1 @@
-From e2f4b25063d7d06f004d0809c30bb616f5bca61b Mon Sep 17 00:00:00 2001
+From 1142c2f79991f12183278ddc81c71a2ce418b01e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e2f4b25063d7d06f004d0809c30bb616f5bca61b ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 025b73acb3..87a29b8535 100644
+index 1067e6e4ea..95314982c3 100644
@@ -25 +26 @@
-@@ -585,4 +585,5 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
+@@ -614,4 +614,5 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
@@ -31 +32 @@
-@@ -593,5 +594,6 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
+@@ -622,5 +623,6 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)



More information about the stable mailing list