Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 28747,
    "url": "https://patches.dpdk.org/api/patches/28747/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1505405343-18234-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": "<1505405343-18234-3-git-send-email-harry.van.haaren@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1505405343-18234-3-git-send-email-harry.van.haaren@intel.com",
    "date": "2017-09-14T16:09:01",
    "name": "[dpdk-dev,v4,2/4] eventdev: add dev attribute get function",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "ec8e09d7e3e863d48086eeca1663b67ace2a068d",
    "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/1505405343-18234-3-git-send-email-harry.van.haaren@intel.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/28747/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/28747/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 EF2E81AEF6;\n\tThu, 14 Sep 2017 18:08:54 +0200 (CEST)",
            "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby dpdk.org (Postfix) with ESMTP id 4E4B1199B3\n\tfor <dev@dpdk.org>; Thu, 14 Sep 2017 18:08:50 +0200 (CEST)",
            "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby orsmga105.jf.intel.com with ESMTP; 14 Sep 2017 09:08:49 -0700",
            "from silpixa00398672.ir.intel.com ([10.237.223.128])\n\tby fmsmga004.fm.intel.com with ESMTP; 14 Sep 2017 09:08:48 -0700"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.42,393,1500966000\"; d=\"scan'208\";a=\"311710632\"",
        "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": "Thu, 14 Sep 2017 17:09:01 +0100",
        "Message-Id": "<1505405343-18234-3-git-send-email-harry.van.haaren@intel.com>",
        "X-Mailer": "git-send-email 2.7.4",
        "In-Reply-To": "<1505405343-18234-1-git-send-email-harry.van.haaren@intel.com>",
        "References": "<1504885015-44642-1-git-send-email-harry.van.haaren@intel.com>\n\t<1505405343-18234-1-git-send-email-harry.van.haaren@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v4 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>\nAcked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>\n\n---\n\nv4: [feedback http://dpdk.org/dev/patchwork/patch/28521/ ]\n- Fixed default case comment (Jerin)\n- Removed /* out */ comment in .h and .c (Jerin)\n- Move function declaration in .h file to dev area (Jerin)\n- Fix inconsistent removal of queue_count() function (Harry)\n---\n lib/librte_eventdev/rte_eventdev.c           |  35 ++++---\n lib/librte_eventdev/rte_eventdev.h           |  37 ++++---\n lib/librte_eventdev/rte_eventdev_version.map |   3 +-\n test/test/test_eventdev.c                    | 110 ++++++++++++++++-----\n test/test/test_eventdev_octeontx.c           | 143 ++++++++++++++++++++-------\n 5 files changed, 241 insertions(+), 87 deletions(-)",
    "diff": "diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c\nindex 9eacc73..ea76444 100644\n--- a/lib/librte_eventdev/rte_eventdev.c\n+++ b/lib/librte_eventdev/rte_eventdev.c\n@@ -610,15 +610,6 @@ rte_event_queue_setup(uint8_t dev_id, uint8_t queue_id,\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@@ -743,13 +734,29 @@ 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)\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+\tdefault:\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n }\n \n int\n@@ -757,6 +764,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)\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 e1febfa..0f7f10a 100644\n--- a/lib/librte_eventdev/rte_eventdev.h\n+++ b/lib/librte_eventdev/rte_eventdev.h\n@@ -399,6 +399,32 @@ struct rte_event_dev_info {\n int\n rte_event_dev_info_get(uint8_t dev_id, struct rte_event_dev_info *dev_info);\n \n+/**\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 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+int\n+rte_event_dev_attr_get(uint8_t dev_id, uint32_t attr_id,\n+\t\t       uint32_t *attr_value);\n+\n+\n /* Event device configuration bitmap flags */\n #define RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT (1ULL << 0)\n /**< Override the global *dequeue_timeout_ns* and use per dequeue timeout in ns.\n@@ -715,17 +741,6 @@ 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- *\n- * @param dev_id\n- *   Event device identifier.\n- * @return\n- *   - The number of configured ports\n- */\n-uint8_t\n-rte_event_port_count(uint8_t dev_id);\n-\n-/**\n  * The queue depth of the port on the enqueue side\n  */\n #define RTE_EVENT_PORT_ATTR_ENQ_DEPTH 0\ndiff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/rte_eventdev_version.map\nindex 57d0b72..1353a6d 100644\n--- a/lib/librte_eventdev/rte_eventdev_version.map\n+++ b/lib/librte_eventdev/rte_eventdev_version.map\n@@ -19,14 +19,12 @@ DPDK_17.05 {\n \n \trte_event_port_default_conf_get;\n \trte_event_port_setup;\n-\trte_event_port_count;\n \trte_event_port_link;\n \trte_event_port_unlink;\n \trte_event_port_links_get;\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@@ -53,6 +51,7 @@ DPDK_17.08 {\n DPDK_17.11 {\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..0c612be 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,9 @@ 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+\tfor (i = 0; i < (int)queue_count; i++) {\n \t\tpriority =  rte_event_queue_priority(TEST_DEV_ID, i);\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@@ -386,11 +405,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 +460,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 +532,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@@ -532,19 +563,28 @@ 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 \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 \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@@ -562,19 +602,28 @@ 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 \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 \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@@ -599,7 +648,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@@ -622,7 +675,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@@ -636,7 +693,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@@ -645,7 +702,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@@ -657,7 +718,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@@ -687,8 +747,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 774d030..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,13 +223,17 @@ _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 \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@@ -335,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@@ -343,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@@ -482,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@@ -498,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@@ -518,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@@ -528,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@@ -651,18 +673,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 +716,23 @@ 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+\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@@ -750,10 +784,20 @@ 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+\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-\tnr_queues = rte_event_queue_count(evdev);\n-\tnr_ports = rte_event_port_count(evdev);\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 +898,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 +1054,23 @@ 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+\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\trte_event_port_count(evdev), 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@@ -1142,14 +1197,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@@ -1184,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@@ -1222,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@@ -1288,9 +1354,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",
        "v4",
        "2/4"
    ]
}