Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/28522/?format=api
{ "id": 28522, "url": "https://patches.dpdk.org/api/patches/28522/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1504885015-44642-4-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": "<1504885015-44642-4-git-send-email-harry.van.haaren@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1504885015-44642-4-git-send-email-harry.van.haaren@intel.com", "date": "2017-09-08T15:36:54", "name": "[dpdk-dev,v3,3/4] eventdev: add queue attribute function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "020449037f3c84c732b8188f7f2119b21bfdd3f0", "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/1504885015-44642-4-git-send-email-harry.van.haaren@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/28522/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/28522/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 26BDC1A8B2;\n\tFri, 8 Sep 2017 17:36:59 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 2E6BD199D6\n\tfor <dev@dpdk.org>; Fri, 8 Sep 2017 17:36:56 +0200 (CEST)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t08 Sep 2017 08:36:55 -0700", "from silpixa00398672.ir.intel.com ([10.237.223.128])\n\tby orsmga003.jf.intel.com with ESMTP; 08 Sep 2017 08:36:54 -0700" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos; i=\"5.42,362,1500966000\"; d=\"scan'208\";\n\ta=\"1012426032\"", "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:36:54 +0100", "Message-Id": "<1504885015-44642-4-git-send-email-harry.van.haaren@intel.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1504885015-44642-1-git-send-email-harry.van.haaren@intel.com>", "References": "<1504883894-43451-1-git-send-email-harry.van.haaren@intel.com>\n\t<1504885015-44642-1-git-send-email-harry.van.haaren@intel.com>", "Subject": "[dpdk-dev] [PATCH v3 3/4] eventdev: add queue attribute 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 generic queue attribute function. It also removes\nthe previous rte_event_queue_priority() and priority() functions, and\nupdates the map files and unit tests to use the new attr functions.\n\nSigned-off-by: Harry van Haaren <harry.van.haaren@intel.com>\n---\n lib/librte_eventdev/rte_eventdev.c | 47 ++++++++--------\n lib/librte_eventdev/rte_eventdev.h | 49 ++++++++---------\n lib/librte_eventdev/rte_eventdev_version.map | 3 +-\n test/test/test_eventdev.c | 80 +++++++++++++++++++++-------\n test/test/test_eventdev_octeontx.c | 75 +++++++++++++++++++-------\n 5 files changed, 166 insertions(+), 88 deletions(-)", "diff": "diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c\nindex 4b1c0be..3756ec7 100644\n--- a/lib/librte_eventdev/rte_eventdev.c\n+++ b/lib/librte_eventdev/rte_eventdev.c\n@@ -609,27 +609,6 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id,\n \treturn (*dev->dev_ops->queue_setup)(dev, queue_id, queue_conf);\n }\n \n-uint8_t\n-rte_event_queue_count(uint8_t dev_id)\n-{\n-\tstruct rte_eventdev *dev;\n-\n-\tdev = &rte_eventdevs[dev_id];\n-\treturn dev->data->nb_queues;\n-}\n-\n-uint8_t\n-rte_event_queue_priority(uint8_t dev_id, uint8_t queue_id)\n-{\n-\tstruct rte_eventdev *dev;\n-\n-\tdev = &rte_eventdevs[dev_id];\n-\tif (dev->data->event_dev_cap & RTE_EVENT_DEV_CAP_QUEUE_QOS)\n-\t\treturn dev->data->queues_prio[queue_id];\n-\telse\n-\t\treturn RTE_EVENT_DEV_PRIORITY_NORMAL;\n-}\n-\n static inline int\n is_valid_port(struct rte_eventdev *dev, uint8_t port_id)\n {\n@@ -794,6 +773,32 @@ rte_event_port_attr_get(uint8_t dev_id, uint8_t port_id, uint32_t attr_id,\n }\n \n int\n+rte_event_queue_attr_get(uint8_t dev_id, uint8_t queue_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_queue(dev, queue_id)) {\n+\t\tRTE_EDEV_LOG_ERR(\"Invalid queue_id=%\" PRIu8, queue_id);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tswitch (attr_id) {\n+\tcase RTE_EVENT_QUEUE_ATTR_PRIORITY:\n+\t\t*attr_value = RTE_EVENT_DEV_PRIORITY_NORMAL;\n+\t\tif (dev->data->event_dev_cap & RTE_EVENT_DEV_CAP_QUEUE_QOS)\n+\t\t\t*attr_value = dev->data->queues_prio[queue_id];\n+\t\tbreak;\n+\t};\n+\treturn 0;\n+}\n+\n+int\n rte_event_port_link(uint8_t dev_id, uint8_t port_id,\n \t\t const uint8_t queues[], const uint8_t priorities[],\n \t\t uint16_t nb_links)\ndiff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h\nindex e931eb2..cd3026d 100644\n--- a/lib/librte_eventdev/rte_eventdev.h\n+++ b/lib/librte_eventdev/rte_eventdev.h\n@@ -606,33 +606,6 @@ int\n rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id,\n \t\t const struct rte_event_queue_conf *queue_conf);\n \n-/**\n- * Get the number of event queues on a specific event device\n- *\n- * @param dev_id\n- * Event device identifier.\n- * @return\n- * - The number of configured event queues\n- */\n-uint8_t\n-rte_event_queue_count(uint8_t dev_id);\n-\n-/**\n- * Get the priority of the event queue on a specific event device\n- *\n- * @param dev_id\n- * Event device identifier.\n- * @param queue_id\n- * Event queue identifier.\n- * @return\n- * - If the device has RTE_EVENT_DEV_CAP_QUEUE_QOS capability then the\n- * configured priority of the event queue in\n- * [RTE_EVENT_DEV_PRIORITY_HIGHEST, RTE_EVENT_DEV_PRIORITY_LOWEST] range\n- * else the value RTE_EVENT_DEV_PRIORITY_NORMAL\n- */\n-uint8_t\n-rte_event_queue_priority(uint8_t dev_id, uint8_t queue_id);\n-\n /* Event port specific APIs */\n \n /** Event port configuration structure */\n@@ -765,6 +738,28 @@ 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 /**\n+ * The priority of the queue.\n+ */\n+#define RTE_EVENT_QUEUE_ATTR_PRIORITY 0\n+\n+/**\n+ * Get an attribute from a queue.\n+ *\n+ * @param dev_id Eventdev id\n+ * @param queue_id Eventdev queue 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 returned value\n+ * -EINVAL invalid device, queue or attr_id provided, or attr_value\n+ * was NULL\n+ */\n+int\n+rte_event_queue_attr_get(uint8_t dev_id, uint8_t queue_id, uint32_t attr_id,\n+\t\t\tuint32_t *attr_value /*out */);\n+\n+/**\n * Start an event device.\n *\n * The device start step is the last one and consists of setting the event\ndiff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/rte_eventdev_version.map\nindex 484a071..c3854f4 100644\n--- a/lib/librte_eventdev/rte_eventdev_version.map\n+++ b/lib/librte_eventdev/rte_eventdev_version.map\n@@ -27,8 +27,6 @@ DPDK_17.05 {\n \n \trte_event_queue_default_conf_get;\n \trte_event_queue_setup;\n-\trte_event_queue_count;\n-\trte_event_queue_priority;\n \n \trte_event_dequeue_timeout_ticks;\n \n@@ -56,5 +54,6 @@ EXPERIMENTAL {\n \n \trte_event_dev_attr_get;\n \trte_event_port_attr_get;\n+\trte_event_queue_attr_get;\n \n } DPDK_17.08;\ndiff --git a/test/test/test_eventdev.c b/test/test/test_eventdev.c\nindex a87b113..9b738e0 100644\n--- a/test/test/test_eventdev.c\n+++ b/test/test/test_eventdev.c\n@@ -273,7 +273,12 @@ test_eventdev_queue_default_conf_get(void)\n \tret = rte_event_queue_default_conf_get(TEST_DEV_ID, 0, NULL);\n \tTEST_ASSERT(ret == -EINVAL, \"Expected -EINVAL, %d\", ret);\n \n-\tfor (i = 0; i < rte_event_queue_count(TEST_DEV_ID); i++) {\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),\n+\t\t\t \"Queue count get failed\");\n+\n+\tfor (i = 0; i < (int)queue_count; i++) {\n \t\tret = rte_event_queue_default_conf_get(TEST_DEV_ID, i,\n \t\t\t\t\t\t &qconf);\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to get queue%d info\", i);\n@@ -318,8 +323,12 @@ test_eventdev_queue_setup(void)\n \tret = rte_event_queue_setup(TEST_DEV_ID, 0, &qconf);\n \tTEST_ASSERT_SUCCESS(ret, \"Failed to setup queue0\");\n \n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),\n+\t\t\t \"Queue count get failed\");\n \n-\tfor (i = 0; i < rte_event_queue_count(TEST_DEV_ID); i++) {\n+\tfor (i = 0; i < (int)queue_count; i++) {\n \t\tret = rte_event_queue_setup(TEST_DEV_ID, i, NULL);\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to setup queue%d\", i);\n \t}\n@@ -336,8 +345,12 @@ test_eventdev_queue_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_queue_count(TEST_DEV_ID),\n-\t\t info.max_event_queues, \"Wrong queue count\");\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),\n+\t\t\t \"Queue count get failed\");\n+\tTEST_ASSERT_EQUAL(queue_count, info.max_event_queues,\n+\t\t\t \"Wrong queue count\");\n \n \treturn TEST_SUCCESS;\n }\n@@ -353,7 +366,12 @@ test_eventdev_queue_priority(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-\tfor (i = 0; i < rte_event_queue_count(TEST_DEV_ID); i++) {\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),\n+\t\t\t \"Queue count get failed\");\n+\n+\tfor (i = 0; i < (int)queue_count; i++) {\n \t\tret = rte_event_queue_default_conf_get(TEST_DEV_ID, i,\n \t\t\t\t\t&qconf);\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to get queue%d def conf\", i);\n@@ -362,8 +380,13 @@ test_eventdev_queue_priority(void)\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to setup queue%d\", i);\n \t}\n \n-\tfor (i = 0; i < rte_event_queue_count(TEST_DEV_ID); i++) {\n-\t\tpriority = rte_event_queue_priority(TEST_DEV_ID, i);\n+\tfor (i = 0; i < (int)queue_count; i++) {\n+\t\tuint32_t tmp;\n+\t\tTEST_ASSERT_SUCCESS(rte_event_queue_attr_get(TEST_DEV_ID, i,\n+\t\t\t\t RTE_EVENT_QUEUE_ATTR_PRIORITY, &tmp),\n+\t\t\t\t \"Queue count get failed\");\n+\t\tpriority = tmp;\n+\n \t\tif (info.event_dev_cap & RTE_EVENT_DEV_CAP_QUEUE_QOS)\n \t\t\tTEST_ASSERT_EQUAL(priority,\n \t\t\t i % RTE_EVENT_DEV_PRIORITY_LOWEST,\n@@ -544,7 +567,11 @@ test_eventdev_start_stop(void)\n \tret = eventdev_configure_setup();\n \tTEST_ASSERT_SUCCESS(ret, \"Failed to configure eventdev\");\n \n-\tfor (i = 0; i < rte_event_queue_count(TEST_DEV_ID); i++) {\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),\n+\t\t\t \"Queue count get failed\");\n+\tfor (i = 0; i < (int)queue_count; i++) {\n \t\tret = rte_event_queue_setup(TEST_DEV_ID, i, NULL);\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to setup queue%d\", i);\n \t}\n@@ -560,8 +587,8 @@ test_eventdev_start_stop(void)\n \t}\n \n \tret = rte_event_port_link(TEST_DEV_ID, 0, NULL, NULL, 0);\n-\tTEST_ASSERT(ret == rte_event_queue_count(TEST_DEV_ID),\n-\t\t\t\"Failed to link port, device %d\", TEST_DEV_ID);\n+\tTEST_ASSERT(ret == (int)queue_count, \"Failed to link port, device %d\",\n+\t\t TEST_DEV_ID);\n \n \tret = rte_event_dev_start(TEST_DEV_ID);\n \tTEST_ASSERT_SUCCESS(ret, \"Failed to start device%d\", TEST_DEV_ID);\n@@ -579,7 +606,11 @@ eventdev_setup_device(void)\n \tret = eventdev_configure_setup();\n \tTEST_ASSERT_SUCCESS(ret, \"Failed to configure eventdev\");\n \n-\tfor (i = 0; i < rte_event_queue_count(TEST_DEV_ID); i++) {\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),\n+\t\t\t \"Queue count get failed\");\n+\tfor (i = 0; i < (int)queue_count; i++) {\n \t\tret = rte_event_queue_setup(TEST_DEV_ID, i, NULL);\n \t\tTEST_ASSERT_SUCCESS(ret, \"Failed to setup queue%d\", i);\n \t}\n@@ -595,8 +626,8 @@ eventdev_setup_device(void)\n \t}\n \n \tret = rte_event_port_link(TEST_DEV_ID, 0, NULL, NULL, 0);\n-\tTEST_ASSERT(ret == rte_event_queue_count(TEST_DEV_ID),\n-\t\t\t\"Failed to link port, device %d\", TEST_DEV_ID);\n+\tTEST_ASSERT(ret == (int)queue_count, \"Failed to link port, device %d\",\n+\t\t TEST_DEV_ID);\n \n \tret = rte_event_dev_start(TEST_DEV_ID);\n \tTEST_ASSERT_SUCCESS(ret, \"Failed to start device%d\", TEST_DEV_ID);\n@@ -621,7 +652,11 @@ test_eventdev_link(void)\n \tTEST_ASSERT(ret >= 0, \"Failed to link with NULL device%d\",\n \t\t\t\t TEST_DEV_ID);\n \n-\tnb_queues = rte_event_queue_count(TEST_DEV_ID);\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),\n+\t\t\t \"Queue count get failed\");\n+\tnb_queues = queue_count;\n \tfor (i = 0; i < nb_queues; i++) {\n \t\tqueues[i] = i;\n \t\tpriorities[i] = RTE_EVENT_DEV_PRIORITY_NORMAL;\n@@ -644,7 +679,11 @@ test_eventdev_unlink(void)\n \tTEST_ASSERT(ret >= 0, \"Failed to unlink with NULL device%d\",\n \t\t\t\t TEST_DEV_ID);\n \n-\tnb_queues = rte_event_queue_count(TEST_DEV_ID);\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),\n+\t\t\t \"Queue count get failed\");\n+\tnb_queues = queue_count;\n \tfor (i = 0; i < nb_queues; i++)\n \t\tqueues[i] = i;\n \n@@ -658,7 +697,7 @@ test_eventdev_unlink(void)\n static int\n test_eventdev_link_get(void)\n {\n-\tint ret, nb_queues, i;\n+\tint ret, i;\n \tuint8_t queues[RTE_EVENT_MAX_QUEUES_PER_DEV];\n \tuint8_t priorities[RTE_EVENT_MAX_QUEUES_PER_DEV];\n \n@@ -667,7 +706,11 @@ test_eventdev_link_get(void)\n \tTEST_ASSERT(ret >= 0, \"Failed to link with NULL device%d\",\n \t\t\t\t TEST_DEV_ID);\n \n-\tnb_queues = rte_event_queue_count(TEST_DEV_ID);\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(TEST_DEV_ID,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),\n+\t\t\t \"Queue count get failed\");\n+\tconst int nb_queues = queue_count;\n \tfor (i = 0; i < nb_queues; i++)\n \t\tqueues[i] = i;\n \n@@ -679,7 +722,6 @@ test_eventdev_link_get(void)\n \tTEST_ASSERT(ret == 0, \"(%d)Wrong link get=%d\", TEST_DEV_ID, ret);\n \n \t/* link all queues and get the links */\n-\tnb_queues = rte_event_queue_count(TEST_DEV_ID);\n \tfor (i = 0; i < nb_queues; i++) {\n \t\tqueues[i] = i;\n \t\tpriorities[i] = RTE_EVENT_DEV_PRIORITY_NORMAL;\n@@ -709,8 +751,8 @@ test_eventdev_link_get(void)\n \tret = rte_event_port_unlink(TEST_DEV_ID, 0, NULL, 0);\n \tTEST_ASSERT(ret == nb_queues, \"Failed to unlink(device%d) ret=%d\",\n \t\t\t\t TEST_DEV_ID, ret);\n+\n \t/* 4links and 2 unlinks */\n-\tnb_queues = rte_event_queue_count(TEST_DEV_ID);\n \tif (nb_queues >= 4) {\n \t\tfor (i = 0; i < 4; i++) {\n \t\t\tqueues[i] = i;\ndiff --git a/test/test/test_eventdev_octeontx.c b/test/test/test_eventdev_octeontx.c\nindex dfe8611..b88b0d2 100644\n--- a/test/test/test_eventdev_octeontx.c\n+++ b/test/test/test_eventdev_octeontx.c\n@@ -193,8 +193,13 @@ _eventdev_setup(int mode)\n \tret = rte_event_dev_configure(evdev, &dev_conf);\n \tTEST_ASSERT_SUCCESS(ret, \"Failed to configure eventdev\");\n \n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT,\n+\t\t\t &queue_count), \"Queue count get failed\");\n+\n \tif (mode == TEST_EVENTDEV_SETUP_PRIORITY) {\n-\t\tif (rte_event_queue_count(evdev) > 8) {\n+\t\tif (queue_count > 8) {\n \t\t\tprintf(\"test expects the unique priority per queue\\n\");\n \t\t\treturn -ENOTSUP;\n \t\t}\n@@ -204,8 +209,8 @@ _eventdev_setup(int mode)\n \t\t * RTE_EVENT_DEV_PRIORITY_LOWEST\n \t\t */\n \t\tuint8_t step = (RTE_EVENT_DEV_PRIORITY_LOWEST + 1) /\n-\t\t\t\trte_event_queue_count(evdev);\n-\t\tfor (i = 0; i < rte_event_queue_count(evdev); i++) {\n+\t\t\t\tqueue_count;\n+\t\tfor (i = 0; i < (int)queue_count; i++) {\n \t\t\tstruct rte_event_queue_conf queue_conf;\n \n \t\t\tret = rte_event_queue_default_conf_get(evdev, i,\n@@ -218,7 +223,7 @@ _eventdev_setup(int mode)\n \n \t} else {\n \t\t/* Configure event queues with default priority */\n-\t\tfor (i = 0; i < rte_event_queue_count(evdev); i++) {\n+\t\tfor (i = 0; i < (int)queue_count; i++) {\n \t\t\tret = rte_event_queue_setup(evdev, i, NULL);\n \t\t\tTEST_ASSERT_SUCCESS(ret, \"Failed to setup queue=%d\", i);\n \t\t}\n@@ -339,6 +344,11 @@ generate_random_events(const unsigned int total_events)\n \tunsigned int i;\n \tint ret;\n \n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT,\n+\t\t\t &queue_count), \"Queue count get failed\");\n+\n \tret = rte_event_dev_info_get(evdev, &info);\n \tTEST_ASSERT_SUCCESS(ret, \"Failed to get event dev info\");\n \tfor (i = 0; i < total_events; i++) {\n@@ -347,7 +357,7 @@ generate_random_events(const unsigned int total_events)\n \t\t\trte_rand() % (RTE_EVENT_TYPE_CPU + 1) /* event_type */,\n \t\t\trte_rand() % 256 /* sub_event_type */,\n \t\t\trte_rand() % (RTE_SCHED_TYPE_PARALLEL + 1),\n-\t\t\trte_rand() % rte_event_queue_count(evdev) /* queue */,\n+\t\t\trte_rand() % queue_count /* queue */,\n \t\t\t0 /* port */,\n \t\t\t1 /* events */);\n \t\tif (ret)\n@@ -486,7 +496,7 @@ test_multi_queue_enq_single_port_deq(void)\n }\n \n /*\n- * Inject 0..MAX_EVENTS events over 0..rte_event_queue_count() with modulus\n+ * Inject 0..MAX_EVENTS events over 0..queue_count with modulus\n * operation\n *\n * For example, Inject 32 events over 0..7 queues\n@@ -502,15 +512,19 @@ test_multi_queue_enq_single_port_deq(void)\n static int\n validate_queue_priority(uint32_t index, uint8_t port, struct rte_event *ev)\n {\n-\tuint32_t range = MAX_EVENTS / rte_event_queue_count(evdev);\n-\tuint32_t expected_val = (index % range) * rte_event_queue_count(evdev);\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT,\n+\t\t\t &queue_count), \"Queue count get failed\");\n+\tuint32_t range = MAX_EVENTS / queue_count;\n+\tuint32_t expected_val = (index % range) * queue_count;\n \n \texpected_val += ev->queue_id;\n \tRTE_SET_USED(port);\n \tTEST_ASSERT_EQUAL(ev->mbuf->seqn, expected_val,\n \t\"seqn=%d index=%d expected=%d range=%d nb_queues=%d max_event=%d\",\n \t\t\tev->mbuf->seqn, index, expected_val, range,\n-\t\t\trte_event_queue_count(evdev), MAX_EVENTS);\n+\t\t\tqueue_count, MAX_EVENTS);\n \treturn 0;\n }\n \n@@ -522,8 +536,12 @@ test_multi_queue_priority(void)\n \tint i, max_evts_roundoff;\n \n \t/* See validate_queue_priority() comments for priority validate logic */\n-\tmax_evts_roundoff = MAX_EVENTS / rte_event_queue_count(evdev);\n-\tmax_evts_roundoff *= rte_event_queue_count(evdev);\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT,\n+\t\t\t &queue_count), \"Queue count get failed\");\n+\tmax_evts_roundoff = MAX_EVENTS / queue_count;\n+\tmax_evts_roundoff *= queue_count;\n \n \tfor (i = 0; i < max_evts_roundoff; i++) {\n \t\tstruct rte_event ev = {.event = 0, .u64 = 0};\n@@ -532,7 +550,7 @@ test_multi_queue_priority(void)\n \t\tTEST_ASSERT_NOT_NULL(m, \"mempool alloc failed\");\n \n \t\tm->seqn = i;\n-\t\tqueue = i % rte_event_queue_count(evdev);\n+\t\tqueue = i % queue_count;\n \t\tupdate_event_and_validation_attr(m, &ev, 0, RTE_EVENT_TYPE_CPU,\n \t\t\t0, RTE_SCHED_TYPE_PARALLEL, queue, 0);\n \t\trte_event_enqueue_burst(evdev, 0, &ev, 1);\n@@ -709,7 +727,12 @@ test_queue_to_port_single_link(void)\n \t\tTEST_ASSERT(ret >= 0, \"Failed to unlink all queues port=%d\", i);\n \t}\n \n-\tnr_links = RTE_MIN(port_count, rte_event_queue_count(evdev));\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT,\n+\t\t\t &queue_count), \"Queue count get failed\");\n+\n+\tnr_links = RTE_MIN(port_count, queue_count);\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@@ -765,7 +788,9 @@ test_queue_to_port_multi_link(void)\n \tuint32_t nr_queues = 0;\n \tuint32_t nr_ports = 0;\n \n-\tnr_queues = rte_event_queue_count(evdev);\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT,\n+\t\t\t &nr_queues), \"Queue count get failed\");\n \n \tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n \t\t\t\tRTE_EVENT_DEV_ATTR_QUEUE_COUNT,\n@@ -1038,10 +1063,14 @@ test_multiport_queue_sched_type_test(uint8_t in_sched_type,\n \n \tnr_ports = RTE_MIN(nr_ports, rte_lcore_count() - 1);\n \n-\tif (rte_event_queue_count(evdev) < 2 || !nr_ports) {\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT,\n+\t\t\t &queue_count), \"Queue count get failed\");\n+\tif (queue_count < 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\tnr_ports, rte_lcore_count() - 1);\n+\t\t\t __func__, queue_count, nr_ports,\n+\t\t\t rte_lcore_count() - 1);\n \t\treturn TEST_SUCCESS;\n \t}\n \n@@ -1213,7 +1242,11 @@ worker_queue_based_pipeline_max_stages_rand_sched_type(void *arg)\n \tstruct rte_event ev;\n \tuint16_t valid_event;\n \tuint8_t port = param->port;\n-\tuint8_t nr_queues = rte_event_queue_count(evdev);\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT,\n+\t\t\t &queue_count), \"Queue count get failed\");\n+\tuint8_t nr_queues = queue_count;\n \trte_atomic32_t *total_events = param->total_events;\n \n \twhile (rte_atomic32_read(total_events) > 0) {\n@@ -1251,7 +1284,11 @@ worker_mixed_pipeline_max_stages_rand_sched_type(void *arg)\n \tstruct rte_event ev;\n \tuint16_t valid_event;\n \tuint8_t port = param->port;\n-\tuint8_t nr_queues = rte_event_queue_count(evdev);\n+\tuint32_t queue_count;\n+\tTEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,\n+\t\t\t RTE_EVENT_DEV_ATTR_QUEUE_COUNT,\n+\t\t\t &queue_count), \"Queue count get failed\");\n+\tuint8_t nr_queues = queue_count;\n \trte_atomic32_t *total_events = param->total_events;\n \n \twhile (rte_atomic32_read(total_events) > 0) {\n", "prefixes": [ "dpdk-dev", "v3", "3/4" ] }