Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

qede: 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: d1b25b79e162b ("qede: add .ndo_xdp_xmit() and XDP_REDIRECT support")
Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.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: Jakub Kicinski <kuba@kernel.org>

authored by

Magnus Karlsson and committed by
Jakub Kicinski
2ccce20d 28b4387f

+4 -3
+4 -3
drivers/net/ethernet/qlogic/qede/qede_fp.c
··· 1438 1438 rx_work_done = (likely(fp->type & QEDE_FASTPATH_RX) && 1439 1439 qede_has_rx_work(fp->rxq)) ? 1440 1440 qede_rx_int(fp, budget) : 0; 1441 + 1442 + if (fp->xdp_xmit & QEDE_XDP_REDIRECT) 1443 + xdp_do_flush(); 1444 + 1441 1445 /* Handle case where we are called by netpoll with a budget of 0 */ 1442 1446 if (rx_work_done < budget || !budget) { 1443 1447 if (!qede_poll_is_more_work(fp)) { ··· 1460 1456 fp->xdp_tx->tx_db.data.bd_prod = cpu_to_le16(xdp_prod); 1461 1457 qede_update_tx_producer(fp->xdp_tx); 1462 1458 } 1463 - 1464 - if (fp->xdp_xmit & QEDE_XDP_REDIRECT) 1465 - xdp_do_flush_map(); 1466 1459 1467 1460 return rx_work_done; 1468 1461 }