X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flibrte_eventdev%2Frte_eventdev.c;h=557198f4a18159877f452d9ae2e73f10e793ed33;hb=3c56316517e2d1a99e10f98ebddc0c39c6f6f86d;hp=3bd571a87beb2828061a4ede0de2bff2d263d637;hpb=6723c0fc7207ca4416822b170b1485a78aa47c7c;p=dpdk.git

diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
index 3bd571a87b..557198f4a1 100644
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -32,9 +32,11 @@
 #include <rte_ethdev.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_telemetry.h>
 
 #include "rte_eventdev.h"
 #include "rte_eventdev_pmd.h"
+#include "rte_eventdev_trace.h"
 
 static struct rte_eventdev rte_event_devices[RTE_EVENT_MAX_DEVS];
 
@@ -129,7 +131,7 @@ rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id,
 				: 0;
 }
 
-int __rte_experimental
+int
 rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps)
 {
 	struct rte_eventdev *dev;
@@ -151,7 +153,7 @@ rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps)
 				: 0;
 }
 
-int __rte_experimental
+int
 rte_event_crypto_adapter_caps_get(uint8_t dev_id, uint8_t cdev_id,
 				  uint32_t *caps)
 {
@@ -174,7 +176,7 @@ rte_event_crypto_adapter_caps_get(uint8_t dev_id, uint8_t cdev_id,
 		(dev, cdev, caps) : -ENOTSUP;
 }
 
-int __rte_experimental
+int
 rte_event_eth_tx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id,
 				uint32_t *caps)
 {
@@ -524,6 +526,7 @@ rte_event_dev_configure(uint8_t dev_id,
 	}
 
 	dev->data->event_dev_cap = info.event_dev_cap;
+	rte_eventdev_trace_configure(dev_id, dev_conf, diag);
 	return diag;
 }
 
@@ -650,6 +653,7 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id,
 	}
 
 	dev->data->queues_cfg[queue_id] = *queue_conf;
+	rte_eventdev_trace_queue_setup(dev_id, queue_id, queue_conf);
 	return (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf);
 }
 
@@ -766,6 +770,7 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id,
 	if (!diag)
 		diag = rte_event_port_unlink(dev_id, port_id, NULL, 0);
 
+	rte_eventdev_trace_port_setup(dev_id, port_id, port_conf, diag);
 	if (diag < 0)
 		return diag;
 
@@ -889,18 +894,18 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
 	uint16_t *links_map;
 	int i, diag;
 
-	RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, -EINVAL, 0);
+	RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, EINVAL, 0);
 	dev = &rte_eventdevs[dev_id];
 
 	if (*dev->dev_ops->port_link == NULL) {
 		RTE_EDEV_LOG_ERR("Function not supported\n");
-		rte_errno = -ENOTSUP;
+		rte_errno = ENOTSUP;
 		return 0;
 	}
 
 	if (!is_valid_port(dev, port_id)) {
 		RTE_EDEV_LOG_ERR("Invalid port_id=%" PRIu8, port_id);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
 
@@ -921,7 +926,7 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
 
 	for (i = 0; i < nb_links; i++)
 		if (queues[i] >= dev->data->nb_queues) {
-			rte_errno = -EINVAL;
+			rte_errno = EINVAL;
 			return 0;
 		}
 
@@ -936,6 +941,7 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
 	for (i = 0; i < diag; i++)
 		links_map[queues[i]] = (uint8_t)priorities[i];
 
+	rte_eventdev_trace_port_link(dev_id, port_id, nb_links, diag);
 	return diag;
 }
 
@@ -948,18 +954,18 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
 	int i, diag, j;
 	uint16_t *links_map;
 
-	RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, -EINVAL, 0);
+	RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, EINVAL, 0);
 	dev = &rte_eventdevs[dev_id];
 
 	if (*dev->dev_ops->port_unlink == NULL) {
 		RTE_EDEV_LOG_ERR("Function not supported");
-		rte_errno = -ENOTSUP;
+		rte_errno = ENOTSUP;
 		return 0;
 	}
 
 	if (!is_valid_port(dev, port_id)) {
 		RTE_EDEV_LOG_ERR("Invalid port_id=%" PRIu8, port_id);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
 
@@ -988,7 +994,7 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
 	nb_unlinks = j;
 	for (i = 0; i < nb_unlinks; i++)
 		if (queues[i] >= dev->data->nb_queues) {
-			rte_errno = -EINVAL;
+			rte_errno = EINVAL;
 			return 0;
 		}
 
@@ -1001,10 +1007,11 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
 	for (i = 0; i < diag; i++)
 		links_map[queues[i]] = EVENT_QUEUE_SERVICE_PRIORITY_INVALID;
 
+	rte_eventdev_trace_port_unlink(dev_id, port_id, nb_unlinks, diag);
 	return diag;
 }
 
