From 361e73364578dc5295280ccb4068e6790848d0fa Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Fri, 10 Mar 2017 15:19:15 +0000 Subject: [PATCH] eventdev: remove default queue overriding PMDs that only do a specific type of scheduling cannot provide CFG_ALL_TYPES, so the Eventdev infrastructure should not demand that every PMD supports CFG_ALL_TYPES. By not overriding the default configuration of the queue as suggested by the PMD, the eventdev_common unit tests can pass on all PMDs, regardless of their capabilities. RTE_EVENT_QUEUE_CFG_DEFAULT is no longer used by the eventdev layer it can be removed now. Applications should use CFG_ALL_TYPES if they require enqueue of all types a queue, or specify which type of queue they require. The CFG_DEFAULT value is changed to CFG_ALL_TYPES in event/skeleton, to not break the compile. A capability flag is added that indicates if the underlying PMD supports creating queues of ALL_TYPES. Signed-off-by: Harry van Haaren Acked-by: Jerin Jacob --- drivers/event/skeleton/skeleton_eventdev.c | 2 +- lib/librte_eventdev/rte_eventdev.c | 1 - lib/librte_eventdev/rte_eventdev.h | 13 +++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/event/skeleton/skeleton_eventdev.c b/drivers/event/skeleton/skeleton_eventdev.c index 8de05688f7..d2da7d8f1c 100644 --- a/drivers/event/skeleton/skeleton_eventdev.c +++ b/drivers/event/skeleton/skeleton_eventdev.c @@ -196,7 +196,7 @@ skeleton_eventdev_queue_def_conf(struct rte_eventdev *dev, uint8_t queue_id, queue_conf->nb_atomic_flows = (1ULL << 20); queue_conf->nb_atomic_order_sequences = (1ULL << 20); - queue_conf->event_queue_cfg = RTE_EVENT_QUEUE_CFG_DEFAULT; + queue_conf->event_queue_cfg = RTE_EVENT_QUEUE_CFG_ALL_TYPES; queue_conf->priority = RTE_EVENT_DEV_PRIORITY_NORMAL; } diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c index 5d8614ad05..60bb793af3 100644 --- a/lib/librte_eventdev/rte_eventdev.c +++ b/lib/librte_eventdev/rte_eventdev.c @@ -602,7 +602,6 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id, RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_def_conf, -ENOTSUP); (*dev->dev_ops->queue_def_conf)(dev, queue_id, &def_conf); - def_conf.event_queue_cfg = RTE_EVENT_QUEUE_CFG_DEFAULT; queue_conf = &def_conf; } diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h index 2b30a357db..5088f28514 100644 --- a/lib/librte_eventdev/rte_eventdev.h +++ b/lib/librte_eventdev/rte_eventdev.h @@ -271,6 +271,13 @@ struct rte_mbuf; /* we just use mbuf pointers; no need to include rte_mbuf.h */ * * @see rte_event_schedule(), rte_event_dequeue_burst() */ +#define RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES (1ULL << 3) +/**< Event device is capable of enqueuing events of any type to any queue. + * If this capability is not set, the queue only supports events of the + * *RTE_EVENT_QUEUE_CFG_* type that it was created with. + * + * @see RTE_EVENT_QUEUE_CFG_* values + */ /* Event device priority levels */ #define RTE_EVENT_DEV_PRIORITY_HIGHEST 0 @@ -471,12 +478,6 @@ rte_event_dev_configure(uint8_t dev_id, /* Event queue specific APIs */ /* Event queue configuration bitmap flags */ -#define RTE_EVENT_QUEUE_CFG_DEFAULT (0) -/**< Default value of *event_queue_cfg* when rte_event_queue_setup() invoked - * with queue_conf == NULL - * - * @see rte_event_queue_setup() - */ #define RTE_EVENT_QUEUE_CFG_TYPE_MASK (3ULL << 0) /**< Mask for event queue schedule type configuration request */ #define RTE_EVENT_QUEUE_CFG_ALL_TYPES (0ULL << 0) -- 2.20.1