Commit 026f6513 authored by Ziyi Guo's avatar Ziyi Guo Committed by Jakub Kicinski
Browse files

net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj() 



ocelot_port_xmit_inj() calls ocelot_can_inject() and
ocelot_port_inject_frame() without holding the injection group lock.
Both functions contain lockdep_assert_held() for the injection lock,
and the correct caller felix_port_deferred_xmit() properly acquires
the lock using ocelot_lock_inj_grp() before calling these functions.

Add ocelot_lock_inj_grp()/ocelot_unlock_inj_grp() around the register
injection path to fix the missing lock protection. The FDMA path is not
affected as it uses its own locking mechanism.

Fixes: c5e12ac3 ("net: mscc: ocelot: serialize access to the injection/extraction groups")
Signed-off-by: default avatarZiyi Guo <n7l8m4@u.northwestern.edu>
Reviewed-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20260208225602.1339325-4-n7l8m4@u.northwestern.edu


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 47f79b20

drivers/net/ethernet/mscc/ocelot_net.c

+10 −2
Original line number Diff line number Diff line
@@ -597,14 +597,22 @@ static netdev_tx_t ocelot_port_xmit_inj(struct sk_buff *skb, 
	int port = priv->port.index;

	u32 rew_op = 0;



	if (!ocelot_can_inject(ocelot, 0))

	ocelot_lock_inj_grp(ocelot, 0);



	if (!ocelot_can_inject(ocelot, 0)) {

		ocelot_unlock_inj_grp(ocelot, 0);

		return NETDEV_TX_BUSY;

	}



	if (!ocelot_xmit_timestamp(ocelot, port, skb, &rew_op))

	if (!ocelot_xmit_timestamp(ocelot, port, skb, &rew_op)) {

		ocelot_unlock_inj_grp(ocelot, 0);

		return NETDEV_TX_OK;

	}



	ocelot_port_inject_frame(ocelot, port, 0, rew_op, skb);



	ocelot_unlock_inj_grp(ocelot, 0);



	consume_skb(skb);



	return NETDEV_TX_OK;