[dpdk-dev,v6,12/21] event/sw: add start stop and close functions

Message ID 1490829963-106807-13-git-send-email-harry.van.haaren@intel.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 success Compilation OK

Commit Message

Van Haaren, Harry March 29, 2017, 11:25 p.m. UTC
  From: Bruce Richardson <bruce.richardson@intel.com>

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>

Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>

---

v6:
- Removed printf() using SW_LOG_ERR instead (Jerin)
- Added rte_smp_wmb() to start() and stop() (Jerin)
- Improved error return values from start() (Jerin)
---
 drivers/event/sw/sw_evdev.c | 78 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
  

Comments

Jerin Jacob March 30, 2017, 8:24 a.m. UTC | #1
On Thu, Mar 30, 2017 at 12:25:54AM +0100, Harry van Haaren wrote:
> From: Bruce Richardson <bruce.richardson@intel.com>
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
> 
> Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
> 
> ---
> 
> v6:
> - Removed printf() using SW_LOG_ERR instead (Jerin)
> - Added rte_smp_wmb() to start() and stop() (Jerin)
> - Improved error return values from start() (Jerin)
> ---
>  drivers/event/sw/sw_evdev.c | 78 +++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 78 insertions(+)
> 
> diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
> index f91a04b..04ab7ad 100644
> --- a/drivers/event/sw/sw_evdev.c
> +++ b/drivers/event/sw/sw_evdev.c
> @@ -442,6 +442,81 @@ sw_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *info)
>  }
>  
>  static int
> +sw_start(struct rte_eventdev *dev)
> +{
> +	unsigned int i, j;
> +	struct sw_evdev *sw = sw_pmd_priv(dev);
> +	/* check all ports are set up */
> +	for (i = 0; i < sw->port_count; i++)
> +		if (sw->ports[i].rx_worker_ring == NULL) {
> +			SW_LOG_ERR("%s %d: port %d not configured\n",
> +			       __func__, __LINE__, i);

Remove __func__ and __LINE_ as SW_LOG_ERR macro has it already.
Check the same issue in other places.

> +			return -EINVAL;
> +		}
> +
> +	/* check all queues are configured and mapped to ports*/
> +	for (i = 0; i < sw->qid_count; i++)
> +		if (sw->qids[i].iq[0] == NULL ||
> +				sw->qids[i].cq_num_mapped_cqs == 0) {
> +			SW_LOG_ERR("%s %d: queue %d not configured\n",
> +			       __func__, __LINE__, i);
> +			return -EDEADLK;
> +		}
> +
> +	/* build up our prioritized array of qids */
> +	/* We don't use qsort here, as if all/multiple entries have the same
> +	 * priority, the result is non-deterministic. From "man 3 qsort":
> +	 * "If two members compare as equal, their order in the sorted
> +	 * array is undefined."
> +	 */
> +	uint32_t qidx = 0;
> +	for (j = 0; j <= RTE_EVENT_DEV_PRIORITY_LOWEST; j++) {
> +		for (i = 0; i < sw->qid_count; i++) {
> +			if (sw->qids[i].priority == j) {
> +				sw->qids_prioritized[qidx] = &sw->qids[i];
> +				qidx++;
> +			}
> +		}
> +	}
> +
> +	rte_smp_wmb();
> +	sw->started = 1;
> +
> +	return 0;
> +}
> +
> +static void
> +sw_stop(struct rte_eventdev *dev)
> +{
> +	struct sw_evdev *sw = sw_pmd_priv(dev);
> +	sw->started = 0;
> +	rte_smp_wmb();
> +}
> +
> +static int
> +sw_close(struct rte_eventdev *dev)
> +{
> +	struct sw_evdev *sw = sw_pmd_priv(dev);
> +	uint32_t i;
> +
> +	for (i = 0; i < sw->qid_count; i++)
> +		sw_queue_release(dev, i);
> +	sw->qid_count = 0;
> +
> +	for (i = 0; i < sw->port_count; i++)
> +		sw_port_release(&sw->ports[i]);
> +	sw->port_count = 0;
> +
> +	memset(&sw->stats, 0, sizeof(sw->stats));
> +	sw->sched_called = 0;
> +	sw->sched_no_iq_enqueues = 0;
> +	sw->sched_no_cq_enqueues = 0;
> +	sw->sched_cq_qid_called = 0;
> +
> +	return 0;
> +}
> +
> +static int
>  assign_numa_node(const char *key __rte_unused, const char *value, void *opaque)
>  {
>  	int *socket_id = opaque;
> @@ -477,6 +552,9 @@ sw_probe(const char *name, const char *params)
>  	static const struct rte_eventdev_ops evdev_sw_ops = {
>  			.dev_configure = sw_dev_configure,
>  			.dev_infos_get = sw_info_get,
> +			.dev_close = sw_close,
> +			.dev_start = sw_start,
> +			.dev_stop = sw_stop,
>  
>  			.queue_def_conf = sw_queue_def_conf,
>  			.queue_setup = sw_queue_setup,
> -- 
> 2.7.4
>
  
Van Haaren, Harry March 30, 2017, 8:49 a.m. UTC | #2
> From: Jerin Jacob [mailto:jerin.jacob@caviumnetworks.com]
> Sent: Thursday, March 30, 2017 9:24 AM
> To: Van Haaren, Harry <harry.van.haaren@intel.com>
> Cc: dev@dpdk.org; Richardson, Bruce <bruce.richardson@intel.com>
> Subject: Re: [PATCH v6 12/21] event/sw: add start stop and close functions

<snip>

> >  static int
> > +sw_start(struct rte_eventdev *dev)
> > +{
> > +	unsigned int i, j;
> > +	struct sw_evdev *sw = sw_pmd_priv(dev);
> > +	/* check all ports are set up */
> > +	for (i = 0; i < sw->port_count; i++)
> > +		if (sw->ports[i].rx_worker_ring == NULL) {
> > +			SW_LOG_ERR("%s %d: port %d not configured\n",
> > +			       __func__, __LINE__, i);
> 
> Remove __func__ and __LINE_ as SW_LOG_ERR macro has it already.
> Check the same issue in other places.

Good one, done and checked for all patches, will be fixed in v7.
  

Patch

diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index f91a04b..04ab7ad 100644
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -442,6 +442,81 @@  sw_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *info)
 }
 
 static int
+sw_start(struct rte_eventdev *dev)
+{
+	unsigned int i, j;
+	struct sw_evdev *sw = sw_pmd_priv(dev);
+	/* check all ports are set up */
+	for (i = 0; i < sw->port_count; i++)
+		if (sw->ports[i].rx_worker_ring == NULL) {
+			SW_LOG_ERR("%s %d: port %d not configured\n",
+			       __func__, __LINE__, i);
+			return -EINVAL;
+		}
+
+	/* check all queues are configured and mapped to ports*/
+	for (i = 0; i < sw->qid_count; i++)
+		if (sw->qids[i].iq[0] == NULL ||
+				sw->qids[i].cq_num_mapped_cqs == 0) {
+			SW_LOG_ERR("%s %d: queue %d not configured\n",
+			       __func__, __LINE__, i);
+			return -EDEADLK;
+		}
+
+	/* build up our prioritized array of qids */
+	/* We don't use qsort here, as if all/multiple entries have the same
+	 * priority, the result is non-deterministic. From "man 3 qsort":
+	 * "If two members compare as equal, their order in the sorted
+	 * array is undefined."
+	 */
+	uint32_t qidx = 0;
+	for (j = 0; j <= RTE_EVENT_DEV_PRIORITY_LOWEST; j++) {
+		for (i = 0; i < sw->qid_count; i++) {
+			if (sw->qids[i].priority == j) {
+				sw->qids_prioritized[qidx] = &sw->qids[i];
+				qidx++;
+			}
+		}
+	}
+
+	rte_smp_wmb();
+	sw->started = 1;
+
+	return 0;
+}
+
+static void
+sw_stop(struct rte_eventdev *dev)
+{
+	struct sw_evdev *sw = sw_pmd_priv(dev);
+	sw->started = 0;
+	rte_smp_wmb();
+}
+
+static int
+sw_close(struct rte_eventdev *dev)
+{
+	struct sw_evdev *sw = sw_pmd_priv(dev);
+	uint32_t i;
+
+	for (i = 0; i < sw->qid_count; i++)
+		sw_queue_release(dev, i);
+	sw->qid_count = 0;
+
+	for (i = 0; i < sw->port_count; i++)
+		sw_port_release(&sw->ports[i]);
+	sw->port_count = 0;
+
+	memset(&sw->stats, 0, sizeof(sw->stats));
+	sw->sched_called = 0;
+	sw->sched_no_iq_enqueues = 0;
+	sw->sched_no_cq_enqueues = 0;
+	sw->sched_cq_qid_called = 0;
+
+	return 0;
+}
+
+static int
 assign_numa_node(const char *key __rte_unused, const char *value, void *opaque)
 {
 	int *socket_id = opaque;
@@ -477,6 +552,9 @@  sw_probe(const char *name, const char *params)
 	static const struct rte_eventdev_ops evdev_sw_ops = {
 			.dev_configure = sw_dev_configure,
 			.dev_infos_get = sw_info_get,
+			.dev_close = sw_close,
+			.dev_start = sw_start,
+			.dev_stop = sw_stop,
 
 			.queue_def_conf = sw_queue_def_conf,
 			.queue_setup = sw_queue_setup,