From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by dpdk.org (Postfix) with ESMTP id B65CE8E65 for ; Wed, 20 Jan 2016 15:57:14 +0100 (CET) Received: by mail-wm0-f49.google.com with SMTP id u188so188116988wmu.1 for ; Wed, 20 Jan 2016 06:57:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=TLD04yN76xRqMwapMdduaOaPeW5V1zNu4a/Gc8SPV/o=; b=EMUWto5opjL56pUtVAiE4ogezCzPGlqxmljjRudBG+DaBOaxBtAI84m9xA3TEduoOI sh+EuggKAxB33QBIrNDNaROkxyQEtctPOUL9FaOBfcRJP7vntEH1I6TxKr97OGejDRbk uvoWsyLRXJqNLLHCQNIjWx5Lvf/0XFpnKnSvsFSue3sHQCed5L4wL9EdEBdje072wgis 1gUDAqtkQPlaxiNiD9ZcLBmYlNurwbdB2lbspNLuMWu26slesvEVQkCR5YeLkhYXqngh bb8XIEqKNwKOTH3ddQWrM1BgfgtX3y5LQXTJ8ytOA+kdIuU6xoq3U81upSlC8ttwiqxc o8eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=TLD04yN76xRqMwapMdduaOaPeW5V1zNu4a/Gc8SPV/o=; b=ZVQqKB7fACYmM2BoJZYdwpDATHiICbpD9W+/mto1Oy3nR89zOwca/40/m2KFg7qYya UmAJ5UN9MSc7IQS75O9vi3pUxvQkpKn7mhbDhwUE9m1XGv+g7TSUy/QEz0hkT4sf/RKy 9xje6KqANX6MFdmcscFMJG58MCUqGVn3+oFRqottnSsuVnwt3a/kFdXtYGsvx65yi4Cx Zrckw1pQxWRrcKBmMGyGZZ7YC9r3ns0/b1W0qye6Vmoi4Hs1Bu3KH1ts96q/sVUEOgIG pWbjKNNxDdZ2rzLIaaEQXIcZ1SMoiZJk6hjP5xcDJvcHBcHzmJtgDH1+Tv6EHr1x1o29 P30g== X-Gm-Message-State: AG10YORNPwLfGffQ2Nk88ADT3XZhq1cSBN9zJPGLaCJv385sYAGXuDG5CPbLyBiYEGTOl1lT X-Received: by 10.28.54.159 with SMTP id y31mr4784952wmh.87.1453301834428; Wed, 20 Jan 2016 06:57:14 -0800 (PST) Received: from [10.16.0.205] (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id n5sm25496567wmf.3.2016.01.20.06.57.13 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jan 2016 06:57:13 -0800 (PST) Message-ID: <569FA03B.8040908@6wind.com> Date: Wed, 20 Jan 2016 15:56:59 +0100 From: Julien Meunier User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.8.0 MIME-Version: 1.0 To: "Zhang, Helin" References: <1453137515-19195-1-git-send-email-julien.meunier@6wind.com> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Cc: "dev@dpdk.org" Subject: Re: [dpdk-dev] [PATCH] 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: Wed, 20 Jan 2016 14:57:14 -0000 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@6wind.com] >> Sent: Tuesday, January 19, 2016 1:19 AM >> To: Zhang, Helin >> Cc:dev@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 >> Signed-off-by: David Marchand >> --- >> 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