DPDK patches and discussions
 help / color / mirror / Atom feed
* [PATCH] test: fix option block
@ 2024-03-14  9:46 Mingjin Ye
  2024-03-15  6:49 ` Jiale, SongX
                   ` (3 more replies)
  0 siblings, 4 replies; 15+ messages in thread
From: Mingjin Ye @ 2024-03-14  9:46 UTC (permalink / raw)
  To: dev; +Cc: Mingjin Ye, stable

The options allow (-a) and block (-b) cannot be used at the same time.
Therefore, allow (-a) will not be added when block (-b) is present.

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

Signed-off-by: Mingjin Ye <mingjinx.ye@intel.com>
---
 app/test/process.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/test/process.h b/app/test/process.h
index 9fb2bf481c..388c7975cd 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -44,7 +44,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) {
@@ -74,7 +74,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,7 +89,18 @@ 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);
+		allow_num = 0;
+		block_num = 0;
+
+		/* If block (-b) is present, allow (-a) is not added. */
+		for (i = 0; i < numargs; i++) {
+			if (strcmp(argv[i], "-b") == 0 ||
+			    strcmp(argv[i], "-block") == 0)
+				block_num++;
+		}
+		if (!block_num)
+			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)
-- 
2.25.1


^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2024-10-17  2:32 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-14  9:46 [PATCH] test: fix option block Mingjin Ye
2024-03-15  6:49 ` Jiale, SongX
     [not found] ` <LV3PR11MB8601B4FC344CC7102C5AC010E5DD2@LV3PR11MB8601.namprd11.prod.outlook.com>
2024-07-03 14:35   ` Stokes, Ian
2024-07-04  8:09     ` Ye, MingjinX
2024-07-04 12:02       ` Stokes, Ian
2024-07-05  1:38         ` Ye, MingjinX
2024-07-10  9:02           ` Stokes, Ian
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     ` [PATCH v4] " Mingjin Ye
2024-10-17  2:31       ` Jiale, SongX

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).