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 4E3A442E92 for ; Mon, 17 Jul 2023 03:49:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4629742D10; Mon, 17 Jul 2023 03:49:58 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 03AC140698; Mon, 17 Jul 2023 03:49:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689558595; x=1721094595; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bTvHZ/x90QpqnAvobdWRsswWJLwUdvjO1fckpZhNx7E=; b=EgasWiF9nCHJgXwSK82q4851Wq+r1AeFzl6sF96eWHtPQmMTzi/z+8// /VDElnd1TRPOCrm/WfpxwThH39CKsTNvz8Q7A60DB6uR10O3dzAxYsItl jX8vpRMz406tAqWCe8VH6q3d+2EndfAhOL/j28uGRoL+3L+V5NW48cTAd whgneeHgc8ne59nD1Se9jfy4Q8LvPNi8Nc1wJH7ZJWLgeMmihrZTaELqw NNBamyEeNSeHDEH1ZrCjUZsUVV+KpFUN9SvWDzDlaECsTpkQkFB4mjuGb sQsXTwL06nutY7bR3rvumnY3OtITu8zwxsgf1IPHyztEVhdrqHZsCIVam g==; X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="355755944" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="355755944" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2023 18:49:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="717039840" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="717039840" Received: from unknown (HELO localhost.localdomain) ([10.239.252.104]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2023 18:49:52 -0700 From: Kaisen You To: dev@dpdk.org Cc: qiming.yang@intel.com, yidingx.zhou@intel.com, Kaisen You , stable@dpdk.org Subject: [PATCH v2] app/test:subprocess synchronization of parameters Date: Mon, 17 Jul 2023 09:47:13 +0800 Message-Id: <20230717014713.536297-1-kaisenx.you@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230705093515.3285574-1-kaisenx.you@intel.com> References: <20230705093515.3285574-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 meson_test, because the child process does not synchronize the NIC startup parameters of the parent process at startup, it uses all NICs bound by vfio as startup parameters by default, and an exception occurs in the subsequent hugefile check, causing the test to fail. Synchronize the NIC startup parameters of the parent process to the child process to solve this problem. Fixes: af75078fece3 ("first public release") Cc: stable@dpdk.org Signed-off-by: Kaisen You --- Changes since v1: - change the patch title to modify the way child processes get NIC parameters, --- app/test/process.h | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/app/test/process.h b/app/test/process.h index 1f073b9c5c..6a8505b80c 100644 --- a/app/test/process.h +++ b/app/test/process.h @@ -15,9 +15,12 @@ #include /* strerror */ #include /* readlink */ #include +#include "private.h" #include /* strlcpy */ +#define MAX_EXTRA_ARGS 32 +#define PCI_PRI_FMT "%.4" PRIx32 ":%.2" PRIx8 ":%.2" PRIx8 ".%" PRIx8 #ifdef RTE_EXEC_ENV_FREEBSD #define self "curproc" #define exe "file" @@ -33,7 +36,6 @@ extern void *send_pkts(void *empty); extern uint16_t flag_for_send_pkts; #endif #endif - /* * 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,9 +46,13 @@ static inline int process_dup(const char *const argv[], int numargs, const char *env_value) { int num; - char *argv_cpy[numargs + 1]; - int i, status; + char *argv_cpy[MAX_EXTRA_ARGS]; + int i, status, s; char path[32]; + struct rte_pci_device *dev = NULL; + char type[MAX_EXTRA_ARGS]; + char *argv_str[MAX_EXTRA_ARGS]; + char str_1[] = "-a"; #ifdef RTE_LIB_PDUMP #ifdef RTE_NET_RING pthread_t thread; @@ -113,10 +119,23 @@ process_dup(const char *const argv[], int numargs, const char *env_value) closedir(dir); } #endif + s = -1; + argv_str[0] = strdup(str_1); + FOREACH_DEVICE_ON_PCIBUS(dev) { + s = s + 2; + sprintf(type, PCI_PRI_FMT, dev->addr.domain, + dev->addr.bus, dev->addr.devid, dev->addr.function); + argv_str[s - 1] = strdup(str_1); + argv_str[s] = strdup(type); + } + for (i = 0; i < s + 1; i++) + argv_cpy[num + i] = strdup(argv_str[i]); + printf("Running binary with argv[]:"); - for (i = 0; i < num; i++) + for (i = 0; i < num + s + 1; i++) printf("'%s' ", argv_cpy[i]); printf("\n"); + argv_cpy[numargs + s + 1] = NULL; fflush(stdout); /* set the environment variable */ -- 2.25.1