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 37BD143E57 for ; Sat, 13 Apr 2024 14:58:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 32FC340A72; Sat, 13 Apr 2024 14:58:48 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2043.outbound.protection.outlook.com [40.107.244.43]) by mails.dpdk.org (Postfix) with ESMTP id 712B240E01 for ; Sat, 13 Apr 2024 14:58:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NX+GLT/ACtKKp4/kRgTRUSN+sOWCLVzGWFPTDr7RxmOziwfsTy3Gq+jem/jV5C+MmNu2f3nicy7yBwRJHSbwijBbmvIg8AgvVXf01inAOm2rvkQ6uiUjTE1hefmWmrLQY8ZAKqjRbYuXj5zeW6vHrfLuwyg+njP9zVR1PjMtxbOqf75RYXvxDdhACxuqGJfKwZvNvaon/y46X/2avdY8IzTY8gIMNKOWPKHzOkU2xPH+Wp8pruF1iLg13qD6OKI8htduUH3xoc8b71OomXxt0q3hTvAB1xcsQcJZmjxKoNnx7gCbe9n2H4OpNjnVdeGhUFS2kbWFwNNl5MwCiQtUHw== 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=9UFm28HtqpQ3//9G+umOGteBVMVAf1MQN9ucpQFZIKI=; b=Qn128+GCeYH5pt+msKYyE0R2Lxi6hJiI2OSx6b05Z6OkhLqwIOIOQCel7h8JY+oxISlmDlbNud3G/mV5XRCGHT1Yf+HmcUkBaQffnGhUlTAVeoykI33o17yOSNArvRyAcL+KXHK9xE/oZvZGqB0DTf8mW0OomhrWLX5BGNVqYXhjU896CZ1yv1DdD9D5DLOZD51sWRxTS0eNgxIUtsxdFqd2tLKgvcVtme2DVrbzZBAoVL4MFst/j2BNO0HHKD37dVZTJXT4UaBuOd2jExgOMVsAiQAZqBTFAdTgSyobc4piThG8wj+eTxwqKNEMX+pHxFHuc62kONJ+dTm9yGFnbg== 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=9UFm28HtqpQ3//9G+umOGteBVMVAf1MQN9ucpQFZIKI=; b=nWeH8cD1JbEvZ1RTFt8qz2Py/X9PZoI7DS/UDBblvsHpp8mkh88FYAYgnob0wzazP2+mJdbJ1VXet3VhxQD1mLvRY1Rb5v+7Hc8Owbgc+kDgxoiSmkYsQM2ZkHMZ+uxlEckZAsPicRbxeSW706NFeWkNcQSjDVTlkJ591hIBpRi5RSxCDdhsCUiu7hWZ2VyqWvl/Tfovp/1+mkVPZ7Mk5PRV5E7TT82FPco8X+bGjPLX+/1ZFr2gbyHRAY33UFGj2vd7kLbivvIbCLotJvt7Q/+vdOyLjDmKqb4eB2Ts6feGuIHKbP6D/XN92m2zKIfjJhuCKCvF9mZXmJTaNirbwA== Received: from MW4PR04CA0293.namprd04.prod.outlook.com (2603:10b6:303:89::28) by DM4PR12MB5794.namprd12.prod.outlook.com (2603:10b6:8:61::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 12:58:43 +0000 Received: from MWH0EPF000989E9.namprd02.prod.outlook.com (2603:10b6:303:89:cafe::d8) by MW4PR04CA0293.outlook.office365.com (2603:10b6:303:89::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.26 via Frontend Transport; Sat, 13 Apr 2024 12:58:43 +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 MWH0EPF000989E9.mail.protection.outlook.com (10.167.241.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:58:43 +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; Sat, 13 Apr 2024 05:58:34 -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.1258.12; Sat, 13 Apr 2024 05:58:33 -0700 From: Xueming Li To: Gregory Etelson CC: Dariusz Sosnowski , Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix non-masked indirect list meter translation' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:35 +0800 Message-ID: <20240413125005.725659-95-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-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: MWH0EPF000989E9:EE_|DM4PR12MB5794:EE_ X-MS-Office365-Filtering-Correlation-Id: aff22a82-4ae2-4434-955c-08dc5bb972fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HqUdpVp8knbznbbsALu7osYmSnWwccep6aHqVyLjHWsUkj45w6eShIT6r/QT2F/6kiuVKw3xlzePQ3ohXksiYbrtzOS6PflahD6T3VDKR6O61yJGEtqOolIfb2AZVsGdOHPW0PloU1unl/qsPu1xGOzqw/s15UnkWzRiS1RbDuDS9hi/yXbytHnR8Qd2IFvrZYQzNNSJ88ud9KgX4WSxnZQ698JrYIygHyuCD6H/LGmMSClrf+vAk5qpfFjTQ/8TPpCpZeDJzmvdx83dcrricH/4wRWNV9prbLICqu+JsIWi6If5dwtzfQPZ6JcKPzM8lMx9U6Tp1j2AWrjUOWFFy/Ci/kReMctv/YOA1GBpbHhGcFuLSLU3B1hQG8TjBZy4Jcwp6Sal2Ld54yQMIcZHRPKj+NChm7TnJto0jXtOg57ODYQ3JQq94rA7wT5LTA+KC8MAxmVeblHeUUBQqEx9Zeb5xQCKMAVPPRdDElxEW7RKzR/WVwW5aVN1Xsxoa0Y/6fejuu1wm5wHepYfULewjB3RnlgCdrpI9pxcVa+/IcJ9i7lOxho3OZjYHnsflkMK0I8ZLxDfbDG5l9gNXrXPqQnmVrNYGcagcS8ImW6ZfubOEZPziiCo1y3/qcdgLmDFhiLCAJ4g6rhIhNq7TPUS54VaPSqe1cYp7uHg0qx+mW2nEGVUe+3sEYcD+nbHOALAMvlf3AWHYA+3tcQJIb9CTR2d7mtXvx1xdPDyia5RrwFR5/QjkmvR5RHUNNHEtuJm 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)(1800799015)(36860700004)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:58:43.4907 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aff22a82-4ae2-4434-955c-08dc5bb972fc 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: MWH0EPF000989E9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5794 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/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=af41defcf7a2252f8383ef3ca2643d6937fe7787 Thanks. Xueming Li --- >From af41defcf7a2252f8383ef3ca2643d6937fe7787 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Thu, 29 Feb 2024 13:31:19 +0200 Subject: [PATCH] net/mlx5: fix non-masked indirect list meter translation Cc: Xueming Li [ upstream commit 4c041e2f0595e4a4e176a6d1f1a00c30debbc1fe ] Template table reuses DR5 action handle for non-masked indirect actions. Flow rule must explicitly translate non-masked indirect action and update DR5 handle with the rule indirect object. Current PMD assumed DR5 handle of non-masked indirect action was always NULL before the action translation. The patch always translates non-masked indirect list meter object. Fixes: e26f50adbf38 ("net/mlx5: support indirect list meter mark action") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_hw.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 6d0f1beeec..7ed0c0ac9b 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1728,15 +1728,9 @@ flow_hw_translate_indirect_meter(struct rte_eth_dev *dev, const struct rte_flow_indirect_update_flow_meter_mark **flow_conf = (typeof(flow_conf))action_conf->conf; - /* - * Masked indirect handle set dr5 action during template table - * translation. - */ - if (!dr_rule->action) { - ret = flow_dr_set_meter(priv, dr_rule, action_conf); - if (ret) - return ret; - } + ret = flow_dr_set_meter(priv, dr_rule, action_conf); + if (ret) + return ret; if (!act_data->shared_meter.conf_masked) { if (flow_conf && flow_conf[0] && flow_conf[0]->init_color < RTE_COLORS) flow_dr_mtr_flow_color(dr_rule, flow_conf[0]->init_color); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:07.916616519 +0800 +++ 0095-net-mlx5-fix-non-masked-indirect-list-meter-translat.patch 2024-04-13 20:43:05.067753840 +0800 @@ -1 +1 @@ -From 4c041e2f0595e4a4e176a6d1f1a00c30debbc1fe Mon Sep 17 00:00:00 2001 +From af41defcf7a2252f8383ef3ca2643d6937fe7787 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4c041e2f0595e4a4e176a6d1f1a00c30debbc1fe ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index b9ba05f695..a4e204695e 100644 +index 6d0f1beeec..7ed0c0ac9b 100644 @@ -29 +31 @@ -@@ -1838,15 +1838,9 @@ flow_hw_translate_indirect_meter(struct rte_eth_dev *dev, +@@ -1728,15 +1728,9 @@ flow_hw_translate_indirect_meter(struct rte_eth_dev *dev,