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 F05B243E57 for ; Sat, 13 Apr 2024 15:01:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EB87F40E32; Sat, 13 Apr 2024 15:01:15 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2085.outbound.protection.outlook.com [40.107.101.85]) by mails.dpdk.org (Postfix) with ESMTP id BDFBC40294 for ; Sat, 13 Apr 2024 15:01:14 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cii3V1MOj1e7W6PP62bgH4r5iNEbgUtcCcfiyFNrHDJ119/eHg7vuZ3DwwccMIxeD3n68vgpUvzDMZD8lc5v32+HJBCjuaZEg7muLzD6zKBhA+7vk1kihkCM5Q8ul4OtBmBFGxy+Rw/TCcWyo8+SL8wIIcGiyOIL8vumWCYq1zys92ClCl7X4SVV3EiAzENOmuGRHk6qS99pi4cInSZDesyohEUV+qkp6t+Pe1ArOonIiedhRhWgz/rEhBB32QxarXoPf/hGYxFHFNUQjT/eRuTaCRHI8zHbnRnXd7g2z2UKqZmMwY/LGdgsj0CaWYG6gR3c87+gLXB9DAl75ICtgg== 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=B9Y8tKKL62eOdnbpPrWEQKHxkVIJ77rORaMft9PUdGY=; b=XOsCJIbtYUHQH2huN40ldUVrShoPhG9XdLa1EWQFZ7CTH528dP/DHkgU7gkMMIgKEVMLpwBHXIUzCsoMlW8NScdRtEtiIqjm6NFthsxQjb0hwCric18RoPgh6HV3R7FRmvMBQgyC9PiuPsm06xlCatdWeb5fIY82uJoGQuFtQz04mnK2k7G07BZhC9udCYxkIBfHr6lHC2d/ajHWJcWpnKzvY496e+fEsMaBAN0ceL3bw+LOONsYuylE/EitR3jd3pIsofoNZTU3NSFsTbE5/h2SY/T+3q8x0b4nZ2WOoKpmOEYRD75Q/CcldLergl4fdD6WuGt7HcAOMzjV4DbLjQ== 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=B9Y8tKKL62eOdnbpPrWEQKHxkVIJ77rORaMft9PUdGY=; b=DGv5unTIqMmnmzFfzj2+CiEz4US/ouFQn5vVUUvCZcJlblIHqnON5qYhCw44lXUbasG0uUT+2X2Zh6kONN3SKpIgkbcF5l0QmDGAlU6GJFp/bjUl1/Hy6pdyJ0vkF0gvIynkxnmUIqxWLSQzZ0B21HbCtIjbg5jAKve0Qyp4y1IW1Ewd9rFmDXfby0gbu0zXSHs2nf+ibw5IVzakgRzIHQQSAIJOC6zUfXz1Cjbwfae0DsjnprgJKJ+jltDCpPuht7HnIr4YTDhMriSpcX20wLyQAVYiP62juuKhviQdXc8B/wuf4pLA+PV88cr/uG2JRimmCHGuZejpxM95GBXUoQ== Received: from SJ0PR13CA0092.namprd13.prod.outlook.com (2603:10b6:a03:2c5::7) by MW4PR12MB6777.namprd12.prod.outlook.com (2603:10b6:303:1e9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Sat, 13 Apr 2024 13:01:11 +0000 Received: from MWH0EPF000A6731.namprd04.prod.outlook.com (2603:10b6:a03:2c5:cafe::80) by SJ0PR13CA0092.outlook.office365.com (2603:10b6:a03:2c5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.16 via Frontend Transport; Sat, 13 Apr 2024 13:01:10 +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 MWH0EPF000A6731.mail.protection.outlook.com (10.167.249.23) 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 13:01:10 +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.986.41; Sat, 13 Apr 2024 06:00:48 -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.1258.12; Sat, 13 Apr 2024 06:00:46 -0700 From: Xueming Li To: Gregory Etelson CC: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix sync flow meter action' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:58 +0800 Message-ID: <20240413125005.725659-118-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.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: MWH0EPF000A6731:EE_|MW4PR12MB6777:EE_ X-MS-Office365-Filtering-Correlation-Id: f69f8fef-7508-4009-7995-08dc5bb9cab6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Aj2JAqiTE0ULfJut/+xti+8DeS0lCgwffxu0DNDAau23X6bZ1hSocnspI1eP?= =?us-ascii?Q?27XeikQ5fIoX59iuhoAl3aNxS1ByWHmKyNYf7LO2fYK6uY5QIaRMYA0C4oqz?= =?us-ascii?Q?ckygv3S3JackGpnZz2VxCC1m0rj11NdjfrdqiQuEwMEWhLta6BPleeMUB6xh?= =?us-ascii?Q?YiS+f447jl3ppyQfFj2pnvSplU969JEw4gG8ls/i108lojGiwnnrBx96+ABY?= =?us-ascii?Q?TP8+0oCMkpFL66P9A9eskb/PtAZbh34lZNtW2NNjWwkVHNdWwz5X5RonnN3V?= =?us-ascii?Q?nnboYqhUZzZO+3oAX+AWBGs1gCFuAmXqkLvdQieNE6mNNBrFq6lpNS5woNxD?= =?us-ascii?Q?sE4l23TxwLORfu12WyLFtQuu8/GxQPK5dWHz4kdfQlNTTsm9zHSQ3j/GBT5p?= =?us-ascii?Q?DbHTeueV1Fm0xL7km6O4l3ZYp2XkKlPRGELURB+JtrnL3i6tMovyYchln4M6?= =?us-ascii?Q?rWvDrMzK/yN1GncyJMbvZYXTaY2cDSDABiOSbwLLZRiVWkK64bFKxDv7GieS?= =?us-ascii?Q?JpH7QjQE1vYMWHNpqYDh2Nly4NDRMYUVCdoQL4O2kzZsG0QVsMewBl26arLK?= =?us-ascii?Q?yc+ckXHFMY2eI3Js7DPnvJ+X73tlIZG5+jkjTbHPJedPZYFEHf+9JIVF77ph?= =?us-ascii?Q?xul83qoRmP50lj1tmYCwS5WfHhrXikWTThI8KpEUwTeD3se49gfOTOnu3SFN?= =?us-ascii?Q?e9oQGEpz3SE9pp+sAMBJYF0B1p1VLYLqLum7V999ixrCKDGZSCzOsSNd4y1f?= =?us-ascii?Q?DkRQDJM10fFh1tV6QrGXDIIOIpb25Z7OFMVSREZ/NZPr5VY+R/ME+f1whjXB?= =?us-ascii?Q?nQUX8UkbE5Z5R9y5l1baiBc3bhDYeIg1fKn7qYfXJy6C99er02X2at866Yg6?= =?us-ascii?Q?PxXX5U1bw5SOrAPZ0W56FoDdgDYqHR1fwkcfftdqCAA2VnTwEvG9OAnGI8iC?= =?us-ascii?Q?RTd61OBg2+sKys1vYobv1LL5nIrq7EhFdyrhB97xPom8CtlQbEEesET+kkHK?= =?us-ascii?Q?qWKUfqcinFcJ1dgiQKb9xyhpnKcgpWfP9F0w3Ly0QDN92YOvjzZ3XffQ1kyU?= =?us-ascii?Q?C6VWiha/8qiDCN/Xkyy/5enOwVecrfVi8sbPi2MV2L0xKClS5LVfbC8kImzh?= =?us-ascii?Q?HGsaCuM+vTXSPn8O2WUrYXqhJigvIU0tmk/1StJV9CdwzeFQlQ4klnyOtwCf?= =?us-ascii?Q?uWWK9E+VASY0sJmSymUPzMrovgCGOfo+s8GS/rglAGGEE4zLWcCzqpk/UrNs?= =?us-ascii?Q?y68qyPi4BWsqhe4wGYI/yXZ+4OZK5vdaDI9YFpRuWwvy8tRDf4+msVg+Uasu?= =?us-ascii?Q?QWq1qQlaQbhXH2elFhnLDUgDZKUCvSFG6vp2dq4HixBO0DLdKHElcdOapbCb?= =?us-ascii?Q?1LMVJjS5WpVtGc2v/KlR7KeUDfHZ?= 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:(13230031)(36860700004)(82310400014)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 13:01:10.6863 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f69f8fef-7508-4009-7995-08dc5bb9cab6 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: MWH0EPF000A6731.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6777 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=df1119d4a906b1644c231059579315d84ee9772c Thanks. Xueming Li --- >From df1119d4a906b1644c231059579315d84ee9772c Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Tue, 19 Mar 2024 13:24:55 +0200 Subject: [PATCH] net/mlx5: fix sync flow meter action Cc: Xueming Li [ upstream commit dc7faa135188ede2455c66e79110538f1f92e08c ] PMD implements sync METER flow action as async. Queue selected for sync operations is `MLX5_HW_INV_QUEUE`. That dummy queue value is translated into `CTRL_QUEUE_ID(priv)`. Async job allocation converts INV queue into the real value, but job release does not. This patch fixes the queue value provided to `flow_hw_job_put()`. This patch also removes dead code found in METER_MARK destroy handler. Coverity issue: 415804, 415806 Fixes: 4359d9d1f76b ("net/mlx5: fix sync meter processing in HWS") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 5 +---- drivers/net/mlx5/mlx5_flow_meter.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index a54075ed7e..47fbbd0818 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -10497,10 +10497,7 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue, NULL, "Unable to wait for ASO meter CQE"); break; } - if (!job) - mlx5_ipool_free(pool->idx_pool, idx); - else - aso = true; + aso = true; break; case MLX5_INDIRECT_ACTION_TYPE_RSS: ret = flow_dv_action_destroy(dev, handle, error); diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index 249dc73691..7bf5018c70 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -1981,7 +1981,7 @@ mlx5_flow_meter_hws_create(struct rte_eth_dev *dev, uint32_t meter_id, ret = mlx5_aso_meter_update_by_wqe(priv, MLX5_HW_INV_QUEUE, aso_mtr, &priv->mtr_bulk, job, true); if (ret) { - flow_hw_job_put(priv, job, MLX5_HW_INV_QUEUE); + flow_hw_job_put(priv, job, CTRL_QUEUE_ID(priv)); return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, "Failed to create devx meter."); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:08.648623763 +0800 +++ 0118-net-mlx5-fix-sync-flow-meter-action.patch 2024-04-13 20:43:05.157753723 +0800 @@ -1 +1 @@ -From dc7faa135188ede2455c66e79110538f1f92e08c Mon Sep 17 00:00:00 2001 +From df1119d4a906b1644c231059579315d84ee9772c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dc7faa135188ede2455c66e79110538f1f92e08c ] @@ -19 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index 35f1ed7a03..9ebbe664d1 100644 +index a54075ed7e..47fbbd0818 100644 @@ -32 +34 @@ -@@ -11494,10 +11494,7 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue, +@@ -10497,10 +10497,7 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev, uint32_t queue, @@ -45 +47 @@ -index 4045c4c249..ca361f7efa 100644 +index 249dc73691..7bf5018c70 100644 @@ -48 +50 @@ -@@ -2265,7 +2265,7 @@ mlx5_flow_meter_hws_create(struct rte_eth_dev *dev, uint32_t meter_id, +@@ -1981,7 +1981,7 @@ mlx5_flow_meter_hws_create(struct rte_eth_dev *dev, uint32_t meter_id,