[dpdk-dev] [PATCH 1/2] app/eventdev: fix order test port creation

* [dpdk-dev] [PATCH 1/2] app/eventdev: fix order test port creation
@ 2019-06-30 17:52 pbhagavatula
  2019-06-30 17:52 ` [dpdk-dev] [PATCH 2/2] test/eventdev: fix producer core validity checks pbhagavatula
  2019-07-02  5:28 ` [dpdk-dev] [PATCH 1/2] app/eventdev: fix order test port creation Jerin Jacob Kollanukkaran
  0 siblings, 2 replies; 5+ messages in thread
From: pbhagavatula @ 2019-06-30 17:52 UTC (permalink / raw)
  To: jerinj; +Cc: dev, Pavan Nikhilesh, stable

From: Pavan Nikhilesh <pbhagavatula@marvell.com>

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

Cc: stable@dpdk.org
Fixes: 5710e751813e ("app/testeventdev: add order port setup")

Signed-off-by: Pavan Nikhilesh <pbhagavatula@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
@@ -67,6 +67,11 @@ order_producer(void *arg)
 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) {
 		evt_err("test need minimum 3 lcores");
@@ -298,12 +303,23 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 	int ret;
 	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,
 	};
 
 	/* setup one port per worker, linking to all queues */
@@ -314,7 +330,7 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 		w->port_id = port;
 		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);
 			return ret;
@@ -326,12 +342,6 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 			return -EINVAL;
 		}
 	}
-	/* 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;
 
 	p->dev_id = opt->dev_id;
@@ -339,7 +349,7 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 	p->queue_id = 0;
 	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);
 		return ret;
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread