Skip to content

Commit

Permalink
virtio-net: execute xdp_do_flush() before napi_complete_done()
Browse files Browse the repository at this point in the history
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: 186b3c9 ("virtio-net: support XDP_REDIRECT")
Signed-off-by: Magnus Karlsson <[email protected]>
Acked-by: Toke Høiland-Jørgensen <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Link: https://lore.kernel.org/all/[email protected]/
Acked-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Jakub Kicinski <[email protected]>
  • Loading branch information
magnus-karlsson authored and kuba-moo committed Jan 28, 2023
1 parent 12b5717 commit ad7e615
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/virtio_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -1677,13 +1677,13 @@ static int virtnet_poll(struct napi_struct *napi, int budget)

received = virtnet_receive(rq, budget, &xdp_xmit);

if (xdp_xmit & VIRTIO_XDP_REDIR)
xdp_do_flush();

/* Out of packets? */
if (received < budget)
virtqueue_napi_complete(napi, rq->vq, received);

if (xdp_xmit & VIRTIO_XDP_REDIR)
xdp_do_flush();

if (xdp_xmit & VIRTIO_XDP_TX) {
sq = virtnet_xdp_get_sq(vi);
if (virtqueue_kick_prepare(sq->vq) && virtqueue_notify(sq->vq)) {
Expand Down

0 comments on commit ad7e615

Please sign in to comment.