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 9844F45610 for ; Fri, 12 Jul 2024 12:50:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90296402E5; Fri, 12 Jul 2024 12:50:53 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2047.outbound.protection.outlook.com [40.107.92.47]) by mails.dpdk.org (Postfix) with ESMTP id 95C7240261 for ; Fri, 12 Jul 2024 12:50:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FxHyBG7FO63lIrUVINw3tZUUlW2EqLGZWG62OfYU0nTKPQpKxhZZECK299C4UrWasRnnMFOWumNZH04f6XOflc9tsSuXEePvJha9nxXqP6GgoX7TWI4n0+pSvqc08V/X3abmeN1FwlMTmoTVuUTTJR0SGny2eYrW61oYdScgOuUcsAGN98z8y+/C9SgYAfspiJVoW5u00Pkf0YMOkW2MLPonyVEI3dq9jWP4OeKLmQX2leDqAqNVFhH9tjnYdzLAU4OVKHARPitzJJSfRG7ST1CWsU/K+2bsI8UPO4zqkEmPw9VO0YMiy1x1CF7rzoazmJmARVszPYlVvdOy+v6P3Q== 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=S91yNRHKy0kiSry4Ip9k2PG5iDLO0NHq025JV0g8f20=; b=eb5HbR3dGBBh/Li6ElL7neyVuEkdT1o7qV4gDze4NbXTZjHVKaxo2RThlJK1Y3jNVZDOkq3xJP6ppzBPT9hyAxuDabS/1QtIXfHFS1ix9IZebkqQoHJJod9VjEYxGHasJ7qakHwtR/MCXGEgba/aYZRDEENJqMxJsbQfz4m5Z8NsS5xdTOQMmRKMjMk7oubouSyxGtf0C/MlGqMNKQxM/gKsGhtxDEQU9yIxJ5U12D/roEpUdUTY/BxkSyG8eUq7dYUT5HFvbEP+trYE0nAes0epciz62jxJjzcbkJ+UJSn/jhmGP0Bo8cVumaMIpu89fnOPtkH4hwzqGdZ7Q/dZXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=ccm.ink 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=S91yNRHKy0kiSry4Ip9k2PG5iDLO0NHq025JV0g8f20=; b=mgKHNE+FoJfT4LdjfV7M2QwpDIHGOb/kR5s5jb6oPFu+cVerv2ttw7h4pSrr2J5GVpyLR8+EpCeOaNN77qarTK8sNYIG8O4aZbQLkuW33nbT6JLDyeEahSEDMFMlMWkS5KRk1HPcy6VAmtliP67bDPMrQiw/88He8/vCymDc89Vw0eyky0dtF/crSiedqBq0CIDNNzGQl8qAm0V6GK6lho7DaYuB9HspmvUkpsDi7E3Bm8cbqaWKgbaEkvzuy5WrdTwykgCPiPWDf4hVcpyLWlcEEzvH4hvBYdpx40BunMx/zA7O5g8IWNR/A10zvIo8+0JotrIzmmgAaoLmta7pRQ== Received: from BYAPR11CA0103.namprd11.prod.outlook.com (2603:10b6:a03:f4::44) by PH7PR12MB7113.namprd12.prod.outlook.com (2603:10b6:510:1ec::8) 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 10:50:46 +0000 Received: from SJ1PEPF000023D5.namprd21.prod.outlook.com (2603:10b6:a03:f4:cafe::3d) by BYAPR11CA0103.outlook.office365.com (2603:10b6:a03:f4::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.21 via Frontend Transport; Fri, 12 Jul 2024 10:50:46 +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 SJ1PEPF000023D5.mail.protection.outlook.com (10.167.244.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:50:46 +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 03:50:33 -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.1544.4; Fri, 12 Jul 2024 03:50:31 -0700 From: Xueming Li To: Chenming Chang CC: Stephen Hemminger , Vladimir Medvedkin , dpdk stable Subject: patch 'hash: fix return code description in Doxygen' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:35 +0800 Message-ID: <20240712104528.308638-50-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-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: 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: SJ1PEPF000023D5:EE_|PH7PR12MB7113:EE_ X-MS-Office365-Filtering-Correlation-Id: e1df7cb3-d380-4605-63db-08dca2607c0c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?KCrFO7si7Dkguar7KZNPYV8tJfgr49hDjr03jLrxxslEopKscl1PxfnWrNnb?= =?us-ascii?Q?JbXOQ6rBPauNEKDx7Yzw4hk12vbV4YlliY/lr7N8UEpuHZJb+BZy+v/AZ8XX?= =?us-ascii?Q?2y+ksByJGBnpaa7pztHEmsc065wzUqfU5ytIZr3hv7/hCw35kscCT4gb2V9F?= =?us-ascii?Q?idbaycdlZgRXQ31MlkmDKBZwGl4oqG1powZ2t6jauvscidNtA0gl31hbIcHC?= =?us-ascii?Q?4r6iVg8vM/2ZEqnpACNiqdmUFfXIB38chhP+cJKLyCbBoNOIJ6C9+okv2Rno?= =?us-ascii?Q?HKYmb59su/eRqJ6I8SGnlIO/JCHVqdZLOjzMZUGYIpfhNAqWxd1bT7XmfuLl?= =?us-ascii?Q?O/MPOqkl5xzd1E5ZS6bnqNT2+pm0gaeUunl8ZBmnkSUIPHfaxeRnhUaAC/F2?= =?us-ascii?Q?GEKYkxZZnNehB/cinQRAlLpxZJ4RpEBuVECzf8BAH5we5/OBCbBprZ2SGxhz?= =?us-ascii?Q?k+lEKkhq+KufFaEMU/xHFVpQaPurFGlyk3BnmH8PtBsvBhP/7RlTu1Y5+PwE?= =?us-ascii?Q?7dGPX0IaNeGQbrkjpmOEEHOwQiKODkcWFslt2v0nak8vby7+7iIp6QaTxU/4?= =?us-ascii?Q?uVwYBNsh0w2WuwSDtQSXftOtzLikxXDZ0M6MA5JoCg7dFMX3pir5nrescJKU?= =?us-ascii?Q?sVS1iDbRa2BOPNLlsAmHuY4c7ItbwPpdO+3P9nGOWH0E89xKlVc0Hl+qRkPj?= =?us-ascii?Q?I+ylfdLPW5DZCZb2Uj2JqVGxDFiUjzDPk9LU+H8y4/0u/1KqVnoB3Ih9kEsD?= =?us-ascii?Q?lNw0WrmEhDrNPMmCO66brRc8YDzCDpXz4ogQ3RxSUP9nyDRkLLWhcp12eTgM?= =?us-ascii?Q?IzTs+wFRg1uqs7/jo3+uEHNFbQae9uBU8E80ur2ggbvQxJl3i2Y1iPqF7MBd?= =?us-ascii?Q?7BGOQI26hVrqggMCi51GFJczVDkkj++LkwA/kCWjTDmP4DDNOSSpgOgpnWWQ?= =?us-ascii?Q?6YLbXvjZcOhRUMIGeKo+6zFFFuutdKgp7R9RXG+J84Obz3rhkN5GHuiTg7cR?= =?us-ascii?Q?/oM5dRZqE2t5JTbliNu5eontB/l9ugATwf+/rZLOncvggpJumaK8uyuqMaQc?= =?us-ascii?Q?iy/M9DPpwdT+fEyDlc5dqKFoAIielwks50BJuJYB4r4vs7VZVyN/qb9VSZro?= =?us-ascii?Q?amyovmndacBFNYaEIsa2xRT7ZZcbb95X9F8K+g7nQB41gAYBH0xuVK2Gk4xu?= =?us-ascii?Q?A1vCEl8OuS39fnLcPYHgvVBxboHV6nRNqKUL6jH8EmvjdntWXGKt9ugOSEKk?= =?us-ascii?Q?/UZhbxS39tJX0Zo1f5qSvm9dnhCaSh6b9cUei0qRZJi19yTOEQ4kCobGnyFC?= =?us-ascii?Q?MCAHu7E13Pwo+Q7jf7hUZD9PK2JBaD1tZ9fEk2oONIs5JGU8IQ7oaYM9pst2?= =?us-ascii?Q?iZq3Md/22ubjyjg3LEqFbaTWyo9gjwu9jC+8ncArd5hN5ZwVjbO5DFnkzqDi?= =?us-ascii?Q?iw+MEIs+nwZ/ExJCccUxkZSffe/HWaF3?= 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)(82310400026)(36860700013)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:50:46.1202 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e1df7cb3-d380-4605-63db-08dca2607c0c 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: SJ1PEPF000023D5.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7113 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=c9c841d41a1683c79b2a8bcf7c193a25ab32e4e5 Thanks. Xueming Li --- >From c9c841d41a1683c79b2a8bcf7c193a25ab32e4e5 Mon Sep 17 00:00:00 2001 From: Chenming Chang Date: Mon, 27 Jun 2022 21:11:21 +0800 Subject: [PATCH] hash: fix return code description in Doxygen Cc: Xueming Li [ upstream commit 78a632e6b52c29c5f297001181e870750eee02a7 ] The rte_hash lookup can return ZERO which is not a positive value. Fixes: af75078fece3 ("first public release") Signed-off-by: Chenming Chang Acked-by: Stephen Hemminger Acked-by: Vladimir Medvedkin --- .mailmap | 1 + lib/hash/rte_hash.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.mailmap b/.mailmap index 79e25426fe..cc90b111fd 100644 --- a/.mailmap +++ b/.mailmap @@ -226,6 +226,7 @@ Cheng Liu Cheng Peng Chengwen Feng Chenmin Sun +Chenming Chang Chenxu Di Chenyu Huang Cheryl Houser diff --git a/lib/hash/rte_hash.h b/lib/hash/rte_hash.h index 7ecc021111..ba96521529 100644 --- a/lib/hash/rte_hash.h +++ b/lib/hash/rte_hash.h @@ -286,7 +286,7 @@ rte_hash_add_key_with_hash_data(const struct rte_hash *h, const void *key, * @return * - -EINVAL if the parameters are invalid. * - -ENOSPC if there is no space in the hash for this key. - * - A positive value that can be used by the caller as an offset into an + * - A non-negative value that can be used by the caller as an offset into an * array of user data. This value is unique for this key. This * unique key id may be larger than the user specified entry count * when RTE_HASH_EXTRA_FLAGS_MULTI_WRITER_ADD flag is set. @@ -310,7 +310,7 @@ rte_hash_add_key(const struct rte_hash *h, const void *key); * @return * - -EINVAL if the parameters are invalid. * - -ENOSPC if there is no space in the hash for this key. - * - A positive value that can be used by the caller as an offset into an + * - A non-negative value that can be used by the caller as an offset into an * array of user data. This value is unique for this key. This * unique key ID may be larger than the user specified entry count * when RTE_HASH_EXTRA_FLAGS_MULTI_WRITER_ADD flag is set. @@ -341,7 +341,7 @@ rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key, hash_sig_t * @return * - -EINVAL if the parameters are invalid. * - -ENOENT if the key is not found. - * - A positive value that can be used by the caller as an offset into an + * - A non-negative value that can be used by the caller as an offset into an * array of user data. This value is unique for this key, and is the same * value that was returned when the key was added. */ @@ -373,7 +373,7 @@ rte_hash_del_key(const struct rte_hash *h, const void *key); * @return * - -EINVAL if the parameters are invalid. * - -ENOENT if the key is not found. - * - A positive value that can be used by the caller as an offset into an + * - A non-negative value that can be used by the caller as an offset into an * array of user data. This value is unique for this key, and is the same * value that was returned when the key was added. */ @@ -440,7 +440,7 @@ rte_hash_free_key_with_position(const struct rte_hash *h, * @param data * Output with pointer to data returned from the hash table. * @return - * - A positive value that can be used by the caller as an offset into an + * - A non-negative value that can be used by the caller as an offset into an * array of user data. This value is unique for this key, and is the same * value that was returned when the key was added. * - -EINVAL if the parameters are invalid. @@ -465,7 +465,7 @@ rte_hash_lookup_data(const struct rte_hash *h, const void *key, void **data); * @param data * Output with pointer to data returned from the hash table. * @return - * - A positive value that can be used by the caller as an offset into an + * - A non-negative value that can be used by the caller as an offset into an * array of user data. This value is unique for this key, and is the same * value that was returned when the key was added. * - -EINVAL if the parameters are invalid. @@ -488,7 +488,7 @@ rte_hash_lookup_with_hash_data(const struct rte_hash *h, const void *key, * @return * - -EINVAL if the parameters are invalid. * - -ENOENT if the key is not found. - * - A positive value that can be used by the caller as an offset into an + * - A non-negative value that can be used by the caller as an offset into an * array of user data. This value is unique for this key, and is the same * value that was returned when the key was added. */ @@ -510,7 +510,7 @@ rte_hash_lookup(const struct rte_hash *h, const void *key); * @return * - -EINVAL if the parameters are invalid. * - -ENOENT if the key is not found. - * - A positive value that can be used by the caller as an offset into an + * - A non-negative value that can be used by the caller as an offset into an * array of user data. This value is unique for this key, and is the same * value that was returned when the key was added. */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:16.332485060 +0800 +++ 0049-hash-fix-return-code-description-in-Doxygen.patch 2024-07-12 18:40:14.076594231 +0800 @@ -1 +1 @@ -From 78a632e6b52c29c5f297001181e870750eee02a7 Mon Sep 17 00:00:00 2001 +From c9c841d41a1683c79b2a8bcf7c193a25ab32e4e5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 78a632e6b52c29c5f297001181e870750eee02a7 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 1aca379558..111dbb0ac3 100644 +index 79e25426fe..cc90b111fd 100644 @@ -23 +25 @@ -@@ -228,6 +228,7 @@ Cheng Liu +@@ -226,6 +226,7 @@ Cheng Liu