Skip to content

Commit 97717e8

Browse files
Heng Qidavem330
authored andcommitted
virtio-net: transmit the multi-buffer xdp
This serves as the basis for XDP_TX and XDP_REDIRECT to send a multi-buffer xdp_frame. Signed-off-by: Heng Qi <hengqi@linux.alibaba.com> Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 22174f7 commit 97717e8

File tree

1 file changed

+26
-5
lines changed

1 file changed

+26
-5
lines changed

drivers/net/virtio_net.c

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -570,22 +570,43 @@ static int __virtnet_xdp_xmit_one(struct virtnet_info *vi,
570570
struct xdp_frame *xdpf)
571571
{
572572
struct virtio_net_hdr_mrg_rxbuf *hdr;
573-
int err;
573+
struct skb_shared_info *shinfo;
574+
u8 nr_frags = 0;
575+
int err, i;
574576

575577
if (unlikely(xdpf->headroom < vi->hdr_len))
576578
return -EOVERFLOW;
577579

578-
/* Make room for virtqueue hdr (also change xdpf->headroom?) */
580+
if (unlikely(xdp_frame_has_frags(xdpf))) {
581+
shinfo = xdp_get_shared_info_from_frame(xdpf);
582+
nr_frags = shinfo->nr_frags;
583+
}
584+
585+
/* In wrapping function virtnet_xdp_xmit(), we need to free
586+
* up the pending old buffers, where we need to calculate the
587+
* position of skb_shared_info in xdp_get_frame_len() and
588+
* xdp_return_frame(), which will involve to xdpf->data and
589+
* xdpf->headroom. Therefore, we need to update the value of
590+
* headroom synchronously here.
591+
*/
592+
xdpf->headroom -= vi->hdr_len;
579593
xdpf->data -= vi->hdr_len;
580594
/* Zero header and leave csum up to XDP layers */
581595
hdr = xdpf->data;
582596
memset(hdr, 0, vi->hdr_len);
583597
xdpf->len += vi->hdr_len;
584598

585-
sg_init_one(sq->sg, xdpf->data, xdpf->len);
599+
sg_init_table(sq->sg, nr_frags + 1);
600+
sg_set_buf(sq->sg, xdpf->data, xdpf->len);
601+
for (i = 0; i < nr_frags; i++) {
602+
skb_frag_t *frag = &shinfo->frags[i];
603+
604+
sg_set_page(&sq->sg[i + 1], skb_frag_page(frag),
605+
skb_frag_size(frag), skb_frag_off(frag));
606+
}
586607

587-
err = virtqueue_add_outbuf(sq->vq, sq->sg, 1, xdp_to_ptr(xdpf),
588-
GFP_ATOMIC);
608+
err = virtqueue_add_outbuf(sq->vq, sq->sg, nr_frags + 1,
609+
xdp_to_ptr(xdpf), GFP_ATOMIC);
589610
if (unlikely(err))
590611
return -ENOSPC; /* Caller handle free/refcnt */
591612

0 commit comments

Comments
 (0)