-int __rte_experimental
+int
 rte_event_port_unlinks_in_progress(uint8_t dev_id, uint8_t port_id)
 {
 	struct rte_eventdev *dev;
@@ -1213,6 +1220,7 @@ rte_event_dev_start(uint8_t dev_id)
 	}
 
 	diag = (*dev->dev_ops->dev_start)(dev);
+	rte_eventdev_trace_start(dev_id, diag);
 	if (diag == 0)
 		dev->data->dev_started = 1;
 	else
@@ -1257,6 +1265,7 @@ rte_event_dev_stop(uint8_t dev_id)
 
 	dev->data->dev_started = 0;
 	(*dev->dev_ops->dev_stop)(dev);
+	rte_eventdev_trace_stop(dev_id);
 }
 
 int
@@ -1275,6 +1284,7 @@ rte_event_dev_close(uint8_t dev_id)
 		return -EBUSY;
 	}
 
+	rte_eventdev_trace_close(dev_id);
 	return (*dev->dev_ops->dev_close)(dev);
 }
 
@@ -1351,6 +1361,7 @@ rte_event_pmd_allocate(const char *name, int socket_id)
 	eventdev = &rte_eventdevs[dev_id];
 
 	eventdev->txa_enqueue = rte_event_tx_adapter_enqueue;
+	eventdev->txa_enqueue_same_dest = rte_event_tx_adapter_enqueue;
 
 	if (eventdev->data == NULL) {
 		struct rte_eventdev_data *eventdev_data = NULL;
@@ -1363,14 +1374,17 @@ rte_event_pmd_allocate(const char *name, int socket_id)
 
 		eventdev->data = eventdev_data;
 
-		strlcpy(eventdev->data->name, name, RTE_EVENTDEV_NAME_MAX_LEN);
+		if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
 
-		eventdev->data->dev_id = dev_id;
-		eventdev->data->socket_id = socket_id;
-		eventdev->data->dev_started = 0;
+			strlcpy(eventdev->data->name, name,
+				RTE_EVENTDEV_NAME_MAX_LEN);
 
-		eventdev->attached = RTE_EVENTDEV_ATTACHED;
+			eventdev->data->dev_id = dev_id;
+			eventdev->data->socket_id = socket_id;
+			eventdev->data->dev_started = 0;
+		}
 
+		eventdev->attached = RTE_EVENTDEV_ATTACHED;
 		eventdev_globals.nb_devs++;
 	}
 
@@ -1411,3 +1425,306 @@ rte_event_pmd_release(struct rte_eventdev *eventdev)
 	eventdev->data = NULL;
 	return 0;
 }
