[dpdk-dev,4/8] app/eventdev: add ethernet device setup helpers

Message ID 1508330348-30060-5-git-send-email-pbhagavatula@caviumnetworks.com (mailing list archive)
State Superseded, archived
Delegated to: Jerin Jacob
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply patch file failure

Commit Message

Pavan Nikhilesh Oct. 18, 2017, 12:39 p.m. UTC
  Add ethernet device setup functions to configure ethdev ports incase
prod_type_ethdev option is enabled.

Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
---
 app/test-eventdev/test_perf_atq.c    |  1 +
 app/test-eventdev/test_perf_common.c | 72 ++++++++++++++++++++++++++++++++++++
 app/test-eventdev/test_perf_common.h |  1 +
 app/test-eventdev/test_perf_queue.c  |  1 +
 4 files changed, 75 insertions(+)
  

Comments

Jerin Jacob Dec. 10, 2017, 12:09 p.m. UTC | #1
-----Original Message-----
> Date: Wed, 18 Oct 2017 18:09:04 +0530
> From: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
> To: bruce.richardson@intel.com, harry.van.haaren@intel.com,
>  gage.eads@intel.com, hemant.agrawal@nxp.com, nipun.gupta@nxp.com,
>  nikhil.rao@intel.com, santosh.shukla@caviumnetworks.com,
>  jerin.jacob@caviumnetworks.com
> Cc: dev@dpdk.org, Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
> Subject: [PATCH 4/8] app/eventdev: add ethernet device setup helpers
> X-Mailer: git-send-email 2.7.4
> 
> Add ethernet device setup functions to configure ethdev ports incase
> prod_type_ethdev option is enabled.
> 
> Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
> ---
>  
> +#define NB_RX_DESC			128
> +#define NB_TX_DESC			512
> +int
> +perf_ethdev_setup(struct evt_test *test, struct evt_options *opt)
> +{
> +	uint16_t nb_rx_queues = 1;

const ?

> +	int i;
> +	int j;
> +	struct test_perf *t = evt_test_priv(test);
> +	struct rte_eth_conf port_conf = {
> +		.rxmode = {
> +			.mq_mode = ETH_MQ_RX_RSS,
> +			.max_rx_pkt_len = ETHER_MAX_LEN,
> +			.split_hdr_size = 0,
> +			.header_split   = 0,
> +			.hw_ip_checksum = 0,
> +			.hw_vlan_filter = 0,
> +			.hw_vlan_strip  = 0,
> +			.hw_vlan_extend = 0,
> +			.jumbo_frame    = 0,
> +			.hw_strip_crc   = 1,
> +		},
> +		.rx_adv_conf = {
> +			.rss_conf = {
> +				.rss_key = NULL,
> +				.rss_hf = ETH_RSS_IP,
> +			},
> +		},
> +	};
> +
> +	if (opt->prod_type == EVT_PROD_TYPE_SYNT)
> +		return 0;
> +
> +	if (!rte_eth_dev_count()) {
> +		evt_err("No ethernet ports found.\n");
> +		return -ENODEV;
> +	}
> +
> +	for (i = 0; i < rte_eth_dev_count(); i++) {
> +
> +		if (rte_eth_dev_configure(i, nb_rx_queues, nb_rx_queues,
> +					&port_conf)
> +				< 0) {
> +			evt_err("Failed to configure eth port [%d]\n", i);
> +			return -EINVAL;
> +		}
> +
> +		for (j = 0; j < nb_rx_queues; j++) {
> +			if (rte_eth_rx_queue_setup(i, j, NB_RX_DESC,
> +					rte_socket_id(), NULL, t->pool) < 0) {
> +				evt_err("Failed to setup eth port [%d]"
> +						" rx_queue: %d."
> +						" Using synthetic producer\n",

- The "\n" is not required as evt_err already has "\n"
- Please change to "Using ethdev Rx adapter producer " instead of "Using synthetic producer" 

> +						i, j);
> +				return -EINVAL;
> +			}
> +			if (rte_eth_tx_queue_setup(i, j, NB_TX_DESC,
> +						rte_socket_id(), NULL) < 0) {
> +				evt_err("Failed to setup eth port [%d]"
> +						" tx_queue: %d."
> +						" Using synthetic producer\n",
> +						i, j);
> +				return -EINVAL;
> +			}
> +		}
> +
> +		rte_eth_promiscuous_enable(i);
> +	}
> +
> +	return 0;
> +}

With above changes,
Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
  

Patch

