| Message ID | 20230717091843.108015-1-wojciech.drewek@intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [iwl-next,v2] ice: Accept LAG netdevs in bridge offloads | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
Dear Wojciech, Thank you for your patch. Am 17.07.23 um 11:18 schrieb Wojciech Drewek: > Allow LAG interfaces to be used in bridge offload using > netif_is_lag_master. In this case, search for ice netdev in > the list of LAG's lower devices. Why weren’t these interfaces allowed to be used like that before? It’d be great if you added that information. > Reviewed-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com> > Signed-off-by: Wojciech Drewek <wojciech.drewek@intel.com> […] Kind nregards, Paul
> -----Original Message----- > From: Paul Menzel <pmenzel@molgen.mpg.de> > Sent: poniedziałek, 17 lipca 2023 11:24 > To: Drewek, Wojciech <wojciech.drewek@intel.com> > Cc: intel-wired-lan@lists.osuosl.org; jiri@resnulli.us; simon.horman@corigine.com; Nguyen, Anthony L > <anthony.l.nguyen@intel.com>; netdev@vger.kernel.org > Subject: Re: [Intel-wired-lan] [PATCH iwl-next v2] ice: Accept LAG netdevs in bridge offloads > > Dear Wojciech, > > > Thank you for your patch. > > > Am 17.07.23 um 11:18 schrieb Wojciech Drewek: > > Allow LAG interfaces to be used in bridge offload using > > netif_is_lag_master. In this case, search for ice netdev in > > the list of LAG's lower devices. > > Why weren’t these interfaces allowed to be used like that before? It’d > be great if you added that information. Both bridge offload[1] and LAG[2] are not accepted yet. Originally this patch was part of the bridge offload series but during the review [3] it was suggested that it should go with LAG series. To sum up, it was intended to support those interfaces from the start. [1] http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=363510 [2] http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=360621 [3] https://lore.kernel.org/netdev/ZH769agjmFeTLkq9@corigine.com/ Regards, Wojtek > > > Reviewed-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com> > > Signed-off-by: Wojciech Drewek <wojciech.drewek@intel.com> > > […] > > > Kind nregards, > > Paul
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Wojciech Drewek > Sent: Monday, July 17, 2023 2:49 PM > To: intel-wired-lan@lists.osuosl.org > Cc: jiri@resnulli.us; simon.horman@corigine.com; Nguyen, Anthony L > <anthony.l.nguyen@intel.com>; netdev@vger.kernel.org > Subject: [Intel-wired-lan] [PATCH iwl-next v2] ice: Accept LAG netdevs in > bridge offloads > > Allow LAG interfaces to be used in bridge offload using netif_is_lag_master. > In this case, search for ice netdev in the list of LAG's lower devices. > > Reviewed-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com> > Signed-off-by: Wojciech Drewek <wojciech.drewek@intel.com> > --- > Note for Tony: This patch needs to go with Dave's LAG > patchset: > http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=360621 > > v2: fix spelling of uplink in ice_eswitch_br_get_uplink_from_lag > --- > .../net/ethernet/intel/ice/ice_eswitch_br.c | 47 +++++++++++++++++-- > 1 file changed, 42 insertions(+), 5 deletions(-) > Observing traffic failure between VFs and VF to uplink when bond is configured as the uplink interface.
diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch_br.c b/drivers/net/ethernet/intel/ice/ice_eswitch_br.c index cc7357ed6e5f..67bfd1f61cdd 100644 --- a/drivers/net/ethernet/intel/ice/ice_eswitch_br.c +++ b/drivers/net/ethernet/intel/ice/ice_eswitch_br.c @@ -20,8 +20,23 @@ static const struct rhashtable_params ice_fdb_ht_params = { static bool ice_eswitch_br_is_dev_valid(const struct net_device *dev) { - /* Accept only PF netdev and PRs */ - return ice_is_port_repr_netdev(dev) || netif_is_ice(dev); + /* Accept only PF netdev, PRs and LAG */ + return ice_is_port_repr_netdev(dev) || netif_is_ice(dev) || + netif_is_lag_master(dev); +} + +static struct net_device * +ice_eswitch_br_get_uplink_from_lag(struct net_device *lag_dev) +{ + struct net_device *lower; + struct list_head *iter; + + netdev_for_each_lower_dev(lag_dev, lower, iter) { + if (netif_is_ice(lower)) + return lower; + } + + return NULL; } static struct ice_esw_br_port * @@ -31,8 +46,19 @@ ice_eswitch_br_netdev_to_port(struct net_device *dev) struct ice_repr *repr = ice_netdev_to_repr(dev); return repr->br_port; - } else if (netif_is_ice(dev)) { - struct ice_pf *pf = ice_netdev_to_pf(dev); + } else if (netif_is_ice(dev) || netif_is_lag_master(dev)) { + struct net_device *ice_dev; + struct ice_pf *pf; + + if (netif_is_lag_master(dev)) + ice_dev = ice_eswitch_br_get_uplink_from_lag(dev); + else + ice_dev = dev; + + if (!ice_dev) + return NULL; + + pf = ice_netdev_to_pf(ice_dev); return pf->br_port; } @@ -1085,7 +1111,18 @@ ice_eswitch_br_port_link(struct ice_esw_br_offloads *br_offloads, err = ice_eswitch_br_vf_repr_port_init(bridge, repr); trace_ice_eswitch_br_port_link(repr->br_port); } else { - struct ice_pf *pf = ice_netdev_to_pf(dev); + struct net_device *ice_dev; + struct ice_pf *pf; + + if (netif_is_lag_master(dev)) + ice_dev = ice_eswitch_br_get_uplink_from_lag(dev); + else + ice_dev = dev; + + if (!ice_dev) + return 0; + + pf = ice_netdev_to_pf(ice_dev); err = ice_eswitch_br_uplink_port_init(bridge, pf); trace_ice_eswitch_br_port_link(pf->br_port);