[dpdk-stable] patch 'test/event: fix Rx adapter intr test for skeleton PMD' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

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/27/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 88f0f7a2e3b8d2d307601c213301cd48f7201718 Mon Sep 17 00:00:00 2001
From: Nikhil Rao <nikhil.rao at intel.com>
Date: Tue, 25 Sep 2018 12:49:05 +0530
Subject: [PATCH] test/event: fix Rx adapter intr test for skeleton PMD

[ upstream commit 9b4631be9d8a5bda647d0240b2e965fd8573e6d4 ]

Skeleton PMD does not support RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ
so make the Rx queue_id = -1 and initialize the event port
configuration to zero.

Fixes: d65856999dd6 ("test/event: add Rx adapter tests for interrupt driven queues")

Signed-off-by: Nikhil Rao <nikhil.rao at intel.com>
Acked-by: Jerin Jacob <jerin.jacob at caviumnetworks.com>
---
 test/test/test_event_eth_rx_adapter.c | 37 ++++++++++++++++-----------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/test/test/test_event_eth_rx_adapter.c b/test/test/test_event_eth_rx_adapter.c
index 7f9d51e9b..cdb468fa8 100644
--- a/test/test/test_event_eth_rx_adapter.c
+++ b/test/test/test_event_eth_rx_adapter.c
@@ -536,9 +536,11 @@ adapter_intr_queue_add_del(void)
 	queue_config.servicing_weight = 0;
 
-	/* add queue 0 */
-	err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
-						TEST_ETHDEV_ID, 0,
-						&queue_config);
-	TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+	if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ) {
+		/* add queue 0 */
+		err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
+							TEST_ETHDEV_ID, 0,
+							&queue_config);
+		TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+	}
 
 	/* add all queues */
@@ -550,9 +552,11 @@ adapter_intr_queue_add_del(void)
 	TEST_ASSERT(err == 0, "Expected 0 got %d", err);
 
-	/* del queue 0 */
-	err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID,
-						TEST_ETHDEV_ID,
-						0);
-	TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+	if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ) {
+		/* del queue 0 */
+		err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID,
+							TEST_ETHDEV_ID,
+							0);
+		TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+	}
 
 	/* del remaining queues */
@@ -572,9 +576,12 @@ adapter_intr_queue_add_del(void)
 	/* intr -> poll mode queue */
 	queue_config.servicing_weight = 1;
-	err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
-						TEST_ETHDEV_ID,
-						0,
-						&queue_config);
-	TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+	if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ) {
+		err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
+							TEST_ETHDEV_ID,
+							0,
+							&queue_config);
+		TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+	}
 
 	err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:31.237245234 +0000
+++ 0011-test-event-fix-Rx-adapter-intr-test-for-skeleton-PMD.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,14 +1,15 @@
-From 9b4631be9d8a5bda647d0240b2e965fd8573e6d4 Mon Sep 17 00:00:00 2001
+From 88f0f7a2e3b8d2d307601c213301cd48f7201718 Mon Sep 17 00:00:00 2001
 From: Nikhil Rao <nikhil.rao at intel.com>
 Date: Tue, 25 Sep 2018 12:49:05 +0530
 Subject: [PATCH] test/event: fix Rx adapter intr test for skeleton PMD
 
+[ upstream commit 9b4631be9d8a5bda647d0240b2e965fd8573e6d4 ]
+
 Skeleton PMD does not support RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ
 so make the Rx queue_id = -1 and initialize the event port
 configuration to zero.
 
 Fixes: d65856999dd6 ("test/event: add Rx adapter tests for interrupt driven queues")
-Cc: stable at dpdk.org
 
 Signed-off-by: Nikhil Rao <nikhil.rao at intel.com>
 Acked-by: Jerin Jacob <jerin.jacob at caviumnetworks.com>
@@ -17,7 +18,7 @@
  1 file changed, 22 insertions(+), 15 deletions(-)
 
 diff --git a/test/test/test_event_eth_rx_adapter.c b/test/test/test_event_eth_rx_adapter.c
-index 1dcc09262..1d3be82b5 100644
+index 7f9d51e9b..cdb468fa8 100644
 --- a/test/test/test_event_eth_rx_adapter.c
 +++ b/test/test/test_event_eth_rx_adapter.c
 @@ -536,9 +536,11 @@ adapter_intr_queue_add_del(void)