Commit 816a3bed authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

switchdev: Add fdb.added_by_user to switchdev notifications 



The following patch enables sending notifications also for events on FDB
entries that weren't added by the user. Give the drivers the information
necessary to distinguish between the two origins of FDB entries.

To maintain the current behavior, have switchdev-implementing drivers
bail out on notifications about non-user-added FDB entries. In case of
mlxsw driver, allow a call to mlxsw_sp_span_respin() so that SPAN over
bridge catches up with the changed FDB.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Acked-by: default avatarIvan Vecera <ivecera@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e913f28

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

+4 −0
Original line number Diff line number Diff line
@@ -2270,6 +2270,8 @@ static void mlxsw_sp_switchdev_event_work(struct work_struct *work) 
	switch (switchdev_work->event) {

	case SWITCHDEV_FDB_ADD_TO_DEVICE:

		fdb_info = &switchdev_work->fdb_info;

		if (!fdb_info->added_by_user)

			break;

		err = mlxsw_sp_port_fdb_set(mlxsw_sp_port, fdb_info, true);

		if (err)

			break;
@@ -2279,6 +2281,8 @@ static void mlxsw_sp_switchdev_event_work(struct work_struct *work) 
		break;

	case SWITCHDEV_FDB_DEL_TO_DEVICE:

		fdb_info = &switchdev_work->fdb_info;

		if (!fdb_info->added_by_user)

			break;

		mlxsw_sp_port_fdb_set(mlxsw_sp_port, fdb_info, false);

		break;

	case SWITCHDEV_FDB_ADD_TO_BRIDGE: /* fall through */

drivers/net/ethernet/rocker/rocker_main.c

+2 −0
Original line number Diff line number Diff line
@@ -2783,6 +2783,8 @@ static int rocker_switchdev_event(struct notifier_block *unused, 
	switch (event) {

	case SWITCHDEV_FDB_ADD_TO_DEVICE: /* fall through */

	case SWITCHDEV_FDB_DEL_TO_DEVICE:

		if (!fdb_info->added_by_user)

			break;

		memcpy(&switchdev_work->fdb_info, ptr,

		       sizeof(switchdev_work->fdb_info));

		switchdev_work->fdb_info.addr = kzalloc(ETH_ALEN, GFP_ATOMIC);

include/net/switchdev.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ struct switchdev_notifier_fdb_info { 
	struct switchdev_notifier_info info; /* must be first */

	const unsigned char *addr;

	u16 vid;

	bool added_by_user;

};



static inline struct net_device *

net/bridge/br_switchdev.c

+7 −3
Original line number Diff line number Diff line
@@ -102,13 +102,15 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p, 


static void

br_switchdev_fdb_call_notifiers(bool adding, const unsigned char *mac,

				u16 vid, struct net_device *dev)

				u16 vid, struct net_device *dev,

				bool added_by_user)

{

	struct switchdev_notifier_fdb_info info;

	unsigned long notifier_type;



	info.addr = mac;

	info.vid = vid;

	info.added_by_user = added_by_user;

	notifier_type = adding ? SWITCHDEV_FDB_ADD_TO_DEVICE : SWITCHDEV_FDB_DEL_TO_DEVICE;

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

}
@@ -123,12 +125,14 @@ br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type) 
	case RTM_DELNEIGH:

		br_switchdev_fdb_call_notifiers(false, fdb->key.addr.addr,

						fdb->key.vlan_id,

						fdb->dst->dev);

						fdb->dst->dev,

						fdb->added_by_user);

		break;

	case RTM_NEWNEIGH:

		br_switchdev_fdb_call_notifiers(true, fdb->key.addr.addr,

						fdb->key.vlan_id,

						fdb->dst->dev);

						fdb->dst->dev,

						fdb->added_by_user);

		break;

	}

}

net/dsa/slave.c

+4 −1
Original line number Diff line number Diff line
@@ -1441,6 +1441,7 @@ static int dsa_slave_switchdev_event(struct notifier_block *unused, 
				     unsigned long event, void *ptr)

{

	struct net_device *dev = switchdev_notifier_info_to_dev(ptr);

	struct switchdev_notifier_fdb_info *fdb_info = ptr;

	struct dsa_switchdev_event_work *switchdev_work;



	if (!dsa_slave_dev_check(dev))
@@ -1458,8 +1459,10 @@ static int dsa_slave_switchdev_event(struct notifier_block *unused, 
	switch (event) {

	case SWITCHDEV_FDB_ADD_TO_DEVICE: /* fall through */

	case SWITCHDEV_FDB_DEL_TO_DEVICE:

		if (!fdb_info->added_by_user)

			break;

		if (dsa_slave_switchdev_fdb_work_init(switchdev_work,

						      ptr))

						      fdb_info))

			goto err_fdb_work_init;

		dev_hold(dev);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE