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 CC3B142ECF for ; Thu, 20 Jul 2023 17:33:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8D9B40685; Thu, 20 Jul 2023 17:33:30 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9A467400D6 for ; Thu, 20 Jul 2023 17:33:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867209; 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=MLwH+KpBCmVRgUH15TKyuI3qJ0JfDxyAYglYCF62QVU=; b=Wsppk9tIGd1F0fxFyJJJ1qMBwZkUrrUV286mIw8IdRWtQdhWCQkp4aomp03E75i2dYnuqL TkLnKBd2A1AsfzZjEv2kXv7jfzXMmgQw4/Wekgm5vr84r9IYmI66Hh6OIiCvqoMUW1PFoz YONRFY/COB0FyZPEAYOlrCqrqUm8yYY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-635-p34-2ys8OwacIg5aY6FH7A-1; Thu, 20 Jul 2023 11:20:08 -0400 X-MC-Unique: p34-2ys8OwacIg5aY6FH7A-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4D2EA936D43; Thu, 20 Jul 2023 15:20:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 119D24CD0E3; Thu, 20 Jul 2023 15:20:06 +0000 (UTC) From: Kevin Traynor To: Feifei Wang Cc: Ruifeng Wang , =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'ring: fix dequeue parameter name' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:20 +0100 Message-ID: <20230720151942.262154-9-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.5 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/25/23. 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/4b8a60276bb67e4fba40fcb285b5b21d20907533 Thanks. Kevin --- >From 4b8a60276bb67e4fba40fcb285b5b21d20907533 Mon Sep 17 00:00:00 2001 From: Feifei Wang Date: Fri, 7 Apr 2023 16:48:25 +0800 Subject: [PATCH] ring: fix dequeue parameter name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit b632e76751ff9797e36531305638e1cbd14ffa09 ] Ring dequeue operation's parameters name should be 'cons_xx', rather than 'prod_xxx'. Fixes: 1fc73390bcf5 ("ring: refactor exported headers") Signed-off-by: Feifei Wang Reviewed-by: Ruifeng Wang Acked-by: Morten Brørup --- lib/ring/rte_ring_elem_pvt.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ring/rte_ring_elem_pvt.h b/lib/ring/rte_ring_elem_pvt.h index 04b55c34a4..99786cca95 100644 --- a/lib/ring/rte_ring_elem_pvt.h +++ b/lib/ring/rte_ring_elem_pvt.h @@ -195,10 +195,10 @@ __rte_ring_dequeue_elems_32(struct rte_ring *r, const uint32_t size, static __rte_always_inline void -__rte_ring_dequeue_elems_64(struct rte_ring *r, uint32_t prod_head, +__rte_ring_dequeue_elems_64(struct rte_ring *r, uint32_t cons_head, void *obj_table, uint32_t n) { unsigned int i; const uint32_t size = r->size; - uint32_t idx = prod_head & r->mask; + uint32_t idx = cons_head & r->mask; uint64_t *ring = (uint64_t *)&r[1]; unaligned_uint64_t *obj = (unaligned_uint64_t *)obj_table; @@ -228,10 +228,10 @@ __rte_ring_dequeue_elems_64(struct rte_ring *r, uint32_t prod_head, static __rte_always_inline void -__rte_ring_dequeue_elems_128(struct rte_ring *r, uint32_t prod_head, +__rte_ring_dequeue_elems_128(struct rte_ring *r, uint32_t cons_head, void *obj_table, uint32_t n) { unsigned int i; const uint32_t size = r->size; - uint32_t idx = prod_head & r->mask; + uint32_t idx = cons_head & r->mask; rte_int128_t *ring = (rte_int128_t *)&r[1]; rte_int128_t *obj = (rte_int128_t *)obj_table; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:56.300898944 +0100 +++ 0009-ring-fix-dequeue-parameter-name.patch 2023-07-20 16:17:54.431749568 +0100 @@ -1 +1 @@ -From b632e76751ff9797e36531305638e1cbd14ffa09 Mon Sep 17 00:00:00 2001 +From 4b8a60276bb67e4fba40fcb285b5b21d20907533 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit b632e76751ff9797e36531305638e1cbd14ffa09 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index e24e4492ff..4b80f58980 100644 +index 04b55c34a4..99786cca95 100644