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

Commit b7847357 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

rocker: fix a sleeping in atomic bug 



[ Upstream commit 43d012123122cc69feacab55b71369f386c19566 ]

This code is holding the &ofdpa->flow_tbl_lock spinlock so it is not
allowed to sleep.  That means we have to pass the OFDPA_OP_FLAG_NOWAIT
flag to ofdpa_flow_tbl_del().

Fixes: 936bd486 ("rocker: use FIB notifications instead of switchdev calls")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 385b8fe3

drivers/net/ethernet/rocker/rocker_ofdpa.c

+2 −1
Original line number Diff line number Diff line
@@ -2795,7 +2795,8 @@ static void ofdpa_fib4_abort(struct rocker *rocker) 
		if (!ofdpa_port)

			continue;

		nh->fib_nh_flags &= ~RTNH_F_OFFLOAD;

		ofdpa_flow_tbl_del(ofdpa_port, OFDPA_OP_FLAG_REMOVE,

		ofdpa_flow_tbl_del(ofdpa_port,

				   OFDPA_OP_FLAG_REMOVE | OFDPA_OP_FLAG_NOWAIT,

				   flow_entry);

	}

	spin_unlock_irqrestore(&ofdpa->flow_tbl_lock, flags);