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 E869245610 for ; Fri, 12 Jul 2024 13:03:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E1A25410E7; Fri, 12 Jul 2024 13:03:32 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2056.outbound.protection.outlook.com [40.107.237.56]) by mails.dpdk.org (Postfix) with ESMTP id 33CED40261 for ; Fri, 12 Jul 2024 13:03:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=w5sXjWOQ+IHIdBX9TV6wPJENsq44MJkPzyZvFNMZ7ARTWGHSroKbzEtugl1Vliqfj7Rsn6AFSsKEqDIiailcdku3b4XB6BjNgh4vNnWkGg6g1d5ydwPRKLJlPIpZDWCVX569UD1mowtgUDHIAQvyZi/153ZP/PcQMWKTIxq5mGnVSynqSER8JA/jZJzoa0de/B7DujhBqqhGIwpsbIVEF7Y8MFFgnB9bQvAjXywG44O0M+EIyYczxGLNakGCoVQCWMNXa3WxHC52pFTUv1+oNRgE01GIuZvH2ZU5TKn/Gyz4STzA5cExq4QGS+obmZjLF3QMYHjLD03/AI/up35lkA== 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=Ypt92+dykLmCsSHQAAF8Is6l6CpS7SP7GR1mu/163w0=; b=KYaj2hCcmWCZVk/p8QodUPRmZXPEUfOP0YOyyMviLT1C+lzzGn2Y3hbNyQEmoDFRCLaLYLsd9uMfdqpiNto3FFC42QFWRoiSiY52EUJuicI4I91ijlAbyRWLgq/0uE/0FEHJEQwVI5zk9npikleVGIwTK/NeMCkoF5mO+L5+A7X3xTwD0c8Yv3nKAOHDRt4AqrZjsYGFOd+ZCcbTwsLxT1TZQSUjvnzmF7M4oPqf2b0BYKHdqjxvWo9k+XsjjcGF9PAFUGu/6WmXIVVu9UlGZ7TJ8a4SmkhKl6wNaiPXufFfCBI1LUjJiTW5sqbYimWSip6zBrbsS5li2q9DpIobVg== 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=Ypt92+dykLmCsSHQAAF8Is6l6CpS7SP7GR1mu/163w0=; b=SVI1Noa8EgOnVpIBUKFVG9IcGDzjArZEJ2Ojffxzn3ndJPNEGAa6AtCL+qCFbWPfjKgD07FPtm8C9CK1bVgDFwmCPLB5SsjGl05UpBH7Qmhvg/D80pVU3mwq1AXNnW1BxkZsPGU6pKABO1UeFl87iSiqe4BKxpoZ/a62IsgtP4Lr0etKWn4qsdUFZbGDiibMTm/AWLsJNShshHim0L+WMn8kcHJSl03mN1exvG/tnRT2GtpfGPnAUV8AkDuZ7geS7ME4jpRdR34yHpaKo2D6AP1JYALQ+9Mqmt3UIw9wMSVt9wNc6lU/f8mRSMjrKGb0kVJ6136tQ3raizC+DyHx2g== Received: from BL1PR13CA0221.namprd13.prod.outlook.com (2603:10b6:208:2bf::16) by SN7PR12MB8434.namprd12.prod.outlook.com (2603:10b6:806:2e6::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.36; Fri, 12 Jul 2024 11:03:28 +0000 Received: from BL02EPF0001A0FA.namprd03.prod.outlook.com (2603:10b6:208:2bf:cafe::d2) by BL1PR13CA0221.outlook.office365.com (2603:10b6:208:2bf::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.8 via Frontend Transport; Fri, 12 Jul 2024 11:03:27 +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 BL02EPF0001A0FA.mail.protection.outlook.com (10.167.242.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 11:03:27 +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; Fri, 12 Jul 2024 04:03:09 -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; Fri, 12 Jul 2024 04:03:07 -0700 From: Xueming Li To: Maayan Kashani CC: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: fix flow template indirect action failure' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 19:01:42 +0800 Message-ID: <20240712110153.309690-12-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712110153.309690-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> <20240712110153.309690-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: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FA:EE_|SN7PR12MB8434:EE_ X-MS-Office365-Filtering-Correlation-Id: bec4eea9-070d-48dc-40bf-08dca2624216 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?qsK3ToDUWdII7SVc4pKpTGzI2JGElTAKJSiKZZopEmJGoJXa1mchyE6W3bRH?= =?us-ascii?Q?nx69p90WzbZYvI0LdhfjBY0gz/hy6W7xZ2Jk/YEhvg9FiyagxUNhwc4e0CuC?= =?us-ascii?Q?zqV/0VjYaf9EgOrNzpycsgF/51RDD1ClNfSWlMH5X8aCvt4SBdIAEgfO+mos?= =?us-ascii?Q?zYURO81i2ePXf/9s/hyn1HXD8WDlqXrB8DNhoC0TDXY/h/FXrb3kjXlsku9v?= =?us-ascii?Q?eEsyWMUXu3lJ069eVY22pjdTWC2Gma9eKpqmvMxM94DC1RYMrFjxYS0h+RMX?= =?us-ascii?Q?v8CYb5CLIlMFkK84bYo0/H0iuDws96Kww3n3RAnfbwK+SYdRe/clNJzFKVQH?= =?us-ascii?Q?9dxW8m80to/eusPOL+sEcy7RorHCRaKUZ92X1TV8hgbIrs/FVV7WowNwH8Fm?= =?us-ascii?Q?Aoy/RvQcFyvw1tvl80O43xRtndlzYt39faj18Xh9MNNnSCesDrthm8u2AWjP?= =?us-ascii?Q?t1+xHqJGEDsKLk08n5/KRHnUk0mygydBt5Sw8n/TPQTjjDQLMi6/EReYmTYW?= =?us-ascii?Q?qw+Lycg/nQqI3BatJsQQZGmuqZJxNiBwUEjXwy7jL4UtqsxbbeKyv+O3jatt?= =?us-ascii?Q?wCrpWHzISy42jD/isvM80+sLMBTRzfToZZVOfZ8C+y+GRAJWay9QvBlNzhCo?= =?us-ascii?Q?8n/9EeHXZRYCOU3X4LILJ3NRjEITV0EmnQq3oyRrH+A9mvb7L9yfeEfzMp+I?= =?us-ascii?Q?ovC96dBSWK6Y4ddyniCLOdNmORkOeApr6VjVZ3K8IhaGL8Y/PXcpkFO+/JYc?= =?us-ascii?Q?3Dm9ILWnsLFTXDUjmOmixng3XeiSBT81hhZMQU1CPIsHpCpXmTaFG+IYE/wq?= =?us-ascii?Q?MzQ2Roiyrlp+N/N33R7Qq49M8mvL78AzeZkXftFcRxUOlzFusEAMt+FmD3mZ?= =?us-ascii?Q?O8U7yLkXO4f2RMGXwkxJZyWPbOtjkz1Mj7z1kka2RDpvFgLvgk4QhEq9+bpn?= =?us-ascii?Q?iRKU4LHHaoBqDlDwm3FJd3HiZct3PM9ti4S16BIxllkItNfKGvnAYMNQWhS9?= =?us-ascii?Q?qtzbqMcKtkjUpXFcyXyA/cJ8uCEoo/X+XXitbpFnEsXyaE91tT38Qs5R3Ck3?= =?us-ascii?Q?lAqZO0QdIJLd8/eUeGQWMGF9xdh3icUmfy6el/dJE5NOLTeJ+QqkT7go1PC7?= =?us-ascii?Q?qGF4guRpvr1cl7OfLUwnjaQu8C1UMAcG6yBgQRiRURW4BUKqStnZyC1zX7fK?= =?us-ascii?Q?6GgBhkWV7jH3eo7zibMDy0/5Veerwh3NCHim92ER3+lweSKwcnJp5Y63u8bz?= =?us-ascii?Q?lnJVyE5SwuTpsXimtajje6Y/QXzokyWzRPPN+pBA3m1BGUZOqeHX79iC3DOQ?= =?us-ascii?Q?Q0/TG4NvhoN9FlEcnGpNAiwqoHKoCGBovhHkMBhayPDvXOgBUT3N7MRbq3dO?= =?us-ascii?Q?aRIlgDVygPAkrnwyM6XmWtoJuUtfPPDRL3IQbw6wiGbxuwmJAA3d+Q76ixk2?= =?us-ascii?Q?C1A5rU6hh7FxPv9ksIW+DStA5GwNDcgM?= 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)(1800799024)(36860700013)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 11:03:27.6985 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bec4eea9-070d-48dc-40bf-08dca2624216 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: BL02EPF0001A0FA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8434 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 07/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=2a32678f150f9beed91f6563d4003f5c158be5dc Thanks. Xueming Li --- >From 2a32678f150f9beed91f6563d4003f5c158be5dc Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Sun, 26 May 2024 16:22:44 +0300 Subject: [PATCH] net/mlx5: fix flow template indirect action failure Cc: Xueming Li [ upstream commit b79ac509105a2cf9fce1734a6798632a0414cd1c ] For indirect action type, on error case the function jumped to err but returned zero cause rte_errno was not initialized before the jump. It caused no error in table creation. In case reaching an error, if rte_errno is not initialized, it will be set to EINVAL. Now table creation should fail if the translate of the action fails. Added driver log warnings so it can be easy to track failure on shared actions translate. Fixes: 7ab3962d2d2b ("net/mlx5: add indirect HW steering action") Signed-off-by: Maayan Kashani Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow_hw.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 2f4b2d774e..39e68b39f7 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1009,15 +1009,19 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, if (!shared_rss || __flow_hw_act_data_shared_rss_append (priv, acts, (enum rte_flow_action_type)MLX5_RTE_FLOW_ACTION_TYPE_RSS, - action_src, action_dst, idx, shared_rss)) + action_src, action_dst, idx, shared_rss)) { + DRV_LOG(WARNING, "Indirect RSS action index %d translate failed", act_idx); return -1; + } break; case MLX5_INDIRECT_ACTION_TYPE_COUNT: if (__flow_hw_act_data_shared_cnt_append(priv, acts, (enum rte_flow_action_type) MLX5_RTE_FLOW_ACTION_TYPE_COUNT, - action_src, action_dst, act_idx)) + action_src, action_dst, act_idx)) { + DRV_LOG(WARNING, "Indirect count action translate failed"); return -1; + } break; case MLX5_INDIRECT_ACTION_TYPE_AGE: /* Not supported, prevent by validate function. */ @@ -1025,15 +1029,19 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, break; case MLX5_INDIRECT_ACTION_TYPE_CT: if (flow_hw_ct_compile(dev, MLX5_HW_INV_QUEUE, - idx, &acts->rule_acts[action_dst])) + idx, &acts->rule_acts[action_dst])) { + DRV_LOG(WARNING, "Indirect CT action translate failed"); return -1; + } break; case MLX5_INDIRECT_ACTION_TYPE_METER_MARK: if (__flow_hw_act_data_shared_mtr_append(priv, acts, (enum rte_flow_action_type) MLX5_RTE_FLOW_ACTION_TYPE_METER_MARK, - action_src, action_dst, idx)) + action_src, action_dst, idx)) { + DRV_LOG(WARNING, "Indirect meter mark action translate failed"); return -1; + } break; case MLX5_INDIRECT_ACTION_TYPE_QUOTA: flow_hw_construct_quota(priv, &acts->rule_acts[action_dst], idx); @@ -2516,6 +2524,9 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev, } return 0; err: + /* If rte_errno was not initialized and reached error state. */ + if (!rte_errno) + rte_errno = EINVAL; err = rte_errno; __flow_hw_action_template_destroy(dev, acts); return rte_flow_error_set(error, err, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:18.159726240 +0800 +++ 0091-net-mlx5-fix-flow-template-indirect-action-failure.patch 2024-07-12 18:40:14.296594204 +0800 @@ -1 +1 @@ -From b79ac509105a2cf9fce1734a6798632a0414cd1c Mon Sep 17 00:00:00 2001 +From 2a32678f150f9beed91f6563d4003f5c158be5dc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b79ac509105a2cf9fce1734a6798632a0414cd1c ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index d9140dbf23..463f7b87a3 100644 +index 2f4b2d774e..39e68b39f7 100644 @@ -29 +31 @@ -@@ -1106,15 +1106,19 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, +@@ -1009,15 +1009,19 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, @@ -51 +53 @@ -@@ -1122,15 +1126,19 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, +@@ -1025,15 +1029,19 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, @@ -73 +75 @@ -@@ -2645,6 +2653,9 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev, +@@ -2516,6 +2524,9 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,