From: Mingjin Ye <mingjinx.ye@intel.com>
To: dev@dpdk.org
Cc: qiming.yang@intel.com, yidingx.zhou@intel.com,
Mingjin Ye <mingjinx.ye@intel.com>,
stable@dpdk.org
Subject: [PATCH v4] app/test: append 'allow' parameters to secondary processes
Date: Wed, 27 Sep 2023 03:42:04 +0000 [thread overview]
Message-ID: <20230927034204.2279012-1-mingjinx.ye@intel.com> (raw)
In-Reply-To: <20230925094240.2122544-1-mingjinx.ye@intel.com>
The 'allow' parameters are not passed to the secondary process, and all
devices will be loaded by default. When the primary process specifies
the 'allow' parameters and does not specify all devices that use the
vfio-pci driver, the secondary process will not load the devices as
expected, which will return incorrect test results.
This patch fixes this issue by appending the 'allow' parameters to the
secondary process.
Fixes: 086eb64db39e ("test/pdump: add unit test for pdump library")
Fixes: 148f963fb532 ("xen: core library changes")
Fixes: af75078fece3 ("first public release")
Fixes: b8d5e544e73e ("test: add procfs error message for multi-process launch")
Cc: stable@dpdk.org
Signed-off-by: Mingjin Ye <mingjinx.ye@intel.com>
---
v4: Resolve patch conflicts and optimize code.
---
app/test/process.h | 60 +++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 57 insertions(+), 3 deletions(-)
diff --git a/app/test/process.h b/app/test/process.h
index af7bc3e0de..1cdf28752e 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -18,6 +18,8 @@
#include <rte_string_fns.h> /* strlcpy */
+#include <rte_devargs.h>
+
#ifdef RTE_EXEC_ENV_FREEBSD
#define self "curproc"
#define exe "file"
@@ -34,6 +36,47 @@ extern uint16_t flag_for_send_pkts;
#endif
#endif
+#define PREFIX_ALLOW "--allow"
+
+static int
+add_parameter_allow(char **argv, int max_capacity)
+{
+ struct rte_devargs *devargs;
+ int count = 0;
+ int name_length, data_length;
+ char *dev;
+ int malloc_size;
+
+ RTE_EAL_DEVARGS_FOREACH(NULL, devargs) {
+ if (count >= max_capacity)
+ return count;
+
+ name_length = strlen(devargs->name);
+ if (name_length == 0)
+ continue;
+
+ if (devargs->data != NULL)
+ data_length = strlen(devargs->data);
+ else
+ data_length = 0;
+
+ malloc_size = name_length + data_length + 1;
+ dev = malloc(malloc_size);
+
+ memcpy(dev, devargs->name, name_length);
+ if (data_length > 0)
+ memcpy(dev + name_length, devargs->data, data_length);
+ memset(dev + malloc_size - 1, 0, 1);
+
+ *(argv + count) = strdup(PREFIX_ALLOW);
+ count++;
+
+ *(argv + count) = dev;
+ count++;
+ }
+ 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
@@ -44,7 +87,9 @@ static inline int
process_dup(const char *const argv[], int numargs, const char *env_value)
{
int num;
- char *argv_cpy[numargs + 1];
+ char **argv_cpy;
+ unsigned int allow_num;
+ unsigned int argv_num;
int i, status;
char path[32];
#ifdef RTE_LIB_PDUMP
@@ -58,12 +103,15 @@ 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 * 2 + 1;
+ argv_cpy = malloc(argv_num * sizeof(char *));
/* make a copy of the arguments to be passed to exec */
for (i = 0; i < numargs; i++)
argv_cpy[i] = strdup(argv[i]);
- argv_cpy[i] = NULL;
num = numargs;
-
+ num += add_parameter_allow(&argv_cpy[i], allow_num * 2);
+ argv_cpy[argv_num - 1] = NULL;
#ifdef RTE_EXEC_ENV_LINUX
{
const char *procdir = "/proc/" self "/fd/";
@@ -131,6 +179,12 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
}
rte_panic("Cannot exec: %s\n", strerror(errno));
}
+
+ for (i = 0; i < num; i++) {
+ if (argv_cpy[i] != NULL)
+ free(argv_cpy[i]);
+ }
+ free(argv_cpy);
}
/* parent process does a wait */
#ifdef RTE_LIB_PDUMP
--
2.25.1
next prev parent reply other threads:[~2023-09-27 3:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-05 9:35 [PATCH] child process synchronization NIC startup parameters Kaisen You
2023-07-06 2:16 ` Yang, Qiming
2023-07-07 1:21 ` You, KaisenX
2023-07-06 19:07 ` Stephen Hemminger
2023-07-14 5:59 ` [PATCH v2] app/test:subprocess synchronization of parameters Kaisen You
2023-07-17 1:47 ` Kaisen You
2023-07-26 2:39 ` Kaisen You
2023-09-25 9:42 ` [PATCH v3] app/test: secondary process passes allow parameters Mingjin Ye
2023-09-25 9:58 ` David Marchand
2023-09-25 10:09 ` Ye, MingjinX
2023-09-25 10:19 ` David Marchand
2023-09-27 3:42 ` Mingjin Ye [this message]
2023-10-13 2:47 ` [PATCH v4] app/test: append 'allow' parameters to secondary processes Huang, ZhiminX
2023-11-09 11:13 ` Bruce Richardson
2023-11-10 10:30 ` [PATCH v5] app/test: secondary process passes allow parameters Mingjin Ye
2023-11-10 11:18 ` Bruce Richardson
2023-11-13 10:42 ` [PATCH v6] " Mingjin Ye
2023-11-13 11:11 ` Bruce Richardson
2023-11-14 10:28 ` [PATCH v7] " Mingjin Ye
2023-11-17 10:05 ` Huang, ZhiminX
2023-11-17 10:24 ` Ye, MingjinX
2023-11-17 11:17 ` Bruce Richardson
2023-11-24 10:28 ` Ye, MingjinX
2024-03-06 13:50 ` Thomas Monjalon
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=20230927034204.2279012-1-mingjinx.ye@intel.com \
--to=mingjinx.ye@intel.com \
--cc=dev@dpdk.org \
--cc=qiming.yang@intel.com \
--cc=stable@dpdk.org \
--cc=yidingx.zhou@intel.com \
/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).