d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eventdev: add queue attribute function

Browse Source 
This commit adds a generic queue attribute function. It also removes
the previous rte_event_queue_priority() and priority() functions, and
updates the map files and unit tests to use the new attr functions.

Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
This commit is contained in:
Harry van Haaren 2017-09-20 14:36:01 +01:00 committed by Jerin Jacob
parent 64103dbcd6
commit 783bdfef7e
4 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/librte_eventdev/rte_eventdev.c
View File

@ -613,18 +613,6 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id,
return (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf);
}
uint8_t
rte_event_queue_priority(uint8_t dev_id, uint8_t queue_id)
{
struct rte_eventdev *dev;
dev = &rte_eventdevs[dev_id];
if (dev->data->event_dev_cap & RTE_EVENT_DEV_CAP_QUEUE_QOS)
return dev->data->queues_prio[queue_id];
else
return RTE_EVENT_DEV_PRIORITY_NORMAL;
}
static inline int
is_valid_port(struct rte_eventdev *dev, uint8_t port_id)
{
@ -792,6 +780,34 @@ rte_event_port_attr_get(uint8_t dev_id, uint8_t port_id, uint32_t attr_id,
return 0;
}
int
rte_event_queue_attr_get(uint8_t dev_id, uint8_t queue_id, uint32_t attr_id,
uint32_t *attr_value)
{
struct rte_eventdev *dev;
if (!attr_value)
return -EINVAL;
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
dev = &rte_eventdevs[dev_id];
if (!is_valid_queue(dev, queue_id)) {
RTE_EDEV_LOG_ERR("Invalid queue_id=%" PRIu8, queue_id);
return -EINVAL;
}
switch (attr_id) {
case RTE_EVENT_QUEUE_ATTR_PRIORITY:
*attr_value = RTE_EVENT_DEV_PRIORITY_NORMAL;
if (dev->data->event_dev_cap & RTE_EVENT_DEV_CAP_QUEUE_QOS)
*attr_value = dev->data->queues_prio[queue_id];
break;
default:
return -EINVAL;
};
return 0;
}
int
rte_event_port_link(uint8_t dev_id, uint8_t port_id,
const uint8_t queues[], const uint8_t priorities[],

35
lib/librte_eventdev/rte_eventdev.h
View File

@ -633,31 +633,26 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id,
const struct rte_event_queue_conf *queue_conf);
/**
* Get the number of event queues on a specific event device
*
* @param dev_id
* Event device identifier.
* @return
* - The number of configured event queues
* The priority of the queue.
*/
uint8_t
rte_event_queue_count(uint8_t dev_id);
#define RTE_EVENT_QUEUE_ATTR_PRIORITY 0
/**
* Get the priority of the event queue on a specific event device
* Get an attribute from a queue.
*
* @param dev_id
* Event device identifier.
* @param queue_id
* Event queue identifier.
* @return
* - If the device has RTE_EVENT_DEV_CAP_QUEUE_QOS capability then the
* configured priority of the event queue in
* [RTE_EVENT_DEV_PRIORITY_HIGHEST, RTE_EVENT_DEV_PRIORITY_LOWEST] range
* else the value RTE_EVENT_DEV_PRIORITY_NORMAL
* @param dev_id Eventdev id
* @param queue_id Eventdev queue id
* @param attr_id The attribute ID to retrieve
* @param[out] attr_value A pointer that will be filled in with the attribute
* value if successful
*
* @retval 0 Successfully returned value
* -EINVAL invalid device, queue or attr_id provided, or attr_value
* was NULL
*/
uint8_t
rte_event_queue_priority(uint8_t dev_id, uint8_t queue_id);
int
rte_event_queue_attr_get(uint8_t dev_id, uint8_t queue_id, uint32_t attr_id,
uint32_t *attr_value);
/* Event port specific APIs */

2
lib/librte_eventdev/rte_eventdev_version.map
View File

@ -25,7 +25,6 @@ DPDK_17.05 {
rte_event_queue_default_conf_get;
rte_event_queue_setup;
rte_event_queue_priority;
rte_event_dequeue_timeout_ticks;
@ -53,5 +52,6 @@ DPDK_17.11 {
rte_event_dev_attr_get;
rte_event_port_attr_get;
rte_event_queue_attr_get;
} DPDK_17.08;

6
test/test/test_eventdev.c
View File

@ -381,7 +381,11 @@ test_eventdev_queue_priority(void)
}
for (i = 0; i < (int)queue_count; i++) {
priority = rte_event_queue_priority(TEST_DEV_ID, i);
uint32_t tmp;
TEST_ASSERT_SUCCESS(rte_event_queue_attr_get(TEST_DEV_ID, i,
RTE_EVENT_QUEUE_ATTR_PRIORITY, &tmp),
"Queue priority get failed");
priority = tmp;
if (info.event_dev_cap & RTE_EVENT_DEV_CAP_QUEUE_QOS)
TEST_ASSERT_EQUAL(priority,