Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9ba0fbc authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

bridge: switchdev: Allow clearing FDB entry offload indication 



Currently, an FDB entry only ceases being offloaded when it is deleted.
This changes with VxLAN encapsulation.

Devices capable of performing VxLAN encapsulation usually have only one
FDB table, unlike the software data path which has two - one in the
bridge driver and another in the VxLAN driver.

Therefore, bridge FDB entries pointing to a VxLAN device are only
offloaded if there is a corresponding entry in the VxLAN FDB.

Allow clearing the offload indication in case the corresponding entry
was deleted from the VxLAN FDB.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 045a5a99

drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

+5 −4
Original line number Diff line number Diff line
@@ -2090,12 +2090,13 @@ void mlxsw_sp_port_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_port, 
static void

mlxsw_sp_fdb_call_notifiers(enum switchdev_notifier_type type,

			    const char *mac, u16 vid,

			    struct net_device *dev)

			    struct net_device *dev, bool offloaded)

{

	struct switchdev_notifier_fdb_info info;



	info.addr = mac;

	info.vid = vid;

	info.offloaded = offloaded;

	call_switchdev_notifiers(type, dev, &info.info);

}
@@ -2147,7 +2148,7 @@ static void mlxsw_sp_fdb_notify_mac_process(struct mlxsw_sp *mlxsw_sp, 
	if (!do_notification)

		return;

	type = adding ? SWITCHDEV_FDB_ADD_TO_BRIDGE : SWITCHDEV_FDB_DEL_TO_BRIDGE;

	mlxsw_sp_fdb_call_notifiers(type, mac, vid, bridge_port->dev);

	mlxsw_sp_fdb_call_notifiers(type, mac, vid, bridge_port->dev, adding);



	return;
@@ -2207,7 +2208,7 @@ static void mlxsw_sp_fdb_notify_mac_lag_process(struct mlxsw_sp *mlxsw_sp, 
	if (!do_notification)

		return;

	type = adding ? SWITCHDEV_FDB_ADD_TO_BRIDGE : SWITCHDEV_FDB_DEL_TO_BRIDGE;

	mlxsw_sp_fdb_call_notifiers(type, mac, vid, bridge_port->dev);

	mlxsw_sp_fdb_call_notifiers(type, mac, vid, bridge_port->dev, adding);



	return;
@@ -2312,7 +2313,7 @@ static void mlxsw_sp_switchdev_bridge_fdb_event_work(struct work_struct *work) 
			break;

		mlxsw_sp_fdb_call_notifiers(SWITCHDEV_FDB_OFFLOADED,

					    fdb_info->addr,

					    fdb_info->vid, dev);

					    fdb_info->vid, dev, true);

		break;

	case SWITCHDEV_FDB_DEL_TO_DEVICE:

		fdb_info = &switchdev_work->fdb_info;

drivers/net/ethernet/rocker/rocker_main.c

+1 −0
Original line number Diff line number Diff line
@@ -2728,6 +2728,7 @@ rocker_fdb_offload_notify(struct rocker_port *rocker_port, 


	info.addr = recv_info->addr;

	info.vid = recv_info->vid;

	info.offloaded = true;

	call_switchdev_notifiers(SWITCHDEV_FDB_OFFLOADED,

				 rocker_port->dev, &info.info);

}

include/net/switchdev.h

+2 −1
Original line number Diff line number Diff line
@@ -159,7 +159,8 @@ struct switchdev_notifier_fdb_info { 
	struct switchdev_notifier_info info; /* must be first */

	const unsigned char *addr;

	u16 vid;

	bool added_by_user;

	u8 added_by_user:1,

	   offloaded:1;

};



static inline struct net_device *

net/bridge/br.c

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static int br_switchdev_event(struct notifier_block *unused, 
			break;

		}

		br_fdb_offloaded_set(br, p, fdb_info->addr,

				     fdb_info->vid);

				     fdb_info->vid, true);

		break;

	case SWITCHDEV_FDB_DEL_TO_BRIDGE:

		fdb_info = ptr;
@@ -163,7 +163,7 @@ static int br_switchdev_event(struct notifier_block *unused, 
	case SWITCHDEV_FDB_OFFLOADED:

		fdb_info = ptr;

		br_fdb_offloaded_set(br, p, fdb_info->addr,

				     fdb_info->vid);

				     fdb_info->vid, fdb_info->offloaded);

		break;

	}

net/bridge/br_fdb.c

+2 −2
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p, 
}



void br_fdb_offloaded_set(struct net_bridge *br, struct net_bridge_port *p,

			  const unsigned char *addr, u16 vid)

			  const unsigned char *addr, u16 vid, bool offloaded)

{

	struct net_bridge_fdb_entry *fdb;
@@ -1160,7 +1160,7 @@ void br_fdb_offloaded_set(struct net_bridge *br, struct net_bridge_port *p, 


	fdb = br_fdb_find(br, addr, vid);

	if (fdb)

		fdb->offloaded = 1;

		fdb->offloaded = offloaded;



	spin_unlock_bh(&br->hash_lock);

}