From patchwork Wed Jul 13 10:27:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingjing Wu X-Patchwork-Id: 14805 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 D10BD2B98; Wed, 13 Jul 2016 12:28:03 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id E5FD12A5F for ; Wed, 13 Jul 2016 12:28:01 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 13 Jul 2016 03:28:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.28,356,1464678000"; d="scan'208"; a="1005911525" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga001.fm.intel.com with ESMTP; 13 Jul 2016 03:28:00 -0700 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id u6DARvVu026528; Wed, 13 Jul 2016 18:27:57 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id u6DARraN016303; Wed, 13 Jul 2016 18:27:55 +0800 Received: (from wujingji@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id u6DARrXV016299; Wed, 13 Jul 2016 18:27:53 +0800 From: Jingjing Wu To: bruce.richardson@intel.com Cc: dev@dpdk.org, jingjing.wu@intel.com, jeffrey.b.shaw@intel.com, helin.zhang@intel.com, jing.d.chen@intel.com, konstantin.ananyev@intel.com Date: Wed, 13 Jul 2016 18:27:50 +0800 Message-Id: <1468405670-16269-1-git-send-email-jingjing.wu@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [PATCH] net/i40e: revert VLAN filtering fix X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This reverts commit 4761f57d58c6f52543738dbe299f846d62d75895. Introducing VLAN table by adding VLAN adminq command will cause NIC's throughput drop obviously. It's a hardware issue. With this revert, VLAN filtering can only work when promiscuous mode is disabled. Reverts: 4761f57d58c6 ("net/i40e: fix VLAN filtering in promiscuous mode") Reported-by: Jeffrey Shaw Signed-off-by: Jingjing Wu --- drivers/net/i40e/i40e_ethdev.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index daac236..3f9f05e 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2718,16 +2718,12 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask) { struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct i40e_vsi *vsi = pf->main_vsi; - struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); if (mask & ETH_VLAN_FILTER_MASK) { - if (dev->data->dev_conf.rxmode.hw_vlan_filter) { - i40e_aq_set_vsi_vlan_promisc(hw, vsi->seid, false, NULL); + if (dev->data->dev_conf.rxmode.hw_vlan_filter) i40e_vsi_config_vlan_filter(vsi, TRUE); - } else { - i40e_aq_set_vsi_vlan_promisc(hw, vsi->seid, true, NULL); + else i40e_vsi_config_vlan_filter(vsi, FALSE); - } } if (mask & ETH_VLAN_STRIP_MASK) { @@ -5777,28 +5773,17 @@ i40e_set_vlan_filter(struct i40e_vsi *vsi, uint16_t vlan_id, bool on) { uint32_t vid_idx, vid_bit; - struct i40e_hw *hw = I40E_VSI_TO_HW(vsi); - struct i40e_aqc_add_remove_vlan_element_data vlan_data = {0}; - int ret; if (vlan_id > ETH_VLAN_ID_MAX) return; vid_idx = I40E_VFTA_IDX(vlan_id); vid_bit = I40E_VFTA_BIT(vlan_id); - vlan_data.vlan_tag = rte_cpu_to_le_16(vlan_id); - if (on) { - 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"); + if (on) vsi->vfta[vid_idx] |= vid_bit; - } else { - 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->vfta[vid_idx] &= ~vid_bit; - } } /**