Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/88193/?format=api
{ "id": 88193, "url": "http://patches.dpdk.org/api/patches/88193/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210225080901.3645291-10-jiawenwu@trustnetic.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": "<20210225080901.3645291-10-jiawenwu@trustnetic.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210225080901.3645291-10-jiawenwu@trustnetic.com", "date": "2021-02-25T08:08:53", "name": "[v3,09/17] net/txgbe: add VLAN handle support to VF driver", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6cb32ac5307b9e88da89d50cb6ba59bc4cad7da4", "submitter": { "id": 1932, "url": "http://patches.dpdk.org/api/people/1932/?format=api", "name": "Jiawen Wu", "email": "jiawenwu@trustnetic.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/20210225080901.3645291-10-jiawenwu@trustnetic.com/mbox/", "series": [ { "id": 15371, "url": "http://patches.dpdk.org/api/series/15371/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=15371", "date": "2021-02-25T08:08:45", "name": "net/txgbe: add VF driver support", "version": 3, "mbox": "http://patches.dpdk.org/series/15371/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/88193/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/88193/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 A8B17A034F;\n\tThu, 25 Feb 2021 09:09:50 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id B3D161607CF;\n\tThu, 25 Feb 2021 09:08:47 +0100 (CET)", "from smtpbgeu2.qq.com (smtpbgeu2.qq.com [18.194.254.142])\n by mails.dpdk.org (Postfix) with ESMTP id 28C1F1607AE\n for <dev@dpdk.org>; Thu, 25 Feb 2021 09:08:44 +0100 (CET)", "from wxdbg.localdomain.com (unknown [183.129.236.74])\n by esmtp6.qq.com (ESMTP) with\n id ; Thu, 25 Feb 2021 16:08:39 +0800 (CST)" ], "X-QQ-mid": "bizesmtp20t1614240519t90rurkf", "X-QQ-SSF": "01400000002000C0D000000A0000000", "X-QQ-FEAT": "dMLGSgzcGotdqJ+d24ydDvPdmWSAZNTuxo4VEE1bGH3cAIisjWHNguoOesR2q\n SvKWKJd5H4Rml1bjpaWH74p/ZCEppny7QxlnRPS2CARU4ILBxWhYe9PhIssi1wRFyY4eMNU\n ly4v2bRTU9MRphkTb/KRu6M0ta0UOtBEweqI31j2LAHg9pT95G9E7wJtOsiLLp6I6pudF5n\n S4dBsIfGG5VwNLJRsb6JtMSfgQpenSb09k/Bw8eXDoF7balU6BO8TOH/NmThP8KYEeMTz+f\n BJbFTt92U3jmDVtHJW0uPNlbvPDOXRCpJpSThOAfia+ut0J4uHA1igMRdAD/TSGr+UfxBbM\n r/Rh8Lb/FgpEgbxTgzahge1CsLtEA==", "X-QQ-GoodBg": "2", "From": "Jiawen Wu <jiawenwu@trustnetic.com>", "To": "dev@dpdk.org", "Cc": "Jiawen Wu <jiawenwu@trustnetic.com>", "Date": "Thu, 25 Feb 2021 16:08:53 +0800", "Message-Id": "<20210225080901.3645291-10-jiawenwu@trustnetic.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210225080901.3645291-1-jiawenwu@trustnetic.com>", "References": "<20210225080901.3645291-1-jiawenwu@trustnetic.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-QQ-SENDSIZE": "520", "Feedback-ID": "bizesmtp:trustnetic.com:qybgforeign:qybgforeign6", "X-QQ-Bgrelay": "1", "Subject": "[dpdk-dev] [PATCH v3 09/17] net/txgbe: add VLAN handle support to\n VF driver", "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": "Add VLAN filter, offload and strip set support to VF driver.\n\nSigned-off-by: Jiawen Wu <jiawenwu@trustnetic.com>\n---\n doc/guides/nics/features/txgbe_vf.ini | 1 +\n drivers/net/txgbe/base/txgbe_vf.c | 30 +++++++\n drivers/net/txgbe/base/txgbe_vf.h | 2 +\n drivers/net/txgbe/txgbe_ethdev_vf.c | 117 ++++++++++++++++++++++++++\n 4 files changed, 150 insertions(+)", "diff": "diff --git a/doc/guides/nics/features/txgbe_vf.ini b/doc/guides/nics/features/txgbe_vf.ini\nindex 675e1af83..0d5d24bcd 100644\n--- a/doc/guides/nics/features/txgbe_vf.ini\n+++ b/doc/guides/nics/features/txgbe_vf.ini\n@@ -11,6 +11,7 @@ Jumbo frame = Y\n Scattered Rx = Y\n LRO = Y\n TSO = Y\n+VLAN filter = Y\n CRC offload = P\n VLAN offload = P\n QinQ offload = P\ndiff --git a/drivers/net/txgbe/base/txgbe_vf.c b/drivers/net/txgbe/base/txgbe_vf.c\nindex 1cf09ad42..9718912f8 100644\n--- a/drivers/net/txgbe/base/txgbe_vf.c\n+++ b/drivers/net/txgbe/base/txgbe_vf.c\n@@ -33,6 +33,7 @@ s32 txgbe_init_ops_vf(struct txgbe_hw *hw)\n \t/* RAR, Multicast, VLAN */\n \tmac->set_rar = txgbe_set_rar_vf;\n \tmac->set_uc_addr = txgbevf_set_uc_addr_vf;\n+\tmac->set_vfta = txgbe_set_vfta_vf;\n \tmac->set_rlpml = txgbevf_rlpml_set_vf;\n \n \tmac->max_tx_queues = 1;\n@@ -256,6 +257,35 @@ s32 txgbe_set_rar_vf(struct txgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,\n \treturn ret_val;\n }\n \n+/**\n+ * txgbe_set_vfta_vf - Set/Unset vlan filter table address\n+ * @hw: pointer to the HW structure\n+ * @vlan: 12 bit VLAN ID\n+ * @vind: unused by VF drivers\n+ * @vlan_on: if true then set bit, else clear bit\n+ * @vlvf_bypass: boolean flag indicating updating default pool is okay\n+ *\n+ * Turn on/off specified VLAN in the VLAN filter table.\n+ **/\n+s32 txgbe_set_vfta_vf(struct txgbe_hw *hw, u32 vlan, u32 vind,\n+\t\t bool vlan_on, bool vlvf_bypass)\n+{\n+\tu32 msgbuf[2];\n+\ts32 ret_val;\n+\tUNREFERENCED_PARAMETER(vind, vlvf_bypass);\n+\n+\tmsgbuf[0] = TXGBE_VF_SET_VLAN;\n+\tmsgbuf[1] = vlan;\n+\t/* Setting the 8 bit field MSG INFO to TRUE indicates \"add\" */\n+\tmsgbuf[0] |= vlan_on << TXGBE_VT_MSGINFO_SHIFT;\n+\n+\tret_val = txgbevf_write_msg_read_ack(hw, msgbuf, msgbuf, 2);\n+\tif (!ret_val && (msgbuf[0] & TXGBE_VT_MSGTYPE_ACK))\n+\t\treturn 0;\n+\n+\treturn ret_val | (msgbuf[0] & TXGBE_VT_MSGTYPE_NACK);\n+}\n+\n /**\n * txgbe_get_mac_addr_vf - Read device MAC address\n * @hw: pointer to the HW structure\ndiff --git a/drivers/net/txgbe/base/txgbe_vf.h b/drivers/net/txgbe/base/txgbe_vf.h\nindex 70d81ca83..45db1b776 100644\n--- a/drivers/net/txgbe/base/txgbe_vf.h\n+++ b/drivers/net/txgbe/base/txgbe_vf.h\n@@ -47,6 +47,8 @@ s32 txgbe_check_mac_link_vf(struct txgbe_hw *hw, u32 *speed,\n s32 txgbe_set_rar_vf(struct txgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,\n \t\t u32 enable_addr);\n s32 txgbevf_set_uc_addr_vf(struct txgbe_hw *hw, u32 index, u8 *addr);\n+s32 txgbe_set_vfta_vf(struct txgbe_hw *hw, u32 vlan, u32 vind,\n+\t\t bool vlan_on, bool vlvf_bypass);\n s32 txgbevf_rlpml_set_vf(struct txgbe_hw *hw, u16 max_size);\n int txgbevf_negotiate_api_version(struct txgbe_hw *hw, int api);\n int txgbevf_get_queues(struct txgbe_hw *hw, unsigned int *num_tcs,\ndiff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c\nindex 8fec75efe..b1573100e 100644\n--- a/drivers/net/txgbe/txgbe_ethdev_vf.c\n+++ b/drivers/net/txgbe/txgbe_ethdev_vf.c\n@@ -26,6 +26,8 @@ static int txgbevf_dev_close(struct rte_eth_dev *dev);\n static void txgbevf_intr_disable(struct rte_eth_dev *dev);\n static void txgbevf_intr_enable(struct rte_eth_dev *dev);\n static int txgbevf_dev_stats_reset(struct rte_eth_dev *dev);\n+static int txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask);\n+static void txgbevf_set_vfta_all(struct rte_eth_dev *dev, bool on);\n static void txgbevf_configure_msix(struct rte_eth_dev *dev);\n static void txgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index);\n static void txgbevf_dev_interrupt_handler(void *param);\n@@ -130,6 +132,8 @@ eth_txgbevf_dev_init(struct rte_eth_dev *eth_dev)\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\n \tstruct txgbe_hw *hw = TXGBE_DEV_HW(eth_dev);\n+\tstruct txgbe_vfta *shadow_vfta = TXGBE_DEV_VFTA(eth_dev);\n+\tstruct txgbe_hwstrip *hwstrip = TXGBE_DEV_HWSTRIP(eth_dev);\n \tstruct rte_ether_addr *perm_addr =\n \t\t\t(struct rte_ether_addr *)hw->mac.perm_addr;\n \n@@ -173,6 +177,12 @@ eth_txgbevf_dev_init(struct rte_eth_dev *eth_dev)\n \thw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id;\n \thw->hw_addr = (void *)pci_dev->mem_resource[0].addr;\n \n+\t/* initialize the vfta */\n+\tmemset(shadow_vfta, 0, sizeof(*shadow_vfta));\n+\n+\t/* initialize the hw strip bitmap*/\n+\tmemset(hwstrip, 0, sizeof(*hwstrip));\n+\n \t/* Initialize the shared code (base driver) */\n \terr = txgbe_init_shared_code(hw);\n \tif (err != 0) {\n@@ -595,6 +605,110 @@ txgbevf_dev_close(struct rte_eth_dev *dev)\n \treturn 0;\n }\n \n+static void txgbevf_set_vfta_all(struct rte_eth_dev *dev, bool on)\n+{\n+\tstruct txgbe_hw *hw = TXGBE_DEV_HW(dev);\n+\tstruct txgbe_vfta *shadow_vfta = TXGBE_DEV_VFTA(dev);\n+\tint i = 0, j = 0, vfta = 0, mask = 1;\n+\n+\tfor (i = 0; i < TXGBE_VFTA_SIZE; i++) {\n+\t\tvfta = shadow_vfta->vfta[i];\n+\t\tif (vfta) {\n+\t\t\tmask = 1;\n+\t\t\tfor (j = 0; j < 32; j++) {\n+\t\t\t\tif (vfta & mask)\n+\t\t\t\t\ttxgbe_set_vfta(hw, (i << 5) + j, 0,\n+\t\t\t\t\t\t on, false);\n+\t\t\t\tmask <<= 1;\n+\t\t\t}\n+\t\t}\n+\t}\n+}\n+\n+static int\n+txgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)\n+{\n+\tstruct txgbe_hw *hw = TXGBE_DEV_HW(dev);\n+\tstruct txgbe_vfta *shadow_vfta = TXGBE_DEV_VFTA(dev);\n+\tuint32_t vid_idx = 0;\n+\tuint32_t vid_bit = 0;\n+\tint ret = 0;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\t/* vind is not used in VF driver, set to 0, check txgbe_set_vfta_vf */\n+\tret = hw->mac.set_vfta(hw, vlan_id, 0, !!on, false);\n+\tif (ret) {\n+\t\tPMD_INIT_LOG(ERR, \"Unable to set VF vlan\");\n+\t\treturn ret;\n+\t}\n+\tvid_idx = (uint32_t)((vlan_id >> 5) & 0x7F);\n+\tvid_bit = (uint32_t)(1 << (vlan_id & 0x1F));\n+\n+\t/* Save what we set and restore it after device reset */\n+\tif (on)\n+\t\tshadow_vfta->vfta[vid_idx] |= vid_bit;\n+\telse\n+\t\tshadow_vfta->vfta[vid_idx] &= ~vid_bit;\n+\n+\treturn 0;\n+}\n+\n+static void\n+txgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)\n+{\n+\tstruct txgbe_hw *hw = TXGBE_DEV_HW(dev);\n+\tuint32_t ctrl;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\tif (queue >= hw->mac.max_rx_queues)\n+\t\treturn;\n+\n+\tctrl = rd32(hw, TXGBE_RXCFG(queue));\n+\ttxgbe_dev_save_rx_queue(hw, queue);\n+\tif (on)\n+\t\tctrl |= TXGBE_RXCFG_VLAN;\n+\telse\n+\t\tctrl &= ~TXGBE_RXCFG_VLAN;\n+\twr32(hw, TXGBE_RXCFG(queue), 0);\n+\tmsec_delay(100);\n+\ttxgbe_dev_store_rx_queue(hw, queue);\n+\twr32m(hw, TXGBE_RXCFG(queue),\n+\t\tTXGBE_RXCFG_VLAN | TXGBE_RXCFG_ENA, ctrl);\n+\n+\ttxgbe_vlan_hw_strip_bitmap_set(dev, queue, on);\n+}\n+\n+static int\n+txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask)\n+{\n+\tstruct txgbe_rx_queue *rxq;\n+\tuint16_t i;\n+\tint on = 0;\n+\n+\t/* VF function only support hw strip feature, others are not support */\n+\tif (mask & ETH_VLAN_STRIP_MASK) {\n+\t\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n+\t\t\trxq = dev->data->rx_queues[i];\n+\t\t\ton = !!(rxq->offloads &\tDEV_RX_OFFLOAD_VLAN_STRIP);\n+\t\t\ttxgbevf_vlan_strip_queue_set(dev, i, on);\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+txgbevf_vlan_offload_set(struct rte_eth_dev *dev, int mask)\n+{\n+\ttxgbe_config_vlan_strip_on_all_queues(dev, mask);\n+\n+\ttxgbevf_vlan_offload_config(dev, mask);\n+\n+\treturn 0;\n+}\n+\n static int\n txgbevf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)\n {\n@@ -866,6 +980,9 @@ static const struct eth_dev_ops txgbevf_eth_dev_ops = {\n \t.xstats_reset = txgbevf_dev_stats_reset,\n \t.xstats_get_names = txgbevf_dev_xstats_get_names,\n \t.dev_infos_get = txgbevf_dev_info_get,\n+\t.vlan_filter_set = txgbevf_vlan_filter_set,\n+\t.vlan_strip_queue_set = txgbevf_vlan_strip_queue_set,\n+\t.vlan_offload_set = txgbevf_vlan_offload_set,\n \t.rx_queue_intr_enable = txgbevf_dev_rx_queue_intr_enable,\n \t.rx_queue_intr_disable = txgbevf_dev_rx_queue_intr_disable,\n \t.mac_addr_add = txgbevf_add_mac_addr,\n", "prefixes": [ "v3", "09/17" ] }