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 7D52F45804 for ; Fri, 23 Aug 2024 18:21:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 703B0402BE; Fri, 23 Aug 2024 18:21:04 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1803540295 for ; Fri, 23 Aug 2024 18:21:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430062; 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=2RhoeJgZPIBKLu2TcEdcYnlJoL1le+0AXQebCmbBr3E=; b=feuZf5hpL1wB2mD+TtkJKWmt7EWxUj3e2TDSoJCoVPlCyKWd8QiGPMuCJwSIkOsVOb8hpi 1j1pSNvve4s/fmzkLLncW54DotNK+G6Xg0VUdNB/0BFlCf0NUZNUeNpaT3I5o4zYgP1x+b RujoByJO4fkxfzs7hneBfwfr81i88ZQ= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-140-LafaQCRsPjezXLkLCz06ow-1; Fri, 23 Aug 2024 12:21:01 -0400 X-MC-Unique: LafaQCRsPjezXLkLCz06ow-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6FF091955D4E for ; Fri, 23 Aug 2024 16:21:00 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B90521955F44; Fri, 23 Aug 2024 16:20:58 +0000 (UTC) From: Kevin Traynor To: Kevin Traynor Cc: David Marchand , dpdk stable Subject: patch 'eal: fix logs for '--lcores'' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:46 +0100 Message-ID: <20240823161929.1004778-38-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 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 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1f57a72efce3d886b70a9356b7ef6ccd6d603778 Thanks. Kevin --- >From 1f57a72efce3d886b70a9356b7ef6ccd6d603778 Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Thu, 13 Jun 2024 17:14:29 +0100 Subject: [PATCH] eal: fix logs for '--lcores' [ upstream commit 0f241cc22e30de0dfd7487dcfd6acde220b5e168 ] The argument is '--lcores' but it is being logged as '--lcore' in several places. e.g. $ dpdk-testpmd -l 8,10,12 --lcores 8,10,12 EAL: Option --lcore is ignored, because (-l) is set! Fix the spelling in logs and tests. Fixes: 117eaa70584b ("eal: add error check for core options") Fixes: 128ee4c26d87 ("app/test: add unit tests for --lcores option") Signed-off-by: Kevin Traynor Reviewed-by: David Marchand --- app/test/test_eal_flags.c | 2 +- lib/eal/common/eal_common_options.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index d7f4c2cd47..8916ea5882 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -584,5 +584,5 @@ test_missing_c_flag(void) launch_proc(argv28) == 0 || launch_proc(argv30) == 0) { printf("Error - " - "process ran without error with invalid --lcore flag\n"); + "process ran without error with invalid --lcores flag\n"); return -1; } diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index 1cd7a33fbf..954062a386 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -1664,5 +1664,5 @@ eal_parse_common_option(int opt, const char *optarg, RTE_LOG(ERR, EAL, "Option -c is ignored, because (%s) is set!\n", (core_parsed == LCORE_OPT_LST) ? "-l" : - (core_parsed == LCORE_OPT_MAP) ? "--lcore" : + (core_parsed == LCORE_OPT_MAP) ? "--lcores" : "-c"); return -1; @@ -1697,5 +1697,5 @@ eal_parse_common_option(int opt, const char *optarg, RTE_LOG(ERR, EAL, "Option -l is ignored, because (%s) is set!\n", (core_parsed == LCORE_OPT_MSK) ? "-c" : - (core_parsed == LCORE_OPT_MAP) ? "--lcore" : + (core_parsed == LCORE_OPT_MAP) ? "--lcores" : "-l"); return -1; @@ -1875,8 +1875,8 @@ eal_parse_common_option(int opt, const char *optarg, if (core_parsed) { - RTE_LOG(ERR, EAL, "Option --lcore is ignored, because (%s) is set!\n", + RTE_LOG(ERR, EAL, "Option --lcores is ignored, because (%s) is set!\n", (core_parsed == LCORE_OPT_LST) ? "-l" : (core_parsed == LCORE_OPT_MSK) ? "-c" : - "--lcore"); + "--lcores"); return -1; } -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.077655231 +0100 +++ 0038-eal-fix-logs-for-lcores.patch 2024-08-23 17:18:09.679429962 +0100 @@ -1 +1 @@ -From 0f241cc22e30de0dfd7487dcfd6acde220b5e168 Mon Sep 17 00:00:00 2001 +From 1f57a72efce3d886b70a9356b7ef6ccd6d603778 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0f241cc22e30de0dfd7487dcfd6acde220b5e168 ] + @@ -26 +28 @@ -index 6cb4b06757..71d8dba731 100644 +index d7f4c2cd47..8916ea5882 100644 @@ -29 +31 @@ -@@ -672,5 +672,5 @@ test_missing_c_flag(void) +@@ -584,5 +584,5 @@ test_missing_c_flag(void) @@ -37 +39 @@ -index e541f07939..f1a5e329a5 100644 +index 1cd7a33fbf..954062a386 100644 @@ -40,2 +42,2 @@ -@@ -1688,5 +1688,5 @@ eal_parse_common_option(int opt, const char *optarg, - EAL_LOG(ERR, "Option -c is ignored, because (%s) is set!", +@@ -1664,5 +1664,5 @@ eal_parse_common_option(int opt, const char *optarg, + RTE_LOG(ERR, EAL, "Option -c is ignored, because (%s) is set!\n", @@ -47,2 +49,2 @@ -@@ -1721,5 +1721,5 @@ eal_parse_common_option(int opt, const char *optarg, - EAL_LOG(ERR, "Option -l is ignored, because (%s) is set!", +@@ -1697,5 +1697,5 @@ eal_parse_common_option(int opt, const char *optarg, + RTE_LOG(ERR, EAL, "Option -l is ignored, because (%s) is set!\n", @@ -54 +56 @@ -@@ -1902,8 +1902,8 @@ eal_parse_common_option(int opt, const char *optarg, +@@ -1875,8 +1875,8 @@ eal_parse_common_option(int opt, const char *optarg, @@ -57,2 +59,2 @@ -- EAL_LOG(ERR, "Option --lcore is ignored, because (%s) is set!", -+ EAL_LOG(ERR, "Option --lcores is ignored, because (%s) is set!", +- RTE_LOG(ERR, EAL, "Option --lcore is ignored, because (%s) is set!\n", ++ RTE_LOG(ERR, EAL, "Option --lcores is ignored, because (%s) is set!\n",