From patchwork Wed Jul 5 09:35:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaisen You X-Patchwork-Id: 129279 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 D13E942DD6; Wed, 5 Jul 2023 11:36:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 187D5410F2; Wed, 5 Jul 2023 11:36:20 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 6605340150; Wed, 5 Jul 2023 11:36:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688549778; x=1720085778; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Tr066M9Zq0pA1qEnMWXv8+eV9Zxy83R8t6qIjw62Kqw=; b=TBLbPdfsX53YgkTkQ9P+WiHBcuaQl3YiwHxkGMMLy4CfI2hYpRAAlrkV X5mntWYK3RSzfoFPcKA4qqZUF3pZobgeQ9/8GyfqzII+usQF9iTJDUbi8 5gRF7nqMntU7V5VX4FimiftDvp1IsHSuxrkTrlHJx54iz07KMZRpR/7ec c2qyC553YkIA08kaigph15Buz/1qSo7gB5l0/jqIv+VnNeweMCLUqmzUw EjFfPr9BD2YO11DjwbaH1E3ldYHeuOfCSXoKtyi/UHPx+VY61BraY4iXF 3tx5g4GwQkzBex453qqFeRv6K6YTLEVVJF+i86dVLAVDmFbcSPYm8MnZy Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10761"; a="362163595" X-IronPort-AV: E=Sophos;i="6.01,182,1684825200"; d="scan'208";a="362163595" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2023 02:36:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10761"; a="1049640849" X-IronPort-AV: E=Sophos;i="6.01,182,1684825200"; d="scan'208";a="1049640849" Received: from unknown (HELO localhost.localdomain) ([10.239.252.104]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2023 02:36:14 -0700 From: Kaisen You To: dev@dpdk.org Cc: qiming.yang@intel.com, yidingx.zhou@intel.com, Kaisen You , stable@dpdk.org Subject: [PATCH] child process synchronization NIC startup parameters Date: Wed, 5 Jul 2023 17:35:14 +0800 Message-Id: <20230705093515.3285574-1-kaisenx.you@intel.com> X-Mailer: git-send-email 2.25.1 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 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: 786b29255c49 ("test: fix file prefix discovery") Cc: stable@dpdk.org Signed-off-by: Kaisen You --- app/test/process.h | 80 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/app/test/process.h b/app/test/process.h index 1f073b9c5c..c8a15e8989 100644 --- a/app/test/process.h +++ b/app/test/process.h @@ -15,9 +15,11 @@ #include /* strerror */ #include /* readlink */ #include +#include #include /* strlcpy */ +#define MAX_EXTRA_ARGS 32 #ifdef RTE_EXEC_ENV_FREEBSD #define self "curproc" #define exe "file" @@ -34,6 +36,50 @@ extern uint16_t flag_for_send_pkts; #endif #endif +/* get cmdline form PID. Read process info form /proc/$PID. */ +static char *get_cmdline_from_pid(pid_t pid, char *buf, int len) +{ + char filename[PATH_MAX]; + char *name = NULL; + int fd; + int ret; + + if (pid < 1 || buf == NULL || len < 0) { + printf("%s: illegal param\n", __func__); + return NULL; + } + + snprintf(filename, PATH_MAX, "/proc/%d/cmdline", pid); + memset(buf, 0, len); + fd = open(filename, O_RDONLY); + if (fd < 0) { + perror("open:"); + return NULL; + } + ret = read(fd, buf, len); + close(fd); + + if (ret < 0) + return NULL; + + if (buf[ret-1] == '\n') + buf[--ret] = 0; + + name = buf; + while (ret) { + if (((unsigned char)*name) < ' ') + *name = ' '; + name++; + ret--; + } + *name = 0; + + if (buf[0]) + return buf; + + return NULL; +} + /* * 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 +90,15 @@ 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, n, s, j; char path[32]; + char buf[1024]; + char *token; + char str_1[] = "-a"; + char str_2[] = " "; + char *argv_str[MAX_EXTRA_ARGS]; + char *argv_copy[MAX_EXTRA_ARGS]; #ifdef RTE_LIB_PDUMP #ifdef RTE_NET_RING pthread_t thread; @@ -113,10 +165,32 @@ process_dup(const char *const argv[], int numargs, const char *env_value) closedir(dir); } #endif + /* Add the -a parameter to the child process start parameter */ + get_cmdline_from_pid(getppid(), buf, 1024); + token = strtok(buf, str_2); + argv_str[0] = strdup(token); + n = 0; + j = 0; + while (token != NULL) { + n = n + 1; + argv_str[n] = strdup(token); + token = strtok(NULL, str_2); + } + for (s = 0; s < n; s++) { + if (strcmp(argv_str[s], str_1) == 0 || + strcmp(argv_str[s + 1], str_1) == 0) { + argv_copy[j] = strdup(argv_str[s + 1]); + j++; + } + } + for (s = 0; s < j; s++) + argv_cpy[numargs + s] = strdup(argv_copy[s]); + printf("Running binary with argv[]:"); - for (i = 0; i < num; i++) + for (i = 0; i < num + j; i++) printf("'%s' ", argv_cpy[i]); printf("\n"); + argv_cpy[numargs + j] = NULL; fflush(stdout); /* set the environment variable */