[dpdk-dev,v3,1/4] eventdev: add port attribute function
Checks
Commit Message
This commit reworks the port functions to retrieve information
about the port, like the enq or deq depths. Note that "port count"
is a device attribute, and is added in a later patch for dev attributes.
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
---
lib/librte_eventdev/rte_eventdev.c | 33 +++++++++++--------
lib/librte_eventdev/rte_eventdev.h | 49 ++++++++++++----------------
lib/librte_eventdev/rte_eventdev_version.map | 7 ++++
test/test/test_eventdev.c | 16 ++++++---
4 files changed, 59 insertions(+), 46 deletions(-)
Comments
-----Original Message-----
> Date: Fri, 8 Sep 2017 16:36:52 +0100
> From: Harry van Haaren <harry.van.haaren@intel.com>
> To: dev@dpdk.org
> CC: jerin.jacob@caviumnetworks.com, Harry van Haaren
> <harry.van.haaren@intel.com>
> Subject: [PATCH v3 1/4] eventdev: add port attribute function
> X-Mailer: git-send-email 2.7.4
>
> This commit reworks the port functions to retrieve information
> about the port, like the enq or deq depths. Note that "port count"
> is a device attribute, and is added in a later patch for dev attributes.
>
> Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
> ---
> lib/librte_eventdev/rte_eventdev.c | 33 +++++++++++--------
> lib/librte_eventdev/rte_eventdev.h | 49 ++++++++++++----------------
> lib/librte_eventdev/rte_eventdev_version.map | 7 ++++
> test/test/test_eventdev.c | 16 ++++++---
> 4 files changed, 59 insertions(+), 46 deletions(-)
>
> -
> -uint8_t
> -rte_event_port_count(uint8_t dev_id)
> -{
> - struct rte_eventdev *dev;
> + if (!is_valid_port(dev, port_id)) {
> + RTE_EDEV_LOG_ERR("Invalid port_id=%" PRIu8, port_id);
> + return -EINVAL;
> + }
>
> - dev = &rte_eventdevs[dev_id];
> - return dev->data->nb_ports;
> + switch (attr_id) {
> + case RTE_EVENT_PORT_ATTR_ENQ_DEPTH:
> + *attr_value = dev->data->ports_enqueue_depth[port_id];
> + break;
> + case RTE_EVENT_PORT_ATTR_DEQ_DEPTH:
> + *attr_value = dev->data->ports_dequeue_depth[port_id];
> + break;
IMO, We should have "default:" case here to detect invalid attr_id here
and return the error code accordingly in the header file as well.
> + };
> + return 0;
> }
> /**
> * Start an event device.
> diff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/rte_eventdev_version.map
> index 4c48e5f..a0adde3 100644
> --- a/lib/librte_eventdev/rte_eventdev_version.map
> +++ b/lib/librte_eventdev/rte_eventdev_version.map
> @@ -51,3 +51,10 @@ DPDK_17.08 {
> rte_event_ring_init;
> rte_event_ring_lookup;
We should delete the remove functions from here.
like rte_event_port_dequeue_depth() and rte_event_port_enqueue_depth;
> } DPDK_17.05;
> +
> +EXPERIMENTAL {
Note sure we need to add EXPERIMENTAL here.(i.e other section don't have this)
> + global:
> +
> + rte_event_port_attr_get;
> +
> +} DPDK_17.08;
@@ -744,30 +744,35 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id,
}
uint8_t
-rte_event_port_dequeue_depth(uint8_t dev_id, uint8_t port_id)
+rte_event_port_count(uint8_t dev_id)
{
struct rte_eventdev *dev;
dev = &rte_eventdevs[dev_id];
- return dev->data->ports_dequeue_depth[port_id];
+ return dev->data->nb_ports;
}
-uint8_t
-rte_event_port_enqueue_depth(uint8_t dev_id, uint8_t port_id)
+int
+rte_event_port_attr_get(uint8_t dev_id, uint8_t port_id, uint32_t attr_id,
+ uint32_t *attr_value /*out */)
{
struct rte_eventdev *dev;
-
+ RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
dev = &rte_eventdevs[dev_id];
- return dev->data->ports_enqueue_depth[port_id];
-}
-
-uint8_t
-rte_event_port_count(uint8_t dev_id)
-{
- struct rte_eventdev *dev;
+ if (!is_valid_port(dev, port_id)) {
+ RTE_EDEV_LOG_ERR("Invalid port_id=%" PRIu8, port_id);
+ return -EINVAL;
+ }
- dev = &rte_eventdevs[dev_id];
- return dev->data->nb_ports;
+ switch (attr_id) {
+ case RTE_EVENT_PORT_ATTR_ENQ_DEPTH:
+ *attr_value = dev->data->ports_enqueue_depth[port_id];
+ break;
+ case RTE_EVENT_PORT_ATTR_DEQ_DEPTH:
+ *attr_value = dev->data->ports_dequeue_depth[port_id];
+ break;
+ };
+ return 0;
}
int
@@ -715,47 +715,40 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id,
const struct rte_event_port_conf *port_conf);
/**
- * Get the number of dequeue queue depth configured for event port designated
- * by its *port_id* on a specific event device
+ * Get the number of ports on a specific event device
*
* @param dev_id
* Event device identifier.
- * @param port_id
- * Event port identifier.
* @return
- * - The number of configured dequeue queue depth
- *
- * @see rte_event_dequeue_burst()
+ * - The number of configured ports
*/
uint8_t
-rte_event_port_dequeue_depth(uint8_t dev_id, uint8_t port_id);
+rte_event_port_count(uint8_t dev_id);
/**
- * Get the number of enqueue queue depth configured for event port designated
- * by its *port_id* on a specific event device
- *
- * @param dev_id
- * Event device identifier.
- * @param port_id
- * Event port identifier.
- * @return
- * - The number of configured enqueue queue depth
- *
- * @see rte_event_enqueue_burst()
+ * The queue depth of the port on the enqueue side
*/
-uint8_t
-rte_event_port_enqueue_depth(uint8_t dev_id, uint8_t port_id);
+#define RTE_EVENT_PORT_ATTR_ENQ_DEPTH 0
+/**
+ * The queue depth of the port on the dequeue side
+ */
+#define RTE_EVENT_PORT_ATTR_DEQ_DEPTH 1
/**
- * Get the number of ports on a specific event device
+ * Get an attribute from a port.
*
- * @param dev_id
- * Event device identifier.
- * @return
- * - The number of configured ports
+ * @param dev_id Eventdev id
+ * @param port_id Eventdev port 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, port or attr_id, or attr_value was NULL
*/
-uint8_t
-rte_event_port_count(uint8_t dev_id);
+int
+rte_event_port_attr_get(uint8_t dev_id, uint8_t port_id, uint32_t attr_id,
+ uint32_t *attr_value /*out */);
/**
* Start an event device.
@@ -51,3 +51,10 @@ DPDK_17.08 {
rte_event_ring_init;
rte_event_ring_lookup;
} DPDK_17.05;
+
+EXPERIMENTAL {
+ global:
+
+ rte_event_port_attr_get;
+
+} DPDK_17.08;
@@ -460,8 +460,12 @@ test_eventdev_dequeue_depth(void)
ret = rte_event_port_setup(TEST_DEV_ID, 0, &pconf);
TEST_ASSERT_SUCCESS(ret, "Failed to setup port0");
- TEST_ASSERT_EQUAL(rte_event_port_dequeue_depth(TEST_DEV_ID, 0),
- pconf.dequeue_depth, "Wrong port dequeue depth");
+ uint32_t value;
+ TEST_ASSERT_EQUAL(rte_event_port_attr_get(TEST_DEV_ID, 0,
+ RTE_EVENT_PORT_ATTR_DEQ_DEPTH, &value),
+ 0, "Call to port dequeue depth failed");
+ TEST_ASSERT_EQUAL(value, pconf.dequeue_depth,
+ "Wrong port dequeue depth");
return TEST_SUCCESS;
}
@@ -481,8 +485,12 @@ test_eventdev_enqueue_depth(void)
ret = rte_event_port_setup(TEST_DEV_ID, 0, &pconf);
TEST_ASSERT_SUCCESS(ret, "Failed to setup port0");
- TEST_ASSERT_EQUAL(rte_event_port_enqueue_depth(TEST_DEV_ID, 0),
- pconf.enqueue_depth, "Wrong port enqueue depth");
+ uint32_t value;
+ TEST_ASSERT_EQUAL(rte_event_port_attr_get(TEST_DEV_ID, 0,
+ RTE_EVENT_PORT_ATTR_ENQ_DEPTH, &value),
+ 0, "Call to port enqueue depth failed");
+ TEST_ASSERT_EQUAL(value, pconf.dequeue_depth,
+ "Wrong port enqueue depth");
return TEST_SUCCESS;
}