From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id D903C2BD8; Sat, 1 Apr 2017 08:15:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491027347; x=1522563347; h=from:to:cc:subject:date:message-id; bh=SHFvJKgriAIQ4xL2UGQCNRL3KMpA2IGp4cc2hvZJh9k=; b=WsT9TAQFs9IpEopUxU8Jq+cgSLVWbrcc1RnUhBrfvUPH5mkOeH95k3qG mDO46nueo4P4zwpWmgjRX7B6Hox1LQ==; Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Mar 2017 23:15:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,256,1486454400"; d="scan'208";a="1149573629" Received: from dpdk26.sh.intel.com ([10.239.128.228]) by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2017 23:15:44 -0700 From: Wenzhuo Lu To: dev@dpdk.org Cc: Wenzhuo Lu , stable@dpdk.org Date: Sat, 1 Apr 2017 14:15:57 +0800 Message-Id: <1491027357-49417-1-git-send-email-wenzhuo.lu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dpdk-stable] [PATCH] net/i40e: fix vlan promisc setting X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Apr 2017 06:15:47 -0000 After adding VLAN filter, the VLAN promiscuous mode is disabled. But there's no chance to enable it. So add the check after deleting VLAN filter. If there's no VLAN filter left, enable the VLAN promiscuous mode. Fixes: 310dac2fde07 ("net/i40e: fix VLAN filter issue") Cc: stable@dpdk.org Signed-off-by: Wenzhuo Lu --- drivers/net/i40e/i40e_ethdev.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 00079bb..63ca029 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -11448,6 +11448,32 @@ int rte_pmd_i40e_set_vf_vlan_tag(uint8_t port, uint16_t vf_id, uint8_t on) return ret; } +static int +i40e_vlan_filter_count(struct i40e_vsi *vsi) +{ + uint32_t j, k; + uint16_t vlan_id; + int count = 0; + + for (j = 0; j < I40E_VFTA_SIZE; j++) { + if (!vsi->vfta[j]) + continue; + + for (k = 0; k < I40E_UINT32_BIT_SIZE; k++) { + if (!(vsi->vfta[j] & (1 << k))) + continue; + + vlan_id = j * I40E_UINT32_BIT_SIZE + k; + if (!vlan_id) + continue; + + count++; + } + } + + return count; +} + int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id, uint64_t vf_mask, uint8_t on) { @@ -11465,7 +11491,7 @@ int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id, if (!is_device_supported(dev, &rte_i40e_pmd)) return -ENOTSUP; - if (vlan_id > ETHER_MAX_VLAN_ID) { + if (vlan_id > ETHER_MAX_VLAN_ID || !vlan_id) { PMD_DRV_LOG(ERR, "Invalid VLAN ID."); return -EINVAL; } @@ -11499,15 +11525,25 @@ int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id, if (on) { if (!vsi->vlan_filter_on) { vsi->vlan_filter_on = true; + i40e_aq_set_vsi_vlan_promisc(hw, + vsi->seid, + false, + NULL); if (!vsi->vlan_anti_spoof_on) i40e_add_rm_all_vlan_filter( vsi, true); } - i40e_aq_set_vsi_vlan_promisc(hw, vsi->seid, - false, NULL); ret = i40e_vsi_add_vlan(vsi, vlan_id); } else { ret = i40e_vsi_delete_vlan(vsi, vlan_id); + + if (!i40e_vlan_filter_count(vsi)) { + vsi->vlan_filter_on = false; + i40e_aq_set_vsi_vlan_promisc(hw, + vsi->seid, + true, + NULL); + } } } } -- 1.9.3