On 08/12/2020 14:07:51+0200, Vladimir Oltean wrote:
> Since switchdev/DSA exposes network interfaces that fulfill many of the
> same user space expectations that dedicated NICs do, it makes sense to
> not deny bonding interfaces with a bonding policy that we cannot offload,
> but instead allow the bonding driver to select the egress interface in
> software.
>
> Signed-off-by: Vladimir Oltean <vladimir.olt...@nxp.com>
Reviewed-by: Alexandre Belloni <alexandre.bell...@bootlin.com>
> ---
> drivers/net/ethernet/mscc/ocelot_net.c | 38 ++++++++++----------------
> 1 file changed, 15 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/net/ethernet/mscc/ocelot_net.c
> b/drivers/net/ethernet/mscc/ocelot_net.c
> index 47b620967156..77957328722a 100644
> --- a/drivers/net/ethernet/mscc/ocelot_net.c
> +++ b/drivers/net/ethernet/mscc/ocelot_net.c
> @@ -1022,6 +1022,15 @@ static int ocelot_netdevice_changeupper(struct
> net_device *dev,
> }
> }
> if (netif_is_lag_master(info->upper_dev)) {
> + struct netdev_lag_upper_info *lag_upper_info;
> +
> + lag_upper_info = info->upper_info;
> +
> + /* Only offload what we can */
> + if (lag_upper_info &&
> + lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH)
> + return NOTIFY_DONE;
> +
> if (info->linking)
> err = ocelot_port_lag_join(ocelot, port,
> info->upper_dev);
> @@ -1037,10 +1046,16 @@ static int
> ocelot_netdevice_lag_changeupper(struct net_device *dev,
> struct netdev_notifier_changeupper_info *info)
> {
> + struct netdev_lag_upper_info *lag_upper_info = info->upper_info;
> struct net_device *lower;
> struct list_head *iter;
> int err = NOTIFY_DONE;
>
> + /* Can't offload LAG => also do bridging in software */
> + if (lag_upper_info &&
> + lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH)
> + return NOTIFY_DONE;
> +
> netdev_for_each_lower_dev(dev, lower, iter) {
> err = ocelot_netdevice_changeupper(lower, info);
> if (err)
> @@ -1056,29 +1071,6 @@ static int ocelot_netdevice_event(struct
> notifier_block *unused,
> struct net_device *dev = netdev_notifier_info_to_dev(ptr);
>
> switch (event) {
> - case NETDEV_PRECHANGEUPPER: {
> - struct netdev_notifier_changeupper_info *info = ptr;
> - struct netdev_lag_upper_info *lag_upper_info;
> - struct netlink_ext_ack *extack;
> -
> - if (!ocelot_netdevice_dev_check(dev))
> - break;
> -
> - if (!netif_is_lag_master(info->upper_dev))
> - break;
> -
> - lag_upper_info = info->upper_info;
> -
> - if (lag_upper_info &&
> - lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH) {
> - extack = netdev_notifier_info_to_extack(&info->info);
> - NL_SET_ERR_MSG_MOD(extack, "LAG device using
> unsupported Tx type");
> -
> - return NOTIFY_BAD;
> - }
> -
> - break;
> - }
> case NETDEV_CHANGEUPPER: {
> struct netdev_notifier_changeupper_info *info = ptr;
>
> --
> 2.25.1
>
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
