From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C4CF5A04DD for ; Wed, 28 Oct 2020 11:49:13 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BD1042C2A; Wed, 28 Oct 2020 11:49:12 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 148912C2A for ; Wed, 28 Oct 2020 11:49:10 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id n15so5168159wrq.2 for ; Wed, 28 Oct 2020 03:49:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lktxhxlmflNUeSeKfN+1DCO1qt/X2/Xb3MPY0MX46O4=; b=N2GVTTDM0/P8ZfWYPX/Zw0/92AoPQY/RICsTDXb8xAOH5FPpnHWVDHEah5Z0iMm9Vv k0LZ5nc6C7Be8wNb/gPqUFV93NzXR54TSVEZH+Kij3nbQb/rn+HEKRWYMS8rmZJWZ2Us sGR74wNMgvVpSUIeY0y6ErZINzICC3PgIiPUDzYq2blq9AdM4XIVIe/hxc0iKLm6NnGs xqaJCvKicLqwpxzQU6V1wmsIEfAenFuADmYjC8raNT27SgwSTxDPkS2YX11T5rj9bzgn bkYA2Ib1SNeBY4D0FHNs/EYkIjQuXSSy36Mh7Fc4DB3n2HYB+u4b5rMaq4S+7s0FUPVc jRpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lktxhxlmflNUeSeKfN+1DCO1qt/X2/Xb3MPY0MX46O4=; b=Nez5DGPw6uLU9Oc4eiiR1l9vowleOc9qjCJR53xhj2bAalI8dJWTxGjtZKZ8p2FBF7 quddSo5dZTPgRjg9wLWaAeT7igYCFqRvsso0GflJOlyrP4JsoahNdea52u7yVplhSao/ npToUYbeTYItupYGZPZ2z1ut/AQWiPAwMNTfQwEiI4bbebSn9QNrqJrvbUIzvlOkQZYh FD76W8foL57nvyylEvbWjlhE4XUcUZbQsbQSX55ChneL2StXH1xuZ3rKnt4cByN/iZyX /s6EfQOXPAm9uCwPQIzZY9dsr9//oUr7p18OGlqBbRt2ttoZN2gY8YXd08Yydrp31h7m Hw8Q== X-Gm-Message-State: AOAM530PxJ4kENcHW7GUfxx1Frk3EyXBYVIxNfyOnEF1W+JU8efjEQ2T L2V6K2lCfBhg+O7yVYmVit0= X-Google-Smtp-Source: ABdhPJwWPX5930yILJ4VLnB+HNvRCduOZv+w5SfddNhShCVgZRdX/lHzOzsneXrk5vGGOllIr8BhMA== X-Received: by 2002:adf:de91:: with SMTP id w17mr7930171wrl.84.1603882148774; Wed, 28 Oct 2020 03:49:08 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y10sm6207412wru.94.2020.10.28.03.49.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:49:08 -0700 (PDT) From: luca.boccassi@gmail.com To: Feifei Wang Cc: Ruifeng Wang , Phil Yang , Honnappa Nagarahalli , Konstantin Ananyev , dpdk stable Date: Wed, 28 Oct 2020 10:43:35 +0000 Message-Id: <20201028104606.3504127-56-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/ring: fix number of single element enqueue/dequeue' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. 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. Thanks. Luca Boccassi --- >From b54402145139750a450d3bc34849fbd9c1e2c475 Mon Sep 17 00:00:00 2001 From: Feifei Wang Date: Sun, 20 Sep 2020 06:48:51 -0500 Subject: [PATCH] test/ring: fix number of single element enqueue/dequeue [ upstream commit f642148eea7c63ab0cfe7ef783657bd9db83518e ] The ring capacity is (RING_SIZE - 1), thus only (RING_SIZE - 1) number of elements can be enqueued into the ring. Fixes: af75078fece3 ("first public release") Signed-off-by: Feifei Wang Reviewed-by: Ruifeng Wang Reviewed-by: Phil Yang Reviewed-by: Honnappa Nagarahalli Acked-by: Konstantin Ananyev --- app/test/test_ring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test/test_ring.c b/app/test/test_ring.c index aaf1e70ad8..4825c9e2e9 100644 --- a/app/test/test_ring.c +++ b/app/test/test_ring.c @@ -696,7 +696,7 @@ test_ring_basic_ex(void) printf("%u ring entries are now free\n", rte_ring_free_count(rp)); - for (i = 0; i < RING_SIZE; i ++) { + for (i = 0; i < RING_SIZE - 1; i ++) { rte_ring_enqueue(rp, obj[i]); } @@ -705,7 +705,7 @@ test_ring_basic_ex(void) goto fail_test; } - for (i = 0; i < RING_SIZE; i ++) { + for (i = 0; i < RING_SIZE - 1; i ++) { rte_ring_dequeue(rp, &obj[i]); } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.524515403 +0000 +++ 0056-test-ring-fix-number-of-single-element-enqueue-deque.patch 2020-10-28 10:35:11.524830318 +0000 @@ -1,13 +1,14 @@ -From f642148eea7c63ab0cfe7ef783657bd9db83518e Mon Sep 17 00:00:00 2001 +From b54402145139750a450d3bc34849fbd9c1e2c475 Mon Sep 17 00:00:00 2001 From: Feifei Wang Date: Sun, 20 Sep 2020 06:48:51 -0500 Subject: [PATCH] test/ring: fix number of single element enqueue/dequeue +[ upstream commit f642148eea7c63ab0cfe7ef783657bd9db83518e ] + The ring capacity is (RING_SIZE - 1), thus only (RING_SIZE - 1) number of elements can be enqueued into the ring. Fixes: af75078fece3 ("first public release") -Cc: stable@dpdk.org Signed-off-by: Feifei Wang Reviewed-by: Ruifeng Wang @@ -19,27 +20,27 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test/test_ring.c b/app/test/test_ring.c -index 0ae97d341e..04bdc9b696 100644 +index aaf1e70ad8..4825c9e2e9 100644 --- a/app/test/test_ring.c +++ b/app/test/test_ring.c -@@ -811,7 +811,7 @@ test_ring_basic_ex(void) - printf("%u ring entries are now free\n", - rte_ring_free_count(rp)); +@@ -696,7 +696,7 @@ test_ring_basic_ex(void) + + printf("%u ring entries are now free\n", rte_ring_free_count(rp)); + +- for (i = 0; i < RING_SIZE; i ++) { ++ for (i = 0; i < RING_SIZE - 1; i ++) { + rte_ring_enqueue(rp, obj[i]); + } + +@@ -705,7 +705,7 @@ test_ring_basic_ex(void) + goto fail_test; + } -- for (j = 0; j < RING_SIZE; j++) { -+ for (j = 0; j < RING_SIZE - 1; j++) { - test_ring_enqueue(rp, obj, esize[i], 1, - TEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE); - } -@@ -822,7 +822,7 @@ test_ring_basic_ex(void) - goto fail_test; - } +- for (i = 0; i < RING_SIZE; i ++) { ++ for (i = 0; i < RING_SIZE - 1; i ++) { + rte_ring_dequeue(rp, &obj[i]); + } -- for (j = 0; j < RING_SIZE; j++) { -+ for (j = 0; j < RING_SIZE - 1; j++) { - test_ring_dequeue(rp, obj, esize[i], 1, - TEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE); - } -- 2.20.1