Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/134948/?format=api
{ "id": 134948, "url": "http://patches.dpdk.org/api/patches/134948/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231208065508.1663412-2-haijie1@huawei.com/", "project": { "id": 1, "url": "http://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": "<20231208065508.1663412-2-haijie1@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231208065508.1663412-2-haijie1@huawei.com", "date": "2023-12-08T06:55:05", "name": "[v4,1/4] net/hns3: refactor VF mailbox message struct", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "047073b68accbad738609bc41452583c4cf08921", "submitter": { "id": 2935, "url": "http://patches.dpdk.org/api/people/2935/?format=api", "name": "Jie Hai", "email": "haijie1@huawei.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231208065508.1663412-2-haijie1@huawei.com/mbox/", "series": [ { "id": 30487, "url": "http://patches.dpdk.org/api/series/30487/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30487", "date": "2023-12-08T06:55:04", "name": "net/hns3: refactor mailbox", "version": 4, "mbox": "http://patches.dpdk.org/series/30487/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/134948/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/134948/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 DA3FC436A6;\n\tFri, 8 Dec 2023 08:09:04 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 518CA42FB9;\n\tFri, 8 Dec 2023 08:09:01 +0100 (CET)", "from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188])\n by mails.dpdk.org (Postfix) with ESMTP id CC0A042FA7\n for <dev@dpdk.org>; Fri, 8 Dec 2023 08:08:58 +0100 (CET)", "from kwepemd100004.china.huawei.com (unknown [172.30.72.53])\n by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Smhw23jHHzShx1;\n Fri, 8 Dec 2023 15:04:34 +0800 (CST)", "from localhost.localdomain (10.67.165.2) by\n kwepemd100004.china.huawei.com (7.221.188.31) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.2.1258.28; Fri, 8 Dec 2023 15:08:56 +0800" ], "From": "Jie Hai <haijie1@huawei.com>", "To": "<dev@dpdk.org>, Yisen Zhuang <yisen.zhuang@huawei.com>, Hao Chen\n <chenh@yusur.tech>, Chunsong Feng <fengchunsong@huawei.com>, Huisong Li\n <lihuisong@huawei.com>, \"Min Hu (Connor)\" <humin29@huawei.com>, Ferruh Yigit\n <ferruh.yigit@intel.com>", "CC": "<fengchengwen@huawei.com>, <liudongdong3@huawei.com>, <haijie1@huawei.com>", "Subject": "[PATCH v4 1/4] net/hns3: refactor VF mailbox message struct", "Date": "Fri, 8 Dec 2023 14:55:05 +0800", "Message-ID": "<20231208065508.1663412-2-haijie1@huawei.com>", "X-Mailer": "git-send-email 2.30.0", "In-Reply-To": "<20231208065508.1663412-1-haijie1@huawei.com>", "References": "<20231108034434.559030-1-haijie1@huawei.com>\n <20231208065508.1663412-1-haijie1@huawei.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.67.165.2]", "X-ClientProxiedBy": "dggems702-chm.china.huawei.com (10.3.19.179) To\n kwepemd100004.china.huawei.com (7.221.188.31)", "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": "From: Dengdui Huang <huangdengdui@huawei.com>\n\nThe data region in VF to PF mbx memssage command is\nused to communicate with PF driver. And this data\nregion exists as an array. As a result, some complicated\nfeature commands, like setting promisc mode, map/unmap\nring vector and setting VLAN id, have to use magic number\nto set them. This isn't good for maintenance of driver.\nSo this patch refactors these messages by extracting an\nhns3_vf_to_pf_msg structure.\n\nIn addition, the PF link change event message is reported\nby the firmware and is reported in hns3_mbx_vf_to_pf_cmd\nformat, it also needs to be modified.\n\nFixes: 463e748964f5 (\"net/hns3: support mailbox\")\nCc: stable@dpdk.org\n\nSigned-off-by: Dengdui Huang <huangdengdui@huawei.com>\nSigned-off-by: Jie Hai <haijie1@huawei.com>\n---\n drivers/net/hns3/hns3_ethdev_vf.c | 54 ++++++++++++++---------------\n drivers/net/hns3/hns3_mbx.c | 24 ++++++-------\n drivers/net/hns3/hns3_mbx.h | 56 ++++++++++++++++++++++---------\n 3 files changed, 76 insertions(+), 58 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c\nindex 916cc0fb1b62..19e734ca8d8e 100644\n--- a/drivers/net/hns3/hns3_ethdev_vf.c\n+++ b/drivers/net/hns3/hns3_ethdev_vf.c\n@@ -254,11 +254,12 @@ hns3vf_set_promisc_mode(struct hns3_hw *hw, bool en_bc_pmc,\n \t * the packets with vlan tag in promiscuous mode.\n \t */\n \thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_MBX_VF_TO_PF, false);\n-\treq->msg[0] = HNS3_MBX_SET_PROMISC_MODE;\n-\treq->msg[1] = en_bc_pmc ? 1 : 0;\n-\treq->msg[2] = en_uc_pmc ? 1 : 0;\n-\treq->msg[3] = en_mc_pmc ? 1 : 0;\n-\treq->msg[4] = hw->promisc_mode == HNS3_LIMIT_PROMISC_MODE ? 1 : 0;\n+\treq->msg.code = HNS3_MBX_SET_PROMISC_MODE;\n+\treq->msg.en_bc = en_bc_pmc ? 1 : 0;\n+\treq->msg.en_uc = en_uc_pmc ? 1 : 0;\n+\treq->msg.en_mc = en_mc_pmc ? 1 : 0;\n+\treq->msg.en_limit_promisc =\n+\t\thw->promisc_mode == HNS3_LIMIT_PROMISC_MODE ? 1 : 0;\n \n \tret = hns3_cmd_send(hw, &desc, 1);\n \tif (ret)\n@@ -347,30 +348,28 @@ hns3vf_bind_ring_with_vector(struct hns3_hw *hw, uint16_t vector_id,\n \t\t\t bool mmap, enum hns3_ring_type queue_type,\n \t\t\t uint16_t queue_id)\n {\n-\tstruct hns3_vf_bind_vector_msg bind_msg;\n+#define HNS3_RING_VERCTOR_DATA_SIZE\t14\n+\tstruct hns3_vf_to_pf_msg req = {0};\n \tconst char *op_str;\n-\tuint16_t code;\n \tint ret;\n \n-\tmemset(&bind_msg, 0, sizeof(bind_msg));\n-\tcode = mmap ? HNS3_MBX_MAP_RING_TO_VECTOR :\n+\treq.code = mmap ? HNS3_MBX_MAP_RING_TO_VECTOR :\n \t\tHNS3_MBX_UNMAP_RING_TO_VECTOR;\n-\tbind_msg.vector_id = (uint8_t)vector_id;\n+\treq.vector_id = (uint8_t)vector_id;\n+\treq.ring_num = 1;\n \n \tif (queue_type == HNS3_RING_TYPE_RX)\n-\t\tbind_msg.param[0].int_gl_index = HNS3_RING_GL_RX;\n+\t\treq.ring_param[0].int_gl_index = HNS3_RING_GL_RX;\n \telse\n-\t\tbind_msg.param[0].int_gl_index = HNS3_RING_GL_TX;\n-\n-\tbind_msg.param[0].ring_type = queue_type;\n-\tbind_msg.ring_num = 1;\n-\tbind_msg.param[0].tqp_index = queue_id;\n+\t\treq.ring_param[0].int_gl_index = HNS3_RING_GL_TX;\n+\treq.ring_param[0].ring_type = queue_type;\n+\treq.ring_param[0].tqp_index = queue_id;\n \top_str = mmap ? \"Map\" : \"Unmap\";\n-\tret = hns3_send_mbx_msg(hw, code, 0, (uint8_t *)&bind_msg,\n-\t\t\t\tsizeof(bind_msg), false, NULL, 0);\n+\tret = hns3_send_mbx_msg(hw, req.code, 0, (uint8_t *)&req.vector_id,\n+\t\t\t\tHNS3_RING_VERCTOR_DATA_SIZE, false, NULL, 0);\n \tif (ret)\n-\t\thns3_err(hw, \"%s TQP %u fail, vector_id is %u, ret is %d.\",\n-\t\t\t op_str, queue_id, bind_msg.vector_id, ret);\n+\t\thns3_err(hw, \"%s TQP %u fail, vector_id is %u, ret = %d.\",\n+\t\t\t op_str, queue_id, req.vector_id, ret);\n \n \treturn ret;\n }\n@@ -965,19 +964,16 @@ hns3vf_update_link_status(struct hns3_hw *hw, uint8_t link_status,\n static int\n hns3vf_vlan_filter_configure(struct hns3_adapter *hns, uint16_t vlan_id, int on)\n {\n-#define HNS3VF_VLAN_MBX_MSG_LEN 5\n+\tstruct hns3_mbx_vlan_filter vlan_filter = {0};\n \tstruct hns3_hw *hw = &hns->hw;\n-\tuint8_t msg_data[HNS3VF_VLAN_MBX_MSG_LEN];\n-\tuint16_t proto = htons(RTE_ETHER_TYPE_VLAN);\n-\tuint8_t is_kill = on ? 0 : 1;\n \n-\tmsg_data[0] = is_kill;\n-\tmemcpy(&msg_data[1], &vlan_id, sizeof(vlan_id));\n-\tmemcpy(&msg_data[3], &proto, sizeof(proto));\n+\tvlan_filter.is_kill = on ? 0 : 1;\n+\tvlan_filter.proto = rte_cpu_to_le_16(RTE_ETHER_TYPE_VLAN);\n+\tvlan_filter.vlan_id = rte_cpu_to_le_16(vlan_id);\n \n \treturn hns3_send_mbx_msg(hw, HNS3_MBX_SET_VLAN, HNS3_MBX_VLAN_FILTER,\n-\t\t\t\t msg_data, HNS3VF_VLAN_MBX_MSG_LEN, true, NULL,\n-\t\t\t\t 0);\n+\t\t\t\t(uint8_t *)&vlan_filter, sizeof(vlan_filter),\n+\t\t\t\t true, NULL, 0);\n }\n \n static int\ndiff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c\nindex f1743c195efa..ad5ec555b39e 100644\n--- a/drivers/net/hns3/hns3_mbx.c\n+++ b/drivers/net/hns3/hns3_mbx.c\n@@ -11,8 +11,6 @@\n #include \"hns3_intr.h\"\n #include \"hns3_rxtx.h\"\n \n-#define HNS3_CMD_CODE_OFFSET\t\t2\n-\n static const struct errno_respcode_map err_code_map[] = {\n \t{0, 0},\n \t{1, -EPERM},\n@@ -127,29 +125,30 @@ hns3_send_mbx_msg(struct hns3_hw *hw, uint16_t code, uint16_t subcode,\n \tstruct hns3_mbx_vf_to_pf_cmd *req;\n \tstruct hns3_cmd_desc desc;\n \tbool is_ring_vector_msg;\n-\tint offset;\n \tint ret;\n \n \treq = (struct hns3_mbx_vf_to_pf_cmd *)desc.data;\n \n \t/* first two bytes are reserved for code & subcode */\n-\tif (msg_len > (HNS3_MBX_MAX_MSG_SIZE - HNS3_CMD_CODE_OFFSET)) {\n+\tif (msg_len > HNS3_MBX_MSG_MAX_DATA_SIZE) {\n \t\thns3_err(hw,\n \t\t\t \"VF send mbx msg fail, msg len %u exceeds max payload len %d\",\n-\t\t\t msg_len, HNS3_MBX_MAX_MSG_SIZE - HNS3_CMD_CODE_OFFSET);\n+\t\t\t msg_len, HNS3_MBX_MSG_MAX_DATA_SIZE);\n \t\treturn -EINVAL;\n \t}\n \n \thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_MBX_VF_TO_PF, false);\n-\treq->msg[0] = code;\n+\treq->msg.code = code;\n \tis_ring_vector_msg = (code == HNS3_MBX_MAP_RING_TO_VECTOR) ||\n \t\t\t (code == HNS3_MBX_UNMAP_RING_TO_VECTOR) ||\n \t\t\t (code == HNS3_MBX_GET_RING_VECTOR_MAP);\n \tif (!is_ring_vector_msg)\n-\t\treq->msg[1] = subcode;\n+\t\treq->msg.subcode = subcode;\n \tif (msg_data) {\n-\t\toffset = is_ring_vector_msg ? 1 : HNS3_CMD_CODE_OFFSET;\n-\t\tmemcpy(&req->msg[offset], msg_data, msg_len);\n+\t\tif (is_ring_vector_msg)\n+\t\t\tmemcpy(&req->msg.vector_id, msg_data, msg_len);\n+\t\telse\n+\t\t\tmemcpy(&req->msg.data, msg_data, msg_len);\n \t}\n \n \t/* synchronous send */\n@@ -296,11 +295,8 @@ static void\n hns3pf_handle_link_change_event(struct hns3_hw *hw,\n \t\t\t\tstruct hns3_mbx_vf_to_pf_cmd *req)\n {\n-#define LINK_STATUS_OFFSET 1\n-#define LINK_FAIL_CODE_OFFSET 2\n-\n-\tif (!req->msg[LINK_STATUS_OFFSET])\n-\t\thns3_link_fail_parse(hw, req->msg[LINK_FAIL_CODE_OFFSET]);\n+\tif (!req->msg.link_status)\n+\t\thns3_link_fail_parse(hw, req->msg.link_fail_code);\n \n \thns3_update_linkstatus_and_event(hw, true);\n }\ndiff --git a/drivers/net/hns3/hns3_mbx.h b/drivers/net/hns3/hns3_mbx.h\nindex 4a328802b920..59fb73abcc6e 100644\n--- a/drivers/net/hns3/hns3_mbx.h\n+++ b/drivers/net/hns3/hns3_mbx.h\n@@ -89,7 +89,6 @@ enum hns3_mbx_link_fail_subcode {\n \tHNS3_MBX_LF_XSFP_ABSENT,\n };\n \n-#define HNS3_MBX_MAX_MSG_SIZE\t16\n #define HNS3_MBX_MAX_RESP_DATA_SIZE\t8\n #define HNS3_MBX_DEF_TIME_LIMIT_MS\t500\n \n@@ -107,6 +106,46 @@ struct hns3_mbx_resp_status {\n \tuint8_t additional_info[HNS3_MBX_MAX_RESP_DATA_SIZE];\n };\n \n+struct hns3_ring_chain_param {\n+\tuint8_t ring_type;\n+\tuint8_t tqp_index;\n+\tuint8_t int_gl_index;\n+};\n+\n+struct hns3_mbx_vlan_filter {\n+\tuint8_t is_kill;\n+\tuint16_t vlan_id;\n+\tuint16_t proto;\n+} __rte_packed;\n+\n+#define HNS3_MBX_MSG_MAX_DATA_SIZE\t14\n+#define HNS3_MBX_MAX_RING_CHAIN_PARAM_NUM\t4\n+struct hns3_vf_to_pf_msg {\n+\tuint8_t code;\n+\tunion {\n+\t\tstruct {\n+\t\t\tuint8_t subcode;\n+\t\t\tuint8_t data[HNS3_MBX_MSG_MAX_DATA_SIZE];\n+\t\t};\n+\t\tstruct {\n+\t\t\tuint8_t en_bc;\n+\t\t\tuint8_t en_uc;\n+\t\t\tuint8_t en_mc;\n+\t\t\tuint8_t en_limit_promisc;\n+\t\t};\n+\t\tstruct {\n+\t\t\tuint8_t vector_id;\n+\t\t\tuint8_t ring_num;\n+\t\t\tstruct hns3_ring_chain_param\n+\t\t\t\tring_param[HNS3_MBX_MAX_RING_CHAIN_PARAM_NUM];\n+\t\t};\n+\t\tstruct {\n+\t\t\tuint8_t link_status;\n+\t\t\tuint8_t link_fail_code;\n+\t\t};\n+\t};\n+};\n+\n struct errno_respcode_map {\n \tuint16_t resp_code;\n \tint err_no;\n@@ -122,7 +161,7 @@ struct hns3_mbx_vf_to_pf_cmd {\n \tuint8_t msg_len;\n \tuint8_t rsv2;\n \tuint16_t match_id;\n-\tuint8_t msg[HNS3_MBX_MAX_MSG_SIZE];\n+\tstruct hns3_vf_to_pf_msg msg;\n };\n \n struct hns3_mbx_pf_to_vf_cmd {\n@@ -134,19 +173,6 @@ struct hns3_mbx_pf_to_vf_cmd {\n \tuint16_t msg[8];\n };\n \n-struct hns3_ring_chain_param {\n-\tuint8_t ring_type;\n-\tuint8_t tqp_index;\n-\tuint8_t int_gl_index;\n-};\n-\n-#define HNS3_MBX_MAX_RING_CHAIN_PARAM_NUM\t4\n-struct hns3_vf_bind_vector_msg {\n-\tuint8_t vector_id;\n-\tuint8_t ring_num;\n-\tstruct hns3_ring_chain_param param[HNS3_MBX_MAX_RING_CHAIN_PARAM_NUM];\n-};\n-\n struct hns3_pf_rst_done_cmd {\n \tuint8_t pf_rst_done;\n \tuint8_t rsv[23];\n", "prefixes": [ "v4", "1/4" ] }