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 53591A0557 for ; Wed, 16 Nov 2022 11:41:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4F3C440F16; Wed, 16 Nov 2022 11:41:11 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id E9E3A40E03 for ; Wed, 16 Nov 2022 11:41:08 +0100 (CET) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id B71A53F07F for ; Wed, 16 Nov 2022 10:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668595268; bh=KzYc5LKZWAnFyIFHFkeHdYSoXhIR43SfLo0pQCrciwQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UAOgbSCcbfFt3yluMAtMbGPjdWgJUtP5/njaA7dju0sFxBFaDwY/9t+iyc3sbhtQx FKRNUKDqUFv0cJlQCWdKGpfBV9jPJZrKMBSRaSE9fvZsRJeIk0oaEjGLr7BzUfI0Yy krKoj8E+fLd1K7fEuIREj6WYI8WwxGK5Ed2ESH18oE3L0CEqWvFdHwt6P0E7FnWVLR 80Z0j03w2bOKrPZICdsI+vXk23CHmLoK6VKGXc19GQWaD5Z0ypN/auW1T7Y4UAdFcj klWthw7MIvRvSFkt0WG2lp85XtFuKbBOd28C6XqVisDOU7dYRk4yof9LQvUcTDMDUC K7tYmH/+u7P/Q== Received: by mail-wm1-f72.google.com with SMTP id c187-20020a1c35c4000000b003cfee3c91cdso1508444wma.6 for ; Wed, 16 Nov 2022 02:41:08 -0800 (PST) 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=KzYc5LKZWAnFyIFHFkeHdYSoXhIR43SfLo0pQCrciwQ=; b=Wxiyk9NFwbRrsIeGxmSBtmIf0zU0EKdAjiYrg9TDWa+MjYJf+2kM0IaxuzmUBkBh1p qYLxbZTD4oQPpLrOaz+5N6KIsfLk4zsy0qX54YhcGRDwSW4kkVxURPk5ihziexNMQApS MYU0COakQrORimYAAEuqOy/dxLbwFT53xxiJTcxfqJuAM1xd+OM6Gd/r/zh+OUAOkwcP Ae7TvN7ICjQZm8rP3HnFARiD3ieMLbbn19GH3gvNXP/vEORfIYzXjOELXgW23EhVl972 NARBU/4yweyXfkn6HZwZJaFSNDMdDr/baV6anY/7pFPAp0AWU3pBmOCUUlQTm9I7nqr2 LWpw== X-Gm-Message-State: ANoB5pmylCGV9RF3SOi9wyyADJ/iyt9ZFG1BHWDmEMZNyBaSVm/IW4Zg pof10fMlgq+0w7VdrQkOGgVLE800w5QjX2lm12yOZs+TMlpy+X+3Hw4zL+wLKuXbVGjdAhNd5o9 Q3JwXJAYaqPtm76pxJc1mTCko X-Received: by 2002:a1c:4b0a:0:b0:3cf:74bb:feb1 with SMTP id y10-20020a1c4b0a000000b003cf74bbfeb1mr1658874wma.102.1668595268157; Wed, 16 Nov 2022 02:41:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf6O0uzzq+2+lc3ejyljYnG6ewvFgicWLFpVtMI+afuNyX8yMS0Y7oFup/Ib9mv40PzfsYTLBA== X-Received: by 2002:a1c:4b0a:0:b0:3cf:74bb:feb1 with SMTP id y10-20020a1c4b0a000000b003cf74bbfeb1mr1658855wma.102.1668595267823; Wed, 16 Nov 2022 02:41:07 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39e5:dd00:975:f38b:96af:696f]) by smtp.gmail.com with ESMTPSA id x3-20020adfdd83000000b002366a624bd4sm14736664wrl.28.2022.11.16.02.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 02:41:07 -0800 (PST) From: christian.ehrhardt@canonical.com To: Stephen Hemminger Cc: dpdk stable Subject: patch 'ring: remove leftover comment about watermark' has been queued to stable release 19.11.14 Date: Wed, 16 Nov 2022 11:40:12 +0100 Message-Id: <20221116104012.2975036-17-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116104012.2975036-1-christian.ehrhardt@canonical.com> References: <20221116104012.2975036-1-christian.ehrhardt@canonical.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 19.11.14 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/23/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/325a874c84f6962ad534a6882539a021880b6350 Thanks. Christian Ehrhardt --- >From 325a874c84f6962ad534a6882539a021880b6350 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 31 May 2022 10:20:41 -0700 Subject: [PATCH] ring: remove leftover comment about watermark [ upstream commit 21dc24b746a7135dd799b462d9a6479dfd54a92f ] The watermark support was removed from rte_ring since version 17.02 but there is leftover in comments. Fixes: 77dd3064270c ("ring: remove watermark support") Signed-off-by: Stephen Hemminger --- lib/librte_ring/rte_ring.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h index 2a9f768a1c..f4a96ca845 100644 --- a/lib/librte_ring/rte_ring.h +++ b/lib/librte_ring/rte_ring.h @@ -146,10 +146,9 @@ ssize_t rte_ring_get_memsize(unsigned count); * object table. It is advised to use rte_ring_get_memsize() to get the * appropriate size. * - * The ring size is set to *count*, which must be a power of two. Water - * marking is disabled by default. The real usable ring size is - * *count-1* instead of *count* to differentiate a free ring from an - * empty ring. + * The ring size is set to *count*, which must be a power of two. + * The real usable ring size is *count-1* instead of *count* to + * differentiate a full ring from an empty ring. * * The ring is not added in RTE_TAILQ_RING global list. Indeed, the * memory given by the caller may not be shareable among dpdk @@ -181,10 +180,9 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned count, * This function uses ``memzone_reserve()`` to allocate memory. Then it * calls rte_ring_init() to initialize an empty ring. * - * The new ring size is set to *count*, which must be a power of - * two. Water marking is disabled by default. The real usable ring size - * is *count-1* instead of *count* to differentiate a free ring from an - * empty ring. + * The new ring size is set to *count*, which must be a power of two. + * The real usable ring size is *count-1* instead of *count* to + * differentiate a full ring from an empty ring. * * The ring is added in RTE_TAILQ_RING list. * -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-16 11:36:51.057214642 +0100 +++ 0017-ring-remove-leftover-comment-about-watermark.patch 2022-11-16 11:36:50.452775701 +0100 @@ -1 +1 @@ -From 21dc24b746a7135dd799b462d9a6479dfd54a92f Mon Sep 17 00:00:00 2001 +From 325a874c84f6962ad534a6882539a021880b6350 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 21dc24b746a7135dd799b462d9a6479dfd54a92f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - lib/ring/rte_ring.h | 14 ++++++-------- + lib/librte_ring/rte_ring.h | 14 ++++++-------- @@ -17,5 +18,5 @@ -diff --git a/lib/ring/rte_ring.h b/lib/ring/rte_ring.h -index 7c48e35d27..7e4cd60650 100644 ---- a/lib/ring/rte_ring.h -+++ b/lib/ring/rte_ring.h -@@ -66,10 +66,9 @@ ssize_t rte_ring_get_memsize(unsigned int count); +diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h +index 2a9f768a1c..f4a96ca845 100644 +--- a/lib/librte_ring/rte_ring.h ++++ b/lib/librte_ring/rte_ring.h +@@ -146,10 +146,9 @@ ssize_t rte_ring_get_memsize(unsigned count); @@ -27 +28 @@ -- * *count-1* instead of *count* to differentiate a full ring from an +- * *count-1* instead of *count* to differentiate a free ring from an @@ -35 +36 @@ -@@ -127,10 +126,9 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned int count, +@@ -181,10 +180,9 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned count, @@ -41 +42 @@ -- * is *count-1* instead of *count* to differentiate a full ring from an +- * is *count-1* instead of *count* to differentiate a free ring from an