Skip to content

virtio-net: support multi buffer xdp

Heng Qi bpf netdev 5 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest10 patches 0 repliesApplied 10/10
  2. v410 patches 2 repliesSuperseded
  3. v39 patches 6 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v29 patches31 repliesSuperseded
v1 RFC9 patches20 repliesSuperseded

Changes in v5 from the cover letter

- Make netdev_warn() in [PATCH 2/10] independent from [PATCH 3/10].

Patches in v5 All 10 applied

#Subject and filesSizeRepliesApplied
1/10virtio-net: disable the hole mechanism for xdpdrivers/net/virtio_net.c+4 -10 repliesApplied
2/10virtio-net: fix calculation of MTU for single-buffer xdpdrivers/net/virtio_net.c+4 -20 repliesApplied
3/10virtio-net: set up xdp for multi buffer packetsdrivers/net/virtio_net.c+3 -30 repliesApplied
4/10virtio-net: update bytes calculation for xdp_framedrivers/net/virtio_net.c+2 -20 repliesApplied
5/10virtio-net: build xdp_buff with multi buffersdrivers/net/virtio_net.c+100 -80 repliesApplied
6/10virtio-net: construct multi-buffer xdp in mergeabledrivers/net/virtio_net.c+44 -140 repliesApplied
7/10virtio-net: transmit the multi-buffer xdpdrivers/net/virtio_net.c+26 -50 repliesApplied
8/10virtio-net: build skb from multi-buffer xdpdrivers/net/virtio_net.c+49 -00 repliesApplied
9/10virtio-net: remove xdp related info from page_to_skb()drivers/net/virtio_net.c+9 -320 repliesApplied
10/10virtio-net: support multi-buffer xdpdrivers/net/virtio_net.c+10 -550 repliesApplied

Reviews trailers per patch

All 10 patches have a Reviewed-by or Acked-by.

PatchXuan ZhuoJason Wang
1/10R-b A-b
2/10R-b A-b
3/10R-b A-b
4/10R-b A-b
5/10R-b A-b
6/10R-b A-b
7/10R-b A-b
8/10R-b A-b
9/10R-b A-b
10/10R-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [PATCH net-next v5 00/10] virtio-net: support multi buffer xdp

Changes since PATCH v4:
- Make netdev_warn() in [PATCH 2/10] independent from [PATCH 3/10].

Changes since PATCH v3:
- Separate fix patch [2/10] for MTU calculation of single buffer xdp. Note that this patch needs to be backported to the stable branch.

Changes since PATCH v2:
- Even if single buffer xdp has a hole mechanism, there will be no problem (limiting mtu and turning off GUEST GSO), so there is no need to backport "[PATCH 1/9]";
- Modify calculation of MTU for single buffer xdp in virtnet_xdp_set();
- Make truesize in mergeable mode return to literal meaning;
- Add some comments for legibility;

Changes since RFC:
- Using headroom instead of vi->xdp_enabled to avoid re-reading in add_recvbuf_mergeable();
- Disable GRO_HW and keep linearization for single buffer xdp;
- Renamed to virtnet_build_xdp_buff_mrg();
- pr_debug() to netdev_dbg();
- Adjusted the order of the patch series.

Currently, virtio net only supports xdp for single-buffer packets or linearized multi-buffer packets. This patchset supports xdp for multi-buffer packets, then larger MTU can be used if xdp sets the xdp.frags. This does not affect single buffer handling.

In order to build multi-buffer xdp neatly, we integrated the code into virtnet_build_xdp_buff_mrg() for xdp. The first buffer is used for prepared xdp buff, and the rest of the buffers are added to its skb_shared_info structure. This structure can also be conveniently converted during XDP_PASS to get the corresponding skb.

Since virtio net uses comp pages, and bpf_xdp_frags_increase_tail() is based on the assumption of the page pool, (rxq->frag_size - skb_frag_size(frag) - skb_frag_off(frag)) is negative in most cases. So we didn't set xdp_rxq->frag_size in virtnet_open() to disable the tail increase.

Heng Qi (10):
virtio-net: disable the hole mechanism for xdp
virtio-net: fix calculation of MTU for single-buffer xdp
virtio-net: set up xdp for multi buffer packets
virtio-net: update bytes calculation for xdp_frame
virtio-net: build xdp_buff with multi buffers
virtio-net: construct multi-buffer xdp in mergeable
virtio-net: transmit the multi-buffer xdp
virtio-net: build skb from multi-buffer xdp
virtio-net: remove xdp related info from page_to_skb()
virtio-net: support multi-buffer xdp

 drivers/net/virtio_net.c | 371 ++++++++++++++++++++++++++-------------
 1 file changed, 250 insertions(+), 121 deletions(-)
Signature · 1 line
2.19.1.6.gb485710b