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 BDB28433D8 for ; Mon, 11 Dec 2023 11:17:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B7CD740ED2; Mon, 11 Dec 2023 11:17:30 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2049.outbound.protection.outlook.com [40.107.244.49]) by mails.dpdk.org (Postfix) with ESMTP id 87AE940E0F for ; Mon, 11 Dec 2023 11:17:29 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Utoo+MMncwrzw6agK1AMH0uCY71PaB20Qc0v5lY9c7kjdEDKFRqk99y9O2Od9E0leni658y02yKaxYafiqEGjCwFhpbu0sZiztIiMYDoUs7yrmJ6bSOWhyj4sVm8uAeDZmEaOLrClh1BC7+N/hCunsfGN8VLhy4KtFUi9/wXteGC8lZO5AM4HEVqACLRQfeamj7+vyjvYLEIuxdKMqGYC2ZyJBWzxsNG5faQF/AH8bJOm6khBD2ukXukmG1Zf6T5LOb5hdM1KBSUuGiEWfLEnaDFAkXzlZu/o2p3NTaPrOo6KdfzsXNsCa97+bA3uaib5chY2JHfWWQwdwYzoioO5w== 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=+tIbPApww2HbOltjqUNx6RTGiui30CKNRcys75wcytM=; b=bae/YH9cAMZF0K/glG2DOZnyDSqjUpxrQFVDIs/x4YJ9cbXy2jAQJkyn7LaNdlV4uzRKWYsrEDVWjb4vyGHfBYqgmvgLKpnhNYw04C9ejd9/RJUyg7tfHU4ApfnavOgyMV9ejYR52/LFXq+Ep4L/2ERtGJL4uEmZmOND4vGp5EFoyDP5nL/UAJXAbYFfyAz7uMzjADBL+9ePLktL7Lf6h+5n5ckpi5wxiIBFrsxX7TByGnP+FioyVuQ6amdTOdtlTs8kw3zR+tLuNpR6uerVJCcqxbD7Y2l8IDJCCgNN63YOxgzz3QSZv5aRT5vdkxcf/tWql6F4MGEKVnoM3II7ng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.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 (0) 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=+tIbPApww2HbOltjqUNx6RTGiui30CKNRcys75wcytM=; b=njkOFBTWKaWA0f2tFiy9sXS0yj50jnZ3dYPbgPaeoq4i9dC9Y9v9ozOnZr4vu44qz13bPGTtgUSol4LllWXRCs3+hf3yWVGb2BBib4s5V4mRENU+YYipBFy3TAxqfw+hAx1c4xQcYrB7SHWo3GIjkArXNmeyFaC1j50nMYy//G5Nt729kJVAWcFXh3RzOC/A9bLLryjiYg0OYS8G0PaWhGpDRiLfMXnScJodji+9mDohV7bDBBsQ3Dm6aPOkne2DqNHP3nWc/MVmMhMFx4JEICu1Fgznaz1K1/zA1ZA9+HKT/pXB7P7u9LfaeseS9FmOyU22z2P4bpiKZlm7Q6gUGw== Received: from DM6PR10CA0027.namprd10.prod.outlook.com (2603:10b6:5:60::40) by DS0PR12MB8043.namprd12.prod.outlook.com (2603:10b6:8:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 10:17:25 +0000 Received: from DS3PEPF000099E1.namprd04.prod.outlook.com (2603:10b6:5:60:cafe::2f) by DM6PR10CA0027.outlook.office365.com (2603:10b6:5:60::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:17:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS3PEPF000099E1.mail.protection.outlook.com (10.167.17.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:17:25 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:17:12 -0800 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; Mon, 11 Dec 2023 02:17:10 -0800 From: Xueming Li To: Dariusz Sosnowski CC: Viacheslav Ovsiienko , dpdk stable Subject: patch 'common/mlx5: fix controller index parsing' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:18 +0800 Message-ID: <20231211101226.2122-54-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: DS3PEPF000099E1:EE_|DS0PR12MB8043:EE_ X-MS-Office365-Filtering-Correlation-Id: f982ee2d-effd-4285-21e1-08dbfa325f22 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RT4S1n86ldKo39RhPUYA1/NQY8Oi4+KKxLOMZCejPcZRwQDrl6fP79QSHF37/+oM6ojH6yEpAipVadfG5VPGkAhMyidbhR1fAOc6zhiRFOQApRUg2hFFGgvO4aMdaO3aCT0T26EoThhHtJY7J15pWnociKkWLEYWbIuYsQrqHaKmSz9kQOAfTTorP5A5G8efKbGicqN6sw/eOtBwi43+kzBDDhNzR4B/HXW0GpVu+63mcjK1KkCLp6QkFa4ui5LZ99kzZ4thjg7rqn3N/AgY+0XwiMjYju4DEqjqFXyup1Y2erTJoxVGV5dZqUifSObUsgZnjmAzaNTR1kU0nH6kkUiMhcvtJYHG7egS4De0z0P+3ElI8MywzKgWPWVG6n0KR3qaBbOQ3hiNUFfgK3PHVCxlu00BITAZTV1qOg1Z7F5m7ANeQU0eAL/XXjs0JWDTkM7E4hrVd0KZSJdIH1g6S+Uo835ZTN4xL65GXblckVhBeHa2tvAMLCl6LWt2ABlub7tA616HcZ0wdkDGC+ev86A38bgj3Iqwg1RFNT37P/l3RclFoT2k5AD9iWoncgzxOfRFe/Z9MlRiV+YzeF/zdl6SmsvdwCxJ6wlxgwqyR+4H62ZJv10HJVpql5/ZX+4lLe904nEuRkFZPaYl0+5PpiI+eGrhbMScO7ciQucNrn2sOCtr5b7bGZLjsaf7JQB6VGoyNYSNUVMHX4uBLalEC2Mam1USEA0ouLzPFZpFlEIE6/e5mRWtidEEMQS/UJp3fQpMMZMl4fXVZ7dfnsmki/A9kN8aV7BbCVn0rIeVYx4= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(396003)(136003)(39860400002)(346002)(376002)(230922051799003)(64100799003)(186009)(1800799012)(451199024)(82310400011)(46966006)(36840700001)(40470700004)(40460700003)(40480700001)(55016003)(53546011)(1076003)(336012)(16526019)(6286002)(26005)(2616005)(7696005)(47076005)(966005)(478600001)(7636003)(82740400003)(356005)(86362001)(36756003)(41300700001)(5660300002)(70586007)(70206006)(54906003)(6636002)(2906002)(426003)(36860700001)(83380400001)(4001150100001)(6862004)(8936002)(8676002)(4326008)(37006003)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:17:25.3032 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f982ee2d-effd-4285-21e1-08dbfa325f22 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099E1.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8043 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 12/13/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=f2ab72ed3dd2f47849a570e64f84dde5121c228a Thanks. Xueming Li --- >From f2ab72ed3dd2f47849a570e64f84dde5121c228a Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Tue, 31 Oct 2023 16:27:27 +0200 Subject: [PATCH] common/mlx5: fix controller index parsing Cc: Xueming Li [ upstream commit 3cd5e500b5cb1b72ee182be4043018f22a5f8a3b ] When probing the Linux kernel network interfaces attached to E-Switch, mlx5 PMD decides the representor type and represented entity using phys_port_name exposed by the mlx5 kernel driver in sysfs. mlx5 PMD first checks this name for multihost controller index. In multihost scenarios, phys_port_name is prefixed with "c[0-9]+" string. Included integer is the controller index. Assuming that phys_port_name contains a string representing a physical port, i.e. "p[0-9]+" string, the parsing logic is incorrect. Both "p[0-9]+" and "c[0-9]+" match the formatting string used to parse phys_port_name, but controller index is still filled out. This patch fixes this behavior by storing the parsed index in a temporary variable and setting controller index if and only if phys_port_name matches multihost controller syntax. Fixes: 59df97f1a832 ("common/mlx5: support sub-function representor parsing") Signed-off-by: Dariusz Sosnowski Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/linux/mlx5_common_os.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c index 7260c1a19f..41345e1597 100644 --- a/drivers/common/mlx5/linux/mlx5_common_os.c +++ b/drivers/common/mlx5/linux/mlx5_common_os.c @@ -96,10 +96,11 @@ mlx5_translate_port_name(const char *port_name_in, char ctrl = 0, pf_c1, pf_c2, vf_c1, vf_c2, eol; char *end; int sc_items; + int32_t ctrl_num = -1; - sc_items = sscanf(port_name_in, "%c%d", - &ctrl, &port_info_out->ctrl_num); + sc_items = sscanf(port_name_in, "%c%d", &ctrl, &ctrl_num); if (sc_items == 2 && ctrl == 'c') { + port_info_out->ctrl_num = ctrl_num; port_name_in++; /* 'c' */ port_name_in += snprintf(NULL, 0, "%d", port_info_out->ctrl_num); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.864978400 +0800 +++ 0053-common-mlx5-fix-controller-index-parsing.patch 2023-12-11 17:56:23.037652300 +0800 @@ -1 +1 @@ -From 3cd5e500b5cb1b72ee182be4043018f22a5f8a3b Mon Sep 17 00:00:00 2001 +From f2ab72ed3dd2f47849a570e64f84dde5121c228a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3cd5e500b5cb1b72ee182be4043018f22a5f8a3b ] @@ -23 +25,0 @@ -Cc: stable@dpdk.org