+
+
+static int
+handle_dev_list(const char *cmd __rte_unused,
+		const char *params __rte_unused,
+		struct rte_tel_data *d)
+{
+	uint8_t dev_id;
+	int ndev = rte_event_dev_count();
+
+	if (ndev < 1)
+		return -1;
+
+	rte_tel_data_start_array(d, RTE_TEL_INT_VAL);
+	for (dev_id = 0; dev_id < RTE_EVENT_MAX_DEVS; dev_id++) {
+		if (rte_eventdevs[dev_id].attached ==
+				RTE_EVENTDEV_ATTACHED)
+			rte_tel_data_add_array_int(d, dev_id);
+	}
+
+	return 0;
+}
+
+static int
+handle_port_list(const char *cmd __rte_unused,
+		 const char *params,
+		 struct rte_tel_data *d)
+{
+	int i;
+	uint8_t dev_id;
+	struct rte_eventdev *dev;
+	char *end_param;
+
+	if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+		return -1;
+
+	dev_id = strtoul(params, &end_param, 10);
+	if (*end_param != '\0')
+		RTE_EDEV_LOG_DEBUG(
+			"Extra parameters passed to eventdev telemetry command, ignoring");
+
+	RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+	dev = &rte_eventdevs[dev_id];
+
+	rte_tel_data_start_array(d, RTE_TEL_INT_VAL);
+	for (i = 0; i < dev->data->nb_ports; i++)
+		rte_tel_data_add_array_int(d, i);
+
+	return 0;
+}
+
+static int
+handle_queue_list(const char *cmd __rte_unused,
+		  const char *params,
+		  struct rte_tel_data *d)
+{
+	int i;
+	uint8_t dev_id;
+	struct rte_eventdev *dev;
+	char *end_param;
+
+	if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+		return -1;
+
+	dev_id = strtoul(params, &end_param, 10);
+	if (*end_param != '\0')
+		RTE_EDEV_LOG_DEBUG(
+			"Extra parameters passed to eventdev telemetry command, ignoring");
+
+	RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+	dev = &rte_eventdevs[dev_id];
+
+	rte_tel_data_start_array(d, RTE_TEL_INT_VAL);
+	for (i = 0; i < dev->data->nb_queues; i++)
+		rte_tel_data_add_array_int(d, i);
+
+	return 0;
+}
+
+static int
+handle_queue_links(const char *cmd __rte_unused,
+		   const char *params,
+		   struct rte_tel_data *d)
+{
+	int i, ret, port_id = 0;
+	char *end_param;
+	uint8_t dev_id;
+	uint8_t queues[RTE_EVENT_MAX_QUEUES_PER_DEV];
+	uint8_t priorities[RTE_EVENT_MAX_QUEUES_PER_DEV];
+	const char *p_param;
+
+	if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+		return -1;
+
+	/* Get dev ID from parameter string */
+	dev_id = strtoul(params, &end_param, 10);
+	RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+
+	p_param = strtok(end_param, ",");
+	if (p_param == NULL || strlen(p_param) == 0 || !isdigit(*p_param))
+		return -1;
+
+	port_id = strtoul(p_param, &end_param, 10);
+	p_param = strtok(NULL, "\0");
+	if (p_param != NULL)
+		RTE_EDEV_LOG_DEBUG(
+			"Extra parameters passed to eventdev telemetry command, ignoring");
+
+	ret = rte_event_port_links_get(dev_id, port_id, queues, priorities);
+	if (ret < 0)
+		return -1;
+
+	rte_tel_data_start_dict(d);
+	for (i = 0; i < ret; i++) {
+		char qid_name[32];
+
+		snprintf(qid_name, 31, "qid_%u", queues[i]);
+		rte_tel_data_add_dict_u64(d, qid_name, priorities[i]);
+	}
+
+	return 0;
+}
+
+static int
+eventdev_build_telemetry_data(int dev_id,
+			      enum rte_event_dev_xstats_mode mode,
+			      int port_queue_id,
+			      struct rte_tel_data *d)
+{
+	struct rte_event_dev_xstats_name *xstat_names;
+	unsigned int *ids;
+	uint64_t *values;
+	int i, ret, num_xstats;
+
+	num_xstats = rte_event_dev_xstats_names_get(dev_id,
+						    mode,
+						    port_queue_id,
+						    NULL,
+						    NULL,
+						    0);
+
+	if (num_xstats < 0)
+		return -1;
+
+	/* use one malloc for names */
+	xstat_names = malloc((sizeof(struct rte_event_dev_xstats_name))
+			     * num_xstats);
+	if (xstat_names == NULL)
+		return -1;
+
+	ids = malloc((sizeof(unsigned int)) * num_xstats);
+	if (ids == NULL) {
+		free(xstat_names);
+		return -1;
+	}
+
+	values = malloc((sizeof(uint64_t)) * num_xstats);
+	if (values == NULL) {
+		free(xstat_names);
+		free(ids);
+		return -1;
+	}
+
+	ret = rte_event_dev_xstats_names_get(dev_id, mode, port_queue_id,
+					     xstat_names, ids, num_xstats);
+	if (ret < 0 || ret > num_xstats) {
+		free(xstat_names);
+		free(ids);
+		free(values);
+		return -1;
+	}
+
+	ret = rte_event_dev_xstats_get(dev_id, mode, port_queue_id,
+				       ids, values, num_xstats);
+	if (ret < 0 || ret > num_xstats) {
+		free(xstat_names);
+		free(ids);
+		free(values);
+		return -1;
+	}
+
+	rte_tel_data_start_dict(d);
+	for (i = 0; i < num_xstats; i++)
+		rte_tel_data_add_dict_u64(d, xstat_names[i].name,
+					  values[i]);
+
+	free(xstat_names);
+	free(ids);
+	free(values);
+	return 0;
+}
+
+static int
+handle_dev_xstats(const char *cmd __rte_unused,
+		  const char *params,
+		  struct rte_tel_data *d)
+{
+	int dev_id;
+	enum rte_event_dev_xstats_mode mode;
+	char *end_param;
+
+	if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+		return -1;
+
+	/* Get dev ID from parameter string */
+	dev_id = strtoul(params, &end_param, 10);
+	if (*end_param != '\0')
+		RTE_EDEV_LOG_DEBUG(
+			"Extra parameters passed to eventdev telemetry command, ignoring");
+
+	RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+
+	mode = RTE_EVENT_DEV_XSTATS_DEVICE;
+	return eventdev_build_telemetry_data(dev_id, mode, 0, d);
+}
+
+static int
+handle_port_xstats(const char *cmd __rte_unused,
+		   const char *params,
+		   struct rte_tel_data *d)
+{
+	int dev_id;
+	int port_queue_id = 0;
+	enum rte_event_dev_xstats_mode mode;
+	char *end_param;
+	const char *p_param;
+
+	if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+		return -1;
+
+	/* Get dev ID from parameter string */
+	dev_id = strtoul(params, &end_param, 10);
+	RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+
+	p_param = strtok(end_param, ",");
+	mode = RTE_EVENT_DEV_XSTATS_PORT;
+
+	if (p_param == NULL || strlen(p_param) == 0 || !isdigit(*p_param))
+		return -1;
+
+	port_queue_id = strtoul(p_param, &end_param, 10);
+
+	p_param = strtok(NULL, "\0");
+	if (p_param != NULL)
+		RTE_EDEV_LOG_DEBUG(
+			"Extra parameters passed to eventdev telemetry command, ignoring");
+
+	return eventdev_build_telemetry_data(dev_id, mode, port_queue_id, d);
+}
+
+static int
+handle_queue_xstats(const char *cmd __rte_unused,
+		    const char *params,
+		    struct rte_tel_data *d)
+{
+	int dev_id;
+	int port_queue_id = 0;
+	enum rte_event_dev_xstats_mode mode;
+	char *end_param;
+	const char *p_param;
+
+	if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+		return -1;
+
+	/* Get dev ID from parameter string */
+	dev_id = strtoul(params, &end_param, 10);
+	RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+
+	p_param = strtok(end_param, ",");
+	mode = RTE_EVENT_DEV_XSTATS_QUEUE;
+
+	if (p_param == NULL || strlen(p_param) == 0 || !isdigit(*p_param))
+		return -1;
+
+	port_queue_id = strtoul(p_param, &end_param, 10);
+
+	p_param = strtok(NULL, "\0");
+	if (p_param != NULL)
+		RTE_EDEV_LOG_DEBUG(
+			"Extra parameters passed to eventdev telemetry command, ignoring");
+
+	return eventdev_build_telemetry_data(dev_id, mode, port_queue_id, d);
+}
+
+RTE_INIT(eventdev_init_telemetry)
+{
+	rte_telemetry_register_cmd("/eventdev/dev_list", handle_dev_list,
+			"Returns list of available eventdevs. Takes no parameters");
+	rte_telemetry_register_cmd("/eventdev/port_list", handle_port_list,
+			"Returns list of available ports. Parameter: DevID");
+	rte_telemetry_register_cmd("/eventdev/queue_list", handle_queue_list,
+			"Returns list of available queues. Parameter: DevID");
+
+	rte_telemetry_register_cmd("/eventdev/dev_xstats", handle_dev_xstats,
+			"Returns stats for an eventdev. Parameter: DevID");
+	rte_telemetry_register_cmd("/eventdev/port_xstats", handle_port_xstats,
+			"Returns stats for an eventdev port. Params: DevID,PortID");
+	rte_telemetry_register_cmd("/eventdev/queue_xstats",
+			handle_queue_xstats,
+			"Returns stats for an eventdev queue. Params: DevID,QueueID");
+	rte_telemetry_register_cmd("/eventdev/queue_links", handle_queue_links,
+			"Returns links for an eventdev port. Params: DevID,QueueID");
+}