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 D14F345804 for ; Fri, 23 Aug 2024 18:20:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC6864339A; Fri, 23 Aug 2024 18:20:53 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 0739043379 for ; Fri, 23 Aug 2024 18:20:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0sGYS+6RcSnlXWVC251HNjlcuX8epTbMJo80eYqNZ2k=; b=afcNxd8qIsGpY2D7TgFPyeLBt8nBmQT9KhcLyyL8podKwAT5XL+2/65qjKFNW+4Cxrvnqf LnWU6BG3DDyuqeP+c07pHD7y3TTRmF7QaUaKiyP7lSJ4cfKU7qX8iUbtxUv4znJsiQWpLg XxFPZB3aNFRFHFTqlCVgaYDskcGQvB8= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-184-C1Gjb8UdPNKoMBFM9WrIeQ-1; Fri, 23 Aug 2024 12:20:48 -0400 X-MC-Unique: C1Gjb8UdPNKoMBFM9WrIeQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 69F191956048; Fri, 23 Aug 2024 16:20:47 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 81BB81956053; Fri, 23 Aug 2024 16:20:45 +0000 (UTC) From: Kevin Traynor 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 21.11.8 Date: Fri, 23 Aug 2024 17:17:40 +0100 Message-ID: <20240823161929.1004778-32-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/bb01e07f1d44e81f43e38f0f7023cc03d4032fb1 Thanks. Kevin --- >From bb01e07f1d44e81f43e38f0f7023cc03d4032fb1 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 [ 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 7d18ead520..ed9ed73919 100644 --- a/.mailmap +++ b/.mailmap @@ -213,4 +213,5 @@ Cheng Peng Chengwen Feng Chenmin Sun +Chenming Chang Chenxu Di Cheryl Houser diff --git a/lib/hash/rte_hash.h b/lib/hash/rte_hash.h index 6067aad954..28bfa06840 100644 --- a/lib/hash/rte_hash.h +++ b/lib/hash/rte_hash.h @@ -287,5 +287,5 @@ rte_hash_add_key_with_hash_data(const struct rte_hash *h, const void *key, * - -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 @@ -311,5 +311,5 @@ rte_hash_add_key(const struct rte_hash *h, const void *key); * - -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 @@ -342,5 +342,5 @@ rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key, hash_sig_t * - -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. @@ -374,5 +374,5 @@ rte_hash_del_key(const struct rte_hash *h, const void *key); * - -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. @@ -441,5 +441,5 @@ rte_hash_free_key_with_position(const struct rte_hash *h, * 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. @@ -466,5 +466,5 @@ rte_hash_lookup_data(const struct rte_hash *h, const void *key, void **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. @@ -489,5 +489,5 @@ rte_hash_lookup_with_hash_data(const struct rte_hash *h, const void *key, * - -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. @@ -511,5 +511,5 @@ rte_hash_lookup(const struct rte_hash *h, const void *key); * - -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.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.920022642 +0100 +++ 0032-hash-fix-return-code-description-in-Doxygen.patch 2024-08-23 17:18:09.667429920 +0100 @@ -1 +1 @@ -From 78a632e6b52c29c5f297001181e870750eee02a7 Mon Sep 17 00:00:00 2001 +From bb01e07f1d44e81f43e38f0f7023cc03d4032fb1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 78a632e6b52c29c5f297001181e870750eee02a7 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 1aca379558..111dbb0ac3 100644 +index 7d18ead520..ed9ed73919 100644 @@ -23 +24 @@ -@@ -229,4 +229,5 @@ Cheng Peng +@@ -213,4 +213,5 @@ Cheng Peng @@ -28 +29 @@ - Chenyu Huang + Cheryl Houser @@ -30 +31 @@ -index 7ecc021111..ba96521529 100644 +index 6067aad954..28bfa06840 100644