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 8C60848AEF for ; Wed, 12 Nov 2025 17:55:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86F4340DF5; Wed, 12 Nov 2025 17:55:29 +0100 (CET) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mails.dpdk.org (Postfix) with ESMTP id 2F67940BA6 for ; Wed, 12 Nov 2025 17:55:28 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-42b3c965df5so730111f8f.1 for ; Wed, 12 Nov 2025 08:55:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762966528; x=1763571328; 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=AeENhAKCh9oK3oIM8V7N88V9MDSJn4Y/vItCMtjJLPY=; b=aGnRnRE9iKhMV8O8buXM1wN1ESaVh8VUGu6DCIy5GKCein3cvizxe+Uj9N/5o8h5Yl OfAwSFdQUQa/n6D9EuZP1VXqQadrQcP+34s9ymO3uFzQpXwD9bqY6DPtiCErREvOWMRL Y4Eew9Ei5anj4J11y8WNyPFN7Fac118kcg3FPcMncgR1cWCx7sl+6i+hhU1i8pvBp4KS lVnSddXsCJzs9TYqht7ZPL/mRZNdPqPRa7H/dwz6ww2Ox5uqcUQLq++jiXiSwtM6IDhq y4PVd7KSlgMkaClfzCBVt49z30OYQahQpzFX/iRkjfHt/vFv9Fp8PSUyYGo7uRTRy3jf RdOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762966528; x=1763571328; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=AeENhAKCh9oK3oIM8V7N88V9MDSJn4Y/vItCMtjJLPY=; b=AAETabhDrHcw1tWBUYCYcx3WF4szI/15ECPGRcpyqettkeC0tPZDw6FooY6XAh7x++ 6DR+khRm7D502hQFeLhcXliGy/t6GF0aR8DGMs8kHUlpR/nWqJ7u8+6M/UbGCrnNaMcE 1neLG1RgKFaNLFsAjNBpXLOmab8XqQpa7cR/EcHwCe8hSqUGSdSWEbCxvcDH5lq+htmc mO9tqjLsiJBcaUKPYCv5sFdFXrIlclrds4s8HreVFh6N0IOwwYr3KEXBxvGpjZt4/ovm OjntTFat8H5lGUFRyBWMOtJvfvNVyrqpmsVNW1UYFEdwruaX2crLtxKmMG9FZJeAhYTL IH/g== X-Forwarded-Encrypted: i=1; AJvYcCWsKwGGpba/u+DD66Ly9rXctAQ8u7gxdSXc4SrNPnSNuoKDYVY5n1bAVjxvlouQPTtze86En9c=@dpdk.org X-Gm-Message-State: AOJu0YyQBOEBFLyoDRtR7UOUL7Jrc5bIFTELTmJc28YZjIVmp2MgmfS8 bf4YSaZVIJuKLSCzBkVNPBIN1MGCuEQmq7AVifoZi68PLs0E9Ikmi4g3lrNOjw== X-Gm-Gg: ASbGncvOiOZ2IERVPOLOxwmEhuJVbdSNmPCxrTRdbP9Kdl7K2JPvggYEWGV7Jm1WVi7 2auL3WfE4xmPDMshFrkdQ0p4GLE3MvGhRZHKcyNXOCQklu1QmuuSki5Oamrg1BMwMFcw3ZWfwnQ xOVyAEMqV/u6ttmGmQqI7jBmx4KnDaXIWCwt30N5wzOFBBZMmGInySbIoLKkS4z0BIquILqYSgS ACcxpETxgvakzYDgrfhH53vlDpbO9eb43DD+/3RgwDs9lzRl91P1TYFoOvAG43t/DthpNuye44b QR+b6W4/i1ypoh9QL0YaipSnchKHNs1H5agRVJX4vbw2cmwx7KMHaPT+CcIEKNoLT5r29sODQzn 0GM9XdYSmZ4ac0H89yp5rqmTAWjHNPFJOWia37lNIj2AGdyFUYCn7BLmQOW/sHcnzNdi+aNaQ8O u60RkcFQ== X-Google-Smtp-Source: AGHT+IFbXOUu8JQtk7UpLysjdQxJbRpR2/W1BD9T63wpIU1itm53ROGhbOdFosbXH2a8zr05PpyVIA== X-Received: by 2002:a05:6000:1acf:b0:42b:3ee9:4771 with SMTP id ffacd0b85a97d-42b4bb9c65dmr3500384f8f.23.1762966527656; Wed, 12 Nov 2025 08:55:27 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:a397:14bc:5982:5745]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-42ac675cd25sm35675163f8f.22.2025.11.12.08.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 08:55:27 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Anatoly Burakov , dpdk stable Subject: patch 'app/pdump: remove hard-coded memory channels' has been queued to stable release 22.11.11 Date: Wed, 12 Nov 2025 16:52:58 +0000 Message-ID: <20251112165308.1618107-44-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251112165308.1618107-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-79-luca.boccassi@gmail.com> <20251112165308.1618107-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.11 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7ea684520e15b62cca3fafc3b48ab1c4f87cd17d Thanks. Luca Boccassi --- >From 7ea684520e15b62cca3fafc3b48ab1c4f87cd17d 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 6216d5454c..460642055f 100644 --- a/app/pdump/main.c +++ b/app/pdump/main.c @@ -979,9 +979,8 @@ main(int argc, char **argv) int ret; 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 */ sigemptyset(&action.sa_mask); @@ -993,13 +992,12 @@ main(int argc, char **argv) sigaction(SIGHUP, &action, NULL); 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); if (diag < 0) @@ -1009,7 +1007,7 @@ main(int argc, char **argv) rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n"); argc -= diag; - argv += (diag - 2); + argv += (diag - 1); /* parse app arguments */ if (argc > 1) { -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-12 16:20:42.652566017 +0000 +++ 0044-app-pdump-remove-hard-coded-memory-channels.patch 2025-11-12 16:20:41.003718817 +0000 @@ -1 +1 @@ -From 4a8d8db495f66b22ce0c12055b1c9f704f542152 Mon Sep 17 00:00:00 2001 +From 7ea684520e15b62cca3fafc3b48ab1c4f87cd17d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4a8d8db495f66b22ce0c12055b1c9f704f542152 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index fa85859703..f3ac81cb80 100644 +index 6216d5454c..460642055f 100644 @@ -25 +26 @@ -@@ -982,9 +982,8 @@ main(int argc, char **argv) +@@ -979,9 +979,8 @@ main(int argc, char **argv) @@ -36 +37 @@ -@@ -996,13 +995,12 @@ main(int argc, char **argv) +@@ -993,13 +992,12 @@ main(int argc, char **argv) @@ -53 +54 @@ -@@ -1012,7 +1010,7 @@ main(int argc, char **argv) +@@ -1009,7 +1007,7 @@ main(int argc, char **argv)