Re: [patch net-next] bridge: try switchdev op first in __vlan_vid_add/del

[Vivien Didelot <vivien.didelot@savoirfairelinux.com>]

Hi Jiri,

On Oct. Friday 09 (41) 01:54 PM, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@mellanox.com>
> 
> Some drivers need to implement both switchdev vlan ops and
> vid_add/kill ndos. For that to work in bridge code, we need to try
> switchdev op first when adding/deleting vlan id.

Just curious, when would a driver need to have both operations?

I kinda have the same question regarding ndo_fdb_{add,del} and the
bridge_{get,set}link equivalent, which is a bit confusing to me.

> 
> Signed-off-by: Jiri Pirko <jiri@mellanox.com>
> Signed-off-by: Ido Schimmel <idosch@mellanox.com>
> ---
>  net/bridge/br_vlan.c | 58 ++++++++++++++++++++--------------------------------
>  1 file changed, 22 insertions(+), 36 deletions(-)
> 
> diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
> index eae07ee..975deb9 100644
> --- a/net/bridge/br_vlan.c
> +++ b/net/bridge/br_vlan.c
> @@ -72,28 +72,20 @@ static void __vlan_add_flags(struct net_bridge_vlan *v, u16 flags)
>  static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,
>  			  u16 vid, u16 flags)
>  {
> -	const struct net_device_ops *ops = dev->netdev_ops;
> +	struct switchdev_obj_port_vlan v = {
> +		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,
> +		.flags = flags,
> +		.vid_begin = vid,
> +		.vid_end = vid,
> +	};
>  	int err;
>  
> -	/* If driver uses VLAN ndo ops, use 8021q to install vid
> -	 * on device, otherwise try switchdev ops to install vid.
> +	/* Try switchdev op first. In case it is not supported, fallback to
> +	 * 8021q add.
>  	 */
> -
> -	if (ops->ndo_vlan_rx_add_vid) {
> -		err = vlan_vid_add(dev, br->vlan_proto, vid);
> -	} else {
> -		struct switchdev_obj_port_vlan v = {
> -			.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,
> -			.flags = flags,
> -			.vid_begin = vid,
> -			.vid_end = vid,
> -		};
> -
> -		err = switchdev_port_obj_add(dev, &v.obj);
> -		if (err == -EOPNOTSUPP)
> -			err = 0;
> -	}
> -
> +	err = switchdev_port_obj_add(dev, &v.obj);
> +	if (err == -EOPNOTSUPP)
> +		return vlan_vid_add(dev, br->vlan_proto, vid);

                err = vlan_vid_add(dev, br->vlan_proto, vid);

Just being picky: the above line would have been preferred to keep a
single return path, but this does not justify a v2 though.

>  	return err;
>  }

Thanks,
-v