ethdev: fix missing imissed counter in xstats

[dpdk.git] / lib / librte_eventdev / rte_eventdev.c

diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
index e6ed0a3..ce6a5dc 100644 (file)
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -56,6 +56,7 @@
 #include <rte_common.h>
 #include <rte_malloc.h>
 #include <rte_errno.h>
+#include <rte_ethdev.h>
 
 #include "rte_eventdev.h"
 #include "rte_eventdev_pmd.h"
@@ -128,6 +129,28 @@ rte_event_dev_info_get(uint8_t dev_id, struct rte_event_dev_info *dev_info)
        return 0;
 }
 
+int
+rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint8_t eth_port_id,
+                               uint32_t *caps)
+{
+       struct rte_eventdev *dev;
+
+       RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(eth_port_id, -EINVAL);
+
+       dev = &rte_eventdevs[dev_id];
+
+       if (caps == NULL)
+               return -EINVAL;
+       *caps = 0;
+
+       return dev->dev_ops->eth_rx_adapter_caps_get ?
+                               (*dev->dev_ops->eth_rx_adapter_caps_get)(dev,
+                                               &rte_eth_devices[eth_port_id],
+                                               caps)
+                               : 0;
+}
+
 static inline int
 rte_event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues)
 {
@@ -494,13 +517,11 @@ is_valid_atomic_queue_conf(const struct rte_event_queue_conf *queue_conf)
 {
        if (queue_conf &&
                !(queue_conf->event_queue_cfg &
-                 RTE_EVENT_QUEUE_CFG_SINGLE_LINK) && (
-               ((queue_conf->event_queue_cfg &
-                       RTE_EVENT_QUEUE_CFG_TYPE_MASK)
-                       == RTE_EVENT_QUEUE_CFG_ALL_TYPES) ||
+                 RTE_EVENT_QUEUE_CFG_SINGLE_LINK) &&
                ((queue_conf->event_queue_cfg &
-                       RTE_EVENT_QUEUE_CFG_TYPE_MASK)
-                       == RTE_EVENT_QUEUE_CFG_ATOMIC_ONLY)
+                        RTE_EVENT_QUEUE_CFG_ALL_TYPES) ||
+               (queue_conf->schedule_type
+                       == RTE_SCHED_TYPE_ATOMIC)
                ))
                return 1;
        else
@@ -512,13 +533,11 @@ is_valid_ordered_queue_conf(const struct rte_event_queue_conf *queue_conf)
 {
        if (queue_conf &&
                !(queue_conf->event_queue_cfg &
-                 RTE_EVENT_QUEUE_CFG_SINGLE_LINK) && (
-               ((queue_conf->event_queue_cfg &
-                       RTE_EVENT_QUEUE_CFG_TYPE_MASK)
-                       == RTE_EVENT_QUEUE_CFG_ALL_TYPES) ||
+                 RTE_EVENT_QUEUE_CFG_SINGLE_LINK) &&
                ((queue_conf->event_queue_cfg &
-                       RTE_EVENT_QUEUE_CFG_TYPE_MASK)
-                       == RTE_EVENT_QUEUE_CFG_ORDERED_ONLY)
+                        RTE_EVENT_QUEUE_CFG_ALL_TYPES) ||
+               (queue_conf->schedule_type
+                       == RTE_SCHED_TYPE_ORDERED)
                ))
                return 1;
        else
@@ -790,6 +809,12 @@ rte_event_queue_attr_get(uint8_t dev_id, uint8_t queue_id, uint32_t attr_id,
        case RTE_EVENT_QUEUE_ATTR_EVENT_QUEUE_CFG:
                *attr_value = conf->event_queue_cfg;
                break;
+       case RTE_EVENT_QUEUE_ATTR_SCHEDULE_TYPE:
+               if (conf->event_queue_cfg & RTE_EVENT_QUEUE_CFG_ALL_TYPES)
+                       return -EOVERFLOW;
+
+               *attr_value = conf->schedule_type;
+               break;
        default:
                return -EINVAL;
        };
@@ -937,6 +962,23 @@ rte_event_dequeue_timeout_ticks(uint8_t dev_id, uint64_t ns,
        return (*dev->dev_ops->timeout_ticks)(dev, ns, timeout_ticks);
 }
 
+int
+rte_event_dev_service_id_get(uint8_t dev_id, uint32_t *service_id)
+{
+       struct rte_eventdev *dev;
+
+       RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+       dev = &rte_eventdevs[dev_id];
+
+       if (service_id == NULL)
+               return -EINVAL;
+
+       if (dev->data->service_inited)
+               *service_id = dev->data->service_id;
+
+       return dev->data->service_inited ? 0 : -ESRCH;
+}
+
 int
 rte_event_dev_dump(uint8_t dev_id, FILE *f)
 {