From patchwork Fri Dec 2 11:53:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xing, Beilei" X-Patchwork-Id: 17379 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 D593DFA80; Fri, 2 Dec 2016 05:14:26 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id C8E63591E for ; Fri, 2 Dec 2016 05:13:31 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP; 01 Dec 2016 20:13:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,284,1477983600"; d="scan'208";a="907853601" Received: from dpdk9.sh.intel.com ([10.239.129.141]) by orsmga003.jf.intel.com with ESMTP; 01 Dec 2016 20:13:19 -0800 From: Beilei Xing To: jingjing.wu@intel.com, helin.zhang@intel.com Cc: dev@dpdk.org, wenzhuo.lu@intel.com Date: Fri, 2 Dec 2016 06:53:39 -0500 Message-Id: <1480679625-4157-19-git-send-email-beilei.xing@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1480679625-4157-1-git-send-email-beilei.xing@intel.com> References: <1480679625-4157-1-git-send-email-beilei.xing@intel.com> Subject: [dpdk-dev] [PATCH 18/24] net/i40e: destroy macvlan filter 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" This patch adds a function to destroy the macvlan filter. Signed-off-by: Beilei Xing --- drivers/net/i40e/i40e_ethdev.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index a3ed1f0..fddd46d 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -519,6 +519,9 @@ static struct i40e_flow *i40e_flow_create(struct rte_eth_dev *dev, struct rte_flow_error *error); static int i40e_dev_destroy_ethertype_filter(struct i40e_pf *pf, struct i40e_ethertype_filter *filter); +static int i40e_dev_destroy_macvlan_filter(struct i40e_pf *pf, + struct i40e_vsi *vsi, + struct i40e_mac_filter *filter); static int i40e_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow, struct rte_flow_error *error); @@ -11708,6 +11711,29 @@ i40e_dev_destroy_ethertype_filter(struct i40e_pf *pf, } static int +i40e_dev_destroy_macvlan_filter(struct i40e_pf *pf, + struct i40e_vsi *vsi, + struct i40e_mac_filter *filter) +{ + struct i40e_hw *hw = I40E_PF_TO_HW(pf); + int ret; + + (void)rte_memcpy(hw->mac.addr, hw->mac.perm_addr, + ETHER_ADDR_LEN); + ret = i40e_vsi_delete_mac(vsi, &filter->mac_info.mac_addr); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "Failed to delete MAC filter."); + return -1; + } + + /* Clear device address as it has been removed. */ + if (is_same_ether_addr(&pf->dev_addr, &filter->mac_info.mac_addr)) + memset(&pf->dev_addr, 0, sizeof(struct ether_addr)); + + return 0; +} + +static int i40e_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow, struct rte_flow_error *error) @@ -11722,6 +11748,10 @@ i40e_flow_destroy(struct rte_eth_dev *dev, ret = i40e_dev_destroy_ethertype_filter(pf, (struct i40e_ethertype_filter *)pmd_flow->rule); break; + case RTE_ETH_FILTER_MACVLAN: + ret = i40e_dev_destroy_macvlan_filter(pf, + pmd_flow->vsi, (struct i40e_mac_filter *)pmd_flow->rule); + break; default: PMD_DRV_LOG(WARNING, "Filter type (%d) not supported", filter_type);