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 5F79E457A1 for ; Mon, 12 Aug 2024 15:02:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B1C6406FF; Mon, 12 Aug 2024 15:02:50 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2040.outbound.protection.outlook.com [40.107.92.40]) by mails.dpdk.org (Postfix) with ESMTP id B5B8F402C3 for ; Mon, 12 Aug 2024 15:02:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=r4KNnc1/ipU286zPdrrhyYL8swhOZzdv9Ibps5FTKgMExI1so80eSt9qsqIqDaqnyXevqC18lFu9JjeTRZ3Ga4LwjKHRTnFWXQlJCRO2GthBj7/r+YeUQzxCx3hy93GYCwqX+F/UVHvoFLXDEXGs+ruRRwvTPmzB2FgZSHHhRy4qEWw8uTDgfNrxvNNE2SEMTepSHygYBPNGuwWQcXYdLbj7V2Z5nqWZ5Ds1X/Cq/Rkmdnkc6x9UgsUdWcTEtbWwldyZHyU8m2JOIuBvBH5S29LnwKSQuBsFv++QS6uuDB/tszVb5BpTz9Zi399NR9vX7j4yVjc4A2o3JazxRKZXIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=HkxdLaxF3DhoeQTydqRsOcFlJQBGq3+bljPIw9/reHk=; b=P1fr4aemu8E/r8yDhB6elfTeFRxk5DZS9GrraLFinFBhxaLTPMiQMKbXBnw5uAT0sqKlGGIgB0f/1bE44rBmrKUSpt5fvtM3//HGXx0G5KDQdlBzfW/bS56/Kr50ZGupN+G7VevR4Ch13OkLcLjW1+VVVzFD/2fsXPaBX8OTrAwmZU5MetFUJrjNwaPwKH+OBYxC91CFq3pESeoPi0701KGNyUuiddLZqukAzWgPwjhavaK+OCPhwUM4Q9Ur08wSIVUndOKO6vdRobVqz0V6Zld+cl/u2YVV9MvhhzbOukTKcarwKdQhIwfaJJLtZ08Mx33rDDBCXd1vMKA0cwZJXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=HkxdLaxF3DhoeQTydqRsOcFlJQBGq3+bljPIw9/reHk=; b=kP5SBWMQ9ApQPsQjYRia8pAI6iRPya1Act4obSCxtTV9se2gafDU7l+BFkYNEIOxwUyb8pYvfuQLYSwAt9vhZTE8ApWpvr9Ogw9YFdjcyhUjnszZ2VeDKBVp3QEV8WQTNv9Zbjafw158ZRcBfJlEzhx9XlcIDmriULXP3hNp3uJ4YvAuiXkMtdTyMzc9zrprRknjWWEhm1PBDnYA74ixYV3YwFpaBkvwtvjIGibRRcyW9lhPUIykQzaxEn1jR28bu71S2RbMwRjYYH30QJ962C/tbqsQeTQNe47eQBpaiqTDs4E/LYjjiQ6mq8bN4aE3y7hPWCeZLpQ5pyB79UCw6g== Received: from BY5PR13CA0020.namprd13.prod.outlook.com (2603:10b6:a03:180::33) by PH7PR12MB9125.namprd12.prod.outlook.com (2603:10b6:510:2f4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 13:02:45 +0000 Received: from SJ5PEPF00000207.namprd05.prod.outlook.com (2603:10b6:a03:180:cafe::c0) by BY5PR13CA0020.outlook.office365.com (2603:10b6:a03:180::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend Transport; Mon, 12 Aug 2024 13:02:45 +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 SJ5PEPF00000207.mail.protection.outlook.com (10.167.244.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 13:02:45 +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.1544.4; Mon, 12 Aug 2024 06:02:15 -0700 Received: from nvidia.com (10.126.230.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.1544.4; Mon, 12 Aug 2024 06:02:14 -0700 From: Xueming Li To: Alex Vesker CC: , Matan Azrad , dpdk stable Subject: patch 'net/mlx5/hws: fix port ID on root item convert' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:50:00 +0800 Message-ID: <20240812125035.389667-124-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: SJ5PEPF00000207:EE_|PH7PR12MB9125:EE_ X-MS-Office365-Filtering-Correlation-Id: 300523d1-74f5-4660-d542-08dcbacf0ef1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?R7pariPFwNqrfAYYMW63uFnRR92ggXzQxRxyv8ebWpgVLBXnMyE6y5BeX4en?= =?us-ascii?Q?FVBUMnQ+2tfRXjb1CRAEhQJzfSoPr5mgpwt9khDKLqieH5VoAj7g1tJWnJbB?= =?us-ascii?Q?E4iMxrVQXSWhuzlyl66kiAKupy2m8sKfI2cDSglequ+ojvzJ6I2Kqqb3DMod?= =?us-ascii?Q?7ZbH4xb8B8r+513ho6yQIK5LE8oZLFFfDMMnu586A49WVUbXrPjtN76D5noF?= =?us-ascii?Q?av4RYgVMClIwVUPczabAty8w2t+e93y3OlHVsHE12H1bFXo5VC4POYKkOvEZ?= =?us-ascii?Q?EoZY0oGjpIPmNggPBA6Hx6COTGcYkJAsNXVzbzwH66HUbsEmM54Nmjp7sNZj?= =?us-ascii?Q?q9yiPa4B8MznsHBdEZrnfwPX/jUaWpy8dczwv0CoD8At/mW+31wkF95AJNLy?= =?us-ascii?Q?rURf/4BFrQrvTB3gAudjO0KJwjneTk1bzNOdNBAOD3r/GphCPGjb6rrODlhk?= =?us-ascii?Q?d6GxA/gABpfR+oWfL3WVkrfDhWYWekwTXL+nTC4UB4d0rLtqEpWpNI00ndSI?= =?us-ascii?Q?EtPf+nEEHcmGBNR07k4AAsQYiwlNC6eZb0y2I/seHaAB4Qv8d7BTtkwhl8Yi?= =?us-ascii?Q?squrVSXP3Q08VhgOQ3Y7QcA83++27QUOANe5p+L5xm4sekNr5l6W73dqa7MA?= =?us-ascii?Q?hIdtHgkBGjiUntYp4u+l5QQkVB5Jbpi4jkYjBIHDsOvn/H+1iflXOyOdq2Xd?= =?us-ascii?Q?nKAcg5ZEl3DkV1o1NQA4MhE/+KlF3rnqiNQNqv2nqh3ws2OEsgPzBT/Hc1am?= =?us-ascii?Q?zZcf0PPit6pGEUclwyXLXL24sawTIiNSaz2u8dkPrqvzwXmMn97tYRYTtFDN?= =?us-ascii?Q?hwccdBH8IiZb+v6ASb4SdCFMWlcjI9lY1tm8luqF+D48Sy4QC96jTtn+nllT?= =?us-ascii?Q?uBhbiesN3nVt+4F4NdjLd2n8+uBkhAIs2xGBBL0a8DFhbFX8QZrLhd158B36?= =?us-ascii?Q?39qOs5KPhXa7OYI1W/8kI/O1c1H3QFgJFpoPAYX2RvZdrskuLahrHAl08ml4?= =?us-ascii?Q?81ILMhPcGRY+1M3bJYcsfNpO8UlkviIxoQ7Wy4COkFCvCwv356IUtmdNaaXk?= =?us-ascii?Q?c1QFCF0zDHbpEmucru69qrvqwrFynCFI8sPzjjO7iEGtIPc2XvxkYw7p7KP8?= =?us-ascii?Q?2vai+QJsVOR0RVUOisQqCftoyosWLT9TaUQLGpyqnMbAhEuYh0GKsxtlVhe3?= =?us-ascii?Q?ZFJ8L4E+R/Bd3ni5B1RzMNHbsVfV/3tvTljV+Q/m3cTZbBVXV6X0QwOYBq8S?= =?us-ascii?Q?eBrOAhe4uDvFUEvZaCb4gwO2corxfGxYuNnmJOhyvs3VAEXfznRvhjXy8qJj?= =?us-ascii?Q?9z8xx8ebKOjEY8obBLlXSzJvM0pX/AiJALvcm4tRo+Wkoea/3UJ9i3QYnvi+?= =?us-ascii?Q?6QET3hE7okdcCZO3jegYZ5fl0756zH1XzFHupD5ORW8oBkhOG8BjDPbsEgyc?= =?us-ascii?Q?driOy1jv2fy+uYpqeg3mwZZMpqR2Mcqk?= 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:(13230040)(376014)(36860700013)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:02:45.1181 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 300523d1-74f5-4660-d542-08dcbacf0ef1 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: SJ5PEPF00000207.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9125 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 23.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 08/14/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=1163643a1e9398959a022020af4654f883e3a55c Thanks. Xueming Li --- >From 1163643a1e9398959a022020af4654f883e3a55c Mon Sep 17 00:00:00 2001 From: Alex Vesker Date: Tue, 9 Jul 2024 15:31:00 +0300 Subject: [PATCH] net/mlx5/hws: fix port ID on root item convert Cc: Xueming Li [ upstream commit befb138bdd924956375745cb1ae8fe3fd029902f ] When calling item convert function we need to pass the port_id in the attributes. This value should be passed not only for cases that match on PORT related items, to resolve we will always pass it. Fixes: 572fe9ef2f46 ("net/mlx5/hws: fix port ID for root table") Signed-off-by: Alex Vesker Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr_matcher.c | 20 +++++--------------- drivers/net/mlx5/hws/mlx5dr_rule.c | 21 +++++---------------- 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_matcher.c b/drivers/net/mlx5/hws/mlx5dr_matcher.c index 89e52d6c28..36be96c668 100644 --- a/drivers/net/mlx5/hws/mlx5dr_matcher.c +++ b/drivers/net/mlx5/hws/mlx5dr_matcher.c @@ -1143,7 +1143,6 @@ static int mlx5dr_matcher_init_root(struct mlx5dr_matcher *matcher) struct mlx5dv_flow_match_parameters *mask; struct mlx5_flow_attr flow_attr = {0}; struct rte_flow_error rte_error; - struct rte_flow_item *item; uint8_t match_criteria; int ret; @@ -1172,20 +1171,11 @@ static int mlx5dr_matcher_init_root(struct mlx5dr_matcher *matcher) return rte_errno; } - /* We need the port id in case of matching representor */ - item = matcher->mt[0].items; - while (item->type != RTE_FLOW_ITEM_TYPE_END) { - if (item->type == RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR || - item->type == RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT) { - ret = flow_hw_get_port_id_from_ctx(ctx, &flow_attr.port_id); - if (ret) { - DR_LOG(ERR, "Failed to get port id for dev %s", - ctx->ibv_ctx->device->name); - rte_errno = EINVAL; - return rte_errno; - } - } - ++item; + ret = flow_hw_get_port_id_from_ctx(ctx, &flow_attr.port_id); + if (ret) { + DR_LOG(ERR, "Failed to get port id for dev %s", ctx->ibv_ctx->device->name); + rte_errno = EINVAL; + return rte_errno; } mask = simple_calloc(1, MLX5_ST_SZ_BYTES(fte_match_param) + diff --git a/drivers/net/mlx5/hws/mlx5dr_rule.c b/drivers/net/mlx5/hws/mlx5dr_rule.c index 82ceaf0750..cc7a30d6d0 100644 --- a/drivers/net/mlx5/hws/mlx5dr_rule.c +++ b/drivers/net/mlx5/hws/mlx5dr_rule.c @@ -599,26 +599,15 @@ static int mlx5dr_rule_create_root(struct mlx5dr_rule *rule, struct mlx5dv_flow_match_parameters *value; struct mlx5_flow_attr flow_attr = {0}; struct mlx5dv_flow_action_attr *attr; - const struct rte_flow_item *cur_item; struct rte_flow_error error; uint8_t match_criteria; int ret; - /* We need the port id in case of matching representor */ - cur_item = items; - while (cur_item->type != RTE_FLOW_ITEM_TYPE_END) { - if (cur_item->type == RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR || - cur_item->type == RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT) { - ret = flow_hw_get_port_id_from_ctx(rule->matcher->tbl->ctx, - &flow_attr.port_id); - if (ret) { - DR_LOG(ERR, "Failed to get port id for dev %s", - rule->matcher->tbl->ctx->ibv_ctx->device->name); - rte_errno = EINVAL; - return rte_errno; - } - } - ++cur_item; + ret = flow_hw_get_port_id_from_ctx(ctx, &flow_attr.port_id); + if (ret) { + DR_LOG(ERR, "Failed to get port id for dev %s", ctx->ibv_ctx->device->name); + rte_errno = EINVAL; + return rte_errno; } attr = simple_calloc(num_actions, sizeof(*attr)); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:06.392845191 +0800 +++ 0123-net-mlx5-hws-fix-port-ID-on-root-item-convert.patch 2024-08-12 20:44:02.495069373 +0800 @@ -1 +1 @@ -From befb138bdd924956375745cb1ae8fe3fd029902f Mon Sep 17 00:00:00 2001 +From 1163643a1e9398959a022020af4654f883e3a55c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit befb138bdd924956375745cb1ae8fe3fd029902f ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -17,2 +19,2 @@ - drivers/net/mlx5/hws/mlx5dr_rule.c | 22 ++++++---------------- - 2 files changed, 11 insertions(+), 31 deletions(-) + drivers/net/mlx5/hws/mlx5dr_rule.c | 21 +++++---------------- + 2 files changed, 10 insertions(+), 31 deletions(-) @@ -21 +23 @@ -index 6a939eb031..dfa2cd435c 100644 +index 89e52d6c28..36be96c668 100644 @@ -24 +26 @@ -@@ -1231,7 +1231,6 @@ static int mlx5dr_matcher_init_root(struct mlx5dr_matcher *matcher) +@@ -1143,7 +1143,6 @@ static int mlx5dr_matcher_init_root(struct mlx5dr_matcher *matcher) @@ -32 +34 @@ -@@ -1260,20 +1259,11 @@ static int mlx5dr_matcher_init_root(struct mlx5dr_matcher *matcher) +@@ -1172,20 +1171,11 @@ static int mlx5dr_matcher_init_root(struct mlx5dr_matcher *matcher) @@ -59 +61 @@ -index 06d8e66f63..1edb7eac74 100644 +index 82ceaf0750..cc7a30d6d0 100644 @@ -62,5 +64 @@ -@@ -694,29 +694,19 @@ int mlx5dr_rule_create_root_no_comp(struct mlx5dr_rule *rule, - struct mlx5dr_rule_action rule_actions[]) - { - struct mlx5dv_flow_matcher *dv_matcher = rule->matcher->dv_matcher; -+ struct mlx5dr_context *ctx = rule->matcher->tbl->ctx; +@@ -599,26 +599,15 @@ static int mlx5dr_rule_create_root(struct mlx5dr_rule *rule,