Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/128277/?format=api
{ "id": 128277, "url": "https://patches.dpdk.org/api/patches/128277/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230607074209.4798-4-haijie1@huawei.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": "<20230607074209.4798-4-haijie1@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230607074209.4798-4-haijie1@huawei.com", "date": "2023-06-07T07:41:58", "name": "[v2,03/13] ethdev: extract codes parsing port ID as a function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "a3520d57996b96b2eb2b785f4b9187a920ce2a03", "submitter": { "id": 2935, "url": "https://patches.dpdk.org/api/people/2935/?format=api", "name": "Jie Hai", "email": "haijie1@huawei.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230607074209.4798-4-haijie1@huawei.com/mbox/", "series": [ { "id": 28386, "url": "https://patches.dpdk.org/api/series/28386/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=28386", "date": "2023-06-07T07:41:55", "name": "support telemetry query ethdev info", "version": 2, "mbox": "https://patches.dpdk.org/series/28386/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/128277/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/128277/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 5358442C4A;\n\tWed, 7 Jun 2023 09:45:54 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 096A442D33;\n\tWed, 7 Jun 2023 09:45:32 +0200 (CEST)", "from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255])\n by mails.dpdk.org (Postfix) with ESMTP id 286F9427F2\n for <dev@dpdk.org>; Wed, 7 Jun 2023 09:45:27 +0200 (CEST)", "from kwepemi500020.china.huawei.com (unknown [172.30.72.53])\n by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4QbfQX0jpCz18Lyd;\n Wed, 7 Jun 2023 15:40:36 +0800 (CST)", "from localhost.localdomain (10.69.192.56) by\n kwepemi500020.china.huawei.com (7.221.188.8) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.1.2507.23; Wed, 7 Jun 2023 15:45:23 +0800" ], "From": "Jie Hai <haijie1@huawei.com>", "To": "Thomas Monjalon <thomas@monjalon.net>, Ferruh Yigit\n <ferruh.yigit@amd.com>, Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "CC": "<dev@dpdk.org>, <liudongdong3@huawei.com>", "Subject": "[PATCH v2 03/13] ethdev: extract codes parsing port ID as a function", "Date": "Wed, 7 Jun 2023 15:41:58 +0800", "Message-ID": "<20230607074209.4798-4-haijie1@huawei.com>", "X-Mailer": "git-send-email 2.33.0", "In-Reply-To": "<20230607074209.4798-1-haijie1@huawei.com>", "References": "<20230530090510.56812-1-haijie1@huawei.com>\n <20230607074209.4798-1-haijie1@huawei.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.69.192.56]", "X-ClientProxiedBy": "dggems704-chm.china.huawei.com (10.3.19.181) To\n kwepemi500020.china.huawei.com (7.221.188.8)", "X-CFilter-Loop": "Reflected", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "This patch extracts codes parsing port_id as a function.\nThe port id of 'int' or 'unsigned long' type passing as\n'uint16_t' may cause truncation, fix it.\n\nSigned-off-by: Jie Hai <haijie1@huawei.com>\n---\n lib/ethdev/rte_ethdev_telemetry.c | 95 ++++++++++++++++---------------\n lib/ethdev/sff_telemetry.c | 4 +-\n 2 files changed, 52 insertions(+), 47 deletions(-)", "diff": "diff --git a/lib/ethdev/rte_ethdev_telemetry.c b/lib/ethdev/rte_ethdev_telemetry.c\nindex ec8e48877187..5e70d0c2a66a 100644\n--- a/lib/ethdev/rte_ethdev_telemetry.c\n+++ b/lib/ethdev/rte_ethdev_telemetry.c\n@@ -11,6 +11,29 @@\n #include \"ethdev_driver.h\"\n #include \"sff_telemetry.h\"\n \n+static int\n+eth_dev_parse_port_params(const char *params __rte_unused, uint16_t *port_id,\n+\t\tchar **end_param, bool has_next)\n+{\n+\tuint64_t pi;\n+\n+\tif (params == NULL || strlen(params) == 0 ||\n+\t\t!isdigit(*params) || port_id == NULL)\n+\t\treturn -EINVAL;\n+\n+\tpi = strtoul(params, end_param, 0);\n+\tif (**end_param != '\\0' && !has_next)\n+\t\tRTE_ETHDEV_LOG(NOTICE,\n+\t\t\t\"Extra parameters passed to ethdev telemetry command, ignoring\\n\");\n+\n+\tif (pi >= UINT16_MAX || !rte_eth_dev_is_valid_port(pi))\n+\t\treturn -EINVAL;\n+\n+\t*port_id = pi;\n+\n+\treturn 0;\n+}\n+\n static int\n eth_dev_handle_port_list(const char *cmd __rte_unused,\n \t\tconst char *params __rte_unused,\n@@ -64,14 +87,13 @@ eth_dev_handle_port_stats(const char *cmd __rte_unused,\n \t\tstruct rte_tel_data *d)\n {\n \tstruct rte_eth_stats stats;\n-\tint port_id, ret;\n-\n-\tif (params == NULL || strlen(params) == 0 || !isdigit(*params))\n-\t\treturn -1;\n+\tuint16_t port_id;\n+\tchar *end_param;\n+\tint ret;\n \n-\tport_id = atoi(params);\n-\tif (!rte_eth_dev_is_valid_port(port_id))\n-\t\treturn -1;\n+\tret = eth_dev_parse_port_params(params, &port_id, &end_param, false);\n+\tif (ret < 0)\n+\t\treturn ret;\n \n \tret = rte_eth_stats_get(port_id, &stats);\n \tif (ret < 0)\n@@ -104,17 +126,15 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused,\n \tstruct rte_eth_xstat *eth_xstats;\n \tstruct rte_eth_xstat_name *xstat_names;\n \tstruct rte_kvargs *kvlist;\n-\tint port_id, num_xstats;\n \tbool hide_zero = false;\n+\tuint16_t port_id;\n \tchar *end_param;\n+\tint num_xstats;\n \tint i, ret;\n \n-\tif (params == NULL || strlen(params) == 0 || !isdigit(*params))\n-\t\treturn -1;\n-\n-\tport_id = strtoul(params, &end_param, 0);\n-\tif (!rte_eth_dev_is_valid_port(port_id))\n-\t\treturn -1;\n+\tret = eth_dev_parse_port_params(params, &port_id, &end_param, true);\n+\tif (ret < 0)\n+\t\treturn ret;\n \n \tif (*end_param != '\\0') {\n \t\tkvlist = rte_kvargs_parse(end_param, valid_keys);\n@@ -166,18 +186,13 @@ eth_dev_handle_port_dump_priv(const char *cmd __rte_unused,\n \t\t\tstruct rte_tel_data *d)\n {\n \tchar *buf, *end_param;\n-\tint port_id, ret;\n+\tuint16_t port_id;\n+\tint ret;\n \tFILE *f;\n \n-\tif (params == NULL || strlen(params) == 0 || !isdigit(*params))\n-\t\treturn -EINVAL;\n-\n-\tport_id = strtoul(params, &end_param, 0);\n-\tif (*end_param != '\\0')\n-\t\tRTE_ETHDEV_LOG(NOTICE,\n-\t\t\t\"Extra parameters passed to ethdev telemetry command, ignoring\");\n-\tif (!rte_eth_dev_is_valid_port(port_id))\n-\t\treturn -EINVAL;\n+\tret = eth_dev_parse_port_params(params, &port_id, &end_param, false);\n+\tif (ret < 0)\n+\t\treturn ret;\n \n \tbuf = calloc(RTE_TEL_MAX_SINGLE_STRING_LEN, sizeof(char));\n \tif (buf == NULL)\n@@ -207,19 +222,14 @@ eth_dev_handle_port_link_status(const char *cmd __rte_unused,\n \t\tstruct rte_tel_data *d)\n {\n \tstatic const char *status_str = \"status\";\n-\tint ret, port_id;\n \tstruct rte_eth_link link;\n+\tuint16_t port_id;\n \tchar *end_param;\n+\tint ret;\n \n-\tif (params == NULL || strlen(params) == 0 || !isdigit(*params))\n-\t\treturn -1;\n-\n-\tport_id = strtoul(params, &end_param, 0);\n-\tif (*end_param != '\\0')\n-\t\tRTE_ETHDEV_LOG(NOTICE,\n-\t\t\t\"Extra parameters passed to ethdev telemetry command, ignoring\");\n-\tif (!rte_eth_dev_is_valid_port(port_id))\n-\t\treturn -1;\n+\tret = eth_dev_parse_port_params(params, &port_id, &end_param, false);\n+\tif (ret < 0)\n+\t\treturn ret;\n \n \tret = rte_eth_link_get_nowait(port_id, &link);\n \tif (ret < 0)\n@@ -246,19 +256,14 @@ eth_dev_handle_port_info(const char *cmd __rte_unused,\n \tstruct rte_tel_data *rxq_state, *txq_state;\n \tchar mac_addr[RTE_ETHER_ADDR_FMT_SIZE];\n \tstruct rte_eth_dev *eth_dev;\n+\tuint16_t port_id;\n \tchar *end_param;\n-\tint port_id, i;\n-\n-\tif (params == NULL || strlen(params) == 0 || !isdigit(*params))\n-\t\treturn -1;\n+\tint ret;\n+\tint i;\n \n-\tport_id = strtoul(params, &end_param, 0);\n-\tif (*end_param != '\\0')\n-\t\tRTE_ETHDEV_LOG(NOTICE,\n-\t\t\t\"Extra parameters passed to ethdev telemetry command, ignoring\");\n-\n-\tif (!rte_eth_dev_is_valid_port(port_id))\n-\t\treturn -EINVAL;\n+\tret = eth_dev_parse_port_params(params, &port_id, &end_param, false);\n+\tif (ret < 0)\n+\t\treturn ret;\n \n \teth_dev = &rte_eth_devices[port_id];\n \ndiff --git a/lib/ethdev/sff_telemetry.c b/lib/ethdev/sff_telemetry.c\nindex 5923350424c0..f29e7fa882ac 100644\n--- a/lib/ethdev/sff_telemetry.c\n+++ b/lib/ethdev/sff_telemetry.c\n@@ -126,7 +126,7 @@ eth_dev_handle_port_module_eeprom(const char *cmd __rte_unused, const char *para\n \t\t\t\t struct rte_tel_data *d)\n {\n \tchar *end_param;\n-\tint port_id;\n+\tuint64_t port_id;\n \n \tif (params == NULL || strlen(params) == 0 || !isdigit(*params))\n \t\treturn -1;\n@@ -134,7 +134,7 @@ eth_dev_handle_port_module_eeprom(const char *cmd __rte_unused, const char *para\n \terrno = 0;\n \tport_id = strtoul(params, &end_param, 0);\n \n-\tif (errno != 0) {\n+\tif (errno != 0 || port_id >= UINT16_MAX) {\n \t\tRTE_ETHDEV_LOG(ERR, \"Invalid argument, %d\\n\", errno);\n \t\treturn -1;\n \t}\n", "prefixes": [ "v2", "03/13" ] }