patch 'test: fix probing in secondary process' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/13/24. 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

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

Thanks.

Kevin

---
>From bf8fb07ca7dbfc397e1dbc18f51b9e4966119028 Mon Sep 17 00:00:00 2001
From: Mingjin Ye <mingjinx.ye at intel.com>
Date: Tue, 14 Nov 2023 10:28:15 +0000
Subject: [PATCH] test: fix probing in secondary process

[ upstream commit b3ce7891ad386310abab56352053a46ba06ca72f ]

In EAL related test cases, the allow parameters are not passed to
the secondary process, resulting in unexpected NICs being loaded.

This patch fixes this issue by appending the allow parameters to
the secondary process.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Mingjin Ye <mingjinx.ye at intel.com>
Tested-by: Zhimin Huang <zhiminx.huang at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 app/test/process.h | 46 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/app/test/process.h b/app/test/process.h
index 622cb0b218..8bb9eeec12 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -16,4 +16,5 @@
 
 #include <rte_string_fns.h> /* strlcpy */
+#include <rte_devargs.h>
 
 #ifdef RTE_EXEC_ENV_FREEBSD
@@ -33,4 +34,32 @@ extern uint16_t flag_for_send_pkts;
 #endif
 
+#define PREFIX_ALLOW "--allow="
+
+static int
+add_parameter_allow(char **argv, int max_capacity)
+{
+	struct rte_devargs *devargs;
+	int count = 0;
+
+	RTE_EAL_DEVARGS_FOREACH(NULL, devargs) {
+		if (strlen(devargs->name) == 0)
+			continue;
+
+		if (devargs->data == NULL || strlen(devargs->data) == 0) {
+			if (asprintf(&argv[count], PREFIX_ALLOW"%s", devargs->name) < 0)
+				break;
+		} else {
+			if (asprintf(&argv[count], PREFIX_ALLOW"%s,%s",
+					 devargs->name, devargs->data) < 0)
+				break;
+		}
+
+		if (++count == max_capacity)
+			break;
+	}
+
+	return count;
+}
+
 /*
  * launches a second copy of the test process using the given argv parameters,
@@ -42,6 +71,8 @@ static inline int
 process_dup(const char *const argv[], int numargs, const char *env_value)
 {
-	int num;
-	char *argv_cpy[numargs + 1];
+	int num = 0;
+	char **argv_cpy;
+	int allow_num;
+	int argv_num;
 	int i, status;
 	char path[32];
@@ -57,4 +88,10 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
 		return -1;
 	else if (pid == 0) {
+		allow_num = rte_devargs_type_count(RTE_DEVTYPE_ALLOWED);
+		argv_num = numargs + allow_num + 1;
+		argv_cpy = calloc(argv_num, sizeof(char *));
+		if (!argv_cpy)
+			rte_panic("Memory allocation failed\n");
+
 		/* make a copy of the arguments to be passed to exec */
 		for (i = 0; i < numargs; i++) {
@@ -63,6 +100,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
 				rte_panic("Error dup args\n");
 		}
-		argv_cpy[i] = NULL;
-		num = numargs;
+		if (allow_num > 0)
+			num = add_parameter_allow(&argv_cpy[i], allow_num);
+		num += numargs;
 
 #ifdef RTE_EXEC_ENV_LINUX
-- 
2.43.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-08 13:47:49.857884490 +0000
+++ 0028-test-fix-probing-in-secondary-process.patch	2024-03-08 13:47:49.036686717 +0000
@@ -1 +1 @@
-From b3ce7891ad386310abab56352053a46ba06ca72f Mon Sep 17 00:00:00 2001
+From bf8fb07ca7dbfc397e1dbc18f51b9e4966119028 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b3ce7891ad386310abab56352053a46ba06ca72f ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index c576c42349..9fb2bf481c 100644
+index 622cb0b218..8bb9eeec12 100644
@@ -26 +27 @@
-@@ -18,4 +18,5 @@
+@@ -16,4 +16,5 @@
@@ -32 +33 @@
-@@ -35,4 +36,32 @@ extern uint16_t flag_for_send_pkts;
+@@ -33,4 +34,32 @@ extern uint16_t flag_for_send_pkts;
@@ -65 +66 @@
-@@ -44,6 +73,8 @@ static inline int
+@@ -42,6 +71,8 @@ static inline int
@@ -76 +77 @@
-@@ -59,4 +90,10 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
+@@ -57,4 +88,10 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
@@ -87 +88 @@
-@@ -65,6 +102,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
+@@ -63,6 +100,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value)