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 4A15145E41 for ; Sat, 7 Dec 2024 09:05:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3FFFA40281; Sat, 7 Dec 2024 09:05:09 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2089.outbound.protection.outlook.com [40.107.236.89]) by mails.dpdk.org (Postfix) with ESMTP id CDEAA40281 for ; Sat, 7 Dec 2024 09:05:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iGddHnXRKrv2F7VyO99fmNsq2B+LcHD9QJEWq6wDKg6k49W9I7OJZqAdsR2ixCH2REVYQeZI7082gMX0fppmc3Csku3YYDtc48QfpWqoQMKKoHy7JUwTi05kzDRTfAAjGRHV1QGCjvuvpFC2paiJbkZOyCDR3Vm4iyMn7i88Z8uKZuf1tfW0YxAhLk3n+Zq/Gnw7ko7GKukBKKHAe3lxrJnwh90u6m32NrCW2/OK4kz2STZYzD8il2wfLepZZFkwsWKod6oXPw1E1dJrZQLn85TgTcRsv8UG1MAmv/xJ9uxsxE9VsZu3U4S4gXruuyvFd/wfp1e4nz0upi9o3QrL2A== 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=7dCEjrGwKwgEAfNCabfznJWTnpmWUDEoZRFIXgppi/Y=; b=shRGMF8P2SvUtP3urzXjO3ahlH02EDgZhqBS+10sqNeTZoEvHYPviGvUqyDhZC5Ohc8VIKgGj+0fO0Gz+DAThqn0zfnmnGGTaxMMEPCpqdtw96fRDli2sgje07n1Q4gqEXvxkgboY+RMzS9GpS8xZ7/097o9gruXEHayUmRfPEtbyVkOnC0AFXhsK4PQWyF4at4Yk+wZvK2ZKS30TMiSfWDO5i99fCerOZNxDbSSQy0ZSso2Z8b9FH8q9oMnw8XGDZAnH1jckbniWCS8RnYdX0wVbKHb+JEhbpZmGvU8cttVLKxDuLgrbGqYPvG4Y+ErcXSp8Sq1pWb8zcdkMSwESQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.com 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=7dCEjrGwKwgEAfNCabfznJWTnpmWUDEoZRFIXgppi/Y=; b=s9WTaVvSfZVjYOQ+aVCvMqGT5x4JUyC+lkxC9udaAAo54Uo3t0ve2LxzMNbve/nwAZGBTky09TngG3qdrrz7SGsDfEKL9onq8VzE5dCWmLds5CWVCtZxdytClyMT2jX/BzAYXtYJpGrLOLlyRv04uXluhH17zsuRrzepJlXYmxlIHILn2S4Bt5ApYHG/21GUqdXGGyLcG1cDIOZDMLaesagubwNdWG1kUgOHpfzbwVcxL4+s9pbgNK5w5xes5OmKYaqXORyj9ZR4w7rTwc6l60kOU5ibc3OZUd5EEu7OhaErJUZZ9+9/EgXAgS+TiU+mOgWNqGdSMG+Gkcw/ACNs7g== Received: from SJ0PR03CA0143.namprd03.prod.outlook.com (2603:10b6:a03:33c::28) by SN7PR12MB6960.namprd12.prod.outlook.com (2603:10b6:806:260::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.12; Sat, 7 Dec 2024 08:05:04 +0000 Received: from SJ1PEPF00001CE2.namprd05.prod.outlook.com (2603:10b6:a03:33c:cafe::fd) by SJ0PR03CA0143.outlook.office365.com (2603:10b6:a03:33c::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.11 via Frontend Transport; Sat, 7 Dec 2024 08:05:03 +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 SJ1PEPF00001CE2.mail.protection.outlook.com (10.167.242.10) 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:05:02 +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.1544.4; Sat, 7 Dec 2024 00:04:57 -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:04:55 -0800 From: Xueming Li To: Dengdui Huang CC: Xueming Li , Jie Hai , "Stephen Hemminger" , dpdk stable Subject: patch 'net/hns3: fix error code for repeatedly create counter' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 15:59:59 +0800 Message-ID: <20241207080055.488538-42-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: SJ1PEPF00001CE2:EE_|SN7PR12MB6960:EE_ X-MS-Office365-Filtering-Correlation-Id: f670704c-1f59-4d5a-29bc-08dd1695da42 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|1800799024|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?aDm9CQ8xEWEXwc6ig+8CBdlvoTE0jL/8gIPkpepD7IXZsSYC5fukqkiGoL2V?= =?us-ascii?Q?aK6ZJX2ZKLPcJJC29M7xmAKjY0nsZwhTLjRE4CK+i+ImYt0bY+L9PQge6H/3?= =?us-ascii?Q?y4abDw6rmYoCW3hxqalibUrpu+KqrerhiFpHGg3lsQyewA4TC3lq8BDSYeDN?= =?us-ascii?Q?vDb2KzXj3A7ZQR8COX24zLNogEu99dbEKSVc7p5uzQRpW0gwzRDlxDHm3LCl?= =?us-ascii?Q?9Td2JpJDvZxibAtAV4XnHrKD0sFo3UfoH9xD0cuQw097DczpwXPV9VXEuLZU?= =?us-ascii?Q?iQeYRohX+vUlB4M+C+krwxGj1VP/YJgTcnZdFJiT3GrskH/TVLoOlWBFlX1k?= =?us-ascii?Q?0wRKYkXTckBb7xwQaeZLJbhfFg8iZFWmSKO2dxRa1MA29xeV6MkGb7339Yax?= =?us-ascii?Q?bP/D9p7kJGLl8qUw/zWlZnUYILVOgqUASANVkBFfIFh43HbXGv+UIZuESWj1?= =?us-ascii?Q?QBlIGR5gfQPkfW1F/P94qV6Sxpfrk5CGk/feEV8D525Tn/xctdbcIrHxpV/m?= =?us-ascii?Q?vtowX+8HxVWySliB+TF+s70zYbNFMWDPavTAyk1PqEiMHZ+gmVr0yXSWrhpT?= =?us-ascii?Q?4UXi6i7gjHIk8CkPBijwML3/Rk9CTYgfNTZM3lYYlkq9b+RhWuj5jcaQR4A7?= =?us-ascii?Q?cE3TT12xAWy7QxYcz9UNADSPNoKBZx9IWS15q0PWV0R8noOMCjudVz5X4upW?= =?us-ascii?Q?/o3ntvyhk9QzaIe4Ls8IDZ0EOkiPVkZPNL01JaBRf/M+hUXSJY7rm1jQicZE?= =?us-ascii?Q?kXI+4QZClbl4B151PJMLCnaMwn7NRcxOZ5I0mGCFKmPnIBzhvbCID/f5EoE7?= =?us-ascii?Q?lEYhMm4LpxnCFdFi7qcoY9n/jGBUE1QCzOFMZS+HoYrSlvAU3S8y0PxcII7Z?= =?us-ascii?Q?2d0cvsax3svxmjByHiosD/2ocumP+yF/QfyoiEkU6thzT7rF97cREs06IE7i?= =?us-ascii?Q?sDai8v4MRmE87IcewPAYPKDrm6NpyVFWfaFLdsTFlvKuotYgLOM2UARzKqzk?= =?us-ascii?Q?Ht8GVF4zxSolUNj2lNMMWwhal7NpSWvzXMrK4TweLLvpLBee1b/mMvMJM8Av?= =?us-ascii?Q?bPCCfgZTLfNB/G+kY/B2mgNS2XK9geYPpczRwMb7BBqx4gbxg27eAQFDOyuT?= =?us-ascii?Q?G93QO0Y+gfyX3q+e7EVOQkLZSNedD/VmmmrQz/H7jloZqFmHmqY4UazHUFyC?= =?us-ascii?Q?wEOjzcMP73kW2Nr73UyuFWgODnRKwDdWCF+0VNqxICgdlrgqAoIfOxTRUcL7?= =?us-ascii?Q?H7nKBoxW2dUfZAOKLpsN2qAM+Dj7pW+TBPt6lD7rUtvNFE+xojDqBoevoH8z?= =?us-ascii?Q?Wy0a65oMZYAz8JFvfePXaVUpMug0TlCoBnIQdNRp19S0OSyoq9NwDDRVewYS?= =?us-ascii?Q?xgX0B/VD3jBaPWYGOl+Kp7JKWIXU7vlFDr/o6EjrF3yqMmxhbh9WlfvPuveC?= =?us-ascii?Q?UvD0IHGwePBbRb/l6OGuw/Qtq8c8nBlB?= 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:(13230040)(36860700013)(376014)(1800799024)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:05:02.2935 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f670704c-1f59-4d5a-29bc-08dd1695da42 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: SJ1PEPF00001CE2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6960 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=3bd77d7b2487c36917e5af8bfe057b69759990e9 Thanks. Xueming Li --- >From 3bd77d7b2487c36917e5af8bfe057b69759990e9 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Thu, 7 Nov 2024 19:56:44 +0800 Subject: [PATCH] net/hns3: fix error code for repeatedly create counter Cc: Xueming Li [ upstream commit 585f1f68f18c7acbc4f920053cbf4ba888e0c271 ] Return EINVAL instead of ENOSPC when the same counter ID is used for multiple times to create a counter. Fixes: fcba820d9b9e ("net/hns3: support flow director") Signed-off-by: Dengdui Huang Signed-off-by: Jie Hai Acked-by: Stephen Hemminger --- drivers/net/hns3/hns3_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index a32fb10ddf..db318854af 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -283,7 +283,7 @@ hns3_counter_new(struct rte_eth_dev *dev, uint32_t indirect, uint32_t id, cnt = hns3_counter_lookup(dev, id); if (cnt) { if (!cnt->indirect || cnt->indirect != indirect) - return rte_flow_error_set(error, ENOTSUP, + return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION_CONF, cnt, "Counter id is used, indirect flag not match"); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:45.474437711 +0800 +++ 0041-net-hns3-fix-error-code-for-repeatedly-create-counte.patch 2024-12-06 23:26:43.933044828 +0800 @@ -1 +1 @@ -From 585f1f68f18c7acbc4f920053cbf4ba888e0c271 Mon Sep 17 00:00:00 2001 +From 3bd77d7b2487c36917e5af8bfe057b69759990e9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 585f1f68f18c7acbc4f920053cbf4ba888e0c271 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 192ffc015e..266934b45b 100644 +index a32fb10ddf..db318854af 100644 @@ -23 +25 @@ -@@ -286,7 +286,7 @@ hns3_counter_new(struct rte_eth_dev *dev, uint32_t indirect, uint32_t id, +@@ -283,7 +283,7 @@ hns3_counter_new(struct rte_eth_dev *dev, uint32_t indirect, uint32_t id,