fm10k: setup VLANs for l2 accelerated macvlan interfaces
Subsystems (2)
PATCH 1/6 fm10k: setup VLANs for l2 accelerated macvlan interfaces
We have support for accelerating macvlan devices via the .ndo_dfwd_add_station() netdev op. These accelerated macvlan MAC addresses are stored in the l2_accel structure, separate from the unicast or multicast address lists.
If a VLAN is added on top of the macvlan device by the stack, traffic will not properly flow to the macvlan. This occurs because we fail to setup the VLANs for l2_accel MAC addresses.
In the non-offloaded case the MAC address is added to the unicast address list, and thus the normal setup for enabling VLANs works as expected.
We also need to add VLANs marked from .ndo_vlan_rx_add_vid() into the l2_accel MAC addresses. Otherwise, VLAN traffic will not properly be received by the VLAN devices attached to the offloaded macvlan devices.
Fix this by adding necessary logic to setup VLANs not only for the unicast and multicast addresses, but also the l2_accel list. We need similar logic in dfwd_add_station, dfwd_del_station, fm10k_update_vid, and fm10k_restore_rx_state.
--- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 50 ++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +48 -2
@@ -925,7 +925,9 @@ static int fm10k_mc_vlan_unsync(struct net_device *netdev,static int fm10k_update_vid (struct net_device *netdev,u16 vid,bool set) {struct fm10k_intfc *interface =netdev_priv (netdev); +struct fm10k_l2_accel *l2_accel = interface->l2_accel;struct fm10k_hw *hw = &interface->hw; +u16 glort;s32 err;int i;
@@ -993,6 +995,22 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)if (err) goto err_out; +/* Update L2 accelerated macvlan addresses */ +if (l2_accel) { +for (i =0 ; i < l2_accel->size; i++) { +struct net_device *sdev = l2_accel->macvlan[i]; + +if (!sdev) +continue ; + + glort = l2_accel->dglort +1 + i; + +fm10k_queue_mac_request (interface, glort, + sdev->dev_addr, + vid, set); + } + } +/* set VLAN ID prior to syncing/unsyncing the VLAN */ interface->vid = vid + (set ?VLAN_N_VID :0 );
@@ -1232,6 +1250,22 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface)fm10k_queue_mac_request (interface, glort, hw->mac.addr, vid, true); + +/* synchronize macvlan addresses */ +if (l2_accel) { +for (i =0 ; i < l2_accel->size; i++) { +struct net_device *sdev = l2_accel->macvlan[i]; + +if (!sdev) +continue ; + + glort = l2_accel->dglort +1 + i; + +fm10k_queue_mac_request (interface, glort, + sdev->dev_addr, + vid, true); + } + } }/* update xcast mode before synchronizing addresses if host's mailbox
@@ -1448,7 +1482,7 @@ static void *fm10k_dfwd_add_station(struct net_device *dev,struct fm10k_dglort_cfg dglort = {0 };struct fm10k_hw *hw = &interface->hw;int size =0 , i; -u16 glort; +u16 vid, glort;/* The hardware supported by fm10k only filters on the destination MAC * address. In order to avoid issues we only support offloading modes
@@ -1528,6 +1562,12 @@ static void *fm10k_dfwd_add_station(struct net_device *dev, hw->mac.default_vid, true); } +for (vid =fm10k_find_next_vlan (interface,0 ); + vid <VLAN_N_VID ; + vid =fm10k_find_next_vlan (interface, vid)) +fm10k_queue_mac_request (interface, glort, sdev->dev_addr, + vid, true); +fm10k_mbx_unlock (interface);return sdev;
@@ -1540,8 +1580,8 @@ static void fm10k_dfwd_del_station(struct net_device *dev, void *priv)struct fm10k_dglort_cfg dglort = {0 };struct fm10k_hw *hw = &interface->hw;struct net_device *sdev = priv; +u16 vid, glort;int i; -u16 glort;if (!l2_accel)return ;
@@ -1568,6 +1608,12 @@ static void fm10k_dfwd_del_station(struct net_device *dev, void *priv) hw->mac.default_vid, false); } +for (vid =fm10k_find_next_vlan (interface,0 ); + vid <VLAN_N_VID ; + vid =fm10k_find_next_vlan (interface, vid)) +fm10k_queue_mac_request (interface, glort, sdev->dev_addr, + vid, false); +fm10k_mbx_unlock (interface);/* record removal */
Signature · 1 line
2.15.1.478.ga1e07cd25f8b
PATCH 2/6 fm10k: reduce duplicate fm10k_stat macro code
Share some of the code for setting up fm10k_stat macros by implementing an FM10K_STAT_FIELDS macro which we can use when setting up the type specific macros.
Title: reduce duplicate fm10k_stat macro code
Change-type: ImplementationChange
Reviewed-on: https://git-amr-1.devtools.intel.com/gerrit/198021
--- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +15 -15
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* Intel(R) Ethernet Switch Host Interface Driver -* Copyright(c) 2013 - 2017 Intel Corporation. +* Copyright(c) 2013 - 2018 Intel Corporation. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License,
@@ -29,12 +29,16 @@ struct fm10k_stats {int stat_offset; }; -#define FM10K_NETDEV_STAT (_net_stat) { \ - .stat_string = #_net_stat, \ - .sizeof_stat = FIELD_SIZEOF(struct net_device_stats, _net_stat), \ - .stat_offset = offsetof(struct net_device_stats, _net_stat) \ +#define FM10K_STAT_FIELDS (_type, _name, _stat) { \ + .stat_string = _name, \ + .sizeof_stat = FIELD_SIZEOF(_type, _stat), \ + .stat_offset = offsetof(_type, _stat) \ } +/* netdevice statistics */ +#define FM10K_NETDEV_STAT (_net_stat) \ + FM10K_STAT_FIELDS(struct net_device_stats, #_net_stat, _net_stat) +static const struct fm10k_stats fm10k_gstrings_net_stats[] = {FM10K_NETDEV_STAT (tx_packets),FM10K_NETDEV_STAT (tx_bytes),
@@ -52,11 +56,9 @@ static const struct fm10k_stats fm10k_gstrings_net_stats[] = {#define FM10K_NETDEV_STATS_LEN ARRAY_SIZE(fm10k_gstrings_net_stats) -#define FM10K_STAT (_name, _stat) { \ - .stat_string = _name, \ - .sizeof_stat = FIELD_SIZEOF(struct fm10k_intfc, _stat), \ - .stat_offset = offsetof(struct fm10k_intfc, _stat) \ -} +/* General interface statistics */ +#define FM10K_STAT (_name, _stat) \ + FM10K_STAT_FIELDS(struct fm10k_intfc, _name, _stat)static const struct fm10k_stats fm10k_gstrings_global_stats[] = {FM10K_STAT ("tx_restart_queue" , restart_queue),
@@ -93,11 +95,9 @@ static const struct fm10k_stats fm10k_gstrings_pf_stats[] = { FM10K_STAT("nodesc_drop", stats.nodesc_drop.count), }; -#define FM10K_MBX_STAT (_name, _stat) { \ - .stat_string = _name, \ - .sizeof_stat = FIELD_SIZEOF(struct fm10k_mbx_info, _stat), \ - .stat_offset = offsetof(struct fm10k_mbx_info, _stat) \ -} +/* mailbox statistics */ +#define FM10K_MBX_STAT (_name, _stat) \ + FM10K_STAT_FIELDS(struct fm10k_mbx_info, _name, _stat)static const struct fm10k_stats fm10k_gstrings_mbx_stats[] = {FM10K_MBX_STAT ("mbx_tx_busy" , tx_busy),
Signature · 1 line
2.15.1.478.ga1e07cd25f8b
Singh
PATCH 2/6 fm10k: reduce duplicate fm10k_stat macro code
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Jacob Keller
Sent: Thursday, April 12, 2018 11:16 AM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH 2/6] fm10k: reduce duplicatefm10k_statmacro codeShare some of the code for setting up
fm10k_statmacros by implementing anFM10K_STAT_FIELDSmacro which we can use when setting up the type specific macros.
Quoted 6 lines
Change-Id Ifeedfafa4707cbeb4fac818ed6672eb1db268e1aSigned-off-by Jacob Keller <[email protected]>Title: reduce duplicate
fm10k_statmacro code
Change-type: ImplementationChange
Reviewed-on: https://git-amr-1.devtools.intel.com/gerrit/198021
---
PATCH 3/6 fm10k: use variadic arguments to fm10k_add_stat_strings
In reply to Jacob KellerInstead of using a fixed prefix string we setup before each call to fm10k_add_stat_strings, modify the helper to take variadic arguments and pass them to vsnprintf. This requires changing the fm10k_stat strings to take % format specifiers where necessary, but the resulting code is much simpler.
Title: use variadic arguments to fm10k_add_stat_strings
Change-type: ImplementationChange
Reviewed-on: https://git-amr-1.devtools.intel.com/gerrit/198022
--- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 53 ++++++++++++------------ 1 file changed, 27 insertions(+), 26 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +27 -26
@@ -24,6 +24,11 @@#include "fm10k.h" struct fm10k_stats { +/* The stat_string is expected to be a format string formatted using +* vsnprintf by fm10k_add_stat_strings. Every member of a stats array +* should use the same format specifiers as they will be formatted +* using the same variadic arguments. +*/ char stat_string[ETH_GSTRING_LEN ];int sizeof_stat;int stat_offset;
@@ -111,15 +116,13 @@ static const struct fm10k_stats fm10k_gstrings_mbx_stats[] = { FM10K_MBX_STAT("mbx_rx_mbmem_pushed", rx_mbmem_pushed), }; -#define FM10K_QUEUE_STAT (_name, _stat) { \ - .stat_string = _name, \ - .sizeof_stat = FIELD_SIZEOF(struct fm10k_ring, _stat), \ - .stat_offset = offsetof(struct fm10k_ring, _stat) \ -} +/* per-queue ring statistics */ +#define FM10K_QUEUE_STAT (_name, _stat) \ + FM10K_STAT_FIELDS(struct fm10k_ring, _name, _stat)static const struct fm10k_stats fm10k_gstrings_queue_stats[] = { -FM10K_QUEUE_STAT ("packets" , stats.packets), -FM10K_QUEUE_STAT ("bytes" , stats.bytes), +FM10K_QUEUE_STAT ("%s_queue_%u_packets" , stats.packets), +FM10K_QUEUE_STAT ("%s_queue_%u_bytes" , stats.bytes), };#define FM10K_GLOBAL_STATS_LEN ARRAY_SIZE(fm10k_gstrings_global_stats)
@@ -149,16 +152,18 @@ enum {static const char fm10k_prv_flags[FM10K_PRV_FLAG_LEN ][ETH_GSTRING_LEN ] = { }; -static void fm10k_add_stat_strings (u8 **p,const char *prefix, -const struct fm10k_stats stats[], -const unsigned int size) +static void fm10k_add_stat_strings (u8 **p,const struct fm10k_stats stats[], +const unsigned int size, ...) {unsigned int i;for (i =0 ; i < size; i++) { -snprintf (*p,ETH_GSTRING_LEN ,"%s%s" , - prefix, stats[i].stat_string); +va_list args; + +va_start (args, size); +vsnprintf (*p,ETH_GSTRING_LEN , stats[i].stat_string, args); *p +=ETH_GSTRING_LEN ; +va_end (args); } }
@@ -167,31 +172,27 @@ static void fm10k_get_stat_strings(struct net_device *dev, u8 *data)struct fm10k_intfc *interface =netdev_priv (dev);unsigned int i; -fm10k_add_stat_strings (&data,"" , fm10k_gstrings_net_stats, +fm10k_add_stat_strings (&data, fm10k_gstrings_net_stats,FM10K_NETDEV_STATS_LEN ); -fm10k_add_stat_strings (&data,"" , fm10k_gstrings_global_stats, +fm10k_add_stat_strings (&data, fm10k_gstrings_global_stats,FM10K_GLOBAL_STATS_LEN ); -fm10k_add_stat_strings (&data,"" , fm10k_gstrings_mbx_stats, +fm10k_add_stat_strings (&data, fm10k_gstrings_mbx_stats,FM10K_MBX_STATS_LEN );if (interface->hw.mac.type != fm10k_mac_vf) -fm10k_add_stat_strings (&data,"" , fm10k_gstrings_pf_stats, +fm10k_add_stat_strings (&data, fm10k_gstrings_pf_stats,FM10K_PF_STATS_LEN );for (i =0 ; i < interface->hw.mac.max_queues; i++) { -char prefix[ETH_GSTRING_LEN ]; +fm10k_add_stat_strings (&data, fm10k_gstrings_queue_stats, +FM10K_QUEUE_STATS_LEN , +"tx" , i); -snprintf (prefix,ETH_GSTRING_LEN ,"tx_queue_%u_" , i); -fm10k_add_stat_strings (&data, prefix, - fm10k_gstrings_queue_stats, -FM10K_QUEUE_STATS_LEN ); - -snprintf (prefix,ETH_GSTRING_LEN ,"rx_queue_%u_" , i); -fm10k_add_stat_strings (&data, prefix, - fm10k_gstrings_queue_stats, -FM10K_QUEUE_STATS_LEN ); +fm10k_add_stat_strings (&data, fm10k_gstrings_queue_stats, +FM10K_QUEUE_STATS_LEN , +"rx" , i); } }
Signature · 1 line
2.15.1.478.ga1e07cd25f8b
Singh
PATCH 3/6 fm10k: use variadic arguments to fm10k_add_stat_strings
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Jacob Keller
Sent: Thursday, April 12, 2018 11:16 AM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH 3/6] fm10k: use variadic arguments tofm10k_add_stat_stringsInstead of using a fixed prefix string we setup before each call to
fm10k_add_stat_strings, modify the helper to take variadic arguments and pass them to vsnprintf. This requires changing thefm10k_statstrings to take % format specifiers where necessary, but the resulting code is much simpler.
Quoted 7 lines
Change-Id I8055adeae0d63c227024c007c2ff51d0ee495238Signed-off-by Jacob Keller <[email protected]>Title: use variadic arguments to
fm10k_add_stat_strings
Change-type: ImplementationChange
Reviewed-on: https://git-amr-1.devtools.intel.com/gerrit/198022Tested-by nosbuild <[email protected]>---
PATCH 4/6 fm10k: use macro to avoid passing the array and size separately
In reply to Jacob KellerAvoid potential bugs with fm10k_add_stat_strings and fm10k_add_ethtool_stats by using a macro to calculate the ARRAY_SIZE when passing. This helps ensure that the size is always correct.
Note that it assumes we only pass static const fm10k_stat arrays, and that evaluation of the argument won't have side effects.
Title: use macro to avoid passing the array and size separately
Change-type: ImplementationChange
Reviewed-on: https://git-amr-1.devtools.intel.com/gerrit/198023
--- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 48 +++++++++++------------- 1 file changed, 21 insertions(+), 27 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +21 -27
@@ -152,8 +152,8 @@ enum {static const char fm10k_prv_flags[FM10K_PRV_FLAG_LEN ][ETH_GSTRING_LEN ] = { }; -static void fm10k_add_stat_strings (u8 **p,const struct fm10k_stats stats[], -const unsigned int size, ...) +static void __fm10k_add_stat_strings (u8 **p,const struct fm10k_stats stats[], +const unsigned int size, ...) {unsigned int i;
@@ -167,31 +167,28 @@ static void fm10k_add_stat_strings(u8 **p, const struct fm10k_stats stats[], } } +#define fm10k_add_stat_strings (p, stats, ...) \ + __fm10k_add_stat_strings(p, stats, ARRAY_SIZE(stats), ## __VA_ARGS__) +static void fm10k_get_stat_strings (struct net_device *dev,u8 *data) {struct fm10k_intfc *interface =netdev_priv (dev);unsigned int i; -fm10k_add_stat_strings (&data, fm10k_gstrings_net_stats, -FM10K_NETDEV_STATS_LEN ); +fm10k_add_stat_strings (&data, fm10k_gstrings_net_stats); -fm10k_add_stat_strings (&data, fm10k_gstrings_global_stats, -FM10K_GLOBAL_STATS_LEN ); +fm10k_add_stat_strings (&data, fm10k_gstrings_global_stats); -fm10k_add_stat_strings (&data, fm10k_gstrings_mbx_stats, -FM10K_MBX_STATS_LEN ); +fm10k_add_stat_strings (&data, fm10k_gstrings_mbx_stats);if (interface->hw.mac.type != fm10k_mac_vf) -fm10k_add_stat_strings (&data, fm10k_gstrings_pf_stats, -FM10K_PF_STATS_LEN ); +fm10k_add_stat_strings (&data, fm10k_gstrings_pf_stats);for (i =0 ; i < interface->hw.mac.max_queues; i++) {fm10k_add_stat_strings (&data, fm10k_gstrings_queue_stats, -FM10K_QUEUE_STATS_LEN ,"tx" , i);fm10k_add_stat_strings (&data, fm10k_gstrings_queue_stats, -FM10K_QUEUE_STATS_LEN ,"rx" , i); } }
@@ -237,9 +234,9 @@ static int fm10k_get_sset_count(struct net_device *dev, int sset) } } -static void fm10k_add_ethtool_stats (u64 **data,void *pointer, -const struct fm10k_stats stats[], -const unsigned int size) +static void __fm10k_add_ethtool_stats (u64 **data,void *pointer, +const struct fm10k_stats stats[], +const unsigned int size) {unsigned int i;char *p;
@@ -273,6 +270,9 @@ static void fm10k_add_ethtool_stats(u64 **data, void *pointer, } } +#define fm10k_add_ethtool_stats (data, pointer, stats) \ + __fm10k_add_ethtool_stats(data, pointer, stats, ARRAY_SIZE(stats)) +static void fm10k_get_ethtool_stats (struct net_device *netdev,struct ethtool_stats __always_unused *stats,u64 *data)
@@ -283,20 +283,16 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,fm10k_update_stats (interface); -fm10k_add_ethtool_stats (&data, net_stats, fm10k_gstrings_net_stats, -FM10K_NETDEV_STATS_LEN ); +fm10k_add_ethtool_stats (&data, net_stats, fm10k_gstrings_net_stats); -fm10k_add_ethtool_stats (&data, interface, fm10k_gstrings_global_stats, -FM10K_GLOBAL_STATS_LEN ); +fm10k_add_ethtool_stats (&data, interface, fm10k_gstrings_global_stats);fm10k_add_ethtool_stats (&data, &interface->hw.mbx, - fm10k_gstrings_mbx_stats, -FM10K_MBX_STATS_LEN ); + fm10k_gstrings_mbx_stats);if (interface->hw.mac.type != fm10k_mac_vf) {fm10k_add_ethtool_stats (&data, interface, - fm10k_gstrings_pf_stats, -FM10K_PF_STATS_LEN ); + fm10k_gstrings_pf_stats); }for (i =0 ; i < interface->hw.mac.max_queues; i++) {
@@ -304,13 +300,11 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev, ring = interface->tx_ring[i];fm10k_add_ethtool_stats (&data, ring, - fm10k_gstrings_queue_stats, -FM10K_QUEUE_STATS_LEN ); + fm10k_gstrings_queue_stats); ring = interface->rx_ring[i];fm10k_add_ethtool_stats (&data, ring, - fm10k_gstrings_queue_stats, -FM10K_QUEUE_STATS_LEN ); + fm10k_gstrings_queue_stats); } }
Signature · 1 line
2.15.1.478.ga1e07cd25f8b
Singh
PATCH 4/6 fm10k: use macro to avoid passing the array and size separately
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Jacob Keller
Sent: Thursday, April 12, 2018 11:16 AM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH 4/6] fm10k: use macro to avoid passing the array and size separatelyAvoid potential bugs with
fm10k_add_stat_stringsandfm10k_add_ethtool_statsby using a macro to calculate theARRAY_SIZEwhen passing. This helps ensure that the size is always correct.Note that it assumes we only pass static const
fm10k_statarrays, and that evaluation of the argument won't have side effects.
Quoted 6 lines
Change-Id Id9396eef12cbab51a2559db80782e33fb20df274Signed-off-by Jacob Keller <[email protected]>Title: use macro to avoid passing the array and size separately
Change-type: ImplementationChange
Reviewed-on: https://git-amr-1.devtools.intel.com/gerrit/198023
---
PATCH 5/6 fm10k: warn if the stat size is unknown
In reply to Jacob KellerTitle: warn if the stat size is unknown
Change-type: DefectResolution
Reviewed-on: https://git-amr-1.devtools.intel.com/gerrit/198024
--- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +2 -0
@@ -265,6 +265,8 @@ static void __fm10k_add_ethtool_stats(u64 **data, void *pointer, *((*data)++) = *(u8 *)p;break ;default : +WARN_ONCE (1 ,"unexpected stat size for %s" , + stats[i].stat_string); *((*data)++) =0 ; } }
Signature · 1 line
2.15.1.478.ga1e07cd25f8b
Singh
PATCH 5/6 fm10k: warn if the stat size is unknown
Quoted 8 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Jacob Keller
Sent: Thursday, April 12, 2018 11:16 AM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH 5/6] fm10k: warn if the stat size is unknown
Quoted 7 lines
Change-Id I80172c86be68bdd1e1df00b650877b686c718b0fSigned-off-by Jacob Keller <[email protected]>Title: warn if the stat size is unknown
Change-type: DefectResolution
Reviewed-on: https://git-amr-1.devtools.intel.com/gerrit/198024Tested-by nosbuild <[email protected]>---
PATCH 6/6 fm10k: don't protect fm10k_queue_mac_request by fm10k_host_mbx_ready
In reply to Jacob KellerWe don't actually need to check if the host mbx is ready when queuing MAC requests, because these are not handled by a special queue which queues up requests until the mailbox is capable of handling them.
Pull these requests outside the fm10k_host_mbx_ready() check, as it is not necessary.
--- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +8 -8
@@ -1555,12 +1555,12 @@ static void *fm10k_dfwd_add_station(struct net_device *dev, glort = l2_accel->dglort +1 + i; -if (fm10k_host_mbx_ready (interface)) { +if (fm10k_host_mbx_ready (interface)) hw->mac.ops.update_xcast_mode (hw, glort,FM10K_XCAST_MODE_NONE ); -fm10k_queue_mac_request (interface, glort, sdev->dev_addr, - hw->mac.default_vid, true); - } + +fm10k_queue_mac_request (interface, glort, sdev->dev_addr, + hw->mac.default_vid, true); for (vid = fm10k_find_next_vlan(interface, 0); vid < VLAN_N_VID;
@@ -1601,12 +1601,12 @@ static void fm10k_dfwd_del_station(struct net_device *dev, void *priv) glort = l2_accel->dglort +1 + i; -if (fm10k_host_mbx_ready (interface)) { +if (fm10k_host_mbx_ready (interface)) hw->mac.ops.update_xcast_mode (hw, glort,FM10K_XCAST_MODE_NONE ); -fm10k_queue_mac_request (interface, glort, sdev->dev_addr, - hw->mac.default_vid, false); - } + +fm10k_queue_mac_request (interface, glort, sdev->dev_addr, + hw->mac.default_vid, false); for (vid = fm10k_find_next_vlan(interface, 0); vid < VLAN_N_VID;
Signature · 1 line
2.15.1.478.ga1e07cd25f8b
Singh
PATCH 6/6 fm10k: don't protect fm10k_queue_mac_request by fm10k_host_mbx_ready
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Jacob Keller
Sent: Thursday, April 12, 2018 11:16 AM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH 6/6] fm10k: don't protectfm10k_queue_mac_requestbyfm10k_host_mbx_readyWe don't actually need to check if the host mbx is ready when queuing MAC requests, because these are not handled by a special queue which queues up requests until the mailbox is capable of handling them.
Quoted 5 lines
Pull these requests outside the
fm10k_host_mbx_ready()check, as it is not necessary.Signed-off-by Jacob Keller <[email protected]>---
Singh
PATCH 1/6 fm10k: setup VLANs for l2 accelerated macvlan interfaces
In reply to Jacob KellerQuoted 26 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Jacob Keller
Sent: Thursday, April 12, 2018 11:16 AM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH 1/6] fm10k: setup VLANs for l2 accelerated macvlan interfacesWe have support for accelerating macvlan devices via the .ndo_dfwd_add_station() netdev op. These accelerated macvlan MAC addresses are stored in the
l2_accelstructure, separate from the unicast or multicast address lists.If a VLAN is added on top of the macvlan device by the stack, traffic will not properly flow to the macvlan. This occurs because we fail to setup the VLANs for
l2_accelMAC addresses.In the non-offloaded case the MAC address is added to the unicast address list, and thus the normal setup for enabling VLANs works as expected.
We also need to add VLANs marked from .ndo_vlan_rx_add_vid() into the
l2_accelMAC addresses. Otherwise, VLAN traffic will not properly be received by the VLAN devices attached to the offloaded macvlan devices.
Quoted 8 lines
Fix this by adding necessary logic to setup VLANs not only for the unicast and multicast addresses, but also the
l2_accellist. We need similar logic indfwd_add_station,dfwd_del_station,fm10k_update_vid, andfm10k_restore_rx_state.Signed-off-by Jacob Keller <[email protected]>Reviewed-by Alexander Duyck <[email protected]>---