diff --git a/app/test-eventdev/test_perf_atq.c b/app/test-eventdev/test_perf_atq.c
index f6fd5d9..aec50a8 100644
--- a/app/test-eventdev/test_perf_atq.c
+++ b/app/test-eventdev/test_perf_atq.c
@@ -281,6 +281,7 @@  static const struct evt_test_ops perf_atq =  {
 	.opt_check          = perf_atq_opt_check,
 	.opt_dump           = perf_atq_opt_dump,
 	.test_setup         = perf_test_setup,
+	.ethdev_setup       = perf_ethdev_setup,
 	.mempool_setup      = perf_mempool_setup,
 	.eventdev_setup     = perf_atq_eventdev_setup,
 	.launch_lcores      = perf_atq_launch_lcores,
diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index b26d694..ebf8900 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -408,6 +408,78 @@  perf_elt_init(struct rte_mempool *mp, void *arg __rte_unused,
 	memset(obj, 0, mp->elt_size);
 }
 
+#define NB_RX_DESC			128
+#define NB_TX_DESC			512
+int
+perf_ethdev_setup(struct evt_test *test, struct evt_options *opt)
+{
+	uint16_t nb_rx_queues = 1;
+	int i;
+	int j;
+	struct test_perf *t = evt_test_priv(test);
+	struct rte_eth_conf port_conf = {
+		.rxmode = {
+			.mq_mode = ETH_MQ_RX_RSS,
+			.max_rx_pkt_len = ETHER_MAX_LEN,
+			.split_hdr_size = 0,
+			.header_split   = 0,
+			.hw_ip_checksum = 0,
+			.hw_vlan_filter = 0,
+			.hw_vlan_strip  = 0,
+			.hw_vlan_extend = 0,
+			.jumbo_frame    = 0,
+			.hw_strip_crc   = 1,
+		},
+		.rx_adv_conf = {
+			.rss_conf = {
+				.rss_key = NULL,
+				.rss_hf = ETH_RSS_IP,
+			},
+		},
+	};
+
+	if (opt->prod_type == EVT_PROD_TYPE_SYNT)
+		return 0;
+
+	if (!rte_eth_dev_count()) {
+		evt_err("No ethernet ports found.\n");
+		return -ENODEV;
+	}
+
+	for (i = 0; i < rte_eth_dev_count(); i++) {
+
+		if (rte_eth_dev_configure(i, nb_rx_queues, nb_rx_queues,
+					&port_conf)
+				< 0) {
+			evt_err("Failed to configure eth port [%d]\n", i);
+			return -EINVAL;
+		}
+
+		for (j = 0; j < nb_rx_queues; j++) {
+			if (rte_eth_rx_queue_setup(i, j, NB_RX_DESC,
+					rte_socket_id(), NULL, t->pool) < 0) {
+				evt_err("Failed to setup eth port [%d]"
+						" rx_queue: %d."
+						" Using synthetic producer\n",
+						i, j);
+				return -EINVAL;
+			}
+			if (rte_eth_tx_queue_setup(i, j, NB_TX_DESC,
+						rte_socket_id(), NULL) < 0) {
+				evt_err("Failed to setup eth port [%d]"
+						" tx_queue: %d."
+						" Using synthetic producer\n",
+						i, j);
+				return -EINVAL;
+			}
+		}
+
+		rte_eth_promiscuous_enable(i);
+	}
+
+	return 0;
+}
+
 int
 perf_mempool_setup(struct evt_test *test, struct evt_options *opt)
 {
diff --git a/app/test-eventdev/test_perf_common.h b/app/test-eventdev/test_perf_common.h
index ab2e599..5c6a615 100644
--- a/app/test-eventdev/test_perf_common.h
+++ b/app/test-eventdev/test_perf_common.h
@@ -157,6 +157,7 @@  perf_nb_event_ports(struct evt_options *opt)
 int perf_test_result(struct evt_test *test, struct evt_options *opt);
 int perf_opt_check(struct evt_options *opt, uint64_t nb_queues);
 int perf_test_setup(struct evt_test *test, struct evt_options *opt);
+int perf_ethdev_setup(struct evt_test *test, struct evt_options *opt);
 int perf_mempool_setup(struct evt_test *test, struct evt_options *opt);
 int perf_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 				uint8_t stride, uint8_t nb_queues);
diff --git a/app/test-eventdev/test_perf_queue.c b/app/test-eventdev/test_perf_queue.c
index 3467bb5..4f3e7e7 100644
--- a/app/test-eventdev/test_perf_queue.c
+++ b/app/test-eventdev/test_perf_queue.c
@@ -294,6 +294,7 @@  static const struct evt_test_ops perf_queue =  {
 	.opt_dump           = perf_queue_opt_dump,
 	.test_setup         = perf_test_setup,
 	.mempool_setup      = perf_mempool_setup,
+	.ethdev_setup	    = perf_ethdev_setup,
 	.eventdev_setup     = perf_queue_eventdev_setup,
 	.launch_lcores      = perf_queue_launch_lcores,
 	.eventdev_destroy   = perf_eventdev_destroy,