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 E8C05454E9 for ; Tue, 25 Jun 2024 02:01:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E41FE4278A; Tue, 25 Jun 2024 02:01:50 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id C030540EDD for ; Tue, 25 Jun 2024 02:01:49 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-421b9068274so43550585e9.1 for ; Mon, 24 Jun 2024 17:01:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273709; x=1719878509; 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=JhbmaWCfnMdVLzU5ntm0RnOBt8Jkce5SoY/nGXJ9Ufo=; b=dA+zL5Klrr1cINAWhxMlLoB+GmidB6VrGy+XzT7QnV7UWfegNn7LkRn67EtFt77zoX JHw74FYo7Id7CI92VvVihiZxZPlfXXflOTizf8ntKWBaZ8JQsK6gz78zPfZvj0//HHwo 6Y/Wtsk6PnRPPTdhAC56nApEbe4TF1yE70PGWcT19tXJ6ApqEOwOPdE73tPWIaONxdmF l5cjYSLob7gSfJFLeDByoOH+ViS5k8I6wi1V/vF4t/8V8L1T7fSDv5Ksk4GTC0v+G+HQ gzWta0n2dSemK6PNlDNTlu12EOkmbuKa983RdTagD70IWq287xDbAJ0dTbadywpa/jxz 9Ftg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273709; x=1719878509; 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=JhbmaWCfnMdVLzU5ntm0RnOBt8Jkce5SoY/nGXJ9Ufo=; b=FJZun6mHfmAwDMONyBTiVLEn4ZQYQOvo/YlVi+al2iX5OzKwGm0NxniHKqJ9kGX8Z6 gCZZBgeCQ8r4RwZDog72uNRdI2gcC0MjxBiDilUJF9cs9qY4Dwd7G1OWudUYT/sTsJno TsXsv9YNW6wt+RZqJEYzIJHma3dSAI36XIzZgh9BJ+4tw5HHfxhT5/vGgmgQT57e8e8B NcdzsI6WapaEa8pB5ePooohdjf1R6dPfRdQ5TQB2NvJ2T6qOXM1/bDVF6CDebThrbXM3 gzd1ZGRy588yOiAP3uqBrwJ93+DBMc4RgByPnPMe20AYT9uITsmckeygZxzqQUOnODPi GCvw== X-Forwarded-Encrypted: i=1; AJvYcCUlLz6sHOkIO6+H4Q0WB88pAh8ZfJaPdSZUsYJZPO97JJdslJjsXEht+Sbu6WS+5L3UjUXeLM3sJdL/Vpgfle8= X-Gm-Message-State: AOJu0YyIiad1OEhmsbWCNC5RiuB2X9X5h/RD1cw1njW5LQWOyyJlen8X ezM3FBummid6K9l3CIKUHnZMNn5Oye1anO32sruxTcB8PMVNZ3g7jQ4btQ== X-Google-Smtp-Source: AGHT+IF+W0lcO3U/bO3AR2uSt3hJQhxWJoR9aBLAAYyoj2cYgAZQV0ZS9ogcWwu9ZCREtKE96nOuHA== X-Received: by 2002:a05:600c:4487:b0:424:781a:189f with SMTP id 5b1f17b1804b1-4248b959264mr41464635e9.15.1719273709245; Mon, 24 Jun 2024 17:01:49 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-424817ab01asm148713575e9.20.2024.06.24.17.01.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:01:48 -0700 (PDT) From: luca.boccassi@gmail.com To: Kevin Traynor Cc: David Marchand , dpdk stable Subject: patch 'eal: fix logs for '--lcores'' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:58:36 +0100 Message-Id: <20240624235907.885628-50-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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/4c07a5e8c1fecea606b82944dd743943ac589e94 Thanks. Luca Boccassi --- >From 4c07a5e8c1fecea606b82944dd743943ac589e94 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 d2b91e2075..f4740ee6e5 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -671,7 +671,7 @@ test_missing_c_flag(void) launch_proc(argv26) == 0 || launch_proc(argv27) == 0 || 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 18a50f7452..5312d03552 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -1686,7 +1686,7 @@ eal_parse_common_option(int opt, const char *optarg, if (core_parsed) { 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; } @@ -1719,7 +1719,7 @@ eal_parse_common_option(int opt, const char *optarg, if (core_parsed) { 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; } @@ -1900,10 +1900,10 @@ 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:16.458431083 +0100 +++ 0050-eal-fix-logs-for-lcores.patch 2024-06-25 00:22:13.181185567 +0100 @@ -1 +1 @@ -From 0f241cc22e30de0dfd7487dcfd6acde220b5e168 Mon Sep 17 00:00:00 2001 +From 4c07a5e8c1fecea606b82944dd743943ac589e94 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0f241cc22e30de0dfd7487dcfd6acde220b5e168 ] + @@ -26 +28 @@ -index 6cb4b06757..71d8dba731 100644 +index d2b91e2075..f4740ee6e5 100644 @@ -39 +41 @@ -index e541f07939..f1a5e329a5 100644 +index 18a50f7452..5312d03552 100644 @@ -42 +44 @@ -@@ -1687,7 +1687,7 @@ eal_parse_common_option(int opt, const char *optarg, +@@ -1686,7 +1686,7 @@ eal_parse_common_option(int opt, const char *optarg, @@ -44 +46 @@ - EAL_LOG(ERR, "Option -c is ignored, because (%s) is set!", + RTE_LOG(ERR, EAL, "Option -c is ignored, because (%s) is set!\n", @@ -51 +53 @@ -@@ -1720,7 +1720,7 @@ eal_parse_common_option(int opt, const char *optarg, +@@ -1719,7 +1719,7 @@ eal_parse_common_option(int opt, const char *optarg, @@ -53 +55 @@ - EAL_LOG(ERR, "Option -l is ignored, because (%s) is set!", + RTE_LOG(ERR, EAL, "Option -l is ignored, because (%s) is set!\n", @@ -60 +62 @@ -@@ -1901,10 +1901,10 @@ eal_parse_common_option(int opt, const char *optarg, +@@ -1900,10 +1900,10 @@ eal_parse_common_option(int opt, const char *optarg, @@ -64,2 +66,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",