From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6547C425E9 for ; Mon, 25 Sep 2023 11:54:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 51A4440A7A; Mon, 25 Sep 2023 11:54:12 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 5582540A6D; Mon, 25 Sep 2023 11:54:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695635649; x=1727171649; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/vUOUOm8+mv+mn9RmOm9JyqkSkc5ODfRodvNk+XsSFY=; b=YF/mdPk8PNcQR1hcpy8Si6wFrxtyaWrwlxI36IAAoIv+mjkaLziL2D9M 3a2l6JgVvH3zurm+XtYYWev7IGqOFKjISE7pVfm/wCnIM+vQs998dKmnD TY66nur0NexZ0mR4P2weiaA24hfu0d26Spyh95bWGqrDUfImHT29wfpcH 0ltidsU9U6ruNIf/6z7FlSm5CVKqNPMMYo2+DN81dDoBfWI5/g4hUhXmv +YItc9dcujJAx49UbS01koIn4VSeWOAum5jAV6XFmhZmYgns5slmpmanD xYLiUz713r/pVntG0npc8AA8e9PnqP+TUIjIcAyNmojosMfpHrQ9n9Glm g==; X-IronPort-AV: E=McAfee;i="6600,9927,10843"; a="445323897" X-IronPort-AV: E=Sophos;i="6.03,174,1694761200"; d="scan'208";a="445323897" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2023 02:54:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10843"; a="921917663" X-IronPort-AV: E=Sophos;i="6.03,174,1694761200"; d="scan'208";a="921917663" Received: from unknown (HELO localhost.localdomain) ([10.239.252.253]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2023 02:54:05 -0700 From: Mingjin Ye To: dev@dpdk.org Cc: qiming.yang@intel.com, yidingx.zhou@intel.com, Mingjin Ye , stable@dpdk.org Subject: [PATCH v3] app/test: secondary process passes allow parameters Date: Mon, 25 Sep 2023 09:42:40 +0000 Message-Id: <20230925094240.2122544-1-mingjinx.ye@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230726023947.3760943-1-kaisenx.you@intel.com> References: <20230726023947.3760943-1-kaisenx.you@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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: 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 --- v3:new solution. --- app/test/process.h | 52 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/app/test/process.h b/app/test/process.h index 1f073b9c5c..57d58309d8 100644 --- a/app/test/process.h +++ b/app/test/process.h @@ -18,6 +18,8 @@ #include /* strlcpy */ +#include + #ifdef RTE_EXEC_ENV_FREEBSD #define self "curproc" #define exe "file" @@ -34,6 +36,44 @@ extern uint16_t flag_for_send_pkts; #endif #endif +#define PREFIX_A "-a" + +static int +add_parameter_a(char **argv, int max_capacity) +{ + struct rte_devargs *devargs; + int count = 0; + int name_length, data_length; + char *dev; + int malloc_szie; + + RTE_EAL_DEVARGS_FOREACH(NULL, devargs) { + if (count >= max_capacity) + return count; + + name_length = strlen(devargs->name); + if (devargs->data != NULL) + data_length = strlen(devargs->data); + else + data_length = 0; + + malloc_szie = name_length + data_length + 1; + dev = malloc(malloc_szie); + + strncpy(dev, devargs->name, name_length); + if (data_length > 0) + strncpy(dev + name_length, devargs->data, data_length); + memset(dev + malloc_szie - 1, 0, 1); + + *(argv + count) = strdup(PREFIX_A); + 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 +84,7 @@ 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[numargs + RTE_MAX_ETHPORTS * 2 + 1]; int i, status; char path[32]; #ifdef RTE_LIB_PDUMP @@ -58,11 +98,12 @@ process_dup(const char *const argv[], int numargs, const char *env_value) if (pid < 0) return -1; else if (pid == 0) { + memset(argv_cpy, 0, numargs + RTE_MAX_ETHPORTS * 2 + 1); /* 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_a(&argv_cpy[i], RTE_MAX_ETHPORTS * 2); #ifdef RTE_EXEC_ENV_LINUX { @@ -131,6 +172,13 @@ 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]); + argv_cpy[i] = NULL; + } + } } /* parent process does a wait */ #ifdef RTE_LIB_PDUMP -- 2.25.1