patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Mingjin Ye <mingjinx.ye@intel.com>
To: dev@dpdk.org
Cc: Mingjin Ye <mingjinx.ye@intel.com>, stable@dpdk.org
Subject: [PATCH v4] test: fix option devices
Date: Wed, 16 Oct 2024 08:17:19 +0000	[thread overview]
Message-ID: <20241016081719.1619975-1-mingjinx.ye@intel.com> (raw)
In-Reply-To: <20241014100026.1517769-1-mingjinx.ye@intel.com>

Without using allow (-a) or block (-b), EAL loads all devices by default.
Unexpected devices may be loaded when running test cases in sub-processes.

This patch fixes the issue by copying the parameters of the primary process
if the allow (-a) or block (-b) option is not used when starting the child
process.

Also, EAL does not allow the options allow (-a) and block (-b) to be used
at the same time.

Fixes: b3ce7891ad38 ("test: fix probing in secondary process")
Cc: stable@dpdk.org

Signed-off-by: Mingjin Ye <mingjinx.ye@intel.com>
---
v2: The long form of the fix option is "--block".
---
v3: new scheme.
---
v4: Changing the commit log.
---
 app/test/process.h | 58 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 4 deletions(-)

diff --git a/app/test/process.h b/app/test/process.h
index 9fb2bf481c..665abae9dc 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -36,6 +36,7 @@ extern uint16_t flag_for_send_pkts;
 #endif
 
 #define PREFIX_ALLOW "--allow="
+#define PREFIX_BLOCK "--block="
 
 static int
 add_parameter_allow(char **argv, int max_capacity)
@@ -44,7 +45,7 @@ add_parameter_allow(char **argv, int max_capacity)
 	int count = 0;
 
 	RTE_EAL_DEVARGS_FOREACH(NULL, devargs) {
-		if (strlen(devargs->name) == 0)
+		if (strlen(devargs->name) == 0 || devargs->type != RTE_DEVTYPE_ALLOWED)
 			continue;
 
 		if (devargs->data == NULL || strlen(devargs->data) == 0) {
@@ -63,6 +64,32 @@ add_parameter_allow(char **argv, int max_capacity)
 	return count;
 }
 
+static int
+add_parameter_block(char **argv, int max_capacity)
+{
+	struct rte_devargs *devargs;
+	int count = 0;
+
+	RTE_EAL_DEVARGS_FOREACH(NULL, devargs) {
+		if (strlen(devargs->name) == 0 || devargs->type != RTE_DEVTYPE_BLOCKED)
+			continue;
+
+		if (devargs->data == NULL || strlen(devargs->data) == 0) {
+			if (asprintf(&argv[count], PREFIX_BLOCK"%s", devargs->name) < 0)
+				break;
+		} else {
+			if (asprintf(&argv[count], PREFIX_BLOCK"%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,
  * which should include argv[0] as the process name. To identify in the
@@ -74,7 +101,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
 {
 	int num = 0;
 	char **argv_cpy;
-	int allow_num;
+	int allow_num, block_num;
 	int argv_num;
 	int i, status;
 	char path[32];
@@ -89,8 +116,27 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
 	if (pid < 0)
 		return -1;
 	else if (pid == 0) {
-		allow_num = rte_devargs_type_count(RTE_DEVTYPE_ALLOWED);
-		argv_num = numargs + allow_num + 1;
+		allow_num = 0;
+		block_num = 0;
+
+		for (i = 0; i < numargs; i++) {
+			if (strcmp(argv[i], "-b") == 0 ||
+			    strcmp(argv[i], "--block") == 0)
+				block_num++;
+			if (strcmp(argv[i], "-a") == 0 ||
+			    strcmp(argv[i], "--allow") == 0)
+				allow_num++;
+		}
+		/* If block (-b) and allow (-a) are present, they will not be added. */
+		if (!block_num && !allow_num) {
+			allow_num = rte_devargs_type_count(RTE_DEVTYPE_ALLOWED);
+			block_num = rte_devargs_type_count(RTE_DEVTYPE_BLOCKED);
+		} else {
+			allow_num = 0;
+			block_num = 0;
+		}
+
+		argv_num = numargs + allow_num + block_num + 1;
 		argv_cpy = calloc(argv_num, sizeof(char *));
 		if (!argv_cpy)
 			rte_panic("Memory allocation failed\n");
@@ -101,8 +147,12 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
 			if (argv_cpy[i] == NULL)
 				rte_panic("Error dup args\n");
 		}
+
+		/* EAL limits block (-b) and allow (-a) to not exist at the same time. */
 		if (allow_num > 0)
 			num = add_parameter_allow(&argv_cpy[i], allow_num);
+		else if (block_num > 0)
+			num = add_parameter_block(&argv_cpy[i], block_num);
 		num += numargs;
 
 #ifdef RTE_EXEC_ENV_LINUX
-- 
2.25.1


      parent reply	other threads:[~2024-10-16  8:40 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-14  9:46 [PATCH] test: fix option block Mingjin Ye
2024-03-15  6:49 ` Jiale, SongX
2024-10-07 17:02 ` Stephen Hemminger
2024-10-12  9:35 ` [PATCH v2] " Mingjin Ye
2024-10-12 22:20   ` Stephen Hemminger
2024-10-14 10:22     ` Ye, MingjinX
2024-10-14 10:00   ` [PATCH v3] test: fix option devices Mingjin Ye
2024-10-15 16:21     ` Stephen Hemminger
2024-10-16  8:17     ` Mingjin Ye [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241016081719.1619975-1-mingjinx.ye@intel.com \
    --to=mingjinx.ye@intel.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).