Commit d3a47063 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'rocker-two-small-changes' 

Ido Schimmel says:

====================
rocker: Two small changes

Patch #1 avoids allocating and scheduling a work item when it is not
doing any work.

Patch #2 aligns rocker with other switchdev drivers to explicitly mark
FDB entries as offloaded. Needed for upcoming MAB offload [1].

[1] https://lore.kernel.org/netdev/20221025100024.1287157-1-idosch@nvidia.com/
====================

Link: https://lore.kernel.org/r/20221101123936.1900453-1-idosch@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3319dbb3 386b4174

drivers/net/ethernet/rocker/rocker_ofdpa.c

+8 −7
Original line number Diff line number Diff line
@@ -1821,19 +1821,17 @@ static void ofdpa_port_fdb_learn_work(struct work_struct *work) 
	const struct ofdpa_fdb_learn_work *lw =

		container_of(work, struct ofdpa_fdb_learn_work, work);

	bool removing = (lw->flags & OFDPA_OP_FLAG_REMOVE);

	bool learned = (lw->flags & OFDPA_OP_FLAG_LEARNED);

	struct switchdev_notifier_fdb_info info = {};

	enum switchdev_notifier_type event;



	info.addr = lw->addr;

	info.vid = lw->vid;

	info.offloaded = !removing;

	event = removing ? SWITCHDEV_FDB_DEL_TO_BRIDGE :

			   SWITCHDEV_FDB_ADD_TO_BRIDGE;



	rtnl_lock();

	if (learned && removing)

		call_switchdev_notifiers(SWITCHDEV_FDB_DEL_TO_BRIDGE,

					 lw->ofdpa_port->dev, &info.info, NULL);

	else if (learned && !removing)

		call_switchdev_notifiers(SWITCHDEV_FDB_ADD_TO_BRIDGE,

					 lw->ofdpa_port->dev, &info.info, NULL);

	call_switchdev_notifiers(event, lw->ofdpa_port->dev, &info.info, NULL);

	rtnl_unlock();



	kfree(work);
@@ -1865,6 +1863,9 @@ static int ofdpa_port_fdb_learn(struct ofdpa_port *ofdpa_port, 
	if (!ofdpa_port_is_bridged(ofdpa_port))

		return 0;



	if (!(flags & OFDPA_OP_FLAG_LEARNED))

		return 0;



	lw = kzalloc(sizeof(*lw), GFP_ATOMIC);

	if (!lw)

		return -ENOMEM;