[dpdk-stable] patch 'app/eventdev: fix order test port creation' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/28/19. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/0b6cf76cbd55261fd6a486c1c75ae668a7f4f4fd

Thanks.

Kevin Traynor

---
>From 0b6cf76cbd55261fd6a486c1c75ae668a7f4f4fd Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula at marvell.com>
Date: Sun, 30 Jun 2019 23:22:39 +0530
Subject: [PATCH] app/eventdev: fix order test port creation

[ upstream commit f77f8c9fe7ea2bd36e0bccd4c908c54e1b7f0420 ]

Configure event ports based on the underlying event device info rather
than using hardcoded values.

Fixes: 5710e751813e ("app/testeventdev: add order port setup")

Signed-off-by: Pavan Nikhilesh <pbhagavatula at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 app/test-eventdev/test_order_common.c | 32 ++++++++++++++++++---------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/test-eventdev/test_order_common.c b/app/test-eventdev/test_order_common.c
index 8a3420130..252e4a14c 100644
--- a/app/test-eventdev/test_order_common.c
+++ b/app/test-eventdev/test_order_common.c
@@ -68,4 +68,9 @@ int
 order_opt_check(struct evt_options *opt)
 {
+	if (opt->prod_type != EVT_PROD_TYPE_SYNT) {
+		evt_err("Invalid producer type");
+		return -EINVAL;
+	}
+
 	/* 1 producer + N workers + 1 master */
 	if (rte_lcore_count() < 3) {
@@ -299,10 +304,21 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 	uint8_t port;
 	struct test_order *t = evt_test_priv(test);
+	struct rte_event_dev_info dev_info;
+
+	memset(&dev_info, 0, sizeof(struct rte_event_dev_info));
+	ret = rte_event_dev_info_get(opt->dev_id, &dev_info);
+	if (ret) {
+		evt_err("failed to get eventdev info %d", opt->dev_id);
+		return ret;
+	}
+
+	if (opt->wkr_deq_dep > dev_info.max_event_port_dequeue_depth)
+		opt->wkr_deq_dep = dev_info.max_event_port_dequeue_depth;
 
 	/* port configuration */
-	const struct rte_event_port_conf wkr_p_conf = {
+	const struct rte_event_port_conf p_conf = {
 			.dequeue_depth = opt->wkr_deq_dep,
-			.enqueue_depth = 64,
-			.new_event_threshold = 4096,
+			.enqueue_depth = dev_info.max_event_port_dequeue_depth,
+			.new_event_threshold = dev_info.max_num_events,
 	};
 
@@ -315,5 +331,5 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 		w->t = t;
 
-		ret = rte_event_port_setup(opt->dev_id, port, &wkr_p_conf);
+		ret = rte_event_port_setup(opt->dev_id, port, &p_conf);
 		if (ret) {
 			evt_err("failed to setup port %d", port);
@@ -327,10 +343,4 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 		}
 	}
-	/* port for producer, no links */
-	const struct rte_event_port_conf prod_conf = {
-			.dequeue_depth = 8,
-			.enqueue_depth = 32,
-			.new_event_threshold = 1200,
-	};
 	struct prod_data *p = &t->prod;
 
@@ -340,5 +350,5 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 	p->t = t;
 
-	ret = rte_event_port_setup(opt->dev_id, port, &prod_conf);
+	ret = rte_event_port_setup(opt->dev_id, port, &p_conf);
 	if (ret) {
 		evt_err("failed to setup producer port %d", port);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.597386398 +0100
+++ 0033-app-eventdev-fix-order-test-port-creation.patch	2019-08-22 19:38:20.454026474 +0100
@@ -1 +1 @@
-From f77f8c9fe7ea2bd36e0bccd4c908c54e1b7f0420 Mon Sep 17 00:00:00 2001
+From 0b6cf76cbd55261fd6a486c1c75ae668a7f4f4fd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f77f8c9fe7ea2bd36e0bccd4c908c54e1b7f0420 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org