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 914AC45E41 for ; Sat, 7 Dec 2024 09:03:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7908B40613; Sat, 7 Dec 2024 09:03:03 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2085.outbound.protection.outlook.com [40.107.244.85]) by mails.dpdk.org (Postfix) with ESMTP id EE8AA40E5E for ; Sat, 7 Dec 2024 09:03:00 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aonSzgZgyinTZmKrBqcmYEXsp5pd+Ik5VuFuSQCkebo8spSH5qS7vEEATw0Niq+m6KzSj4oKRdPTW+bIVenbMkUbJeF5gPskHxmU1WG/Q3z1L4MIYdIIgUQu6VwJGPx3afRzZs01pXI6tuQvF6PjNIIxWIZ81QXZWii3EU3yhZ8v23KvMfSMV9KCbyezOsjwcn6H8MvrG34c6l1dQZLAb1CZcTVM77SXb4Qq6ls5Cb37bkSZjXKqGDBb5YHxJCNMQolaD3lhclck9QK1zrUZmXQiLxTlILUt45H9tiu2eW02s64Sa3Q1bhBXyvC0wfkmWFUVcm8HWtiTg9GkkDI03A== 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=VS8SZ6Xx6YgFMI/7fyr0ElT4psXx95D/z6AqmeBnuXc=; b=dbFBjJVzscrvDrK1ogrUnGG+qIw1dh8ar7Vu0PuyYXUPp+T9j0DNCOEGp6pMhsd3qzDJKTCyPl2WVuELbPdJlBvrFUTaMGYh2g3ik1q1DmAMN2YVdxHCdPAYzZ2XR1fPEq+NZjbgPu781QwyDxYfzGp8smUap4LAYViX6ngjaD5tIVSPxg3pNNiZeZ7Mvyfi6tPSBappIfo4eZ4PS+KzlPK4SEM+ireIL64Rodmjkcn8X0KHb16c0I2NoIsjJ63/3aRWWEaXCl+5/HnKmxijEf+Scr/Q55hONnoM7IfnXz2AnNx71O62ITOlJGa5EOzwqb28zVYtzHfAp26k1bE5jw== 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=VS8SZ6Xx6YgFMI/7fyr0ElT4psXx95D/z6AqmeBnuXc=; b=aen9vCCTe/8NqmR/LHpzZRbBMZKOyisoLi/bby6MYGmThD48ViPNDKg0aS/eTb1q9sUcTC918bdzrojhBcxH71wGIgUQX3AbvhRly1v5Xy6TUnP9Bf6M5pGKmI9nEGk7ZWKsLkA1aNSdief6SAX9XswjkAUzXSXCl876J1IuFPt6HIHJws40zkMaO3OjFreQvSB4PcG1a/Fptxci34rpt1BNVDsVlKLByz1dkLMPF5AJplU3U/8H2Am8MlK+a2OCmpfiTxM1ZFigds1pSJdbYLX/2xefY+CFJWjSjXaPa3sAbyl66YEZNo04mEb25hCuqBYqewnniXNiRhXPlL+V4w== Received: from PH8PR05CA0012.namprd05.prod.outlook.com (2603:10b6:510:2cc::11) by MN0PR12MB5980.namprd12.prod.outlook.com (2603:10b6:208:37f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.25; Sat, 7 Dec 2024 08:02:56 +0000 Received: from CY4PEPF0000E9DC.namprd05.prod.outlook.com (2603:10b6:510:2cc:cafe::dc) by PH8PR05CA0012.outlook.office365.com (2603:10b6:510:2cc::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8251.11 via Frontend Transport; Sat, 7 Dec 2024 08:02:56 +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 CY4PEPF0000E9DC.mail.protection.outlook.com (10.167.241.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:02:55 +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; Sat, 7 Dec 2024 00:02:45 -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.1544.4; Sat, 7 Dec 2024 00:02:43 -0800 From: Xueming Li To: Gregory Etelson CC: Xueming Li , Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix SWS meter state initialization' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 15:59:36 +0800 Message-ID: <20241207080055.488538-19-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-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: CY4PEPF0000E9DC:EE_|MN0PR12MB5980:EE_ X-MS-Office365-Filtering-Correlation-Id: 31764865-5baf-4b62-80d2-08dd16958eeb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?prikx937xZGA+43mfByYwwqkwekvgVGPyEfbG/tbb0+ThDuTY5nuh/6jTxPz?= =?us-ascii?Q?y7cc0VLjUq0z3A+gDItgkjuoiJu4nwKAras9D6zLR39rpI2JcuTuy2GLqsHK?= =?us-ascii?Q?Ru/DRZTEjeb1yY8L5pdhZKZJ2TqivHyQMR154dxvdVFQy7hZzpxB1WtpLf6H?= =?us-ascii?Q?Rmk1uY9/9eaItH7gLmMNcd5MEk8qKhqVgfUWcPT9fiTd3PKiYAp0JrOGaSDT?= =?us-ascii?Q?ox+Yvg+VtYxQIbUS9UxpXu++IVnpvvLRWZ4anfikwYMTU7xyGZrTHL+82Hq9?= =?us-ascii?Q?G4Vx0vJAOOys45PsfVKSa1DfXGwYtwxCFxvOk/aAkmxr4JEp9gmaPGEu7hVM?= =?us-ascii?Q?MqxKmve4T7eaPfqmrAJ89gQ/dro5hqFHEUYIKjsYegOV8nh0hPGVYtIwz5NS?= =?us-ascii?Q?uTxCi9fVckrDHm7sateXR3LcxKlCNf9EHKPVNGEBHTmlPpoj9CW1LDXRuuVw?= =?us-ascii?Q?sVENrq1x5e3PAyTHxl2wVWVMyatcEGNPe0xaPOcWt9DDeL1uGXJ9cE/Yow4h?= =?us-ascii?Q?wIND4Zl+Xxc10KUmtX9BNH73pNLpmEaR7w9FLMnylbHagRzVzo5FZFkIPTYP?= =?us-ascii?Q?6WNN1XmyTf19PEuE9nLu9blPWokUW8uChuI1S4xEM2wWnVaEXaEzi3frKusg?= =?us-ascii?Q?6EoW5/wScU2zfgN3aKm8hVuTEzpnMNvsV+wahOkWFSEPCXKyv6fBSDpQv5bu?= =?us-ascii?Q?qrChbqS9p2mXUve/9Y0twwDuvbViLKOwOnhsAOvtiBYMClQguo3kkBQ5dQbJ?= =?us-ascii?Q?DtgIT3f+Bu4WOYWClXNsZgFLWWJNoHHIyaCKT8OkfUqjpfA2QYis0abx+xF9?= =?us-ascii?Q?BoGwg21jKBglFyjvRCYjFGRIfFLzA9HGkSXTYttYx2hLnHjCmFEaH3H+QGsg?= =?us-ascii?Q?409y/f+D8nwF0wID41g4H4wYE6oXxjdBQ+pXuIV130NYSfp9gPO/pP6wkD9M?= =?us-ascii?Q?CnblxWCJ9ZXo3d5lYYXfnQrHHIvdCKWMdw5lU29eMD8u+26fsvxUGJDRR7uX?= =?us-ascii?Q?utU87OcEcPQyzsyDt5P3jelg1wSlVEkkXk2o+kKK9nUieOlrJLNxysoWrdm2?= =?us-ascii?Q?JlJqw2+1y1t8VgS+aLQV0mMXZwhJtzGvi+c9f+/1mwS70WYnrftSf2gSUNTP?= =?us-ascii?Q?7RnjH1unABeXxveXi3zBTAb62EEMtWGTvOIq36ldRB+dMDYOOEjyU180X9Sd?= =?us-ascii?Q?VI++PNhfWSIuXt6BFmA4n7zbmTlZlAcXEMiStv+Bc4flYrktD4zmtZz6wAfG?= =?us-ascii?Q?G7eSe78qvKkXhWbgQo1EB4qyVNFxIyurvbdnhlSA8uYpdHEUpU67VGWhP1pj?= =?us-ascii?Q?pluejNugFg87ro7PG+w9rXyn6N/gjwDz/mOgz9gjy6nCVmruToAro1i7azZ+?= =?us-ascii?Q?xCCCtFHBxH6ML/a0RGEZEe3CgMcGDUuE6krBQrceuqYcDqAOLuZmXX0KtkkZ?= =?us-ascii?Q?DEDMEeRiZ17987/lT4EFWpDJhP2j+ERV?= 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)(1800799024)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:02:55.9121 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 31764865-5baf-4b62-80d2-08dd16958eeb 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: CY4PEPF0000E9DC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5980 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.3 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/10/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=19021b32a7aa90926974e99dc25a0fb9d9d0b071 Thanks. Xueming Li --- >From 19021b32a7aa90926974e99dc25a0fb9d9d0b071 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Sun, 27 Oct 2024 17:31:36 +0200 Subject: [PATCH] net/mlx5: fix SWS meter state initialization Cc: Xueming Li [ upstream commit 0c37d8f7ba2cac289896de024d9c58a65ba3ece9 ] Update the state initialization for SWS meter objects to properly monitor ASO object availability. The PMD uses the meter 'state' variable to track whether ASO objects are available for use. This ensures that the SWS meter object state is correctly initialized, allowing the PMD to accurately manage ASO resources for metering functionality. Fixes: 4359d9d1f76b ("net/mlx5: fix sync meter processing in HWS") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_meter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index a4d954cb1f..1376533604 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -1613,6 +1613,7 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv, if (sh->meter_aso_en) { fm->is_enable = !!is_enable; aso_mtr = container_of(fm, struct mlx5_aso_mtr, fm); + aso_mtr->state = ASO_METER_WAIT; ret = mlx5_aso_meter_update_by_wqe(priv, MLX5_HW_INV_QUEUE, aso_mtr, &priv->mtr_bulk, NULL, true); @@ -1864,6 +1865,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, /* If ASO meter supported, update ASO flow meter by wqe. */ if (priv->sh->meter_aso_en) { aso_mtr = container_of(fm, struct mlx5_aso_mtr, fm); + aso_mtr->state = ASO_METER_WAIT; ret = mlx5_aso_meter_update_by_wqe(priv, MLX5_HW_INV_QUEUE, aso_mtr, &priv->mtr_bulk, NULL, true); if (ret) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:44.757004919 +0800 +++ 0018-net-mlx5-fix-SWS-meter-state-initialization.patch 2024-12-06 23:26:43.883044829 +0800 @@ -1 +1 @@ -From 0c37d8f7ba2cac289896de024d9c58a65ba3ece9 Mon Sep 17 00:00:00 2001 +From 19021b32a7aa90926974e99dc25a0fb9d9d0b071 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0c37d8f7ba2cac289896de024d9c58a65ba3ece9 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 98a61cbdd4..233b140785 100644 +index a4d954cb1f..1376533604 100644 @@ -27 +29 @@ -@@ -1914,6 +1914,7 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv, +@@ -1613,6 +1613,7 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv, @@ -35 +37 @@ -@@ -2165,6 +2166,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, +@@ -1864,6 +1865,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id,