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 A3D24A00C4 for ; Fri, 18 Nov 2022 00:11:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A032F42D23; Fri, 18 Nov 2022 00:11:08 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 099AD4021F for ; Fri, 18 Nov 2022 00:11:07 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id cl5so6358312wrb.9 for ; Thu, 17 Nov 2022 15:11:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=H0wAd2XHgquYDW1CS3gPp+CeqCisC34ysGJ2p2fs77c=; b=ZX9N8+Dq4xPlSPG0mKuoMAyUGu6k5w5nDDrnOdFmpLPVla9O0R9BWYNGdvO2NNgDeZ w/q49Gwx/ASA3BA5//bu0H8dKhoGl8K0cuweFiUzSwIQa9lT7fI4jIFnK9Pu7A82ZaZE ljOHcSCbGKLEcqeyCciqJxwGfg9e2q5/2X8p3DLIuXKWDe9n981tF5jSiVcNZ6zRaKrG YeHYlLZta0OMAeYdFJiV3UuXWlEaCKqLPLQnJL/zBof4iKoiGNbjnJsVCiIG8EooOyRB BSIkCwkmb3KOw94kzUgGEgF8PbJCXUELw1IyCdf8T4/0iLJUciGPpneFndxzlJTjqVqU yDdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H0wAd2XHgquYDW1CS3gPp+CeqCisC34ysGJ2p2fs77c=; b=iOvF09R39WC3C/iN7Ki9IWieGhKgr6T1evbKl7PCOCPLlN8k+8jUoRvQi5+h2RhuEl R4n+rSHsIG/dgy6gge6I68DmMj1hFVV/eVpAy7FKucH8xPJvQM38HloGf4OKJePuymIG okWy0JVV2onGONldkfysVJ7QlXY8ZoMgebbZLrbvbxAknqde3gW39Ka8gBGskTUPoYB4 cS2XcZR/vMUJVEbMcqYVnS7VoFWrlmUnwylGwrB2oNbZF39sXGYLwM/5dwRNSLqDH8ZT HCWdjfxRW4LA4trQ8LCrEEMblxZbmhTGL6n5J1awq8HhEuNtXw4EY9Oks5Uu9e0Nvh2k 8epA== X-Gm-Message-State: ANoB5pnk6Pufep6F51FfWcs6ISK8ROV6YrSOYg8XUGA6nV9HijuuXfT0 v+p5yAwVwDoQ8TXGrFe3ZIEWAqsfqB4= X-Google-Smtp-Source: AA0mqf5Lt1/TbFf/IRcdiyfUA9jB7aXe6twv0P2yh9/eUcIcNIX/SU7fSc3o47nmjvpTrh8Gwb9ssw== X-Received: by 2002:adf:f949:0:b0:236:704f:29f4 with SMTP id q9-20020adff949000000b00236704f29f4mr2798559wrr.11.1668726666755; Thu, 17 Nov 2022 15:11:06 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id h16-20020a05600c315000b003cff309807esm7350803wmo.23.2022.11.17.15.11.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 15:11:06 -0800 (PST) From: luca.boccassi@gmail.com To: Haiyue Wang Cc: dpdk stable Subject: patch 'ring: fix description' has been queued to stable release 20.11.7 Date: Thu, 17 Nov 2022 23:08:57 +0000 Message-Id: <20221117230859.611465-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117230859.611465-1-luca.boccassi@gmail.com> References: <20221105171146.1520039-47-luca.boccassi@gmail.com> <20221117230859.611465-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/22. 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/229138af8427090e3693c3a2332667149315b8d9 Thanks. Luca Boccassi --- >From 229138af8427090e3693c3a2332667149315b8d9 Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Fri, 8 Apr 2022 20:40:42 +0800 Subject: [PATCH] ring: fix description [ upstream commit a2248c87e2ba9aa0b455e8b4b90ec713aa212749 ] The index description isn't right, correct it as the Programmer's guide said. Also correct the guide's figure description about 'Dequeue First Step'. Fixes: 4a22e6ee3d2f ("doc: refactor figure numbers into references") Fixes: af75078fece3 ("first public release") Signed-off-by: Haiyue Wang --- doc/guides/prog_guide/ring_lib.rst | 2 +- lib/librte_ring/rte_ring_core.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guides/prog_guide/ring_lib.rst b/doc/guides/prog_guide/ring_lib.rst index 54e0bb4b68..515a715266 100644 --- a/doc/guides/prog_guide/ring_lib.rst +++ b/doc/guides/prog_guide/ring_lib.rst @@ -172,7 +172,7 @@ If there are not enough objects in the ring (this is detected by checking prod_t .. figure:: img/ring-dequeue1.* - Dequeue last step + Dequeue first step Dequeue Second Step diff --git a/lib/librte_ring/rte_ring_core.h b/lib/librte_ring/rte_ring_core.h index 25d2244a69..0503d5798e 100644 --- a/lib/librte_ring/rte_ring_core.h +++ b/lib/librte_ring/rte_ring_core.h @@ -114,8 +114,8 @@ struct rte_ring_hts_headtail { * An RTE ring structure. * * The producer and the consumer have a head and a tail index. The particularity - * of these index is that they are not between 0 and size(ring). These indexes - * are between 0 and 2^32, and we mask their value when we access the ring[] + * of these index is that they are not between 0 and size(ring)-1. These indexes + * are between 0 and 2^32 -1, and we mask their value when we access the ring[] * field. Thanks to this assumption, we can do subtractions between 2 index * values in a modulo-32bit base: that's why the overflow of the indexes is not * a problem. -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-17 23:07:56.870092112 +0000 +++ 0033-ring-fix-description.patch 2022-11-17 23:07:55.560331899 +0000 @@ -1 +1 @@ -From a2248c87e2ba9aa0b455e8b4b90ec713aa212749 Mon Sep 17 00:00:00 2001 +From 229138af8427090e3693c3a2332667149315b8d9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a2248c87e2ba9aa0b455e8b4b90ec713aa212749 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - lib/ring/rte_ring_core.h | 4 ++-- + lib/librte_ring/rte_ring_core.h | 4 ++-- @@ -34,5 +35,5 @@ -diff --git a/lib/ring/rte_ring_core.h b/lib/ring/rte_ring_core.h -index 1252ca9546..82b237091b 100644 ---- a/lib/ring/rte_ring_core.h -+++ b/lib/ring/rte_ring_core.h -@@ -111,8 +111,8 @@ struct rte_ring_hts_headtail { +diff --git a/lib/librte_ring/rte_ring_core.h b/lib/librte_ring/rte_ring_core.h +index 25d2244a69..0503d5798e 100644 +--- a/lib/librte_ring/rte_ring_core.h ++++ b/lib/librte_ring/rte_ring_core.h +@@ -114,8 +114,8 @@ struct rte_ring_hts_headtail {