Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/72604/?format=api
{ "id": 72604, "url": "http://patches.dpdk.org/api/patches/72604/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1593604482-47494-3-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": "<1593604482-47494-3-git-send-email-xavier.huwei@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1593604482-47494-3-git-send-email-xavier.huwei@huawei.com", "date": "2020-07-01T11:54:34", "name": "[02/10] net/hns3: support LRO", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "d8b4cd3025f44d4de9b1dd59bc581a1b4567045b", "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/1593604482-47494-3-git-send-email-xavier.huwei@huawei.com/mbox/", "series": [ { "id": 10710, "url": "http://patches.dpdk.org/api/series/10710/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=10710", "date": "2020-07-01T11:54:33", "name": "misc updates for hns3 PMD driver", "version": 1, "mbox": "http://patches.dpdk.org/series/10710/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/72604/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/72604/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 5985AA0350;\n\tWed, 1 Jul 2020 13:56:48 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 7E7721D381;\n\tWed, 1 Jul 2020 13:56:33 +0200 (CEST)", "from huawei.com (szxga07-in.huawei.com [45.249.212.35])\n by dpdk.org (Postfix) with ESMTP id 8A14C1D148\n for <dev@dpdk.org>; Wed, 1 Jul 2020 13:56:29 +0200 (CEST)", "from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58])\n by Forcepoint Email with ESMTP id 2859AF13C9A5B95109E1\n for <dev@dpdk.org>; Wed, 1 Jul 2020 19:56:27 +0800 (CST)", "from localhost.localdomain (10.69.192.56) by\n DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id\n 14.3.487.0; Wed, 1 Jul 2020 19:56:21 +0800" ], "From": "\"Wei Hu (Xavier)\" <xavier.huwei@huawei.com>", "To": "<dev@dpdk.org>", "CC": "<xavier.huwei@huawei.com>", "Date": "Wed, 1 Jul 2020 19:54:34 +0800", "Message-ID": "<1593604482-47494-3-git-send-email-xavier.huwei@huawei.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1593604482-47494-1-git-send-email-xavier.huwei@huawei.com>", "References": "<1593604482-47494-1-git-send-email-xavier.huwei@huawei.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.69.192.56]", "X-CFilter-Loop": "Reflected", "Subject": "[dpdk-dev] [PATCH 02/10] net/hns3: support LRO", "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 <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": "This patch adds support of LRO offload for hns3 PMD driver.\n\nSigned-off-by: Hongbo Zheng <zhenghongbo3@huawei.com>\nSigned-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>\n---\n doc/guides/nics/features/hns3.ini | 1 +\n doc/guides/nics/features/hns3_vf.ini | 1 +\n doc/guides/nics/hns3.rst | 1 +\n drivers/net/hns3/hns3_ethdev.c | 35 ++++++++++++----------------\n drivers/net/hns3/hns3_ethdev.h | 2 +-\n drivers/net/hns3/hns3_ethdev_vf.c | 16 ++++++++++++-\n drivers/net/hns3/hns3_rxtx.c | 45 ++++++++++++++++++++++++++++++++++++\n drivers/net/hns3/hns3_rxtx.h | 4 +++-\n 8 files changed, 82 insertions(+), 23 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/hns3.ini b/doc/guides/nics/features/hns3.ini\nindex c3a8544..66abda7 100644\n--- a/doc/guides/nics/features/hns3.ini\n+++ b/doc/guides/nics/features/hns3.ini\n@@ -9,6 +9,7 @@ Rx interrupt = Y\n MTU update = Y\n Jumbo frame = Y\n TSO = Y\n+LRO = Y\n Promiscuous mode = Y\n Allmulticast mode = Y\n Unicast MAC filter = Y\ndiff --git a/doc/guides/nics/features/hns3_vf.ini b/doc/guides/nics/features/hns3_vf.ini\nindex 80773ac..71d246a 100644\n--- a/doc/guides/nics/features/hns3_vf.ini\n+++ b/doc/guides/nics/features/hns3_vf.ini\n@@ -9,6 +9,7 @@ Rx interrupt = Y\n MTU update = Y\n Jumbo frame = Y\n TSO = Y\n+LRO = Y\n Promiscuous mode = Y\n Allmulticast mode = Y\n Unicast MAC filter = Y\ndiff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst\nindex 05dbe41..ae3c5f6 100644\n--- a/doc/guides/nics/hns3.rst\n+++ b/doc/guides/nics/hns3.rst\n@@ -18,6 +18,7 @@ Features of the HNS3 PMD are:\n - Packet type information\n - Checksum offload\n - TSO offload\n+- LRO offload\n - Promiscuous mode\n - Multicast mode\n - Port hardware statistics\ndiff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c\nindex 62d8758..7758855 100644\n--- a/drivers/net/hns3/hns3_ethdev.c\n+++ b/drivers/net/hns3/hns3_ethdev.c\n@@ -1099,25 +1099,6 @@ hns3_config_tso(struct hns3_hw *hw, unsigned int tso_mss_min,\n \treturn hns3_cmd_send(hw, &desc, 1);\n }\n \n-int\n-hns3_config_gro(struct hns3_hw *hw, bool en)\n-{\n-\tstruct hns3_cfg_gro_status_cmd *req;\n-\tstruct hns3_cmd_desc desc;\n-\tint ret;\n-\n-\thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_GRO_GENERIC_CONFIG, false);\n-\treq = (struct hns3_cfg_gro_status_cmd *)desc.data;\n-\n-\treq->gro_en = rte_cpu_to_le_16(en ? 1 : 0);\n-\n-\tret = hns3_cmd_send(hw, &desc, 1);\n-\tif (ret)\n-\t\thns3_err(hw, \"GRO hardware config cmd failed, ret = %d\", ret);\n-\n-\treturn ret;\n-}\n-\n static int\n hns3_set_umv_space(struct hns3_hw *hw, uint16_t space_size,\n \t\t uint16_t *allocated_size, bool is_alloc)\n@@ -2276,6 +2257,7 @@ hns3_dev_configure(struct rte_eth_dev *dev)\n \tuint16_t nb_tx_q = dev->data->nb_tx_queues;\n \tstruct rte_eth_rss_conf rss_conf;\n \tuint16_t mtu;\n+\tbool gro_en;\n \tint ret;\n \n \t/*\n@@ -2342,6 +2324,12 @@ hns3_dev_configure(struct rte_eth_dev *dev)\n \tif (ret)\n \t\tgoto cfg_err;\n \n+\t/* config hardware GRO */\n+\tgro_en = conf->rxmode.offloads & DEV_RX_OFFLOAD_TCP_LRO ? true : false;\n+\tret = hns3_config_gro(hw, gro_en);\n+\tif (ret)\n+\t\tgoto cfg_err;\n+\n \thw->adapter_state = HNS3_NIC_CONFIGURED;\n \n \treturn 0;\n@@ -2449,6 +2437,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)\n \tinfo->min_rx_bufsize = hw->rx_buf_len;\n \tinfo->max_mac_addrs = HNS3_UC_MACADDR_NUM;\n \tinfo->max_mtu = info->max_rx_pktlen - HNS3_ETH_OVERHEAD;\n+\tinfo->max_lro_pkt_size = HNS3_MAX_LRO_SIZE;\n \tinfo->rx_offload_capa = (DEV_RX_OFFLOAD_IPV4_CKSUM |\n \t\t\t\t DEV_RX_OFFLOAD_TCP_CKSUM |\n \t\t\t\t DEV_RX_OFFLOAD_UDP_CKSUM |\n@@ -2460,7 +2449,8 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)\n \t\t\t\t DEV_RX_OFFLOAD_VLAN_STRIP |\n \t\t\t\t DEV_RX_OFFLOAD_VLAN_FILTER |\n \t\t\t\t DEV_RX_OFFLOAD_JUMBO_FRAME |\n-\t\t\t\t DEV_RX_OFFLOAD_RSS_HASH);\n+\t\t\t\t DEV_RX_OFFLOAD_RSS_HASH |\n+\t\t\t\t DEV_RX_OFFLOAD_TCP_LRO);\n \tinfo->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;\n \tinfo->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |\n \t\t\t\t DEV_TX_OFFLOAD_IPV4_CKSUM |\n@@ -4381,6 +4371,7 @@ hns3_uninit_pf(struct rte_eth_dev *eth_dev)\n \n \thns3_enable_hw_error_intr(hns, false);\n \thns3_rss_uninit(hns);\n+\t(void)hns3_config_gro(hw, false);\n \thns3_promisc_uninit(hw);\n \thns3_fdir_filter_uninit(hns);\n \thns3_uninit_umv_space(hw);\n@@ -5215,6 +5206,10 @@ hns3_restore_conf(struct hns3_adapter *hns)\n \tif (ret)\n \t\tgoto err_promisc;\n \n+\tret = hns3_restore_gro_conf(hw);\n+\tif (ret)\n+\t\tgoto err_promisc;\n+\n \tif (hns->hw.adapter_state == HNS3_NIC_STARTED) {\n \t\tret = hns3_do_start(hns, false);\n \t\tif (ret)\ndiff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h\nindex 21412c4..93fe2fe 100644\n--- a/drivers/net/hns3/hns3_ethdev.h\n+++ b/drivers/net/hns3/hns3_ethdev.h\n@@ -46,6 +46,7 @@\n #define HNS3_MAX_BD_PAYLEN\t\t(1024 * 1024 - 1)\n #define HNS3_MAX_TSO_HDR_SIZE\t\t512\n #define HNS3_MAX_TSO_HDR_BD_NUM\t\t3\n+#define HNS3_MAX_LRO_SIZE\t\t64512\n \n #define HNS3_ETH_OVERHEAD \\\n \t(RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + HNS3_VLAN_TAG_SIZE * 2)\n@@ -654,7 +655,6 @@ hns3_test_and_clear_bit(unsigned int nr, volatile uint64_t *addr)\n }\n \n int hns3_buffer_alloc(struct hns3_hw *hw);\n-int hns3_config_gro(struct hns3_hw *hw, bool en);\n int hns3_dev_filter_ctrl(struct rte_eth_dev *dev,\n \t\t\t enum rte_filter_type filter_type,\n \t\t\t enum rte_filter_op filter_op, void *arg);\ndiff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c\nindex 0fdee4d..ccf44a1 100644\n--- a/drivers/net/hns3/hns3_ethdev_vf.c\n+++ b/drivers/net/hns3/hns3_ethdev_vf.c\n@@ -757,6 +757,7 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)\n \tuint16_t nb_tx_q = dev->data->nb_tx_queues;\n \tstruct rte_eth_rss_conf rss_conf;\n \tuint16_t mtu;\n+\tbool gro_en;\n \tint ret;\n \n \t/*\n@@ -817,6 +818,12 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)\n \tif (ret)\n \t\tgoto cfg_err;\n \n+\t/* config hardware GRO */\n+\tgro_en = conf->rxmode.offloads & DEV_RX_OFFLOAD_TCP_LRO ? true : false;\n+\tret = hns3_config_gro(hw, gro_en);\n+\tif (ret)\n+\t\tgoto cfg_err;\n+\n \thw->adapter_state = HNS3_NIC_CONFIGURED;\n \treturn 0;\n \n@@ -898,6 +905,7 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)\n \tinfo->min_rx_bufsize = hw->rx_buf_len;\n \tinfo->max_mac_addrs = HNS3_VF_UC_MACADDR_NUM;\n \tinfo->max_mtu = info->max_rx_pktlen - HNS3_ETH_OVERHEAD;\n+\tinfo->max_lro_pkt_size = HNS3_MAX_LRO_SIZE;\n \n \tinfo->rx_offload_capa = (DEV_RX_OFFLOAD_IPV4_CKSUM |\n \t\t\t\t DEV_RX_OFFLOAD_UDP_CKSUM |\n@@ -910,7 +918,8 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)\n \t\t\t\t DEV_RX_OFFLOAD_VLAN_STRIP |\n \t\t\t\t DEV_RX_OFFLOAD_VLAN_FILTER |\n \t\t\t\t DEV_RX_OFFLOAD_JUMBO_FRAME |\n-\t\t\t\t DEV_RX_OFFLOAD_RSS_HASH);\n+\t\t\t\t DEV_RX_OFFLOAD_RSS_HASH |\n+\t\t\t\t DEV_RX_OFFLOAD_TCP_LRO);\n \tinfo->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;\n \tinfo->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |\n \t\t\t\t DEV_TX_OFFLOAD_IPV4_CKSUM |\n@@ -1648,6 +1657,7 @@ hns3vf_uninit_vf(struct rte_eth_dev *eth_dev)\n \tPMD_INIT_FUNC_TRACE();\n \n \thns3_rss_uninit(hns);\n+\t(void)hns3_config_gro(hw, false);\n \t(void)hns3vf_set_alive(hw, false);\n \t(void)hns3vf_set_promisc_mode(hw, false, false, false);\n \thns3vf_disable_irq0(hw);\n@@ -2219,6 +2229,10 @@ hns3vf_restore_conf(struct hns3_adapter *hns)\n \tif (ret)\n \t\tgoto err_vlan_table;\n \n+\tret = hns3_restore_gro_conf(hw);\n+\tif (ret)\n+\t\tgoto err_vlan_table;\n+\n \tif (hw->adapter_state == HNS3_NIC_STARTED) {\n \t\tret = hns3vf_do_start(hns, false);\n \t\tif (ret)\ndiff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c\nindex 57017b6..4e3391d 100644\n--- a/drivers/net/hns3/hns3_rxtx.c\n+++ b/drivers/net/hns3/hns3_rxtx.c\n@@ -1519,6 +1519,7 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \tuint32_t bd_base_info;\n \tuint32_t cksum_err;\n \tuint32_t l234_info;\n+\tuint32_t gro_size;\n \tuint32_t ol_info;\n \tuint64_t dma_addr;\n \tuint16_t data_len;\n@@ -1665,6 +1666,13 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\t}\n \t\trxm->next = NULL;\n \n+\t\tgro_size = hns3_get_field(bd_base_info, HNS3_RXD_GRO_SIZE_M,\n+\t\t\t\t\t HNS3_RXD_GRO_SIZE_S);\n+\t\tif (gro_size != 0) {\n+\t\t\tfirst_seg->ol_flags |= PKT_RX_LRO;\n+\t\t\tfirst_seg->tso_segsz = gro_size;\n+\t\t}\n+\n \t\tret = hns3_handle_bdinfo(rxq, first_seg, bd_base_info,\n \t\t\t\t\t l234_info, &cksum_err);\n \t\tif (unlikely(ret))\n@@ -1850,6 +1858,43 @@ hns3_tso_proc_tunnel(struct hns3_desc *desc, uint64_t ol_flags,\n \treturn 0;\n }\n \n+int\n+hns3_config_gro(struct hns3_hw *hw, bool en)\n+{\n+\tstruct hns3_cfg_gro_status_cmd *req;\n+\tstruct hns3_cmd_desc desc;\n+\tint ret;\n+\n+\thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_GRO_GENERIC_CONFIG, false);\n+\treq = (struct hns3_cfg_gro_status_cmd *)desc.data;\n+\n+\treq->gro_en = rte_cpu_to_le_16(en ? 1 : 0);\n+\n+\tret = hns3_cmd_send(hw, &desc, 1);\n+\tif (ret)\n+\t\thns3_err(hw, \"%s hardware GRO failed, ret = %d\",\n+\t\t\t en ? \"enable\" : \"disable\", ret);\n+\n+\treturn ret;\n+}\n+\n+int\n+hns3_restore_gro_conf(struct hns3_hw *hw)\n+{\n+\tuint64_t offloads;\n+\tbool gro_en;\n+\tint ret;\n+\n+\toffloads = hw->data->dev_conf.rxmode.offloads;\n+\tgro_en = offloads & DEV_RX_OFFLOAD_TCP_LRO ? true : false;\n+\tret = hns3_config_gro(hw, gro_en);\n+\tif (ret)\n+\t\thns3_err(hw, \"restore hardware GRO to %s failed, ret = %d\",\n+\t\t\t gro_en ? \"enabled\" : \"disabled\", ret);\n+\n+\treturn ret;\n+}\n+\n static inline bool\n hns3_pkt_is_tso(struct rte_mbuf *m)\n {\ndiff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h\nindex 0cb92ce..380d27b 100644\n--- a/drivers/net/hns3/hns3_rxtx.h\n+++ b/drivers/net/hns3/hns3_rxtx.h\n@@ -73,7 +73,7 @@\n #define HNS3_RXD_TSIND_M\t\t\t(0x7 << HNS3_RXD_TSIND_S)\n #define HNS3_RXD_LKBK_B\t\t\t\t15\n #define HNS3_RXD_GRO_SIZE_S\t\t\t16\n-#define HNS3_RXD_GRO_SIZE_M\t\t\t(0x3ff << HNS3_RXD_GRO_SIZE_S)\n+#define HNS3_RXD_GRO_SIZE_M\t\t\t(0x3fff << HNS3_RXD_GRO_SIZE_S)\n \n #define HNS3_TXD_L3T_S\t\t\t\t0\n #define HNS3_TXD_L3T_M\t\t\t\t(0x3 << HNS3_TXD_L3T_S)\n@@ -376,5 +376,7 @@ void hns3_set_queue_intr_rl(struct hns3_hw *hw, uint16_t queue_id,\n \t\t\t uint16_t rl_value);\n int hns3_set_fake_rx_or_tx_queues(struct rte_eth_dev *dev, uint16_t nb_rx_q,\n \t\t\t\t uint16_t nb_tx_q);\n+int hns3_config_gro(struct hns3_hw *hw, bool en);\n+int hns3_restore_gro_conf(struct hns3_hw *hw);\n \n #endif /* _HNS3_RXTX_H_ */\n", "prefixes": [ "02/10" ] }