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 5F6B7431D5 for ; Sun, 22 Oct 2023 16:32:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 52290402C5; Sun, 22 Oct 2023 16:32:08 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2080.outbound.protection.outlook.com [40.107.243.80]) by mails.dpdk.org (Postfix) with ESMTP id 0E68B402C5 for ; Sun, 22 Oct 2023 16:32:07 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IxIKMQLMbhBzABAcjZwpT+ZrH9oaR8t/d5OTjg7a4eqw7FNuKYt69i7yY2nBrHAQFId5VqHv+047WR6a8cruDbQV+A5Lt8+1I7E2Vm7gbVfz+twmGTSLC+vGrsWAyxDa5xwLCUI7exYD8jBAr7tHEser7av8oK1PLq0ARdEjDfVQ/ER+NE598gHSONTqlHDjV4Iv3KyUGwr8wdB2rAmMIc821nsNiScy6AYWMFXM81r5Lk6KOWfMSiuDXaToFrQ+pKC4uSse7OxP4VhL1h+cp5bXD1XpWb6yXYKWN4tVomAHpLAtS6nFcPncvB9Xho3YZPJFnqDcUuFkLoJ0h+gxiA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tYvsmUr5S7yI4NepC2DchUhkZzmkMYUliUCiPVUvsro=; b=kzC3uEiRs9t5VIqxWDbGEonbh/arDD6i9YKiIlaOp8biuRoW2kz/yRGFhCaxT6BFE8o0/8b9ygQ/PLv6M6xsTbja1Jr+GDi0eJajRsWqko/OrtOHn7iKZ2kUevJvMOmVXMDjUUl92jN+i6eTzqqPi4vDJc0Fsk/pMHCLvQU7yJj/daqdCQ/w3WosxCj5+1F2gs0+CpKtu2BuEOyR46uvuu56Waa8gN1VDp/SjRIoEif52FHZoY2HJ12T6qUDbdwvgMCJxX1q/C24FU8myfFG2bVWuPNSrYiWyBp3OnzZJrwQVE+HiZxF0gZO/UMCepeS9UhSat2EQwLawtX7E2f0Fw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=tYvsmUr5S7yI4NepC2DchUhkZzmkMYUliUCiPVUvsro=; b=qHKDiOEiRPU/EIc8txL7T4IEvteJLBzwBK7j1APIpLEIOZSDs+0TTBdDhxBRH5h5XdE1msACNCZn133H9PgqvEGw4AItp6wmKww5MtzncVnc5KXFO8rkb8SqkfwKn32zo5V3ocAXC7n2OEj7yqtGUP7zemOX/4eoGSR9b9IA4uw8MWOqubgIKsvtUATaCTWCe8JVPGp/rbxXpOAUiiuCZh6BHAGOGdZ3IeF+axgIpR4gnP09thsfpKBeCOgrNnZfVrBYU6CHT8dvyfYi/aGjfdEY/XliCZ2Ynip2K+5XU9bPRz0Y3U/NB6PA+v0IPdbfq/UEvGj2BJAPcHp+O55LIA== Received: from MN2PR06CA0007.namprd06.prod.outlook.com (2603:10b6:208:23d::12) by MW4PR12MB6973.namprd12.prod.outlook.com (2603:10b6:303:20a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.23; Sun, 22 Oct 2023 14:32:05 +0000 Received: from BL02EPF0001A0FC.namprd03.prod.outlook.com (2603:10b6:208:23d:cafe::a4) by MN2PR06CA0007.outlook.office365.com (2603:10b6:208:23d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.29 via Frontend Transport; Sun, 22 Oct 2023 14:32:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF0001A0FC.mail.protection.outlook.com (10.167.242.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:32:04 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:31:49 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:31:47 -0700 From: Xueming Li To: Stephen Hemminger CC: Tyler Retzlaff , dpdk stable Subject: patch 'common/mlx5: replace use of PMD log type' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:22:09 +0800 Message-ID: <20231022142250.10324-101-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FC:EE_|MW4PR12MB6973:EE_ X-MS-Office365-Filtering-Correlation-Id: 563c09eb-3acb-4a15-8d7d-08dbd30ba9c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zjj3k+qmAyigVl66dL/tkxysWGS8j7uab5A71+0vkfPeKc+0Y7bPzQHD8rPbJAEcHTn2rCanDBULTFHsSs4ETnrkULRi5dp6P3Hr2yKB5a+kJy08B9Wp1Nvlpyp4hAFc14HZqU5quvY43jL4a2yPq7q2vrSzE3gP2STj+67mYI45FOfX6p7jmw91bryuYXx0rBMq8zAKW34iC06DO6n5FfOuJctaQLjUMdtMfoLVhZuX2kgXyNITvskuNO/A3+IQeM8np73eHGA0+HzQS0oOwGWUfTI16Wk1//1ZuXOYq7chDiyLvCC/zXgpxbKGjmpUXy+NNNSrUYgYcagbe9z1yFlaJP4mJB9FuerWO60XtU4QTk862eJZd/rBqYBHlcGNVp7LA7hBGysKDznKHlPe3IjJK2F+z297Hmoxa3gexGcT0/99n79aul3yi76MweOqRJ8lYR0m1Pjx4knCbMScYyjHcgbphah3tuxZJU6vznceqFCAFK2sik5soI4gAz3tm0peg3muxDM/TmBJkTYssPeasHUCAVmI7VHBUknosyxLY89FDB6l0EFJxnYwU5mN+5zp8fGZ2u/VDXteogaPbTmYXAb7h5XErs/t1k9ttiWL6DE7lVc6upqEiciFxgzh80U/4GA0MRofOg/P/7R7Z3f5PptPvopje5BigU59AEeLPWfzVTeVeHg0yy9NI54fNIgHNLUYNaxjjegSQ9qPmzPg5DYcMpZgrEDk6NacIpxCBl2KDWo4kJPjTKcPez6/nv3niRhXLUirBB6RTWfLCDHqea5/rK12ltq/1fEyB4c= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(396003)(136003)(376002)(39850400004)(346002)(230922051799003)(82310400011)(186009)(1800799009)(64100799003)(451199024)(46966006)(36840700001)(40470700004)(40480700001)(36756003)(55016003)(40460700003)(36860700001)(6916009)(316002)(86362001)(7696005)(82740400003)(7636003)(356005)(4001150100001)(53546011)(83380400001)(16526019)(2616005)(336012)(26005)(1076003)(426003)(6666004)(6286002)(2906002)(966005)(478600001)(54906003)(70586007)(70206006)(41300700001)(4326008)(5660300002)(47076005)(8676002)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:32:04.7241 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 563c09eb-3acb-4a15-8d7d-08dbd30ba9c7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A0FC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6973 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.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/15/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=62a937220c125aa1b0cb40cfbb6a6e058ed0975e Thanks. Xueming Li --- >From 62a937220c125aa1b0cb40cfbb6a6e058ed0975e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 21 Aug 2023 09:16:25 -0700 Subject: [PATCH] common/mlx5: replace use of PMD log type Cc: Xueming Li [ upstream commit 8c3a4688cca2b3179c6fea6f724e21848cacc80b ] The goal to eliminate the generic PMD logtype. One place it is used unnecessarily is in the mlx5 common code. Change the one RTE_LOG() call here to use the same macro as other log messages in same file. Fixes: 9c410b28b27a ("common/mlx5: refactor HCA attributes query") Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff --- drivers/common/mlx5/linux/mlx5_common_os.c | 2 +- drivers/common/mlx5/mlx5_devx_cmds.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c index 2ebb8ac8b6..7260c1a19f 100644 --- a/drivers/common/mlx5/linux/mlx5_common_os.c +++ b/drivers/common/mlx5/linux/mlx5_common_os.c @@ -266,7 +266,7 @@ mlx5_glue_path(char *buf, size_t size) goto error; return buf; error: - RTE_LOG(ERR, PMD, "unable to append \"-glue\" to last component of" + DRV_LOG(ERR, "unable to append \"-glue\" to last component of" " RTE_EAL_PMD_PATH (\"" RTE_EAL_PMD_PATH "\"), please" " re-configure DPDK"); return NULL; diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c index 5742f9e831..5ae2627caa 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.c +++ b/drivers/common/mlx5/mlx5_devx_cmds.c @@ -543,7 +543,7 @@ mlx5_devx_cmd_query_hca_vdpa_attr(void *ctx, MLX5_GET_HCA_CAP_OP_MOD_VDPA_EMULATION | MLX5_HCA_CAP_OPMOD_GET_CUR); if (!hcattr) { - RTE_LOG(DEBUG, PMD, "Failed to query devx VDPA capabilities"); + DRV_LOG(DEBUG, "Failed to query devx VDPA capabilities"); vdpa_attr->valid = 0; } else { vdpa_attr->valid = 1; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:38.031556300 +0800 +++ 0100-common-mlx5-replace-use-of-PMD-log-type.patch 2023-10-22 22:17:34.366723700 +0800 @@ -1 +1 @@ -From 8c3a4688cca2b3179c6fea6f724e21848cacc80b Mon Sep 17 00:00:00 2001 +From 62a937220c125aa1b0cb40cfbb6a6e058ed0975e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8c3a4688cca2b3179c6fea6f724e21848cacc80b ] @@ -34 +37 @@ -index 66a77159a0..9db0b2ac89 100644 +index 5742f9e831..5ae2627caa 100644