Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/127698/?format=api
{ "id": 127698, "url": "http://patchwork.dpdk.org/api/patches/127698/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230530090510.56812-11-haijie1@huawei.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20230530090510.56812-11-haijie1@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230530090510.56812-11-haijie1@huawei.com", "date": "2023-05-30T09:05:10", "name": "[10/10] ethdev: support telemetry query VLAN info", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "2f5459efe847c4e8804ebe36e4921e617dd5ae02", "submitter": { "id": 2935, "url": "http://patchwork.dpdk.org/api/people/2935/?format=api", "name": "Jie Hai", "email": "haijie1@huawei.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230530090510.56812-11-haijie1@huawei.com/mbox/", "series": [ { "id": 28245, "url": "http://patchwork.dpdk.org/api/series/28245/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=28245", "date": "2023-05-30T09:05:00", "name": "support telemetry query ethdev info", "version": 1, "mbox": "http://patchwork.dpdk.org/series/28245/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/127698/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/127698/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 2EE7242BE1;\n\tTue, 30 May 2023 11:08:39 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3118F42D5A;\n\tTue, 30 May 2023 11:07:52 +0200 (CEST)", "from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])\n by mails.dpdk.org (Postfix) with ESMTP id 1D94A42D36\n for <dev@dpdk.org>; Tue, 30 May 2023 11:07:45 +0200 (CEST)", "from kwepemi500020.china.huawei.com (unknown [172.30.72.54])\n by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QVmdQ0ZhWzqTRC;\n Tue, 30 May 2023 17:03:06 +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; Tue, 30 May 2023 17:07:43 +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 10/10] ethdev: support telemetry query VLAN info", "Date": "Tue, 30 May 2023 17:05:10 +0800", "Message-ID": "<20230530090510.56812-11-haijie1@huawei.com>", "X-Mailer": "git-send-email 2.33.0", "In-Reply-To": "<20230530090510.56812-1-haijie1@huawei.com>", "References": "<20230530090510.56812-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": "dggems705-chm.china.huawei.com (10.3.19.182) 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 supports querying VLAN information by telemetry.\nThe command is like:\n--> /ethdev/vlan,0\n{\n \"/ethdev/vlan\": {\n \"pvid\": 0,\n \"hw_vlan_reject_tagged\": 0,\n \"hw_vlan_reject_untagged\": 0,\n \"hw_vlan_insert_pvid\": 0,\n \"VLAN_STRIP\": \"off\",\n \"VLAN_EXTEND\": \"off\",\n \"QINQ_STRIP\": \"off\",\n \"VLAN_FILTER\": \"on\",\n \"vlan_num\": 3,\n \"vlan_ids\": {\n \"vlan_0_to_63\": [\n 1,\n 20\n ],\n \"vlan_192_to_255\": [\n 200\n ]\n }\n }\n}\n\nSigned-off-by: Jie Hai <haijie1@huawei.com>\n---\n lib/ethdev/rte_ethdev.c | 114 ++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 114 insertions(+)", "diff": "diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c\nindex f7a84ae6c35d..ba3484d8e870 100644\n--- a/lib/ethdev/rte_ethdev.c\n+++ b/lib/ethdev/rte_ethdev.c\n@@ -7659,6 +7659,118 @@ eth_dev_handle_port_fec(const char *cmd __rte_unused,\n \treturn 0;\n }\n \n+static int\n+eth_dev_add_vlan_id(int port_id, struct rte_tel_data *d)\n+{\n+\tstruct rte_tel_data *vlan_blks[64] = {NULL};\n+\tuint16_t vlan_num, vidx, vbit, num_blks;\n+\tchar blk_name[RTE_TEL_MAX_STRING_LEN];\n+\tstruct rte_vlan_filter_conf *vfc;\n+\tstruct rte_tel_data *vlan_blk;\n+\tstruct rte_tel_data *vd;\n+\tuint64_t bit_width;\n+\tuint64_t vlan_id;\n+\n+\tvd = rte_tel_data_alloc();\n+\tif (vd == NULL)\n+\t\treturn -ENOMEM;\n+\n+\tvfc = &rte_eth_devices[port_id].data->vlan_filter_conf;\n+\tbit_width = CHAR_BIT * sizeof(uint64_t);\n+\tvlan_num = 0;\n+\tnum_blks = 0;\n+\n+\trte_tel_data_start_dict(vd);\n+\tfor (vidx = 0; vidx < RTE_DIM(vfc->ids); vidx++) {\n+\t\tif (vfc->ids[vidx] == 0)\n+\t\t\tcontinue;\n+\n+\t\tvlan_blk = rte_tel_data_alloc();\n+\t\tif (vlan_blk == NULL)\n+\t\t\tgoto free_all;\n+\n+\t\tvlan_blks[num_blks] = vlan_blk;\n+\t\tnum_blks++;\n+\t\tsnprintf(blk_name, RTE_TEL_MAX_STRING_LEN, \"vlan_%lu_to_%lu\",\n+\t\t\t bit_width * vidx, bit_width * (vidx + 1) - 1);\n+\t\trte_tel_data_start_array(vlan_blk, RTE_TEL_UINT_VAL);\n+\t\trte_tel_data_add_dict_container(vd, blk_name, vlan_blk, 0);\n+\n+\t\tfor (vbit = 0; vbit < bit_width; vbit++) {\n+\t\t\tif ((vfc->ids[vidx] & RTE_BIT64(vbit)) == 0)\n+\t\t\t\tcontinue;\n+\n+\t\t\tvlan_id = bit_width * vidx + vbit;\n+\t\t\trte_tel_data_add_array_uint(vlan_blk, vlan_id);\n+\t\t\tvlan_num++;\n+\t\t}\n+\t}\n+\n+\trte_tel_data_add_dict_uint(d, \"vlan_num\", vlan_num);\n+\trte_tel_data_add_dict_container(d, \"vlan_ids\", vd, 0);\n+\n+\treturn 0;\n+\n+free_all:\n+\twhile (num_blks-- > 0)\n+\t\trte_tel_data_free(vlan_blks[num_blks]);\n+\n+\trte_tel_data_free(vd);\n+\treturn -ENOMEM;\n+}\n+\n+static int\n+eth_dev_handle_port_vlan(const char *cmd __rte_unused,\n+\t\tconst char *params,\n+\t\tstruct rte_tel_data *d)\n+{\n+\tstruct rte_eth_txmode *txmode;\n+\tstruct rte_eth_conf dev_conf;\n+\tunsigned long port_id;\n+\tint offload, ret;\n+\tchar *end_param;\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\");\n+\n+\tif (port_id >= UINT16_MAX || !rte_eth_dev_is_valid_port(port_id))\n+\t\treturn -EINVAL;\n+\n+\tret = rte_eth_dev_conf_get(port_id, &dev_conf);\n+\tif (ret != 0) {\n+\t\tRTE_ETHDEV_LOG(ERR,\n+\t\t\t\"Failed to get device configuration, ret = %d\\n\", ret);\n+\t\treturn ret;\n+\t}\n+\n+\ttxmode = &dev_conf.txmode;\n+\trte_tel_data_start_dict(d);\n+\trte_tel_data_add_dict_uint(d, \"pvid\", txmode->pvid);\n+\trte_tel_data_add_dict_uint(d, \"hw_vlan_reject_tagged\",\n+\t\ttxmode->hw_vlan_reject_tagged);\n+\trte_tel_data_add_dict_uint(d, \"hw_vlan_reject_untagged\",\n+\t\ttxmode->hw_vlan_reject_untagged);\n+\trte_tel_data_add_dict_uint(d, \"hw_vlan_insert_pvid\",\n+\t\ttxmode->hw_vlan_insert_pvid);\n+\n+\toffload = rte_eth_dev_get_vlan_offload(port_id);\n+\trte_tel_data_add_dict_string(d, \"VLAN_STRIP\",\n+\t\t((offload & RTE_ETH_VLAN_STRIP_OFFLOAD) != 0) ? \"on\" : \"off\");\n+\trte_tel_data_add_dict_string(d, \"VLAN_EXTEND\",\n+\t\t((offload & RTE_ETH_VLAN_EXTEND_OFFLOAD) != 0) ? \"on\" : \"off\");\n+\trte_tel_data_add_dict_string(d, \"QINQ_STRIP\",\n+\t\t((offload & RTE_ETH_QINQ_STRIP_OFFLOAD) != 0) ? \"on\" : \"off\");\n+\trte_tel_data_add_dict_string(d, \"VLAN_FILTER\",\n+\t\t((offload & RTE_ETH_VLAN_FILTER_OFFLOAD) != 0) ? \"on\" : \"off\");\n+\n+\treturn eth_dev_add_vlan_id(port_id, d);\n+}\n+\n RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO);\n \n RTE_INIT(ethdev_init_telemetry)\n@@ -7694,4 +7806,6 @@ RTE_INIT(ethdev_init_telemetry)\n \t\t\t\"Returns RSS info for a port. Parameters: unsigned port_id\");\n \trte_telemetry_register_cmd(\"/ethdev/fec\", eth_dev_handle_port_fec,\n \t\t\t\"Returns FEC info for a port. Parameters: unsigned port_id\");\n+\trte_telemetry_register_cmd(\"/ethdev/vlan\", eth_dev_handle_port_vlan,\n+\t\t\t\"Returns VLAN info for a port. Parameters: unsigned port_id\");\n }\n", "prefixes": [ "10/10" ] }