event/sw: fix mapped qid count with parallel queue

[dpdk.git] / drivers / event / sw / sw_evdev.c

diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index 0caf8ba..bc834a9 100644 (file)
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -90,7 +90,8 @@ sw_port_link(struct rte_eventdev *dev, void *port, const uint8_t queues[],
                } else if (q->type == RTE_SCHED_TYPE_ORDERED) {
                        p->num_ordered_qids++;
                        p->num_qids_mapped++;
-               } else if (q->type == RTE_SCHED_TYPE_ATOMIC) {
+               } else if (q->type == RTE_SCHED_TYPE_ATOMIC ||
+                               q->type == RTE_SCHED_TYPE_PARALLEL) {
                        p->num_qids_mapped++;
                }
 
@@ -559,12 +560,13 @@ sw_dump(struct rte_eventdev *dev, FILE *f)
                                inflights += qid->fids[flow].pcount;
                        }
 
-               uint32_t cq;
-               fprintf(f, "\tInflights: %u\tFlows pinned per port: ",
-                               inflights);
-               for (cq = 0; cq < sw->port_count; cq++)
-                       fprintf(f, "%d ", affinities_per_port[cq]);
-               fprintf(f, "\n");
+               uint32_t port;
+               fprintf(f, "\tPer Port Stats:\n");
+               for (port = 0; port < sw->port_count; port++) {
+                       fprintf(f, "\t  Port %d: Pkts: %"PRIu64, port,
+                                       qid->to_port[port]);
+                       fprintf(f, "\tFlows: %d\n", affinities_per_port[port]);
+               }
 
                uint32_t iq;
                uint32_t iq_printed = 0;
@@ -696,7 +698,7 @@ set_credit_quanta(const char *key __rte_unused, const char *value, void *opaque)
 }
 
 static int
-sw_probe(const char *name, const char *params)
+sw_probe(struct rte_vdev_device *vdev)
 {
        static const struct rte_eventdev_ops evdev_sw_ops = {
                        .dev_configure = sw_dev_configure,
@@ -727,12 +729,16 @@ sw_probe(const char *name, const char *params)
                CREDIT_QUANTA_ARG,
                NULL
        };
+       const char *name;
+       const char *params;
        struct rte_eventdev *dev;
        struct sw_evdev *sw;
        int socket_id = rte_socket_id();
        int sched_quanta  = SW_DEFAULT_SCHED_QUANTA;
        int credit_quanta = SW_DEFAULT_CREDIT_QUANTA;
 
+       name = rte_vdev_device_name(vdev);
+       params = rte_vdev_device_args(vdev);
        if (params != NULL && params[0] != '\0') {
                struct rte_kvargs *kvlist = rte_kvargs_parse(params, args);
 
@@ -806,8 +812,11 @@ sw_probe(const char *name, const char *params)
 }
 
 static int
-sw_remove(const char *name)
+sw_remove(struct rte_vdev_device *vdev)
 {
+       const char *name;
+
+       name = rte_vdev_device_name(vdev);
        if (name == NULL)
                return -EINVAL;