From patchwork Mon Nov 13 10:42:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingjin Ye X-Patchwork-Id: 134153 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 860BC430AB; Mon, 13 Nov 2023 11:57:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18CEC4026C; Mon, 13 Nov 2023 11:57:04 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 2D2C94021F; Mon, 13 Nov 2023 11:57:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699873022; x=1731409022; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HWHmNyDPA8ING7W1hkarN8Xll164K4qMd/+IUa8fugg=; b=SMrekJsRMmi3RBKquQsANNtqNrRMpYuJDe1wWBYkcVEzDELbgs0MHCJL 102RMYKoH1e1XjJLNbwOgMgrfXPKj5pga/i3odLq9QbgYT8j4bhuhap00 n25YPUBvLXfqniOndKexmfdWkhH13bd3xcmSRBWvCqwOsaPUijEahorFL 5PoplSHnLYnNQQePzlqL+WD/9C4ySl+FMpLepINjLBlABk1mNco+wkpcy XmCCjO28+b8roYoA8V+bKx0FoZRULf6ChTmLwpmegRnzKUIJNnJIQ4vx2 9CUEMfIJYtfQJ2vd4r42bPuX4H3Qz8nPQKuaY9zZ1H0nGOQQOtKJqS8Qd w==; X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="387577993" X-IronPort-AV: E=Sophos;i="6.03,299,1694761200"; d="scan'208";a="387577993" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2023 02:57:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="834687870" X-IronPort-AV: E=Sophos;i="6.03,299,1694761200"; d="scan'208";a="834687870" Received: from unknown (HELO localhost.localdomain) ([10.239.252.253]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2023 02:56:59 -0800 From: Mingjin Ye To: dev@dpdk.org Cc: qiming.yang@intel.com, Mingjin Ye , stable@dpdk.org Subject: [PATCH v6] app/test: secondary process passes allow parameters Date: Mon, 13 Nov 2023 10:42:22 +0000 Message-Id: <20231113104222.85891-1-mingjinx.ye@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231110103013.469430-1-mingjinx.ye@intel.com> References: <20231110103013.469430-1-mingjinx.ye@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-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: af75078fece3 ("first public release") Cc: stable@dpdk.org Signed-off-by: Mingjin Ye Acked-by: Bruce Richardson --- v5: Optimized. --- v6: Optimized. --- app/test/process.h | 52 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/app/test/process.h b/app/test/process.h index af7bc3e0de..cd3603b7bb 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,34 @@ 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; + + RTE_EAL_DEVARGS_FOREACH(NULL, devargs) { + if (strlen(devargs->name) == 0) + continue; + + if (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, * which should include argv[0] as the process name. To identify in the @@ -44,7 +74,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; + int allow_num; + int argv_num; int i, status; char path[32]; #ifdef RTE_LIB_PDUMP @@ -58,12 +90,21 @@ 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; + argv_cpy = malloc(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++) argv_cpy[i] = strdup(argv[i]); - argv_cpy[i] = NULL; - num = numargs; + num = add_parameter_allow(&argv_cpy[i], allow_num); + if (num != allow_num) + rte_panic("Fill allow parameter incomplete\n"); + num += numargs; + argv_cpy[argv_num - 1] = NULL; #ifdef RTE_EXEC_ENV_LINUX { const char *procdir = "/proc/" self "/fd/"; @@ -131,6 +172,11 @@ 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++) + free(argv_cpy[i]); + + free(argv_cpy); } /* parent process does a wait */ #ifdef RTE_LIB_PDUMP