patch 'net/af_xdp: disable secondary process support' has been queued to stable release 19.11.11

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/6dbdbe50b13050a1121ac4882d29b325c155d2e1

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 6dbdbe50b13050a1121ac4882d29b325c155d2e1 Mon Sep 17 00:00:00 2001
From: Ciara Loftus <ciara.loftus at intel.com>
Date: Fri, 8 Oct 2021 07:50:20 +0000
Subject: [PATCH] net/af_xdp: disable secondary process support

[ upstream commit 0668d829085c4e92a6a1117e2b7cb8653eff8038 ]

Since the AF_XDP PMD does not work for secondary processes as reported
in Bugzilla 805, check for the process type at the beginning of probe
and return ENOTSUP if the process type is secondary.

It is planned that secondary processes will be supported by the PMD in
full in a future release by using rte_mp_msg to pass the state to the
secondary process that it requires in order to work.

Bugzilla ID: 805
Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD")

Reported-by: Stephen Hemminger <stephen at networkplumber.org>
Signed-off-by: Ciara Loftus <ciara.loftus at intel.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/af_xdp/rte_eth_af_xdp.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 1d7911db43..c50974f723 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -1305,16 +1305,11 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev)
 		rte_vdev_device_name(dev));
 
 	name = rte_vdev_device_name(dev);
-	if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
-		strlen(rte_vdev_device_args(dev)) == 0) {
-		eth_dev = rte_eth_dev_attach_secondary(name);
-		if (eth_dev == NULL) {
-			AF_XDP_LOG(ERR, "Failed to probe %s\n", name);
-			return -EINVAL;
-		}
-		eth_dev->dev_ops = &ops;
-		rte_eth_dev_probing_finish(eth_dev);
-		return 0;
+	if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+		AF_XDP_LOG(ERR, "Failed to probe %s. "
+				"AF_XDP PMD does not support secondary processes.\n",
+				name);
+		return -ENOTSUP;
 	}
 
 	kvlist = rte_kvargs_parse(rte_vdev_device_args(dev), valid_arguments);
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:10.053737867 +0100
+++ 0071-net-af_xdp-disable-secondary-process-support.patch	2021-11-30 16:50:05.746873207 +0100
@@ -1 +1 @@
-From 0668d829085c4e92a6a1117e2b7cb8653eff8038 Mon Sep 17 00:00:00 2001
+From 6dbdbe50b13050a1121ac4882d29b325c155d2e1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0668d829085c4e92a6a1117e2b7cb8653eff8038 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -22,19 +23,3 @@
- doc/guides/rel_notes/release_21_11.rst |  4 ++++
- drivers/net/af_xdp/rte_eth_af_xdp.c    | 15 +++++----------
- 2 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
-index 30175246c7..48e0bb60a1 100644
---- a/doc/guides/rel_notes/release_21_11.rst
-+++ b/doc/guides/rel_notes/release_21_11.rst
-@@ -85,6 +85,10 @@ New Features
-   * Default VLAN strip behavior was changed. VLAN tag won't be stripped
-     unless ``DEV_RX_OFFLOAD_VLAN_STRIP`` offload is enabled.
- 
-+* **Updated AF_XDP PMD.**
-+
-+  * Disabled secondary process support.
-+
- * **Updated Broadcom bnxt PMD.**
- 
-   * Added flow offload support for Thor.
+ drivers/net/af_xdp/rte_eth_af_xdp.c | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
@@ -42 +27 @@
-index a619dd218d..b362ccdcd3 100644
+index 1d7911db43..c50974f723 100644
@@ -45 +30 @@
-@@ -1783,16 +1783,11 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev)
+@@ -1305,16 +1305,11 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev)