Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/57863/?format=api
{ "id": 57863, "url": "http://patches.dpdk.org/api/patches/57863/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1566568031-45991-22-git-send-email-xavier.huwei@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": "<1566568031-45991-22-git-send-email-xavier.huwei@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1566568031-45991-22-git-send-email-xavier.huwei@huawei.com", "date": "2019-08-23T13:47:10", "name": "[21/22] net/hns3: add multiple process support for hns3 PMD driver", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "9ae926bad2a8c8dd90466dcafeb82fc840f3b2c5", "submitter": { "id": 1405, "url": "http://patches.dpdk.org/api/people/1405/?format=api", "name": "Wei Hu (Xavier)", "email": "xavier.huwei@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/1566568031-45991-22-git-send-email-xavier.huwei@huawei.com/mbox/", "series": [ { "id": 6114, "url": "http://patches.dpdk.org/api/series/6114/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6114", "date": "2019-08-23T13:46:49", "name": "add hns3 ethernet PMD driver", "version": 1, "mbox": "http://patches.dpdk.org/series/6114/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/57863/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/57863/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 87B011BFCC;\n\tFri, 23 Aug 2019 15:50:25 +0200 (CEST)", "from huawei.com (szxga05-in.huawei.com [45.249.212.191])\n\tby dpdk.org (Postfix) with ESMTP id 094781BFCE\n\tfor <dev@dpdk.org>; Fri, 23 Aug 2019 15:49:43 +0200 (CEST)", "from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.58])\n\tby Forcepoint Email with ESMTP id C3FD92A9FB30EFE774AD;\n\tFri, 23 Aug 2019 21:49:41 +0800 (CST)", "from localhost.localdomain (10.67.212.132) by\n\tDGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP\n\tServer id 14.3.439.0; Fri, 23 Aug 2019 21:49:31 +0800" ], "From": "\"Wei Hu (Xavier)\" <xavier.huwei@huawei.com>", "To": "<dev@dpdk.org>", "CC": "<linuxarm@huawei.com>, <xavier_huwei@163.com>, <liudongdong3@huawei.com>,\n\t<forest.zhouchang@huawei.com>", "Date": "Fri, 23 Aug 2019 21:47:10 +0800", "Message-ID": "<1566568031-45991-22-git-send-email-xavier.huwei@huawei.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1566568031-45991-1-git-send-email-xavier.huwei@huawei.com>", "References": "<1566568031-45991-1-git-send-email-xavier.huwei@huawei.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.67.212.132]", "X-CFilter-Loop": "Reflected", "Subject": "[dpdk-dev] [PATCH 21/22] net/hns3: add multiple process support for\n\thns3 PMD driver", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This patch adds multiple process support for hns3 PMD driver.\nMulti-process support selection queue by configuring RSS or\nflow director. The primary process supports various management\nops, and the secondary process only supports queries ops.\nThe primary process notifies the secondary processes to start\nor stop tranceiver.\n\nSigned-off-by: Chunsong Feng <fengchunsong@huawei.com>\nSigned-off-by: Min Wang (Jushui) <wangmin3@huawei.com>\nSigned-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>\nSigned-off-by: Min Hu (Connor) <humin29@huawei.com>\nSigned-off-by: Hao Chen <chenhao164@huawei.com>\nSigned-off-by: Huisong Li <lihuisong@huawei.com>\n---\n drivers/net/hns3/hns3_ethdev.c | 36 ++++++-\n drivers/net/hns3/hns3_ethdev_vf.c | 29 ++++-\n drivers/net/hns3/hns3_mp.c | 219 ++++++++++++++++++++++++++++++++++++++\n drivers/net/hns3/hns3_mp.h | 14 +++\n 4 files changed, 296 insertions(+), 2 deletions(-)\n create mode 100644 drivers/net/hns3/hns3_mp.c\n create mode 100644 drivers/net/hns3/hns3_mp.h", "diff": "diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c\nindex 9a4c560..28fa9a6 100644\n--- a/drivers/net/hns3/hns3_ethdev.c\n+++ b/drivers/net/hns3/hns3_ethdev.c\n@@ -40,6 +40,7 @@\n #include \"hns3_intr.h\"\n #include \"hns3_regs.h\"\n #include \"hns3_dcb.h\"\n+#include \"hns3_mp.h\"\n \n #define HNS3_DEFAULT_PORT_CONF_BURST_SIZE\t32\n #define HNS3_DEFAULT_PORT_CONF_QUEUES_NUM\t1\n@@ -4078,6 +4079,10 @@ hns3_dev_stop(struct rte_eth_dev *eth_dev)\n \thw->adapter_state = HNS3_NIC_STOPPING;\n \thns3_set_rxtx_function(eth_dev);\n \trte_wmb();\n+\t/* Disable datapath on secondary process. */\n+\thns3_mp_req_stop_rxtx(eth_dev);\n+\t/* Prevent crashes when queues are still in use. */\n+\trte_delay_ms(hw->tqps_num);\n \n \trte_spinlock_lock(&hw->lock);\n \tif (rte_atomic16_read(&hw->reset.resetting) == 0) {\n@@ -4108,6 +4113,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)\n \thns3_uninit_pf(eth_dev);\n \thns3_free_all_queues(eth_dev);\n \trte_free(hw->reset.wait_data);\n+\thns3_mp_uninit_primary();\n \thns3_warn(hw, \"Close port %d finished\", hw->data->port_id);\n }\n \n@@ -4750,6 +4756,28 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {\n \t.dev_supported_ptypes_get = hns3_dev_supported_ptypes_get,\n };\n \n+static const struct eth_dev_ops hns3_eth_dev_secondary_ops = {\n+\t.stats_get = hns3_stats_get,\n+\t.stats_reset = hns3_stats_reset,\n+\t.xstats_get = hns3_dev_xstats_get,\n+\t.xstats_get_names = hns3_dev_xstats_get_names,\n+\t.xstats_reset = hns3_dev_xstats_reset,\n+\t.xstats_get_by_id = hns3_dev_xstats_get_by_id,\n+\t.xstats_get_names_by_id = hns3_dev_xstats_get_names_by_id,\n+\t.dev_infos_get = hns3_dev_infos_get,\n+\t.fw_version_get = hns3_fw_version_get,\n+\t.flow_ctrl_get = hns3_flow_ctrl_get,\n+\t.link_update = hns3_dev_link_update,\n+\t.rss_hash_update = hns3_dev_rss_hash_update,\n+\t.rss_hash_conf_get = hns3_dev_rss_hash_conf_get,\n+\t.reta_update = hns3_dev_rss_reta_update,\n+\t.reta_query = hns3_dev_rss_reta_query,\n+\t.filter_ctrl = hns3_dev_filter_ctrl,\n+\t.get_reg = hns3_get_regs,\n+\t.get_dcb_info = hns3_get_dcb_info,\n+\t.dev_supported_ptypes_get = hns3_dev_supported_ptypes_get,\n+};\n+\n static const struct hns3_reset_ops hns3_reset_ops = {\n \t.reset_service = hns3_reset_service,\n \t.stop_service = hns3_stop_service,\n@@ -4783,10 +4811,16 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)\n \thns3_filterlist_init(eth_dev);\n \n \thns3_set_rxtx_function(eth_dev);\n-\tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n+\tif (rte_eal_process_type() != RTE_PROC_PRIMARY) {\n+\t\teth_dev->dev_ops = &hns3_eth_dev_secondary_ops;\n+\t\thns3_mp_init_secondary();\n+\t\thw->secondary_cnt++;\n \t\treturn 0;\n+\t}\n \n \teth_dev->dev_ops = &hns3_eth_dev_ops;\n+\thns3_mp_init_primary();\n+\thw->adapter_state = HNS3_NIC_UNINITIALIZED;\n \trte_eth_copy_pci_info(eth_dev, pci_dev);\n \n \tif (device_id == HNS3_DEV_ID_25GE_RDMA ||\ndiff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c\nindex 45360c4..1d33779 100644\n--- a/drivers/net/hns3/hns3_ethdev_vf.c\n+++ b/drivers/net/hns3/hns3_ethdev_vf.c\n@@ -40,6 +40,7 @@\n #include \"hns3_regs.h\"\n #include \"hns3_intr.h\"\n #include \"hns3_dcb.h\"\n+#include \"hns3_mp.h\"\n \n #define HNS3VF_KEEP_ALIVE_INTERVAL\t2000000 /* us */\n #define HNS3VF_SERVICE_INTERVAL\t\t1000000 /* us */\n@@ -1174,6 +1175,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)\n \thns3vf_uninit_vf(eth_dev);\n \thns3_free_all_queues(eth_dev);\n \trte_free(hw->reset.wait_data);\n+\thns3_mp_uninit_primary();\n \thns3_warn(hw, \"Close port %d finished\", hw->data->port_id);\n }\n \n@@ -1251,6 +1253,7 @@ hns3vf_dev_start(struct rte_eth_dev *eth_dev)\n \thw->adapter_state = HNS3_NIC_STARTED;\n \trte_spinlock_unlock(&hw->lock);\n \thns3_set_rxtx_function(eth_dev);\n+\thns3_mp_req_start_rxtx(eth_dev);\n \treturn 0;\n }\n \n@@ -1556,6 +1559,25 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = {\n \t.dev_supported_ptypes_get = hns3_dev_supported_ptypes_get,\n };\n \n+static const struct eth_dev_ops hns3vf_eth_dev_secondary_ops = {\n+\t.stats_get = hns3_stats_get,\n+\t.stats_reset = hns3_stats_reset,\n+\t.xstats_get = hns3_dev_xstats_get,\n+\t.xstats_get_names = hns3_dev_xstats_get_names,\n+\t.xstats_reset\t = hns3_dev_xstats_reset,\n+\t.xstats_get_by_id = hns3_dev_xstats_get_by_id,\n+\t.xstats_get_names_by_id = hns3_dev_xstats_get_names_by_id,\n+\t.dev_infos_get = hns3vf_dev_infos_get,\n+\t.link_update = hns3vf_dev_link_update,\n+\t.rss_hash_update = hns3_dev_rss_hash_update,\n+\t.rss_hash_conf_get = hns3_dev_rss_hash_conf_get,\n+\t.reta_update = hns3_dev_rss_reta_update,\n+\t.reta_query = hns3_dev_rss_reta_query,\n+\t.filter_ctrl = hns3_dev_filter_ctrl,\n+\t.get_reg = hns3_get_regs,\n+\t.dev_supported_ptypes_get = hns3_dev_supported_ptypes_get,\n+};\n+\n static const struct hns3_reset_ops hns3vf_reset_ops = {\n \t.reset_service = hns3vf_reset_service,\n \t.stop_service = hns3vf_stop_service,\n@@ -1589,10 +1611,15 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)\n \thns3_filterlist_init(eth_dev);\n \n \thns3_set_rxtx_function(eth_dev);\n-\tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n+\tif (rte_eal_process_type() != RTE_PROC_PRIMARY) {\n+\t\teth_dev->dev_ops = &hns3vf_eth_dev_secondary_ops;\n+\t\thns3_mp_init_secondary();\n+\t\thw->secondary_cnt++;\n \t\treturn 0;\n+\t}\n \n \teth_dev->dev_ops = &hns3vf_eth_dev_ops;\n+\thns3_mp_init_primary();\n \n \thw->adapter_state = HNS3_NIC_UNINITIALIZED;\n \trte_eth_copy_pci_info(eth_dev, pci_dev);\ndiff --git a/drivers/net/hns3/hns3_mp.c b/drivers/net/hns3/hns3_mp.c\nnew file mode 100644\nindex 0000000..2f56d8b\n--- /dev/null\n+++ b/drivers/net/hns3/hns3_mp.c\n@@ -0,0 +1,219 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2018-2019 Hisilicon Limited.\n+ */\n+\n+#include <stdbool.h>\n+\n+#include <rte_eal.h>\n+#include <rte_ethdev_driver.h>\n+#include <rte_string_fns.h>\n+#include <rte_io.h>\n+\n+#include \"hns3_cmd.h\"\n+#include \"hns3_mbx.h\"\n+#include \"hns3_rss.h\"\n+#include \"hns3_fdir.h\"\n+#include \"hns3_stats.h\"\n+#include \"hns3_ethdev.h\"\n+#include \"hns3_logs.h\"\n+#include \"hns3_rxtx.h\"\n+#include \"hns3_mp.h\"\n+\n+/*\n+ * Initialize IPC message.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet structure.\n+ * @param[out] msg\n+ * Pointer to message to fill in.\n+ * @param[in] type\n+ * Message type.\n+ */\n+static inline void\n+mp_init_msg(struct rte_eth_dev *dev, struct rte_mp_msg *msg,\n+\t enum hns3_mp_req_type type)\n+{\n+\tstruct hns3_mp_param *param = (struct hns3_mp_param *)msg->param;\n+\n+\tmemset(msg, 0, sizeof(*msg));\n+\tstrlcpy(msg->name, HNS3_MP_NAME, sizeof(msg->name));\n+\tmsg->len_param = sizeof(*param);\n+\tparam->type = type;\n+\tparam->port_id = dev->data->port_id;\n+}\n+\n+/*\n+ * IPC message handler of primary process.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet structure.\n+ * @param[in] peer\n+ * Pointer to the peer socket path.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mp_primary_handle(const struct rte_mp_msg *mp_msg __rte_unused,\n+\t\t const void *peer __rte_unused)\n+{\n+\treturn 0;\n+}\n+\n+/*\n+ * IPC message handler of a secondary process.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet structure.\n+ * @param[in] peer\n+ * Pointer to the peer socket path.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer)\n+{\n+\tstruct rte_mp_msg mp_res;\n+\tstruct hns3_mp_param *res = (struct hns3_mp_param *)mp_res.param;\n+\tconst struct hns3_mp_param *param =\n+\t\t(const struct hns3_mp_param *)mp_msg->param;\n+\tstruct rte_eth_dev *dev;\n+\tint ret;\n+\n+\tif (!rte_eth_dev_is_valid_port(param->port_id)) {\n+\t\trte_errno = ENODEV;\n+\t\tPMD_INIT_LOG(ERR, \"port %u invalid port ID\", param->port_id);\n+\t\treturn -rte_errno;\n+\t}\n+\tdev = &rte_eth_devices[param->port_id];\n+\tswitch (param->type) {\n+\tcase HNS3_MP_REQ_START_RXTX:\n+\t\tPMD_INIT_LOG(INFO, \"port %u starting datapath\",\n+\t\t\t dev->data->port_id);\n+\t\trte_mb();\n+\t\thns3_set_rxtx_function(dev);\n+\t\tmp_init_msg(dev, &mp_res, param->type);\n+\t\tres->result = 0;\n+\t\tret = rte_mp_reply(&mp_res, peer);\n+\t\tbreak;\n+\tcase HNS3_MP_REQ_STOP_RXTX:\n+\t\tPMD_INIT_LOG(INFO, \"port %u stopping datapath\",\n+\t\t\t dev->data->port_id);\n+\t\thns3_set_rxtx_function(dev);\n+\t\trte_mb();\n+\t\tmp_init_msg(dev, &mp_res, param->type);\n+\t\tres->result = 0;\n+\t\tret = rte_mp_reply(&mp_res, peer);\n+\t\tbreak;\n+\tdefault:\n+\t\trte_errno = EINVAL;\n+\t\tPMD_INIT_LOG(ERR, \"port %u invalid mp request type\",\n+\t\t\t dev->data->port_id);\n+\t\treturn -rte_errno;\n+\t}\n+\treturn ret;\n+}\n+\n+/*\n+ * Broadcast request of stopping/starting data-path to secondary processes.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet structure.\n+ * @param[in] type\n+ * Request type.\n+ */\n+static void\n+mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type)\n+{\n+\tstruct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tstruct rte_mp_msg mp_req;\n+\tstruct rte_mp_msg *mp_res;\n+\tstruct rte_mp_reply mp_rep;\n+\tstruct hns3_mp_param *res;\n+\tstruct timespec ts;\n+\tint ret;\n+\tint i;\n+\n+\tif (!hw->secondary_cnt)\n+\t\treturn;\n+\tif (type != HNS3_MP_REQ_START_RXTX && type != HNS3_MP_REQ_STOP_RXTX) {\n+\t\thns3_err(hw, \"port %u unknown request (req_type %d)\",\n+\t\t\t dev->data->port_id, type);\n+\t\treturn;\n+\t}\n+\tmp_init_msg(dev, &mp_req, type);\n+\tts.tv_sec = HNS3_MP_REQ_TIMEOUT_SEC;\n+\tts.tv_nsec = 0;\n+\tret = rte_mp_request_sync(&mp_req, &mp_rep, &ts);\n+\tif (ret) {\n+\t\thns3_err(hw, \"port %u failed to request stop/start Rx/Tx (%d)\",\n+\t\t\t dev->data->port_id, type);\n+\t\tgoto exit;\n+\t}\n+\tif (mp_rep.nb_sent != mp_rep.nb_received) {\n+\t\tPMD_INIT_LOG(ERR,\n+\t\t\t\"port %u not all secondaries responded (req_type %d)\",\n+\t\t\tdev->data->port_id, type);\n+\t\tgoto exit;\n+\t}\n+\tfor (i = 0; i < mp_rep.nb_received; i++) {\n+\t\tmp_res = &mp_rep.msgs[i];\n+\t\tres = (struct hns3_mp_param *)mp_res->param;\n+\t\tif (res->result) {\n+\t\t\thns3_err(hw, \"port %u request failed on secondary #%d\",\n+\t\t\t\t dev->data->port_id, i);\n+\t\t\tgoto exit;\n+\t\t}\n+\t}\n+exit:\n+\tfree(mp_rep.msgs);\n+}\n+\n+/*\n+ * Broadcast request of starting data-path to secondary processes. The request\n+ * is synchronous.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet structure.\n+ */\n+void hns3_mp_req_start_rxtx(struct rte_eth_dev *dev)\n+{\n+\tmp_req_on_rxtx(dev, HNS3_MP_REQ_START_RXTX);\n+}\n+\n+/*\n+ * Broadcast request of stopping data-path to secondary processes. The request\n+ * is synchronous.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet structure.\n+ */\n+void hns3_mp_req_stop_rxtx(struct rte_eth_dev *dev)\n+{\n+\tmp_req_on_rxtx(dev, HNS3_MP_REQ_STOP_RXTX);\n+}\n+\n+/*\n+ * Initialize by primary process.\n+ */\n+void hns3_mp_init_primary(void)\n+{\n+\trte_mp_action_register(HNS3_MP_NAME, mp_primary_handle);\n+}\n+\n+/*\n+ * Un-initialize by primary process.\n+ */\n+void hns3_mp_uninit_primary(void)\n+{\n+\trte_mp_action_unregister(HNS3_MP_NAME);\n+}\n+\n+/*\n+ * Initialize by secondary process.\n+ */\n+void hns3_mp_init_secondary(void)\n+{\n+\trte_mp_action_register(HNS3_MP_NAME, mp_secondary_handle);\n+}\ndiff --git a/drivers/net/hns3/hns3_mp.h b/drivers/net/hns3/hns3_mp.h\nnew file mode 100644\nindex 0000000..aefbeb1\n--- /dev/null\n+++ b/drivers/net/hns3/hns3_mp.h\n@@ -0,0 +1,14 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2018-2019 Hisilicon Limited.\n+ */\n+\n+#ifndef _HNS3_MP_H_\n+#define _HNS3_MP_H_\n+\n+void hns3_mp_req_start_rxtx(struct rte_eth_dev *dev);\n+void hns3_mp_req_stop_rxtx(struct rte_eth_dev *dev);\n+void hns3_mp_init_primary(void);\n+void hns3_mp_uninit_primary(void);\n+void hns3_mp_init_secondary(void);\n+\n+#endif /* _HNS3_MP_H_ */\n", "prefixes": [ "21/22" ] }