From patchwork Mon Mar 13 04:55:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 21719 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 12AD4D145; Mon, 13 Mar 2017 05:05:21 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 5A17C69C5 for ; Mon, 13 Mar 2017 05:04:56 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Mar 2017 21:04:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.36,156,1486454400"; d="scan'208"; a="1121703630" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.129.167]) by fmsmga001.fm.intel.com with ESMTP; 12 Mar 2017 21:04:54 -0700 From: Qi Zhang To: jingjing.wu@intel.com, helin.zhang@intel.com Cc: dev@dpdk.org, Qi Zhang Date: Mon, 13 Mar 2017 00:55:42 -0400 Message-Id: <20170313045543.65464-2-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170313045543.65464-1-qi.z.zhang@intel.com> References: <20170303015924.68986-1-qi.z.zhang@intel.com> <20170313045543.65464-1-qi.z.zhang@intel.com> Subject: [dpdk-dev] [PATCH v2 1/2] net/i40e: enable VF untag drop X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add a new private API to support the untag drop enable/disable for specific VF. Add a flag "untag_drop" in i40e_vsi to help track the untag drop status, so it prevent error from i40e_aq_remove_vlan when call rte_pmd_i40e_set_vf_vlan_untag_drop twice. Signed-off-by: Qi Zhang --- V2: - Add a flag "untag_drop" in i40e_vsi to track the untag drop status. drivers/net/i40e/i40e_ethdev.c | 54 +++++++++++++++++++++++++++++++++++++++++ drivers/net/i40e/i40e_ethdev.h | 1 + drivers/net/i40e/rte_pmd_i40e.h | 18 ++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 303027b..304b02b 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -11212,3 +11212,57 @@ rte_pmd_i40e_reset_vf_stats(uint8_t port, return 0; } + +int rte_pmd_i40e_set_vf_vlan_untag_drop(uint8_t port, + uint16_t vf_id, + uint8_t on) +{ + struct rte_eth_dev *dev; + struct i40e_pf *pf; + struct i40e_vsi *vsi; + struct i40e_aqc_add_remove_vlan_element_data vlan_data = {0}; + struct i40e_hw *hw; + int ret = 0; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV); + + dev = &rte_eth_devices[port]; + + if (!is_device_supported(dev, &rte_i40e_pmd)) + return -ENOTSUP; + + pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); + + if (vf_id >= pf->vf_num || !pf->vfs) { + PMD_DRV_LOG(ERR, "Invalid VF ID."); + return -EINVAL; + } + + vsi = pf->vfs[vf_id].vsi; + if (!vsi) { + PMD_DRV_LOG(ERR, "Invalid VSI."); + return -EINVAL; + } + + + hw = I40E_VSI_TO_HW(vsi); + vlan_data.vlan_tag = 0; + vlan_data.vlan_flags = 0x1; + + if (on && !vsi->untag_drop) { + ret = i40e_aq_add_vlan(hw, vsi->seid, &vlan_data, 1, NULL); + if (ret != I40E_SUCCESS) + PMD_DRV_LOG(ERR, "Failed to add vlan filter"); + else + vsi->untag_drop = 1; + } else if (!on && vsi->untag_drop) { + ret = i40e_aq_remove_vlan(hw, vsi->seid, + &vlan_data, 1, NULL); + if (ret != I40E_SUCCESS) + PMD_DRV_LOG(ERR, "Failed to remove vlan filter"); + else + vsi->untag_drop = 0; + } + + return ret; +} diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index f545850..25d0c49 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -365,6 +365,7 @@ struct i40e_vsi { uint8_t enabled_tc; /* The traffic class enabled */ uint8_t vlan_anti_spoof_on; /* The VLAN anti-spoofing enabled */ struct i40e_bw_info bw_info; /* VSI bandwidth information */ + uint8_t untag_drop; /* VLAN untagged drop enable/disable status */ }; struct pool_entry { diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h index a0ad88c..895e2cc 100644 --- a/drivers/net/i40e/rte_pmd_i40e.h +++ b/drivers/net/i40e/rte_pmd_i40e.h @@ -332,4 +332,22 @@ int rte_pmd_i40e_get_vf_stats(uint8_t port, int rte_pmd_i40e_reset_vf_stats(uint8_t port, uint16_t vf_id); +/** + * Enable/Disable VF untag drop + * + * @param port + * The port identifier of the Ethernet device. + * @param vf_id + * VF on witch to enable/disable + * @param on + * Enable or Disable + * @retura + * - (0) if successful. + * -(-ENODEVE) if *port* invalid + * -(-EINVAL) if bad parameter. + */ +int rte_pmd_i40e_set_vf_vlan_untag_drop(uint8_t port, + uint16_t vf_id, + uint8_t on); + #endif /* _PMD_I40E_H_ */