Hello, Yes, you are right. Even if VLAN filtering is configured most of the time during initialization, we should managed the case of multiple MAC addresses already configured.
I will send you a v2 patch with this modification, use ether_addr_copy and add additional debug messages. Regards, On 01/20/2016 06:00 AM, Zhang, Helin wrote: >> -----Original Message----- >> From: Julien Meunier [mailto:julien.meunier at 6wind.com] >> Sent: Tuesday, January 19, 2016 1:19 AM >> To: Zhang, Helin >> Cc:dev at dpdk.org >> Subject: [PATCH] i40e: fix vlan filtering >> >> VLAN filtering was always performed, even if hw_vlan_filter was disabled. >> During device initialization, default filter RTE_MACVLAN_PERFECT_MATCH >> was applied. In this situation, all incoming VLAN frames were dropped by the >> card (increase of the register RUPP - Rx Unsupported Protocol). >> >> In order to restore default behavior, if HW VLAN filtering is activated, set >> a >> filter to match MAC and VLAN. If not, set a filter to only match MAC. >> >> Signed-off-by: Julien Meunier<julien.meunier at 6wind.com> >> Signed-off-by: David Marchand<david.marchand at 6wind.com> >> --- >> drivers/net/i40e/i40e_ethdev.c | 39 >> ++++++++++++++++++++++++++++++++++++++- >> drivers/net/i40e/i40e_ethdev.h | 1 + >> 2 files changed, 39 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c >> index bf6220d..ef9d578 100644 >> --- a/drivers/net/i40e/i40e_ethdev.c >> +++ b/drivers/net/i40e/i40e_ethdev.c >> @@ -2332,6 +2332,13 @@ 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; >> >> + if (mask & ETH_VLAN_FILTER_MASK) { >> + if (dev->data->dev_conf.rxmode.hw_vlan_filter) >> + i40e_vsi_config_vlan_filter(vsi, TRUE); >> + else >> + i40e_vsi_config_vlan_filter(vsi, FALSE); >> + } >> + >> if (mask & ETH_VLAN_STRIP_MASK) { >> /* Enable or disable VLAN stripping */ >> if (dev->data->dev_conf.rxmode.hw_vlan_strip) >> @@ -4156,6 +4163,34 @@ fail_mem: >> return NULL; >> } >> >> +/* Configure vlan filter on or off */ >> +int >> +i40e_vsi_config_vlan_filter(struct i40e_vsi *vsi, bool on) { >> + struct i40e_hw *hw = I40E_VSI_TO_HW(vsi); >> + struct i40e_mac_filter_info filter; >> + int ret; >> + >> + rte_memcpy(&filter.mac_addr, >> + (struct ether_addr *)(hw->mac.perm_addr), >> ETH_ADDR_LEN); >> + ret = i40e_vsi_delete_mac(vsi, &filter.mac_addr); >> + >> + if (on) { >> + /* Filter to match MAC and VLAN */ >> + filter.filter_type = RTE_MACVLAN_PERFECT_MATCH; >> + } else { >> + /* Filter to match only MAC */ >> + filter.filter_type = RTE_MAC_PERFECT_MATCH; >> + } >> + >> + ret |= i40e_vsi_add_mac(vsi, &filter); > How would it be if multiple mac addresses has been configured? > I think this might be ignored in the code changes, right? > > Regards, > Helin > >> + >> + if (ret) >> + PMD_DRV_LOG(INFO, "Update VSI failed to %s vlan filter", >> + on ? "enable" : "disable"); >> + return ret; >> +} >> + >> /* Configure vlan stripping on or off */ int >> i40e_vsi_config_vlan_stripping(struct i40e_vsi *vsi, bool on) @@ -4203,9 >> +4238,11 @@ i40e_dev_init_vlan(struct rte_eth_dev *dev) { >> struct rte_eth_dev_data *data = dev->data; >> int ret; >> + int mask = 0; >> >> /* Apply vlan offload setting */ >> - i40e_vlan_offload_set(dev, ETH_VLAN_STRIP_MASK); >> + mask = ETH_VLAN_STRIP_MASK | ETH_VLAN_FILTER_MASK; >> + i40e_vlan_offload_set(dev, mask); >> >> /* Apply double-vlan setting, not implemented yet */ >> >> diff --git a/drivers/net/i40e/i40e_ethdev.h >> b/drivers/net/i40e/i40e_ethdev.h index 1f9792b..5505d72 100644 >> --- a/drivers/net/i40e/i40e_ethdev.h >> +++ b/drivers/net/i40e/i40e_ethdev.h >> @@ -551,6 +551,7 @@ void i40e_vsi_queues_unbind_intr(struct i40e_vsi >> *vsi); int i40e_vsi_vlan_pvid_set(struct i40e_vsi *vsi, >> struct i40e_vsi_vlan_pvid_info *info); int >> i40e_vsi_config_vlan_stripping(struct i40e_vsi *vsi, bool on); >> +int i40e_vsi_config_vlan_filter(struct i40e_vsi *vsi, bool on); >> uint64_t i40e_config_hena(uint64_t flags); uint64_t >> i40e_parse_hena(uint64_t flags); enum i40e_status_code >> i40e_fdir_setup_tx_resources(struct i40e_pf *pf); >> -- >> 2.1.4 -- Julien MEUNIER 6WIND
