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>
Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch_br.c b/drivers/net/ethernet/intel/ice/ice_eswitch_br.c
index cc7357e..67bfd1f 100644 (file)
--- 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);