Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/48993/?format=api
{ "id": 48993, "url": "https://patches.dpdk.org/api/patches/48993/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1545032259-77179-23-git-send-email-wenzhuo.lu@intel.com/", "project": { "id": 1, "url": "https://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": "<1545032259-77179-23-git-send-email-wenzhuo.lu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1545032259-77179-23-git-send-email-wenzhuo.lu@intel.com", "date": "2018-12-17T07:37:30", "name": "[v5,22/31] net/ice: support VLAN ops", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "36f93049e67fb1cf87ce73ec6f1ebbf147253d4f", "submitter": { "id": 258, "url": "https://patches.dpdk.org/api/people/258/?format=api", "name": "Wenzhuo Lu", "email": "wenzhuo.lu@intel.com" }, "delegate": { "id": 1540, "url": "https://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1545032259-77179-23-git-send-email-wenzhuo.lu@intel.com/mbox/", "series": [ { "id": 2824, "url": "https://patches.dpdk.org/api/series/2824/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=2824", "date": "2018-12-17T07:37:08", "name": "A new net PMD - ICE", "version": 5, "mbox": "https://patches.dpdk.org/series/2824/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/48993/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/48993/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 91A2A1BA9E;\n\tMon, 17 Dec 2018 08:33:35 +0100 (CET)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id 284C91B8B5\n\tfor <dev@dpdk.org>; Mon, 17 Dec 2018 08:33:22 +0100 (CET)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t16 Dec 2018 23:33:21 -0800", "from dpdk26.sh.intel.com ([10.67.110.164])\n\tby orsmga002.jf.intel.com with ESMTP; 16 Dec 2018 23:33:20 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.56,364,1539673200\"; d=\"scan'208\";a=\"118899303\"", "From": "Wenzhuo Lu <wenzhuo.lu@intel.com>", "To": "dev@dpdk.org", "Cc": "Wenzhuo Lu <wenzhuo.lu@intel.com>, Qiming Yang <qiming.yang@intel.com>, \n\tXiaoyun Li <xiaoyun.li@intel.com>, Jingjing Wu <jingjing.wu@intel.com>", "Date": "Mon, 17 Dec 2018 15:37:30 +0800", "Message-Id": "<1545032259-77179-23-git-send-email-wenzhuo.lu@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1545032259-77179-1-git-send-email-wenzhuo.lu@intel.com>", "References": "<1542956179-80951-1-git-send-email-wenzhuo.lu@intel.com>\n\t<1545032259-77179-1-git-send-email-wenzhuo.lu@intel.com>", "Subject": "[dpdk-dev] [PATCH v5 22/31] net/ice: support VLAN ops", "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": "Add below ops,\nice_vlan_filter_set\nice_vlan_offload_set\nice_vlan_tpid_set\nice_vlan_pvid_set\n\nSigned-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>\nSigned-off-by: Qiming Yang <qiming.yang@intel.com>\nSigned-off-by: Xiaoyun Li <xiaoyun.li@intel.com>\nSigned-off-by: Jingjing Wu <jingjing.wu@intel.com>\n---\n doc/guides/nics/features/ice.ini | 3 +\n doc/guides/nics/ice.rst | 16 ++\n drivers/net/ice/ice_ethdev.c | 590 +++++++++++++++++++++++++++++++++++++++\n 3 files changed, 609 insertions(+)", "diff": "diff --git a/doc/guides/nics/features/ice.ini b/doc/guides/nics/features/ice.ini\nindex 759a036..5ac8e56 100644\n--- a/doc/guides/nics/features/ice.ini\n+++ b/doc/guides/nics/features/ice.ini\n@@ -12,6 +12,9 @@ MTU update = Y\n Jumbo frame = Y\n Unicast MAC filter = Y\n Multicast MAC filter = Y\n+VLAN filter = Y\n+VLAN offload = Y\n+QinQ offload = Y\n BSD nic_uio = Y\n Linux UIO = Y\n Linux VFIO = Y\ndiff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst\nindex 96a594f..466af55 100644\n--- a/doc/guides/nics/ice.rst\n+++ b/doc/guides/nics/ice.rst\n@@ -64,6 +64,22 @@ Driver compilation and testing\n Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>`\n for details.\n \n+Sample Application Notes\n+------------------------\n+\n+Vlan filter\n+~~~~~~~~~~~\n+\n+Vlan filter only works when Promiscuous mode is off.\n+\n+To start ``testpmd``, and add vlan 10 to port 0:\n+\n+.. code-block:: console\n+\n+ ./app/testpmd -l 0-15 -n 4 -- -i\n+ ...\n+\n+ testpmd> rx_vlan add 10 0\n \n Limitations or Known issues\n ---------------------------\ndiff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c\nindex 29840fd..1d3cc7a 100644\n--- a/drivers/net/ice/ice_ethdev.c\n+++ b/drivers/net/ice/ice_ethdev.c\n@@ -24,6 +24,13 @@ static void ice_dev_info_get(struct rte_eth_dev *dev,\n static int ice_link_update(struct rte_eth_dev *dev,\n \t\t\t int wait_to_complete);\n static int ice_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);\n+static int ice_vlan_offload_set(struct rte_eth_dev *dev, int mask);\n+static int ice_vlan_tpid_set(struct rte_eth_dev *dev,\n+\t\t\t enum rte_vlan_type vlan_type,\n+\t\t\t uint16_t tpid);\n+static int ice_vlan_filter_set(struct rte_eth_dev *dev,\n+\t\t\t uint16_t vlan_id,\n+\t\t\t int on);\n static int ice_macaddr_set(struct rte_eth_dev *dev,\n \t\t\t struct ether_addr *mac_addr);\n static int ice_macaddr_add(struct rte_eth_dev *dev,\n@@ -31,6 +38,8 @@ static int ice_macaddr_add(struct rte_eth_dev *dev,\n \t\t\t __rte_unused uint32_t index,\n \t\t\t uint32_t pool);\n static void ice_macaddr_remove(struct rte_eth_dev *dev, uint32_t index);\n+static int ice_vlan_pvid_set(struct rte_eth_dev *dev,\n+\t\t\t uint16_t pvid, int on);\n \n static const struct rte_pci_id pci_id_ice_map[] = {\n \t{ RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_BACKPLANE) },\n@@ -60,6 +69,10 @@ static int ice_macaddr_add(struct rte_eth_dev *dev,\n \t.mac_addr_set = ice_macaddr_set,\n \t.mac_addr_add = ice_macaddr_add,\n \t.mac_addr_remove = ice_macaddr_remove,\n+\t.vlan_filter_set = ice_vlan_filter_set,\n+\t.vlan_offload_set = ice_vlan_offload_set,\n+\t.vlan_tpid_set = ice_vlan_tpid_set,\n+\t.vlan_pvid_set = ice_vlan_pvid_set,\n };\n \n static void\n@@ -470,6 +483,297 @@ static int ice_macaddr_add(struct rte_eth_dev *dev,\n \treturn ret;\n }\n \n+/* Find out specific VLAN filter */\n+static struct ice_vlan_filter *\n+ice_find_vlan_filter(struct ice_vsi *vsi, uint16_t vlan_id)\n+{\n+\tstruct ice_vlan_filter *f;\n+\n+\tTAILQ_FOREACH(f, &vsi->vlan_list, next) {\n+\t\tif (vlan_id == f->vlan_info.vlan_id)\n+\t\t\treturn f;\n+\t}\n+\n+\treturn NULL;\n+}\n+\n+static int\n+ice_add_vlan_filter(struct ice_vsi *vsi, uint16_t vlan_id)\n+{\n+\tstruct ice_fltr_list_entry *v_list_itr = NULL;\n+\tstruct ice_vlan_filter *f;\n+\tstruct LIST_HEAD_TYPE list_head;\n+\tstruct ice_hw *hw = ICE_VSI_TO_HW(vsi);\n+\tint ret = 0;\n+\n+\tif (!vsi || vlan_id > ETHER_MAX_VLAN_ID)\n+\t\treturn -EINVAL;\n+\n+\t/* If it's added and configured, return. */\n+\tf = ice_find_vlan_filter(vsi, vlan_id);\n+\tif (f) {\n+\t\tPMD_DRV_LOG(INFO, \"This VLAN filter already exists.\");\n+\t\treturn 0;\n+\t}\n+\n+\tif (!vsi->vlan_anti_spoof_on && !vsi->vlan_filter_on)\n+\t\treturn 0;\n+\n+\tINIT_LIST_HEAD(&list_head);\n+\n+\tv_list_itr = (struct ice_fltr_list_entry *)\n+\t\t ice_malloc(hw, sizeof(*v_list_itr));\n+\tif (!v_list_itr) {\n+\t\tret = -ENOMEM;\n+\t\tgoto DONE;\n+\t}\n+\tv_list_itr->fltr_info.l_data.vlan.vlan_id = vlan_id;\n+\tv_list_itr->fltr_info.src_id = ICE_SRC_ID_VSI;\n+\tv_list_itr->fltr_info.fltr_act = ICE_FWD_TO_VSI;\n+\tv_list_itr->fltr_info.lkup_type = ICE_SW_LKUP_VLAN;\n+\tv_list_itr->fltr_info.flag = ICE_FLTR_TX;\n+\tv_list_itr->fltr_info.vsi_handle = vsi->idx;\n+\n+\tLIST_ADD(&v_list_itr->list_entry, &list_head);\n+\n+\t/* Add the vlan */\n+\tret = ice_add_vlan(hw, &list_head);\n+\tif (ret != ICE_SUCCESS) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to add VLAN filter\");\n+\t\tret = -EINVAL;\n+\t\tgoto DONE;\n+\t}\n+\n+\t/* Add vlan into vlan list */\n+\tf = rte_zmalloc(NULL, sizeof(*f), 0);\n+\tif (!f) {\n+\t\tPMD_DRV_LOG(ERR, \"failed to allocate memory\");\n+\t\tret = -ENOMEM;\n+\t\tgoto DONE;\n+\t}\n+\tf->vlan_info.vlan_id = vlan_id;\n+\tTAILQ_INSERT_TAIL(&vsi->vlan_list, f, next);\n+\tvsi->vlan_num++;\n+\n+\tret = 0;\n+\n+DONE:\n+\trte_free(v_list_itr);\n+\treturn ret;\n+}\n+\n+static int\n+ice_remove_vlan_filter(struct ice_vsi *vsi, uint16_t vlan_id)\n+{\n+\tstruct ice_fltr_list_entry *v_list_itr = NULL;\n+\tstruct ice_vlan_filter *f;\n+\tstruct LIST_HEAD_TYPE list_head;\n+\tstruct ice_hw *hw = ICE_VSI_TO_HW(vsi);\n+\tint ret = 0;\n+\n+\t/**\n+\t * Vlan 0 is the generic filter for untagged packets\n+\t * and can't be removed.\n+\t */\n+\tif (!vsi || vlan_id == 0 || vlan_id > ETHER_MAX_VLAN_ID)\n+\t\treturn -EINVAL;\n+\n+\t/* Can't find it, return an error */\n+\tf = ice_find_vlan_filter(vsi, vlan_id);\n+\tif (!f)\n+\t\treturn -EINVAL;\n+\n+\tINIT_LIST_HEAD(&list_head);\n+\n+\tv_list_itr = (struct ice_fltr_list_entry *)\n+\t\t ice_malloc(hw, sizeof(*v_list_itr));\n+\tif (!v_list_itr) {\n+\t\tret = -ENOMEM;\n+\t\tgoto DONE;\n+\t}\n+\n+\tv_list_itr->fltr_info.l_data.vlan.vlan_id = vlan_id;\n+\tv_list_itr->fltr_info.src_id = ICE_SRC_ID_VSI;\n+\tv_list_itr->fltr_info.fltr_act = ICE_FWD_TO_VSI;\n+\tv_list_itr->fltr_info.lkup_type = ICE_SW_LKUP_VLAN;\n+\tv_list_itr->fltr_info.flag = ICE_FLTR_TX;\n+\tv_list_itr->fltr_info.vsi_handle = vsi->idx;\n+\n+\tLIST_ADD(&v_list_itr->list_entry, &list_head);\n+\n+\t/* remove the vlan filter */\n+\tret = ice_remove_vlan(hw, &list_head);\n+\tif (ret != ICE_SUCCESS) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to remove VLAN filter\");\n+\t\tret = -EINVAL;\n+\t\tgoto DONE;\n+\t}\n+\n+\t/* Remove the vlan id from vlan list */\n+\tTAILQ_REMOVE(&vsi->vlan_list, f, next);\n+\trte_free(f);\n+\tvsi->vlan_num--;\n+\n+\tret = 0;\n+DONE:\n+\trte_free(v_list_itr);\n+\treturn ret;\n+}\n+\n+static int\n+ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)\n+{\n+\tstruct ice_mac_filter *m_f;\n+\tstruct ice_vlan_filter *v_f;\n+\tint ret = 0;\n+\n+\tif (!vsi || !vsi->mac_num)\n+\t\treturn -EINVAL;\n+\n+\tTAILQ_FOREACH(m_f, &vsi->mac_list, next) {\n+\t\tret = ice_remove_mac_filter(vsi, &m_f->mac_info.mac_addr);\n+\t\tif (ret != ICE_SUCCESS) {\n+\t\t\tret = -EINVAL;\n+\t\t\tgoto DONE;\n+\t\t}\n+\t}\n+\n+\tif (vsi->vlan_num == 0)\n+\t\treturn 0;\n+\n+\tTAILQ_FOREACH(v_f, &vsi->vlan_list, next) {\n+\t\tret = ice_remove_vlan_filter(vsi, v_f->vlan_info.vlan_id);\n+\t\tif (ret != ICE_SUCCESS) {\n+\t\t\tret = -EINVAL;\n+\t\t\tgoto DONE;\n+\t\t}\n+\t}\n+\n+DONE:\n+\treturn ret;\n+}\n+\n+static int\n+ice_vsi_config_qinq_insertion(struct ice_vsi *vsi, bool on)\n+{\n+\tstruct ice_hw *hw = ICE_VSI_TO_HW(vsi);\n+\tstruct ice_vsi_ctx ctxt;\n+\tuint8_t qinq_flags;\n+\tint ret = 0;\n+\n+\t/* Check if it has been already on or off */\n+\tif (vsi->info.valid_sections &\n+\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID)) {\n+\t\tif (on) {\n+\t\t\tif ((vsi->info.outer_tag_flags &\n+\t\t\t ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST) ==\n+\t\t\t ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST)\n+\t\t\t\treturn 0; /* already on */\n+\t\t} else {\n+\t\t\tif (!(vsi->info.outer_tag_flags &\n+\t\t\t ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST))\n+\t\t\t\treturn 0; /* already off */\n+\t\t}\n+\t}\n+\n+\tif (on)\n+\t\tqinq_flags = ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST;\n+\telse\n+\t\tqinq_flags = 0;\n+\t/* clear global insertion and use per packet insertion */\n+\tvsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_INSERT);\n+\tvsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST);\n+\tvsi->info.outer_tag_flags |= qinq_flags;\n+\t/* use default vlan type 0x8100 */\n+\tvsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_TYPE_M);\n+\tvsi->info.outer_tag_flags |= ICE_DFLT_OUTER_TAG_TYPE <<\n+\t\t\t\t ICE_AQ_VSI_OUTER_TAG_TYPE_S;\n+\t(void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));\n+\tctxt.info.valid_sections =\n+\t\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID);\n+\tctxt.vsi_num = vsi->vsi_id;\n+\tret = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(INFO,\n+\t\t\t \"Update VSI failed to %s qinq stripping\",\n+\t\t\t on ? \"enable\" : \"disable\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tvsi->info.valid_sections |=\n+\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID);\n+\n+\treturn ret;\n+}\n+\n+static int\n+ice_vsi_config_qinq_stripping(struct ice_vsi *vsi, bool on)\n+{\n+\tstruct ice_hw *hw = ICE_VSI_TO_HW(vsi);\n+\tstruct ice_vsi_ctx ctxt;\n+\tuint8_t qinq_flags;\n+\tint ret = 0;\n+\n+\t/* Check if it has been already on or off */\n+\tif (vsi->info.valid_sections &\n+\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID)) {\n+\t\tif (on) {\n+\t\t\tif ((vsi->info.outer_tag_flags &\n+\t\t\t ICE_AQ_VSI_OUTER_TAG_MODE_M) ==\n+\t\t\t ICE_AQ_VSI_OUTER_TAG_COPY)\n+\t\t\t\treturn 0; /* already on */\n+\t\t} else {\n+\t\t\tif ((vsi->info.outer_tag_flags &\n+\t\t\t ICE_AQ_VSI_OUTER_TAG_MODE_M) ==\n+\t\t\t ICE_AQ_VSI_OUTER_TAG_NOTHING)\n+\t\t\t\treturn 0; /* already off */\n+\t\t}\n+\t}\n+\n+\tif (on)\n+\t\tqinq_flags = ICE_AQ_VSI_OUTER_TAG_COPY;\n+\telse\n+\t\tqinq_flags = ICE_AQ_VSI_OUTER_TAG_NOTHING;\n+\tvsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_MODE_M);\n+\tvsi->info.outer_tag_flags |= qinq_flags;\n+\t/* use default vlan type 0x8100 */\n+\tvsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_TYPE_M);\n+\tvsi->info.outer_tag_flags |= ICE_DFLT_OUTER_TAG_TYPE <<\n+\t\t\t\t ICE_AQ_VSI_OUTER_TAG_TYPE_S;\n+\t(void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));\n+\tctxt.info.valid_sections =\n+\t\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID);\n+\tctxt.vsi_num = vsi->vsi_id;\n+\tret = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(INFO,\n+\t\t\t \"Update VSI failed to %s qinq stripping\",\n+\t\t\t on ? \"enable\" : \"disable\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tvsi->info.valid_sections |=\n+\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID);\n+\n+\treturn ret;\n+}\n+\n+static int\n+ice_vsi_config_double_vlan(struct ice_vsi *vsi, int on)\n+{\n+\tint ret;\n+\n+\tret = ice_vsi_config_qinq_stripping(vsi, on);\n+\tif (ret)\n+\t\tPMD_DRV_LOG(ERR, \"Fail to set qinq stripping - %d\", ret);\n+\n+\tret = ice_vsi_config_qinq_insertion(vsi, on);\n+\tif (ret)\n+\t\tPMD_DRV_LOG(ERR, \"Fail to set qinq insertion - %d\", ret);\n+\n+\treturn ret;\n+}\n+\n /* Enable IRQ0 */\n static void\n ice_pf_enable_irq0(struct ice_hw *hw)\n@@ -829,6 +1133,7 @@ static int ice_macaddr_add(struct rte_eth_dev *dev,\n \tstruct rte_intr_handle *intr_handle;\n \tstruct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tstruct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n+\tstruct ice_vsi *vsi;\n \tint ret;\n \n \tdev->dev_ops = &ice_eth_dev_ops;\n@@ -881,6 +1186,11 @@ static int ice_macaddr_add(struct rte_eth_dev *dev,\n \t\tgoto err_pf_setup;\n \t}\n \n+\tvsi = pf->main_vsi;\n+\n+\t/* Disable double vlan by default */\n+\tice_vsi_config_double_vlan(vsi, FALSE);\n+\n \t/* register callback func to eal lib */\n \trte_intr_callback_register(intr_handle,\n \t\t\t\t ice_interrupt_handler, dev);\n@@ -916,6 +1226,8 @@ static int ice_macaddr_add(struct rte_eth_dev *dev,\n \n \thw = ICE_VSI_TO_HW(vsi);\n \n+\tice_remove_all_mac_vlan_filters(vsi);\n+\n \tmemset(&vsi_ctx, 0, sizeof(vsi_ctx));\n \n \tvsi_ctx.vsi_num = vsi->vsi_id;\n@@ -1498,6 +1810,284 @@ static int ice_macaddr_set(struct rte_eth_dev *dev,\n }\n \n static int\n+ice_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)\n+{\n+\tstruct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n+\tstruct ice_vsi *vsi = pf->main_vsi;\n+\tint ret;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\tif (on) {\n+\t\tret = ice_add_vlan_filter(vsi, vlan_id);\n+\t\tif (ret < 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Failed to add vlan filter\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t} else {\n+\t\tret = ice_remove_vlan_filter(vsi, vlan_id);\n+\t\tif (ret < 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Failed to remove vlan filter\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+/* Configure vlan filter on or off */\n+static int\n+ice_vsi_config_vlan_filter(struct ice_vsi *vsi, bool on)\n+{\n+\tstruct ice_hw *hw = ICE_VSI_TO_HW(vsi);\n+\tstruct ice_vsi_ctx ctxt;\n+\tuint8_t sec_flags, sw_flags2;\n+\tint ret = 0;\n+\n+\tsec_flags = ICE_AQ_VSI_SEC_TX_VLAN_PRUNE_ENA <<\n+\t\t ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S;\n+\tsw_flags2 = ICE_AQ_VSI_SW_FLAG_RX_VLAN_PRUNE_ENA;\n+\n+\tif (on) {\n+\t\tvsi->info.sec_flags |= sec_flags;\n+\t\tvsi->info.sw_flags2 |= sw_flags2;\n+\t} else {\n+\t\tvsi->info.sec_flags &= ~sec_flags;\n+\t\tvsi->info.sw_flags2 &= ~sw_flags2;\n+\t}\n+\tvsi->info.sw_id = hw->port_info->sw_id;\n+\t(void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));\n+\tctxt.info.valid_sections =\n+\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_SW_VALID |\n+\t\t\t\t ICE_AQ_VSI_PROP_SECURITY_VALID);\n+\tctxt.vsi_num = vsi->vsi_id;\n+\n+\tret = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(INFO, \"Update VSI failed to %s vlan rx pruning\",\n+\t\t\t on ? \"enable\" : \"disable\");\n+\t\tret = -EINVAL;\n+\t} else {\n+\t\tvsi->info.valid_sections |=\n+\t\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_SW_VALID |\n+\t\t\t\t\t ICE_AQ_VSI_PROP_SECURITY_VALID);\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static int\n+ice_vsi_config_vlan_stripping(struct ice_vsi *vsi, bool on)\n+{\n+\tstruct ice_hw *hw = ICE_VSI_TO_HW(vsi);\n+\tstruct ice_vsi_ctx ctxt;\n+\tuint8_t vlan_flags;\n+\tint ret = 0;\n+\n+\t/* Check if it has been already on or off */\n+\tif (vsi->info.valid_sections &\n+\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID)) {\n+\t\tif (on) {\n+\t\t\tif ((vsi->info.vlan_flags &\n+\t\t\t ICE_AQ_VSI_VLAN_EMOD_M) ==\n+\t\t\t ICE_AQ_VSI_VLAN_EMOD_STR_BOTH)\n+\t\t\t\treturn 0; /* already on */\n+\t\t} else {\n+\t\t\tif ((vsi->info.vlan_flags &\n+\t\t\t ICE_AQ_VSI_VLAN_EMOD_M) ==\n+\t\t\t ICE_AQ_VSI_VLAN_EMOD_NOTHING)\n+\t\t\t\treturn 0; /* already off */\n+\t\t}\n+\t}\n+\n+\tif (on)\n+\t\tvlan_flags = ICE_AQ_VSI_VLAN_EMOD_STR_BOTH;\n+\telse\n+\t\tvlan_flags = ICE_AQ_VSI_VLAN_EMOD_NOTHING;\n+\tvsi->info.vlan_flags &= ~(ICE_AQ_VSI_VLAN_EMOD_M);\n+\tvsi->info.vlan_flags |= vlan_flags;\n+\t(void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));\n+\tctxt.info.valid_sections =\n+\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID);\n+\tctxt.vsi_num = vsi->vsi_id;\n+\tret = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(INFO, \"Update VSI failed to %s vlan stripping\",\n+\t\t\t on ? \"enable\" : \"disable\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tvsi->info.valid_sections |=\n+\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID);\n+\n+\treturn ret;\n+}\n+\n+static int\n+ice_vlan_offload_set(struct rte_eth_dev *dev, int mask)\n+{\n+\tstruct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n+\tstruct ice_vsi *vsi = pf->main_vsi;\n+\tstruct rte_eth_rxmode *rxmode;\n+\n+\trxmode = &dev->data->dev_conf.rxmode;\n+\tif (mask & ETH_VLAN_FILTER_MASK) {\n+\t\tif (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_FILTER)\n+\t\t\tice_vsi_config_vlan_filter(vsi, TRUE);\n+\t\telse\n+\t\t\tice_vsi_config_vlan_filter(vsi, FALSE);\n+\t}\n+\n+\tif (mask & ETH_VLAN_STRIP_MASK) {\n+\t\tif (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP)\n+\t\t\tice_vsi_config_vlan_stripping(vsi, TRUE);\n+\t\telse\n+\t\t\tice_vsi_config_vlan_stripping(vsi, FALSE);\n+\t}\n+\n+\tif (mask & ETH_VLAN_EXTEND_MASK) {\n+\t\tif (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)\n+\t\t\tice_vsi_config_double_vlan(vsi, TRUE);\n+\t\telse\n+\t\t\tice_vsi_config_double_vlan(vsi, FALSE);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+ice_vlan_tpid_set(struct rte_eth_dev *dev,\n+\t\t enum rte_vlan_type vlan_type,\n+\t\t uint16_t tpid)\n+{\n+\tstruct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tuint64_t reg_r = 0, reg_w = 0;\n+\tuint16_t reg_id = 0;\n+\tint ret = 0;\n+\tint qinq = dev->data->dev_conf.rxmode.offloads &\n+\t\t DEV_RX_OFFLOAD_VLAN_EXTEND;\n+\n+\tswitch (vlan_type) {\n+\tcase ETH_VLAN_TYPE_OUTER:\n+\t\tif (qinq)\n+\t\t\treg_id = 3;\n+\t\telse\n+\t\t\treg_id = 5;\n+\tbreak;\n+\tcase ETH_VLAN_TYPE_INNER:\n+\t\tif (qinq) {\n+\t\t\treg_id = 5;\n+\t\t} else {\n+\t\t\tPMD_DRV_LOG(ERR,\n+\t\t\t\t \"Unsupported vlan type in single vlan.\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\tbreak;\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"Unsupported vlan type %d\", vlan_type);\n+\t\treturn -EINVAL;\n+\t}\n+\treg_r = ICE_READ_REG(hw, GL_SWT_L2TAGCTRL(reg_id));\n+\tPMD_DRV_LOG(DEBUG, \"Debug read from ICE GL_SWT_L2TAGCTRL[%d]: \"\n+\t\t \"0x%08\"PRIx64\"\", reg_id, reg_r);\n+\n+\treg_w = reg_r & (~(GL_SWT_L2TAGCTRL_ETHERTYPE_M));\n+\treg_w |= ((uint64_t)tpid << GL_SWT_L2TAGCTRL_ETHERTYPE_S);\n+\tif (reg_r == reg_w) {\n+\t\tPMD_DRV_LOG(DEBUG, \"No need to write\");\n+\t\treturn 0;\n+\t}\n+\n+\tICE_WRITE_REG(hw, GL_SWT_L2TAGCTRL(reg_id), reg_w);\n+\tPMD_DRV_LOG(DEBUG, \"Debug write 0x%08\"PRIx64\" to \"\n+\t\t \"ICE GL_SWT_L2TAGCTRL[%d]\", reg_w, reg_id);\n+\n+\treturn ret;\n+}\n+\n+static int\n+ice_vsi_vlan_pvid_set(struct ice_vsi *vsi, struct ice_vsi_vlan_pvid_info *info)\n+{\n+\tstruct ice_hw *hw;\n+\tstruct ice_vsi_ctx ctxt;\n+\tuint8_t vlan_flags = 0;\n+\tint ret;\n+\n+\tif (!vsi || !info) {\n+\t\tPMD_DRV_LOG(ERR, \"invalid parameters\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (info->on) {\n+\t\tvsi->info.pvid = info->config.pvid;\n+\t\t/**\n+\t\t * If insert pvid is enabled, only tagged pkts are\n+\t\t * allowed to be sent out.\n+\t\t */\n+\t\tvlan_flags = ICE_AQ_VSI_PVLAN_INSERT_PVID |\n+\t\t\t ICE_AQ_VSI_VLAN_MODE_UNTAGGED;\n+\t} else {\n+\t\tvsi->info.pvid = 0;\n+\t\tif (info->config.reject.tagged == 0)\n+\t\t\tvlan_flags |= ICE_AQ_VSI_VLAN_MODE_TAGGED;\n+\n+\t\tif (info->config.reject.untagged == 0)\n+\t\t\tvlan_flags |= ICE_AQ_VSI_VLAN_MODE_UNTAGGED;\n+\t}\n+\tvsi->info.vlan_flags &= ~(ICE_AQ_VSI_PVLAN_INSERT_PVID |\n+\t\t\t\t ICE_AQ_VSI_VLAN_MODE_M);\n+\tvsi->info.vlan_flags |= vlan_flags;\n+\tmemset(&ctxt, 0, sizeof(ctxt));\n+\trte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));\n+\tctxt.info.valid_sections =\n+\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID);\n+\tctxt.vsi_num = vsi->vsi_id;\n+\n+\thw = ICE_VSI_TO_HW(vsi);\n+\tret = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);\n+\tif (ret != ICE_SUCCESS) {\n+\t\tPMD_DRV_LOG(ERR,\n+\t\t\t \"update VSI for VLAN insert failed, err %d\",\n+\t\t\t ret);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tvsi->info.valid_sections |=\n+\t\trte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID);\n+\n+\treturn ret;\n+}\n+\n+static int\n+ice_vlan_pvid_set(struct rte_eth_dev *dev, uint16_t pvid, int on)\n+{\n+\tstruct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n+\tstruct ice_vsi *vsi = pf->main_vsi;\n+\tstruct rte_eth_dev_data *data = pf->dev_data;\n+\tstruct ice_vsi_vlan_pvid_info info;\n+\tint ret;\n+\n+\tmemset(&info, 0, sizeof(info));\n+\tinfo.on = on;\n+\tif (info.on) {\n+\t\tinfo.config.pvid = pvid;\n+\t} else {\n+\t\tinfo.config.reject.tagged =\n+\t\t\tdata->dev_conf.txmode.hw_vlan_reject_tagged;\n+\t\tinfo.config.reject.untagged =\n+\t\t\tdata->dev_conf.txmode.hw_vlan_reject_untagged;\n+\t}\n+\n+\tret = ice_vsi_vlan_pvid_set(vsi, &info);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to set pvid.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n ice_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t struct rte_pci_device *pci_dev)\n {\n", "prefixes": [ "v5", "22/31" ] }