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 35AF9432F3; Fri, 10 Nov 2023 11:40:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 037F540E5E; Fri, 10 Nov 2023 11:40:00 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 6339140291; Fri, 10 Nov 2023 11:39:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699612798; x=1731148798; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cAdVRH6t7WkJbduyGE0UgA8o1FwlfuqRG+COcX1J31U=; b=K5P2v/uYAn1EAkoN+Nyeygkm3vzNBreCrKhrJzgXwk3dU2YIEd5tSxWj NNQXOS4XqKdGH8DNfICH6q8oMhb1AAAebASUsWjoqYePDQvLUKzSSz4dS F3vGXbRtgrv3Y6HhchMJ6Yt4J9qapcy1pLTr4P5VWv44TguVpQqSTXJE9 KfpzeiQ88KOfnFRxUJaJ8/oRzOTSbMweGQdyJBrk8WhBfsVFlwbB3sF7R CPst4Y9MJ0C5rqAzv2Z49nE3+02y15QIDwIgp/O7+nqawZrOD34n5t1/V cawtXAcCsRN9hg23s6V5r70hph0NRnejjR5CDg8Jkx7cfL1bIdR1QwCQy Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="393042760" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="393042760" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2023 02:39:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="757171840" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="757171840" Received: from unknown (HELO localhost.localdomain) ([10.239.252.253]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2023 02:39:55 -0800 From: Mingjin Ye To: dev@dpdk.org Cc: qiming.yang@intel.com, Mingjin Ye , stable@dpdk.org Subject: [PATCH v5] app/test: secondary process passes allow parameters Date: Fri, 10 Nov 2023 10:30:12 +0000 Message-Id: <20231110103013.469430-1-mingjinx.ye@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230927034204.2279012-1-mingjinx.ye@intel.com> References: <20230927034204.2279012-1-mingjinx.ye@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- v5: Optimized. --- app/test/process.h | 74 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/app/test/process.h b/app/test/process.h index af7bc3e0de..f8beb3c36f 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,57 @@ 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; + char *dev; + int malloc_size; + int allow_size = strlen(PREFIX_ALLOW); + int offset; + + RTE_EAL_DEVARGS_FOREACH(NULL, devargs) { + int name_length = 0; + int data_length = 0; + + 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 = allow_size + name_length + data_length + 1; + dev = malloc(malloc_size); + if (!dev) + return count; + + offset = 0; + memcpy(dev + offset, PREFIX_ALLOW, allow_size); + offset += allow_size; + memcpy(dev + offset, devargs->name, name_length); + offset += name_length; + if (data_length > 0) { + memcpy(dev + offset, devargs->data, data_length); + offset += data_length; + } + memset(dev + offset, 0x00, 1); + + *(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 +97,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 +113,17 @@ 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 *)); /* 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 +191,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