[dpdk-stable] patch 'test/ring: fix number of single element enqueue/dequeue' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

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 <feifei.wang2 at arm.com>
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 <feifei.wang2 at arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang at arm.com>
Reviewed-by: Phil Yang <phil.yang at arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
---
 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 <feifei.wang2 at arm.com>
 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 at dpdk.org
 
 Signed-off-by: Feifei Wang <feifei.wang2 at arm.com>
 Reviewed-by: Ruifeng Wang <ruifeng.wang at arm.com>
@@ -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