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 156E5A0A0E for ; Mon, 10 May 2021 18:16:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 101F6406A3; Mon, 10 May 2021 18:16:29 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2068.outbound.protection.outlook.com [40.107.92.68]) by mails.dpdk.org (Postfix) with ESMTP id A72894014E for ; Mon, 10 May 2021 18:16:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lw3/OHUwXVCIaTVkCiENufbti/jH06hxFbK9RiWM/Yjymb70D0+Jd6Ie3EsglTa1ocX2SegjCyK0OXzunRuQHLRtFA/K1SyeFM+3dM59sFuh6rtEPTwShmjvdAJneG1cVOHUGUBntJLqaJYewGLGjgdFMaBIJUIYkGhkD/jsYk4X1vNM+vmHXJmzumpoR7oQuloNsBWzgvvcZY9LQmXnqkSDtFPGJHMSxBpcCLMW/n8At9gOdivWFwRFhRvwkkmuSkuAeKjF0TAt3/1c7uUJg0R3A/uPTencmWx7/aOFenXefSD0ESRvxS3DpgTjiqIm71zxDZ8wgqYJ4M5hAFQYEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Sq8uOjWoPOeaDVavn3MnfB6AYt3k+zKnQcPCsSQVPoI=; b=nRLRStTih50SyVDSmb/izwpe+UAlCFlz2d6r7klrVP+45KUze2MRorZnBAV0RR5tJzQ35RplU80P2j+yJ1J9Vol6o/2UhFLCSaaH+4ZVkX6Zi70uNO8DmE7YV8sshDLlVyQEmmY08ZR4KaAqLaOlcZs0kQMwEhAf/pmfGGDl/kK6L4zK/EJmCRnr7moUcq6L26mCubpqof9NxUuIuLoq4SccQq3Tiu2wYpzIDKItHD0oB+B1BH08/eSHjZTJys4xmZGyf/cC/a88oW3m2Lc/XNTGX7BKK1PTGd7DAb5hMXol+YTn4SfMQSZQCScNW1TqIC+AQDviZeWOb+vzWMlg6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=partner.samsung.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Sq8uOjWoPOeaDVavn3MnfB6AYt3k+zKnQcPCsSQVPoI=; b=bk3TXFwc+Iz3Xkdo4iifLPWIX3e3jI0cc0sKyay3wPUjB6Heeei4W86al4thr5QyiWUs9K1I9CZA3sdEPcSmKFc7MidRGzVqb3tDbcqF/XYAzNDSgXtI18WX+fGNdCca5GMulY5YDsxQP203hKdCRHXTdWaeL1M/qX6SdT/0lksft4NcwT4b0N0qrmAV2JlcL1k748MmiT3p4RHvELTI5vkDzpNjhtbEc0UU2J6fPeiGFx55XkwprkwbMCU2ZLMP7Q1GGH5sOCHiSYFys/KSS8iNwH/+3sE46Yx+8COSNdSZKJEdB5K8XY+H8sJDk0WNnvuT3O2AwOcsUuHi1D6SjA== Received: from DM5PR11CA0019.namprd11.prod.outlook.com (2603:10b6:3:115::29) by BL0PR12MB4883.namprd12.prod.outlook.com (2603:10b6:208:1c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:16:22 +0000 Received: from DM6NAM11FT058.eop-nam11.prod.protection.outlook.com (2603:10b6:3:115:cafe::bc) by DM5PR11CA0019.outlook.office365.com (2603:10b6:3:115::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:16:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; partner.samsung.com; dkim=none (message not signed) header.d=none;partner.samsung.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT058.mail.protection.outlook.com (10.13.172.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:16:21 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:16:18 +0000 From: Xueming Li To: David Marchand CC: Luca Boccassi , Thomas Monjalon , Lukasz Wojciechowski , dpdk stable Date: Tue, 11 May 2021 00:01:21 +0800 Message-ID: <20210510160258.30982-132-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1d9e876c-4b96-425a-80f2-08d913cef349 X-MS-TrafficTypeDiagnostic: BL0PR12MB4883: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tNU2BpdLqb7+cxI1yOVgW+EMTzTqze4bt27hYAXYLL5WYXpYVOg2lcJ1VlZQFg/Ps4oIhz5z5+b1SagjZbzHH0qpNB//vhRWyBMb37ubf6PnM2xsIwxc9sWew8ML1mezaFHhf9njNF1pbcd4v3LeK4FANbEQGz3lfwCk/ynvJe0IuFJqVxXtf0fsZ66JF80rz9Frc6J7j1HeYd/537bhy/+1yWGm+snpGyr916b2S8BCGRB2H2eFT16CHUM8d1EXglxW+uVuCLzAYNEXpQ46FGa0adDh93F/uRy+EyjaIjoswRVty3jAdmgOoiklpdtw6aIBehlvsXp/mLFefyCdVaZZIWpCMjndT/4PgfEdfWhNr42me1Gq/qUP3SZmRxwTAwO8BS+MvT604bk/G/LLZJAhWkuRQ1+EZqtG0ae2MjawbXpsyT6mvqqpuemSe+1pWrH03x5Xixs7Arc4MUZKSNjADX5XdUDl2W19FaUW9j4bLO++VTFYG9138jFnIo5P0ZT6j6iyXMIaIAbC5m96ljkemm1oAfFX4d9CT1roqO4rlk9ElA+KOHpxsuvMFCoSN75Zk1e5Pp0wWCkFXIkl2MfBdA90WreU5xd0KJRdfsdciAItU4gNA13x+1aTTLo9BVgoF9CXVAOYid5t0F1jn0i2DTSwZscTxfxdMpm0Yi5QMptf7FTwqvgEtvr6FM+hZ4+DsmnZLWfa4YfRRJ4V1rkof7hKTZJjbyi+VgBXg0+BC9OiVHXbja4MIXm4v/Yqryfxa1jl8IMVc/5CCZf7KQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(136003)(39860400002)(396003)(376002)(36840700001)(46966006)(7696005)(55016002)(36906005)(7636003)(478600001)(83380400001)(2906002)(8676002)(26005)(316002)(36860700001)(16526019)(36756003)(6916009)(86362001)(356005)(186003)(54906003)(426003)(53546011)(6666004)(336012)(966005)(82740400003)(70586007)(8936002)(4326008)(5660300002)(82310400003)(1076003)(70206006)(47076005)(6286002)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:16:21.4397 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d9e876c-4b96-425a-80f2-08d913cef349 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT058.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4883 Subject: [dpdk-stable] patch 'eal: fix evaluation of log level option' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/3ad213dfa731dc1fb5370c14f8cbac80993d42d3 Thanks. Xueming Li --- >From 3ad213dfa731dc1fb5370c14f8cbac80993d42d3 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 9 Apr 2021 13:04:53 +0200 Subject: [PATCH] eal: fix evaluation of log level option Cc: Luca Boccassi [ upstream commit 3e08081637ca082a8b58d5db2a11836dbe4e3e8c ] --log-level option is handled early, no need to reevaluate it later in EAL init. Before: $ echo quit | ./build/app/test/dpdk-test --no-huge -m 512 \ --log-level=lib.eal:debug \ --log-level=lib.ethdev:debug --log-level=lib.ethdev:info \ |& grep -i log.level EAL: lib.eal log level changed from info to debug EAL: lib.ethdev log level changed from info to debug EAL: lib.ethdev log level changed from debug to info EAL: lib.ethdev log level changed from info to debug EAL: lib.ethdev log level changed from debug to info EAL: lib.telemetry log level changed from disabled to warning After: $ echo quit | ./build/app/test/dpdk-test --no-huge -m 512 \ --log-level=lib.eal:debug \ --log-level=lib.ethdev:debug --log-level=lib.ethdev:info \ |& grep -i log.level EAL: lib.eal log level changed from info to debug EAL: lib.ethdev log level changed from info to debug EAL: lib.ethdev log level changed from debug to info EAL: lib.telemetry log level changed from disabled to warning Fixes: 6c7216eefd63 ("eal: fix log level of early messages") Fixes: 1c806ae5c3ac ("eal/windows: support command line options parsing") Signed-off-by: David Marchand Acked-by: Thomas Monjalon Acked-by: Lukasz Wojciechowski Tested-by: Lukasz Wojciechowski --- lib/librte_eal/freebsd/eal.c | 4 ++++ lib/librte_eal/linux/eal.c | 4 ++++ lib/librte_eal/windows/eal.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c index 51478358c7..77b42de416 100644 --- a/lib/librte_eal/freebsd/eal.c +++ b/lib/librte_eal/freebsd/eal.c @@ -521,6 +521,10 @@ eal_parse_args(int argc, char **argv) goto out; } + /* eal_log_level_parse() already handled this option */ + if (opt == OPT_LOG_LEVEL_NUM) + continue; + ret = eal_parse_common_option(opt, optarg, internal_conf); /* common parser is not happy */ if (ret < 0) { diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c index 32b48c3de9..2ccbad7b08 100644 --- a/lib/librte_eal/linux/eal.c +++ b/lib/librte_eal/linux/eal.c @@ -704,6 +704,10 @@ eal_parse_args(int argc, char **argv) goto out; } + /* eal_log_level_parse() already handled this option */ + if (opt == OPT_LOG_LEVEL_NUM) + continue; + ret = eal_parse_common_option(opt, optarg, internal_conf); /* common parser is not happy */ if (ret < 0) { diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c index 1e5f6576f0..78ac4adaeb 100644 --- a/lib/librte_eal/windows/eal.c +++ b/lib/librte_eal/windows/eal.c @@ -149,6 +149,10 @@ eal_parse_args(int argc, char **argv) return -1; } + /* eal_log_level_parse() already handled this option */ + if (opt == OPT_LOG_LEVEL_NUM) + continue; + ret = eal_parse_common_option(opt, optarg, internal_conf); /* common parser is not happy */ if (ret < 0) { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.011520100 +0800 +++ 0133-eal-fix-evaluation-of-log-level-option.patch 2021-05-10 23:59:26.530000000 +0800 @@ -1 +1 @@ -From 3e08081637ca082a8b58d5db2a11836dbe4e3e8c Mon Sep 17 00:00:00 2001 +From 3ad213dfa731dc1fb5370c14f8cbac80993d42d3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 3e08081637ca082a8b58d5db2a11836dbe4e3e8c ] @@ -35 +37,0 @@ -Cc: stable@dpdk.org @@ -48 +50 @@ -index 5544701f20..f4d1676754 100644 +index 51478358c7..77b42de416 100644 @@ -63 +65 @@ -index baeead3301..ba19fc6347 100644 +index 32b48c3de9..2ccbad7b08 100644 @@ -66 +68 @@ -@@ -705,6 +705,10 @@ eal_parse_args(int argc, char **argv) +@@ -704,6 +704,10 @@ eal_parse_args(int argc, char **argv) @@ -78 +80 @@ -index 68a1fd1d21..41be20d89f 100644 +index 1e5f6576f0..78ac4adaeb 100644 @@ -81 +83 @@ -@@ -150,6 +150,10 @@ eal_parse_args(int argc, char **argv) +@@ -149,6 +149,10 @@ eal_parse_args(int argc, char **argv)