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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 05/21/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.

Thanks.

Luca Boccassi

---
>From bfc5290bc8e1cb8afab2b8858c28f303e9c9a6ff 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 025b73acb3..87a29b8535 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -584,6 +584,7 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
 	PMD_LOG(INFO, "Initializing pmd_null for %s", name);
 
 	if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+		struct pmd_internals *internals;
 		eth_dev = rte_eth_dev_attach_secondary(name);
 		if (!eth_dev) {
 			PMD_LOG(ERR, "Failed to probe %s", name);
@@ -592,7 +593,8 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
 		/* TODO: request info from primary to set up Rx and Tx */
 		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;
 		} else {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:47.140388686 +0100
+++ 0065-net-null-fix-secondary-burst-function-selection.patch	2020-05-19 14:04:44.224648517 +0100
@@ -1,8 +1,10 @@
-From e2f4b25063d7d06f004d0809c30bb616f5bca61b Mon Sep 17 00:00:00 2001
+From bfc5290bc8e1cb8afab2b8858c28f303e9c9a6ff 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.
@@ -11,7 +13,6 @@
 functions unintentionally.
 
 Fixes: bccc77a6a74a ("net/null: fix multi-process Rx and Tx")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---