Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/96280/?format=api
{ "id": 96280, "url": "http://patchwork.dpdk.org/api/patches/96280/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1627297180-47307-3-git-send-email-humin29@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": "<1627297180-47307-3-git-send-email-humin29@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1627297180-47307-3-git-send-email-humin29@huawei.com", "date": "2021-07-26T10:59:40", "name": "[v1,2/2] net/hns3: support set link up/down for PF", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "aefeec67063f1636feb755992178efd138718434", "submitter": { "id": 1944, "url": "http://patchwork.dpdk.org/api/people/1944/?format=api", "name": "humin (Q)", "email": "humin29@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/1627297180-47307-3-git-send-email-humin29@huawei.com/mbox/", "series": [ { "id": 17989, "url": "http://patchwork.dpdk.org/api/series/17989/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=17989", "date": "2021-07-26T10:59:38", "name": "Features for hns3 PMD", "version": 1, "mbox": "http://patchwork.dpdk.org/series/17989/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/96280/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/96280/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 4A72AA0C47;\n\tMon, 26 Jul 2021 13:00:51 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 80A77410F8;\n\tMon, 26 Jul 2021 13:00:38 +0200 (CEST)", "from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255])\n by mails.dpdk.org (Postfix) with ESMTP id 99B22410E1\n for <dev@dpdk.org>; Mon, 26 Jul 2021 13:00:35 +0200 (CEST)", "from dggeme756-chm.china.huawei.com (unknown [172.30.72.57])\n by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4GYGym05rpz1CP2H\n for <dev@dpdk.org>; Mon, 26 Jul 2021 18:54:40 +0800 (CST)", "from localhost.localdomain (10.69.192.56) by\n dggeme756-chm.china.huawei.com (10.3.19.102) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id\n 15.1.2176.2; Mon, 26 Jul 2021 19:00:32 +0800" ], "From": "\"Min Hu (Connor)\" <humin29@huawei.com>", "To": "<dev@dpdk.org>", "CC": "<ferruh.yigit@intel.com>, <andrew.rybchenko@oktetlabs.ru>", "Date": "Mon, 26 Jul 2021 18:59:40 +0800", "Message-ID": "<1627297180-47307-3-git-send-email-humin29@huawei.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1627297180-47307-1-git-send-email-humin29@huawei.com>", "References": "<1627297180-47307-1-git-send-email-humin29@huawei.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.69.192.56]", "X-ClientProxiedBy": "dggems704-chm.china.huawei.com (10.3.19.181) To\n dggeme756-chm.china.huawei.com (10.3.19.102)", "X-CFilter-Loop": "Reflected", "Subject": "[dpdk-dev] [PATCH v1 2/2] net/hns3: support set link up/down for PF", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Huisong Li <lihuisong@huawei.com>\n\nThis patch adds set link up/down feature. RxTx datapath and link status\nwill be disabled when dev_set_link_down() is called, and can be enabled by\ndev_start() or dev_set_link_up().\n\nSigned-off-by: Huisong Li <lihuisong@huawei.com>\nSigned-off-by: Min Hu (Connor) <humin29@huawei.com>\n---\n drivers/net/hns3/hns3_ethdev.c | 107 ++++++++++++++++++++++++++++++++++++++---\n drivers/net/hns3/hns3_ethdev.h | 11 +++--\n drivers/net/hns3/hns3_rxtx.c | 28 ++++++++++-\n drivers/net/hns3/hns3_rxtx.h | 2 +\n 4 files changed, 138 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c\nindex a374fa7..7d37004 100644\n--- a/drivers/net/hns3/hns3_ethdev.c\n+++ b/drivers/net/hns3/hns3_ethdev.c\n@@ -103,6 +103,7 @@ static int hns3_restore_fec(struct hns3_hw *hw);\n static int hns3_query_dev_fec_info(struct hns3_hw *hw);\n static int hns3_do_stop(struct hns3_adapter *hns);\n static int hns3_check_port_speed(struct hns3_hw *hw, uint32_t link_speeds);\n+static int hns3_cfg_mac_mode(struct hns3_hw *hw, bool enable);\n \n void hns3_ether_format_addr(char *buf, uint16_t size,\n \t\t\t const struct rte_ether_addr *ether_addr)\n@@ -2924,6 +2925,88 @@ hns3_dev_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete)\n }\n \n static int\n+hns3_dev_set_link_up(struct rte_eth_dev *dev)\n+{\n+\tstruct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tint ret;\n+\n+\t/*\n+\t * The \"tx_pkt_burst\" will be restored. But the secondary process does\n+\t * not support the mechanism for notifying the primary process.\n+\t */\n+\tif (rte_eal_process_type() != RTE_PROC_PRIMARY) {\n+\t\thns3_err(hw, \"secondary process does not support to set link up.\");\n+\t\treturn -ENOTSUP;\n+\t}\n+\n+\t/*\n+\t * If device isn't started Rx/Tx function is still disabled, setting\n+\t * link up is not allowed. But it is probably better to return success\n+\t * to reduce the impact on the upper layer.\n+\t */\n+\tif (hw->adapter_state != HNS3_NIC_STARTED) {\n+\t\thns3_info(hw, \"device isn't started, can't set link up.\");\n+\t\treturn 0;\n+\t}\n+\n+\tif (!hw->set_link_down)\n+\t\treturn 0;\n+\n+\trte_spinlock_lock(&hw->lock);\n+\tret = hns3_cfg_mac_mode(hw, true);\n+\tif (ret) {\n+\t\trte_spinlock_unlock(&hw->lock);\n+\t\thns3_err(hw, \"failed to set link up, ret = %d\", ret);\n+\t\treturn ret;\n+\t}\n+\n+\thw->set_link_down = false;\n+\thns3_start_tx_datapath(dev);\n+\trte_spinlock_unlock(&hw->lock);\n+\n+\treturn 0;\n+}\n+\n+static int\n+hns3_dev_set_link_down(struct rte_eth_dev *dev)\n+{\n+\tstruct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tint ret;\n+\n+\t/*\n+\t * The \"tx_pkt_burst\" will be set to dummy function. But the secondary\n+\t * process does not support the mechanism for notifying the primary\n+\t * process.\n+\t */\n+\tif (rte_eal_process_type() != RTE_PROC_PRIMARY) {\n+\t\thns3_err(hw, \"secondary process does not support to set link down.\");\n+\t\treturn -ENOTSUP;\n+\t}\n+\n+\t/*\n+\t * If device isn't started or the API has been called, link status is\n+\t * down, return success.\n+\t */\n+\tif (hw->adapter_state != HNS3_NIC_STARTED || hw->set_link_down)\n+\t\treturn 0;\n+\n+\trte_spinlock_lock(&hw->lock);\n+\thns3_stop_tx_datapath(dev);\n+\tret = hns3_cfg_mac_mode(hw, false);\n+\tif (ret) {\n+\t\thns3_start_tx_datapath(dev);\n+\t\trte_spinlock_unlock(&hw->lock);\n+\t\thns3_err(hw, \"failed to set link down, ret = %d\", ret);\n+\t\treturn ret;\n+\t}\n+\n+\thw->set_link_down = true;\n+\trte_spinlock_unlock(&hw->lock);\n+\n+\treturn 0;\n+}\n+\n+static int\n hns3_parse_func_status(struct hns3_hw *hw, struct hns3_func_status_cmd *status)\n {\n \tstruct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);\n@@ -5576,6 +5659,7 @@ static int\n hns3_do_start(struct hns3_adapter *hns, bool reset_queue)\n {\n \tstruct hns3_hw *hw = &hns->hw;\n+\tbool link_en;\n \tint ret;\n \n \tret = hns3_update_queue_map_configure(hns);\n@@ -5600,7 +5684,8 @@ hns3_do_start(struct hns3_adapter *hns, bool reset_queue)\n \t\treturn ret;\n \t}\n \n-\tret = hns3_cfg_mac_mode(hw, true);\n+\tlink_en = hw->set_link_down ? false : true;\n+\tret = hns3_cfg_mac_mode(hw, link_en);\n \tif (ret) {\n \t\tPMD_INIT_LOG(ERR, \"failed to enable MAC, ret = %d\", ret);\n \t\tgoto err_config_mac_mode;\n@@ -5731,6 +5816,7 @@ hns3_dev_start(struct rte_eth_dev *dev)\n {\n \tstruct hns3_adapter *hns = dev->data->dev_private;\n \tstruct hns3_hw *hw = &hns->hw;\n+\tbool old_state = hw->set_link_down;\n \tint ret;\n \n \tPMD_INIT_FUNC_TRACE();\n@@ -5740,12 +5826,17 @@ hns3_dev_start(struct rte_eth_dev *dev)\n \trte_spinlock_lock(&hw->lock);\n \thw->adapter_state = HNS3_NIC_STARTING;\n \n+\t/*\n+\t * If the dev_set_link_down() API has been called, the \"set_link_down\"\n+\t * flag can be cleared by dev_start() API. In addition, the flag should\n+\t * also be cleared before calling hns3_do_start() so that MAC can be\n+\t * enabled in dev_start stage.\n+\t */\n+\thw->set_link_down = false;\n \tret = hns3_do_start(hns, true);\n-\tif (ret) {\n-\t\thw->adapter_state = HNS3_NIC_CONFIGURED;\n-\t\trte_spinlock_unlock(&hw->lock);\n-\t\treturn ret;\n-\t}\n+\tif (ret)\n+\t\tgoto do_start_fail;\n+\n \tret = hns3_map_rx_interrupt(dev);\n \tif (ret)\n \t\tgoto map_rx_inter_err;\n@@ -5801,6 +5892,8 @@ hns3_dev_start(struct rte_eth_dev *dev)\n \thns3_stop_all_txqs(dev);\n map_rx_inter_err:\n \t(void)hns3_do_stop(hns);\n+do_start_fail:\n+\thw->set_link_down = old_state;\n \thw->adapter_state = HNS3_NIC_CONFIGURED;\n \trte_spinlock_unlock(&hw->lock);\n \n@@ -7345,6 +7438,8 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {\n \t.mac_addr_set = hns3_set_default_mac_addr,\n \t.set_mc_addr_list = hns3_set_mc_mac_addr_list,\n \t.link_update = hns3_dev_link_update,\n+\t.dev_set_link_up = hns3_dev_set_link_up,\n+\t.dev_set_link_down = hns3_dev_set_link_down,\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,\ndiff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h\nindex 2e48ff6..0e4e426 100644\n--- a/drivers/net/hns3/hns3_ethdev.h\n+++ b/drivers/net/hns3/hns3_ethdev.h\n@@ -481,6 +481,11 @@ struct hns3_hw {\n \tstruct hns3_cmq cmq;\n \tstruct hns3_mbx_resp_status mbx_resp; /* mailbox response */\n \tstruct hns3_mac mac;\n+\t/*\n+\t * This flag indicates dev_set_link_down() API is called, and is cleared\n+\t * by dev_set_link_up() or dev_start().\n+\t */\n+\tbool set_link_down;\n \tunsigned int secondary_cnt; /* Number of secondary processes init'd. */\n \tstruct hns3_tqp_stats tqp_stats;\n \t/* Include Mac stats | Rx stats | Tx stats */\n@@ -699,9 +704,9 @@ struct hns3_vtag_cfg {\n /* Request types for IPC. */\n enum hns3_mp_req_type {\n \tHNS3_MP_REQ_START_RXTX = 1,\n-\tHNS3_MP_REQ_STOP_RXTX = 2,\n-\tHNS3_MP_REQ_START_TX = 3,\n-\tHNS3_MP_REQ_STOP_TX = 4,\n+\tHNS3_MP_REQ_STOP_RXTX,\n+\tHNS3_MP_REQ_START_TX,\n+\tHNS3_MP_REQ_STOP_TX,\n \tHNS3_MP_REQ_MAX\n };\n \ndiff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c\nindex 7d8176f..0f222b3 100644\n--- a/drivers/net/hns3/hns3_rxtx.c\n+++ b/drivers/net/hns3/hns3_rxtx.c\n@@ -20,6 +20,7 @@\n #include \"hns3_rxtx.h\"\n #include \"hns3_regs.h\"\n #include \"hns3_logs.h\"\n+#include \"hns3_mp.h\"\n \n #define HNS3_CFG_DESC_NUM(num)\t((num) / 8 - 1)\n #define HNS3_RX_RING_PREFETCTH_MASK\t3\n@@ -4372,6 +4373,7 @@ hns3_trace_rxtx_function(struct rte_eth_dev *dev)\n \n void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev)\n {\n+\tstruct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n \tstruct hns3_adapter *hns = eth_dev->data->dev_private;\n \teth_tx_prep_t prep = NULL;\n \n@@ -4379,7 +4381,9 @@ void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev)\n \t __atomic_load_n(&hns->hw.reset.resetting, __ATOMIC_RELAXED) == 0) {\n \t\teth_dev->rx_pkt_burst = hns3_get_rx_function(eth_dev);\n \t\teth_dev->rx_descriptor_status = hns3_dev_rx_descriptor_status;\n-\t\teth_dev->tx_pkt_burst = hns3_get_tx_function(eth_dev, &prep);\n+\t\teth_dev->tx_pkt_burst = hw->set_link_down ?\n+\t\t\t\t\thns3_dummy_rxtx_burst :\n+\t\t\t\t\thns3_get_tx_function(eth_dev, &prep);\n \t\teth_dev->tx_pkt_prepare = prep;\n \t\teth_dev->tx_descriptor_status = hns3_dev_tx_descriptor_status;\n \t\thns3_trace_rxtx_function(eth_dev);\n@@ -4703,3 +4707,25 @@ hns3_enable_rxd_adv_layout(struct hns3_hw *hw)\n \tif (hns3_dev_rxd_adv_layout_supported(hw))\n \t\thns3_write_dev(hw, HNS3_RXD_ADV_LAYOUT_EN_REG, 1);\n }\n+\n+void\n+hns3_stop_tx_datapath(struct rte_eth_dev *dev)\n+{\n+\tdev->tx_pkt_burst = hns3_dummy_rxtx_burst;\n+\tdev->tx_pkt_prepare = NULL;\n+\trte_wmb();\n+\t/* Disable tx datapath on secondary process. */\n+\thns3_mp_req_stop_tx(dev);\n+\t/* Prevent crashes when queues are still in use. */\n+\trte_delay_ms(dev->data->nb_tx_queues);\n+}\n+\n+void\n+hns3_start_tx_datapath(struct rte_eth_dev *dev)\n+{\n+\teth_tx_prep_t prep = NULL;\n+\n+\tdev->tx_pkt_burst = hns3_get_tx_function(dev, &prep);\n+\tdev->tx_pkt_prepare = prep;\n+\thns3_mp_req_start_tx(dev);\n+}\ndiff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h\nindex 141de7a..cd7c21c 100644\n--- a/drivers/net/hns3/hns3_rxtx.h\n+++ b/drivers/net/hns3/hns3_rxtx.h\n@@ -766,5 +766,7 @@ void hns3_enable_rxd_adv_layout(struct hns3_hw *hw);\n int hns3_dev_rx_descriptor_status(void *rx_queue, uint16_t offset);\n int hns3_dev_tx_descriptor_status(void *tx_queue, uint16_t offset);\n void hns3_tx_push_init(struct rte_eth_dev *dev);\n+void hns3_stop_tx_datapath(struct rte_eth_dev *dev);\n+void hns3_start_tx_datapath(struct rte_eth_dev *dev);\n \n #endif /* _HNS3_RXTX_H_ */\n", "prefixes": [ "v1", "2/2" ] }