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 92E0348B69 for ; Fri, 21 Nov 2025 12:23:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8DA70402ED; Fri, 21 Nov 2025 12:23:45 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id CCB80402E5 for ; Fri, 21 Nov 2025 12:23:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763724224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fPLS6SeLvcYQJKnKF7ES0Gg+V4SI5ya8EcWp2Wv1cLA=; b=aASM0nWHyfJ7RFYP3BIB4hFhSfn4wRIoZLiBAO5d95BfApxN0x8x0tEnG1oDmYBSHj59px aR/X2TRR0+2AXJbj1QIQpl+Ub7NlmClYoETC69hKFJ9iAJlLUGYoIyOJNFWne9RoOUmIw4 KCXZ9Z4kT7FvLXh6qGwh+JOk9r7D4vI= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-367-v-z34KGgO3GE-_dqeOHINg-1; Fri, 21 Nov 2025 06:23:41 -0500 X-MC-Unique: v-z34KGgO3GE-_dqeOHINg-1 X-Mimecast-MFC-AGG-ID: v-z34KGgO3GE-_dqeOHINg_1763724220 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5A811180057A; Fri, 21 Nov 2025 11:23:40 +0000 (UTC) Received: from rh.redhat.com (unknown [10.42.28.165]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1C83F30044DB; Fri, 21 Nov 2025 11:23:38 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Anatoly Burakov , dpdk stable Subject: patch 'app/pdump: remove hard-coded memory channels' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:20:42 +0000 Message-ID: <20251121112128.485623-58-ktraynor@redhat.com> In-Reply-To: <20251121112128.485623-1-ktraynor@redhat.com> References: <20251121112128.485623-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KznMzdhKkzPamOUbwHPcFDgI_SePQVmIr8PtfnVgQqk_1763724220 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/26/25. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/32b1f22ca1b96e60b67b7a2ff94793d44c18966c Thanks. Kevin --- >From 32b1f22ca1b96e60b67b7a2ff94793d44c18966c Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 17 Oct 2025 12:06:36 +0100 Subject: [PATCH] app/pdump: remove hard-coded memory channels [ upstream commit 4a8d8db495f66b22ce0c12055b1c9f704f542152 ] The pdump main function modifies argc/argv before calling EAL init function. It needs to do so in order to add the proc-type=secondary flag, but also adds in "-n4" as parameter. This parameter is unnecessary and also causes duplicate parameter errors if the user also passes in -n flag on the commandline. Just remove this flag. Fixes: caa7028276b8 ("app/pdump: add tool for packet capturing") Signed-off-by: Bruce Richardson Acked-by: Anatoly Burakov --- app/pdump/main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/pdump/main.c b/app/pdump/main.c index fa85859703..f3ac81cb80 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -983,7 +983,6 @@ main(int argc, char **argv) int i; - char n_flag[] = "-n4"; char mp_flag[] = "--proc-type=secondary"; - char *argp[argc + 2]; + char *argp[argc + 1]; /* catch ctrl-c so we can cleanup on exit */ @@ -997,11 +996,10 @@ main(int argc, char **argv) argp[0] = argv[0]; - argp[1] = n_flag; - argp[2] = mp_flag; + argp[1] = mp_flag; for (i = 1; i < argc; i++) - argp[i + 2] = argv[i]; + argp[i + 1] = argv[i]; - argc += 2; + argc += 1; diag = rte_eal_init(argc, argp); @@ -1013,5 +1011,5 @@ main(int argc, char **argv) argc -= diag; - argv += (diag - 2); + argv += (diag - 1); /* parse app arguments */ -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:11.421827589 +0000 +++ 0058-app-pdump-remove-hard-coded-memory-channels.patch 2025-11-21 11:05:09.535201476 +0000 @@ -1 +1 @@ -From 4a8d8db495f66b22ce0c12055b1c9f704f542152 Mon Sep 17 00:00:00 2001 +From 32b1f22ca1b96e60b67b7a2ff94793d44c18966c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4a8d8db495f66b22ce0c12055b1c9f704f542152 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org