Commit 12b57179 authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Jakub Kicinski
Browse files

lan966x: execute xdp_do_flush() before napi_complete_done() 



Make sure that xdp_do_flush() is always executed before
napi_complete_done(). This is important for two reasons. First, a
redirect to an XSKMAP assumes that a call to xdp_do_redirect() from
napi context X on CPU Y will be followed by a xdp_do_flush() from the
same napi context and CPU. This is not guaranteed if the
napi_complete_done() is executed before xdp_do_flush(), as it tells
the napi logic that it is fine to schedule napi context X on another
CPU. Details from a production system triggering this bug using the
veth driver can be found following the first link below.

The second reason is that the XDP_REDIRECT logic in itself relies on
being inside a single NAPI instance through to the xdp_do_flush() call
for RCU protection of all in-kernel data structures. Details can be
found in the second link below.

Fixes: a825b611 ("net: lan966x: Add support for XDP_REDIRECT")
Signed-off-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Acked-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Acked-by: default avatarSteen Hegelund <Steen.Hegelund@microchip.com>
Link: https://lore.kernel.org/r/20221220185903.1105011-1-sbohrer@cloudflare.com
Link: https://lore.kernel.org/all/20210624160609.292325-1-toke@redhat.com/


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

drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c

+3 −3
Original line number Diff line number Diff line
@@ -608,12 +608,12 @@ static int lan966x_fdma_napi_poll(struct napi_struct *napi, int weight) 
		lan966x_fdma_rx_reload(rx);

	}



	if (counter < weight && napi_complete_done(napi, counter))

		lan_wr(0xff, lan966x, FDMA_INTR_DB_ENA);



	if (redirect)

		xdp_do_flush();



	if (counter < weight && napi_complete_done(napi, counter))

		lan_wr(0xff, lan966x, FDMA_INTR_DB_ENA);



	return counter;

}