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 2632343CAD for ; Thu, 14 Mar 2024 01:12:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 180E742E6E; Thu, 14 Mar 2024 01:12:49 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 03FB942E40 for ; Thu, 14 Mar 2024 01:12:48 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-413f2682975so364115e9.3 for ; Wed, 13 Mar 2024 17:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375167; x=1710979967; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bYvGETIuz3HYr7UMxxslW7lU/SVKqTOwmPp0DipFsrQ=; b=SMPKWtvYdtxxPdvhycd0L0h5q/1VN9cYp0L1BHIUP1Oh0yadHpbZEkgJ5UvECKQAaA ob4ZuI5hVgQDvzxVMvPFxFWHikhKXjFfYkzMk2tqqbJ6siMbvFhTxMO3/PBsjGUYfA/8 HR0uHTgYiK7tofeGCmwmOkd1T8RgNXaX3567XZ9eE7LXi3H0ypavy01avZckam4H7RUH 4bdneyk/cEaPhihPnlFcnLEy22YmGO4X1lPDKp+xcf098qK7xRHiDom0D1uBD/LqtSbS 0MqLQarsTCaQB9DB/GSEzpJYCEB5YCPNAjtc58ppvhyfqA/ljc3xpccak2ts3VRY33v2 gA/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375167; x=1710979967; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bYvGETIuz3HYr7UMxxslW7lU/SVKqTOwmPp0DipFsrQ=; b=ulKSdntJe8H+z8tBrG/mgcUJhpWuDRsqwYK5bxZoF8zi8jFVKwkY/c6NecuQNCkIN7 c2ml15/ZlBM4DvVRWUSEPkjBvfXq6awoPgD6VLj4G/jm5xgR27YauPGE8x+k7gOZT0ke PBdXIDa5yprbS0W/u5jcGPBKmGcC0KdZ2x0zu8LhgRiGU7BGrq3YMTGRADSW3o4qMnwm IsTbL7HnvHnnWubVncBYmvQDFUAmnW45Ho/k0S3xuHx8OxkxSHyo7+sKGmBLrbJLj4u+ 1Txk2dlQo5f0RLC1+z3BXu9xtI2EQydELYQJcm+cB/m7vWrq10DK+LQeMHzzJon9J5Kq Ia4A== X-Forwarded-Encrypted: i=1; AJvYcCUpaZ2yOv8G7kHJWKuTzWaVGixRU3654YuoyIIoe4qOgWsXi368UGrN/qYeNnurfz2HLzkLvNeHAcXEOgm7u00= X-Gm-Message-State: AOJu0YwyCtJHEQuo9W2WT3vSdVh+SV66i3Wlp4VBeD6Ww5joMbPqVjzv FsmFyOqBspoosCBTYDi8p3OLHqcnp223NIGMAgQ5vGBAVGoJEZpqzDb01RJIot4= X-Google-Smtp-Source: AGHT+IGSEGfCggM55rfj58xol0kv3ylXorx+2qgJpOCyEaA3QQZpXT7MDnysLiUTFVLueU4XgIEFaw== X-Received: by 2002:a05:600c:3512:b0:412:eff3:8497 with SMTP id h18-20020a05600c351200b00412eff38497mr201841wmq.1.1710375167600; Wed, 13 Mar 2024 17:12:47 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id l12-20020a05600c4f0c00b004122b7a680dsm603525wmq.21.2024.03.13.17.12.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:12:47 -0700 (PDT) From: luca.boccassi@gmail.com To: Mingjin Ye Cc: Zhimin Huang , Bruce Richardson , dpdk stable Subject: patch 'test: fix probing in secondary process' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:47 +0000 Message-Id: <20240314000957.2810803-51-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-1-luca.boccassi@gmail.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 Hi, FYI, your patch has been queued to stable release 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/16/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/60ca8f9c7660816a62709f951558ee6de806c9c5 Thanks. Luca Boccassi --- >From 60ca8f9c7660816a62709f951558ee6de806c9c5 Mon Sep 17 00:00:00 2001 From: Mingjin Ye Date: Tue, 14 Nov 2023 10:28:15 +0000 Subject: [PATCH] test: fix probing in secondary process [ upstream commit b3ce7891ad386310abab56352053a46ba06ca72f ] 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") Signed-off-by: Mingjin Ye Tested-by: Zhimin Huang Acked-by: Bruce Richardson --- app/test/process.h | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/app/test/process.h b/app/test/process.h index abf6855aaa..e8e7e5ab60 100644 --- a/app/test/process.h +++ b/app/test/process.h @@ -17,6 +17,7 @@ #include #include /* strlcpy */ +#include #ifdef RTE_EXEC_ENV_FREEBSD #define self "curproc" @@ -34,6 +35,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 (devargs->data == NULL || 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 @@ -43,8 +72,10 @@ extern uint16_t flag_for_send_pkts; static inline int process_dup(const char *const argv[], int numargs, const char *env_value) { - int num; - char *argv_cpy[numargs + 1]; + int num = 0; + char **argv_cpy; + int allow_num; + int argv_num; int i, status; char path[32]; #ifdef RTE_LIB_PDUMP @@ -58,14 +89,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 = calloc(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]); if (argv_cpy[i] == NULL) rte_panic("Error dup args\n"); } - argv_cpy[i] = NULL; - num = numargs; + if (allow_num > 0) + num = add_parameter_allow(&argv_cpy[i], allow_num); + num += numargs; #ifdef RTE_EXEC_ENV_LINUX { -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:23.054972330 +0000 +++ 0051-test-fix-probing-in-secondary-process.patch 2024-03-14 00:09:20.705617048 +0000 @@ -1 +1 @@ -From b3ce7891ad386310abab56352053a46ba06ca72f Mon Sep 17 00:00:00 2001 +From 60ca8f9c7660816a62709f951558ee6de806c9c5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b3ce7891ad386310abab56352053a46ba06ca72f ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index c576c42349..9fb2bf481c 100644 +index abf6855aaa..e8e7e5ab60 100644