Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/28517/?format=api
{ "id": 28517, "url": "https://patches.dpdk.org/api/patches/28517/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1504883894-43451-3-git-send-email-harry.van.haaren@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1504883894-43451-3-git-send-email-harry.van.haaren@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1504883894-43451-3-git-send-email-harry.van.haaren@intel.com", "date": "2017-09-08T15:18:12", "name": "[dpdk-dev,v2,2/4] eventdev: add dev attribute get function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "9426a6fb44f9e0730496b16077d8035e1035f09c", "submitter": { "id": 317, "url": "https://patches.dpdk.org/api/people/317/?format=api", "name": "Van Haaren, Harry", "email": "harry.van.haaren@intel.com" }, "delegate": { "id": 310, "url": "https://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1504883894-43451-3-git-send-email-harry.van.haaren@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/28517/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/28517/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 01873199D3;\n\tFri, 8 Sep 2017 17:18:13 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 9F41927D\n\tfor <dev@dpdk.org>; Fri, 8 Sep 2017 17:18:09 +0200 (CEST)", "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t08 Sep 2017 08:18:08 -0700", "from silpixa00398672.ir.intel.com ([10.237.223.128])\n\tby orsmga005.jf.intel.com with ESMTP; 08 Sep 2017 08:18:08 -0700" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.42,362,1500966000\"; d=\"scan'208\";a=\"147035363\"", "From": "Harry van Haaren <harry.van.haaren@intel.com>", "To": "dev@dpdk.org", "Cc": "jerin.jacob@caviumnetworks.com,\n\tHarry van Haaren <harry.van.haaren@intel.com>", "Date": "Fri, 8 Sep 2017 16:18:12 +0100", "Message-Id": "<1504883894-43451-3-git-send-email-harry.van.haaren@intel.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1504883894-43451-1-git-send-email-harry.van.haaren@intel.com>", "References": "<1500900500-144237-1-git-send-email-harry.van.haaren@intel.com>\n\t<1504883894-43451-1-git-send-email-harry.van.haaren@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 2/4] eventdev: add dev attribute get function", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This commit adds a device attribute function, allowing flexible\nfetching of device attributes, like port count or queue count.\nThe unit tests and .map file are updated to the new function.\n\nSigned-off-by: Harry van Haaren <harry.van.haaren@intel.com>\n---\n lib/librte_eventdev/rte_eventdev.c | 24 ++++++++--\n lib/librte_eventdev/rte_eventdev.h | 28 ++++++++---\n lib/librte_eventdev/rte_eventdev_version.map | 2 +-\n test/test/test_eventdev.c | 36 +++++++++++---\n test/test/test_eventdev_octeontx.c | 72 ++++++++++++++++++++--------\n 5 files changed, 124 insertions(+), 38 deletions(-)", "diff": "diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c\nindex 6b867b3..177dc6b 100644\n--- a/lib/librte_eventdev/rte_eventdev.c\n+++ b/lib/librte_eventdev/rte_eventdev.c\n@@ -743,13 +743,27 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id,\n \treturn 0;\n }\n \n-uint8_t\n-rte_event_port_count(uint8_t dev_id)\n+int\n+rte_event_dev_attr_get(uint8_t dev_id, uint32_t attr_id,\n+\t\t uint32_t *attr_value /*out */)\n {\n \tstruct rte_eventdev *dev;\n \n+\tif(!attr_value)\n+\t\treturn -EINVAL;\n+\tRTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);\n \tdev = &rte_eventdevs[dev_id];\n-\treturn dev->data->nb_ports;\n+\n+\tswitch(attr_id) {\n+\tcase RTE_EVENT_DEV_ATTR_PORT_COUNT:\n+\t\t*attr_value = dev->data->nb_ports;\n+\t\tbreak;\n+\tcase RTE_EVENT_DEV_ATTR_QUEUE_COUNT:\n+\t\t*attr_value = dev->data->nb_queues;\n+\t\tbreak;\n+\t}\n+\n+\treturn 0;\n }\n \n int\n@@ -757,6 +771,10 @@ rte_event_port_attr_get(uint8_t dev_id, uint8_t port_id, uint32_t attr_id,\n \t\t\tuint32_t *attr_value /*out */)\n {\n \tstruct rte_eventdev *dev;\n+\n+\tif(!attr_value)\n+\t\treturn -EINVAL;\n+\n \tRTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);\n \tdev = &rte_eventdevs[dev_id];\n \tif (!is_valid_port(dev, port_id)) {\ndiff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h\nindex fadc209..e931eb2 100644\n--- a/lib/librte_eventdev/rte_eventdev.h\n+++ b/lib/librte_eventdev/rte_eventdev.h\n@@ -715,15 +715,29 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id,\n \t\t const struct rte_event_port_conf *port_conf);\n \n /**\n- * Get the number of ports on a specific event device\n+ * The count of ports.\n+ */\n+#define RTE_EVENT_DEV_ATTR_PORT_COUNT 0\n+/**\n+ * The count of queues.\n+ */\n+#define RTE_EVENT_DEV_ATTR_QUEUE_COUNT 1\n+\n+/**\n+ * Get an attribute from a device.\n *\n- * @param dev_id\n- * Event device identifier.\n- * @return\n- * - The number of configured ports\n+ * @param dev_id Eventdev id\n+ * @param attr_id The attribute ID to retrieve\n+ * @param[out] attr_value A pointer that will be filled in with the attribute\n+ * value if successful.\n+ *\n+ * @retval 0 Successfully retrieved attribute value\n+ * -EINVAL Invalid device or *attr_id* provided, or *attr_value*\n+ * is NULL\n */\n-uint8_t\n-rte_event_port_count(uint8_t dev_id);\n+int\n+rte_event_dev_attr_get(uint8_t dev_id, uint32_t attr_id,\n+\t\t uint32_t *attr_value /*out */);\n \n /**\n * The queue depth of the port on the enqueue side\ndiff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/rte_eventdev_version.map\nindex a0adde3..484a071 100644\n--- a/lib/librte_eventdev/rte_eventdev_version.map\n+++ b/lib/librte_eventdev/rte_eventdev_version.map\n@@ -21,7 +21,6 @@ DPDK_17.05 {\n \trte_event_port_setup;\n \trte_event_port_dequeue_depth;\n \trte_event_port_enqueue_depth;\n-\trte_event_port_count;\n \trte_event_port_link;\n \trte_event_port_unlink;\n \trte_event_port_links_get;\n@@ -55,6 +54,7 @@ DPDK_17.08 {\n EXPERIMENTAL {\n \tglobal:\n \n+\trte_event_dev_attr_get;\n \trte_event_port_attr_get;\n \n } DPDK_17.08;\ndiff --git a/test/test/test_eventdev.c b/test/test/test_eventdev.c\nindex f3ec470..a87b113 100644\n--- a/test/test/test_eventdev.c\n+++ b/test/test/test_eventdev.c\n@@ -386,11 +386,16 @@ test_eventdev_port_default_conf_get(void)\n \tret = rte_event_port_default_conf_get(TEST_DEV_ID, 0, NULL);\n \tTEST_ASSERT(ret == -EINVAL, \"Expected -EINVAL, %d\", ret);\n \n+\tuint32_t port_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&port_count), \"Port count get failed\");\n+\n \tret = rte_event_port_default_conf_get(TEST_DEV_ID,\n-\t\t\trte_event_port_count(TEST_DEV_ID) + 1, NULL);\n+\t\t\tport_count + 1, NULL);\n \tTEST_ASSERT(ret == -EINVAL, \"Expected -EINVAL, %d\", ret);\n \n-\tfor (i = 0; i < rte_event_port_count(TEST_DEV_ID); i++) {\n+\tfor (i = 0; i < (int)port_count; i++) {\n \t\tret = rte_event_port_default_conf_get(TEST_DEV_ID, i,\n \t\t\t\t\t\t\t&pconf);\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to get port%d info\", i);\n@@ -436,8 +441,12 @@ test_eventdev_port_setup(void)\n \tret = rte_event_port_setup(TEST_DEV_ID, 0, &pconf);\n \tTEST_ASSERT_SUCCESS(ret, \"Failed to setup port0\");\n \n+\tuint32_t port_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&port_count), \"Port count get failed\");\n \n-\tfor (i = 0; i < rte_event_port_count(TEST_DEV_ID); i++) {\n+\tfor (i = 0; i < (int)port_count; i++) {\n \t\tret = rte_event_port_setup(TEST_DEV_ID, i, NULL);\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to setup port%d\", i);\n \t}\n@@ -504,8 +513,11 @@ test_eventdev_port_count(void)\n \tret = rte_event_dev_info_get(TEST_DEV_ID, &info);\n \tTEST_ASSERT_SUCCESS(ret, \"Failed to get event dev info\");\n \n-\tTEST_ASSERT_EQUAL(rte_event_port_count(TEST_DEV_ID),\n-\t\t info.max_event_ports, \"Wrong port count\");\n+\tuint32_t port_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&port_count), \"Port count get failed\");\n+\tTEST_ASSERT_EQUAL(port_count, info.max_event_ports, \"Wrong port count\");\n \n \treturn TEST_SUCCESS;\n }\n@@ -537,7 +549,12 @@ test_eventdev_start_stop(void)\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to setup queue%d\", i);\n \t}\n \n-\tfor (i = 0; i < rte_event_port_count(TEST_DEV_ID); i++) {\n+\tuint32_t port_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&port_count), \"Port count get failed\");\n+\n+\tfor (i = 0; i < (int)port_count; i++) {\n \t\tret = rte_event_port_setup(TEST_DEV_ID, i, NULL);\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to setup port%d\", i);\n \t}\n@@ -567,7 +584,12 @@ eventdev_setup_device(void)\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to setup queue%d\", i);\n \t}\n \n-\tfor (i = 0; i < rte_event_port_count(TEST_DEV_ID); i++) {\n+\tuint32_t port_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&port_count), \"Port count get failed\");\n+\n+\tfor (i = 0; i < (int)port_count; i++) {\n \t\tret = rte_event_port_setup(TEST_DEV_ID, i, NULL);\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to setup port%d\", i);\n \t}\ndiff --git a/test/test/test_eventdev_octeontx.c b/test/test/test_eventdev_octeontx.c\nindex 774d030..dfe8611 100644\n--- a/test/test/test_eventdev_octeontx.c\n+++ b/test/test/test_eventdev_octeontx.c\n@@ -224,7 +224,11 @@ _eventdev_setup(int mode)\n \t\t}\n \t}\n \t/* Configure event ports */\n-\tfor (i = 0; i < rte_event_port_count(evdev); i++) {\n+\tuint32_t port_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&port_count), \"Port count get failed\");\n+\tfor (i = 0; i < (int)port_count; i++) {\n \t\tret = rte_event_port_setup(evdev, i, NULL);\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to setup port=%d\", i);\n \t\tret = rte_event_port_link(evdev, i, NULL, NULL, 0);\n@@ -651,18 +655,21 @@ static int\n test_multi_queue_enq_multi_port_deq(void)\n {\n \tconst unsigned int total_events = MAX_EVENTS;\n-\tuint8_t nr_ports;\n+\tuint32_t nr_ports;\n \tint ret;\n \n \tret = generate_random_events(total_events);\n \tif (ret)\n \t\treturn TEST_FAILED;\n \n-\tnr_ports = RTE_MIN(rte_event_port_count(evdev), rte_lcore_count() - 1);\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&nr_ports), \"Port count get failed\");\n+\tnr_ports = RTE_MIN(nr_ports, rte_lcore_count() - 1);\n \n \tif (!nr_ports) {\n \t\tprintf(\"%s: Not enough ports=%d or workers=%d\\n\", __func__,\n-\t\t\trte_event_port_count(evdev), rte_lcore_count() - 1);\n+\t\t\tnr_ports, rte_lcore_count() - 1);\n \t\treturn TEST_SUCCESS;\n \t}\n \n@@ -691,14 +698,18 @@ test_queue_to_port_single_link(void)\n {\n \tint i, nr_links, ret;\n \n+\tuint32_t port_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&port_count), \"Port count get failed\");\n+\n \t/* Unlink all connections that created in eventdev_setup */\n-\tfor (i = 0; i < rte_event_port_count(evdev); i++) {\n+\tfor (i = 0; i < (int)port_count; i++) {\n \t\tret = rte_event_port_unlink(evdev, i, NULL, 0);\n \t\tTEST_ASSERT(ret >= 0, \"Failed to unlink all queues port=%d\", i);\n \t}\n \n-\tnr_links = RTE_MIN(rte_event_port_count(evdev),\n-\t\t\t\trte_event_queue_count(evdev));\n+\tnr_links = RTE_MIN(port_count, rte_event_queue_count(evdev));\n \tconst unsigned int total_events = MAX_EVENTS / nr_links;\n \n \t/* Link queue x to port x and inject events to queue x through port x */\n@@ -750,10 +761,18 @@ static int\n test_queue_to_port_multi_link(void)\n {\n \tint ret, port0_events = 0, port1_events = 0;\n-\tuint8_t nr_queues, nr_ports, queue, port;\n+\tuint8_t queue, port;\n+\tuint32_t nr_queues = 0;\n+\tuint32_t nr_ports = 0;\n \n \tnr_queues = rte_event_queue_count(evdev);\n-\tnr_ports = rte_event_port_count(evdev);\n+\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_QUEUE_COUNT,\n+\t\t\t\t&nr_queues), \"Queue count get failed\");\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&nr_ports), \"Port count get failed\");\n \n \tif (nr_ports < 2) {\n \t\tprintf(\"%s: Not enough ports to test ports=%d\\n\",\n@@ -854,14 +873,17 @@ test_multiport_flow_sched_type_test(uint8_t in_sched_type,\n \t\t\tuint8_t out_sched_type)\n {\n \tconst unsigned int total_events = MAX_EVENTS;\n-\tuint8_t nr_ports;\n+\tuint32_t nr_ports;\n \tint ret;\n \n-\tnr_ports = RTE_MIN(rte_event_port_count(evdev), rte_lcore_count() - 1);\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&nr_ports), \"Port count get failed\");\n+\tnr_ports = RTE_MIN(nr_ports, rte_lcore_count() - 1);\n \n \tif (!nr_ports) {\n \t\tprintf(\"%s: Not enough ports=%d or workers=%d\\n\", __func__,\n-\t\t\trte_event_port_count(evdev), rte_lcore_count() - 1);\n+\t\t\tnr_ports, rte_lcore_count() - 1);\n \t\treturn TEST_SUCCESS;\n \t}\n \n@@ -1007,15 +1029,19 @@ test_multiport_queue_sched_type_test(uint8_t in_sched_type,\n \t\t\tuint8_t out_sched_type)\n {\n \tconst unsigned int total_events = MAX_EVENTS;\n-\tuint8_t nr_ports;\n+\tuint32_t nr_ports;\n \tint ret;\n \n-\tnr_ports = RTE_MIN(rte_event_port_count(evdev), rte_lcore_count() - 1);\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&nr_ports), \"Port count get failed\");\n+\n+\tnr_ports = RTE_MIN(nr_ports, rte_lcore_count() - 1);\n \n \tif (rte_event_queue_count(evdev) < 2 || !nr_ports) {\n \t\tprintf(\"%s: Not enough queues=%d ports=%d or workers=%d\\n\",\n \t\t\t __func__, rte_event_queue_count(evdev),\n-\t\t\trte_event_port_count(evdev), rte_lcore_count() - 1);\n+\t\t\tnr_ports, rte_lcore_count() - 1);\n \t\treturn TEST_SUCCESS;\n \t}\n \n@@ -1142,14 +1168,17 @@ worker_flow_based_pipeline_max_stages_rand_sched_type(void *arg)\n static int\n launch_multi_port_max_stages_random_sched_type(int (*fn)(void *))\n {\n-\tuint8_t nr_ports;\n+\tuint32_t nr_ports;\n \tint ret;\n \n-\tnr_ports = RTE_MIN(rte_event_port_count(evdev), rte_lcore_count() - 1);\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&nr_ports), \"Port count get failed\");\n+\tnr_ports = RTE_MIN(nr_ports, rte_lcore_count() - 1);\n \n \tif (!nr_ports) {\n \t\tprintf(\"%s: Not enough ports=%d or workers=%d\\n\", __func__,\n-\t\t\trte_event_port_count(evdev), rte_lcore_count() - 1);\n+\t\t\tnr_ports, rte_lcore_count() - 1);\n \t\treturn TEST_SUCCESS;\n \t}\n \n@@ -1288,9 +1317,12 @@ worker_ordered_flow_producer(void *arg)\n static inline int\n test_producer_consumer_ingress_order_test(int (*fn)(void *))\n {\n-\tuint8_t nr_ports;\n+\tuint32_t nr_ports;\n \n-\tnr_ports = RTE_MIN(rte_event_port_count(evdev), rte_lcore_count() - 1);\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t\tRTE_EVENT_DEV_ATTR_PORT_COUNT,\n+\t\t\t\t&nr_ports), \"Port count get failed\");\n+\tnr_ports = RTE_MIN(nr_ports, rte_lcore_count() - 1);\n \n \tif (rte_lcore_count() < 3 || nr_ports < 2) {\n \t\tprintf(\"### Not enough cores for %s test.\\n\", __func__);\n", "prefixes": [ "dpdk-dev", "v2", "2/4" ] }