151 lines
4.7 KiB
Diff
151 lines
4.7 KiB
Diff
Description: backport of dpdk 16.04-rc1 fix for LP: #1559981
|
|
|
|
Forwarded: n/a (already upstream)
|
|
Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
|
|
Last-Update: 2016-03-20
|
|
|
|
From 330aa319382aec9ea595f9ebcb9a3c44647ad66c Mon Sep 17 00:00:00 2001
|
|
From: Julien Meunier <julien.meunier@6wind.com>
|
|
Date: Thu, 4 Feb 2016 12:02:16 +0100
|
|
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.
|
|
|
|
Fixes: 4861cde46116 ("i40e: new poll mode driver")
|
|
Fixes: 912b595146d6 ("i40e: mac vlan filter")
|
|
|
|
Signed-off-by: Julien Meunier <julien.meunier@6wind.com>
|
|
Acked-by: Helin Zhang <helin.zhang@intel.com>
|
|
---
|
|
drivers/net/i40e/i40e_ethdev.c | 73 ++++++++++++++++++++++++++++++++++++++++--
|
|
drivers/net/i40e/i40e_ethdev.h | 1 +
|
|
2 files changed, 72 insertions(+), 2 deletions(-)
|
|
|
|
Index: dpdk/drivers/net/i40e/i40e_ethdev.c
|
|
===================================================================
|
|
--- dpdk.orig/drivers/net/i40e/i40e_ethdev.c
|
|
+++ dpdk/drivers/net/i40e/i40e_ethdev.c
|
|
@@ -2332,6 +2332,13 @@ i40e_vlan_offload_set(struct rte_eth_dev
|
|
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)
|
|
@@ -2583,7 +2590,10 @@ i40e_macaddr_add(struct rte_eth_dev *dev
|
|
}
|
|
|
|
(void)rte_memcpy(&mac_filter.mac_addr, mac_addr, ETHER_ADDR_LEN);
|
|
- mac_filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;
|
|
+ if (dev->data->dev_conf.rxmode.hw_vlan_filter)
|
|
+ mac_filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;
|
|
+ else
|
|
+ mac_filter.filter_type = RTE_MAC_PERFECT_MATCH;
|
|
|
|
if (pool == 0)
|
|
vsi = pf->main_vsi;
|
|
@@ -4156,6 +4166,63 @@ fail_mem:
|
|
return NULL;
|
|
}
|
|
|
|
+/* Configure vlan filter on or off */
|
|
+int
|
|
+i40e_vsi_config_vlan_filter(struct i40e_vsi *vsi, bool on)
|
|
+{
|
|
+ int i, num;
|
|
+ struct i40e_mac_filter *f;
|
|
+ struct i40e_mac_filter_info *mac_filter;
|
|
+ enum rte_mac_filter_type desired_filter;
|
|
+ int ret = I40E_SUCCESS;
|
|
+
|
|
+ if (on) {
|
|
+ /* Filter to match MAC and VLAN */
|
|
+ desired_filter = RTE_MACVLAN_PERFECT_MATCH;
|
|
+ } else {
|
|
+ /* Filter to match only MAC */
|
|
+ desired_filter = RTE_MAC_PERFECT_MATCH;
|
|
+ }
|
|
+
|
|
+ num = vsi->mac_num;
|
|
+
|
|
+ mac_filter = rte_zmalloc("mac_filter_info_data",
|
|
+ num * sizeof(*mac_filter), 0);
|
|
+ if (mac_filter == NULL) {
|
|
+ PMD_DRV_LOG(ERR, "failed to allocate memory");
|
|
+ return I40E_ERR_NO_MEMORY;
|
|
+ }
|
|
+
|
|
+ i = 0;
|
|
+
|
|
+ /* Remove all existing mac */
|
|
+ TAILQ_FOREACH(f, &vsi->mac_list, next) {
|
|
+ mac_filter[i] = f->mac_info;
|
|
+ ret = i40e_vsi_delete_mac(vsi, &f->mac_info.mac_addr);
|
|
+ if (ret) {
|
|
+ PMD_DRV_LOG(ERR, "Update VSI failed to %s vlan filter",
|
|
+ on ? "enable" : "disable");
|
|
+ goto DONE;
|
|
+ }
|
|
+ i++;
|
|
+ }
|
|
+
|
|
+ /* Override with new filter */
|
|
+ for (i = 0; i < num; i++) {
|
|
+ mac_filter[i].filter_type = desired_filter;
|
|
+ ret = i40e_vsi_add_mac(vsi, &mac_filter[i]);
|
|
+ if (ret) {
|
|
+ PMD_DRV_LOG(ERR, "Update VSI failed to %s vlan filter",
|
|
+ on ? "enable" : "disable");
|
|
+ goto DONE;
|
|
+ }
|
|
+ }
|
|
+
|
|
+DONE:
|
|
+ rte_free(mac_filter);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
/* Configure vlan stripping on or off */
|
|
int
|
|
i40e_vsi_config_vlan_stripping(struct i40e_vsi *vsi, bool on)
|
|
@@ -4203,9 +4270,11 @@ i40e_dev_init_vlan(struct rte_eth_dev *d
|
|
{
|
|
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 */
|
|
|
|
Index: dpdk/drivers/net/i40e/i40e_ethdev.h
|
|
===================================================================
|
|
--- dpdk.orig/drivers/net/i40e/i40e_ethdev.h
|
|
+++ dpdk/drivers/net/i40e/i40e_ethdev.h
|
|
@@ -551,6 +551,7 @@ void i40e_vsi_queues_unbind_intr(struct
|
|
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);
|