From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by dpdk.org (Postfix) with ESMTP id 9BCCA58D8 for ; Thu, 4 Feb 2016 12:02:47 +0100 (CET) Received: by mail-wm0-f41.google.com with SMTP id 128so21320709wmz.1 for ; Thu, 04 Feb 2016 03:02:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w+7IQdKXOew4vMGcc8lCbjhOqxrkGHZloNo1RYXZ47k=; b=RlO/IN5hgudPyQ5x1Dnjky1TAl+ltJVZSt6WQCCJPhKmpJpN5r76gSS8VJ+mMuMF22 9sAgLQ40e8cBuBNxWQM+FxfkaEZUBzKJOp4Mlx+YmzYu2tUfRj1qn6NYEfoH4vpsmGpU 6IAtFWcaPNDGd1vRBQGigOBjac0d+mxqwpzcDZ8ywuf5NJfpO7Zt1/INwPfjzpznv6LX QO3qBemUYDfmkFAfBeUwCDt+ztjSk2Da5EeZ1szOKu50OElAGZCxPTm+GBDp6ergGF2A 2ygMNOdQBWf00xt7Q3jnElHFXjDyBPOcV222wfYoZJ1E2Lj1jAUyNr+BYfz7lNKnZFbc 0IbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w+7IQdKXOew4vMGcc8lCbjhOqxrkGHZloNo1RYXZ47k=; b=GN6MY8kzx5zYnlZcXCsR0v594PkFiEMFuOZDEA24SPHhzt4g/g8f3gxmbxR9rsiUp/ R3kxwRVhk8YUO9VdjfFiUOdR07Wx2Hm2aeZJPgdenHequgUnNG2g6kkhxOylq8VrbKHj 28s5uXWL1/HktEaykFCCjmVKkv2RmFfMD+uPajFyUZVlBRPFRzfveZGtUpQUgBy7KZl6 FRyNgIFMthCS/dttCbO2DU7WlWAkGThV4uriOkxNYEaG65drs5MxC37vhdKcp/BdZzzV Xlf1M/UqPp3nCHmCSQeh061zqn3tDtiNoCMq70j73mjCDLa09KRfhx3/1/ixK/hc5Kfa UQKQ== X-Gm-Message-State: AG10YORmYWksdnDrgl6z/Vbd72JLsuh/s62xZZSUJCvH7jJZUu05/Bnwa1XaiD2VqkK7d88f X-Received: by 10.194.82.97 with SMTP id h1mr7158036wjy.88.1454583767426; Thu, 04 Feb 2016 03:02:47 -0800 (PST) Received: from grendel.vm.6wind.com. (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id u191sm25763507wmd.4.2016.02.04.03.02.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Feb 2016 03:02:46 -0800 (PST) From: Julien Meunier To: helin.zhang@intel.com Date: Thu, 4 Feb 2016 12:02:16 +0100 Message-Id: <1454583736-20244-1-git-send-email-julien.meunier@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1454421057-6602-1-git-send-email-julien.meunier@6wind.com> References: <1454421057-6602-1-git-send-email-julien.meunier@6wind.com> Cc: dev@dpdk.org Subject: [dpdk-dev] [PATCH v3] i40e: fix vlan filtering 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: , X-List-Received-Date: Thu, 04 Feb 2016 11:02:47 -0000 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 --- Changes since v2: - switch log level from INFO to ERR in case of failure Changes since v1: - use ether_addr_copy() for mac copy - add more debug messages in case of failure - update all existing filters when multiple mac addresses have been configured - when adding new mac address, use correct filter TODO: - i40e_update_default_filter_setting always forces to RTE_MACVLAN_PERFECT_MATCH. => The type of filter should be changed according to vlan filter setting. - What happens if vlan filter setting changes when various filters are already set like RTE_MACVLAN_PERFECT_MATCH, RTE_MACVLAN_PERFECT_MATCH, RTE_MAC_HASH_MATCH, RTE_MACVLAN_HASH_MATCH ? => With testpmd, it is possible to add manually these filters. But when changing vlan filter setting, all previous filter set manually are overriden. --- drivers/net/i40e/i40e_ethdev.c | 73 ++++++++++++++++++++++++++++++++++++++++-- drivers/net/i40e/i40e_ethdev.h | 1 + 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index bf6220d..750206b 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) @@ -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 *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