From: Jason Wang <jasowang@redhat.com>
To: Xuan Zhuo <xuanzhuo@linux.alibaba.com>, netdev@vger.kernel.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
"Jakub Kicinski" <kuba@kernel.org>,
"Björn Töpel" <bjorn@kernel.org>,
"Magnus Karlsson" <magnus.karlsson@intel.com>,
"Jonathan Lemon" <jonathan.lemon@gmail.com>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Jesper Dangaard Brouer" <hawk@kernel.org>,
"John Fastabend" <john.fastabend@gmail.com>,
"Andrii Nakryiko" <andrii@kernel.org>,
"Martin KaFai Lau" <kafai@fb.com>,
"Song Liu" <songliubraving@fb.com>, "Yonghong Song" <yhs@fb.com>,
"KP Singh" <kpsingh@kernel.org>,
virtualization@lists.linux-foundation.org, bpf@vger.kernel.org,
"Dust Li" <dust.li@linux.alibaba.com>
Subject: Re: [PATCH net-next v3 5/8] virtio-net: xsk zero copy xmit support xsk unaligned mode
Date: Tue, 6 Apr 2021 14:55:36 +0800 [thread overview]
Message-ID: <44b460db-d852-7151-9833-21fed25ecdc7@redhat.com> (raw)
In-Reply-To: <20210331071139.15473-6-xuanzhuo@linux.alibaba.com>
在 2021/3/31 下午3:11, Xuan Zhuo 写道:
> In xsk unaligned mode, the frame pointed to by desc may span two
> consecutive pages, but not more than two pages.
>
> Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
I'd squash this patch into patch 4.
> ---
> drivers/net/virtio_net.c | 30 ++++++++++++++++++++++++------
> 1 file changed, 24 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index c8a317a93ef7..259fafcf6028 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -2562,24 +2562,42 @@ static void virtnet_xsk_check_space(struct send_queue *sq)
> static int virtnet_xsk_xmit(struct send_queue *sq, struct xsk_buff_pool *pool,
> struct xdp_desc *desc)
> {
> + u32 offset, n, i, copy, copied;
Let's use a better name since we don't actually copy anything here.
> struct virtnet_info *vi;
> struct page *page;
> void *data;
> - u32 offset;
> + int err, m;
> u64 addr;
> - int err;
>
> vi = sq->vq->vdev->priv;
> addr = desc->addr;
> +
> data = xsk_buff_raw_get_data(pool, addr);
> +
> offset = offset_in_page(data);
> + m = desc->len - (PAGE_SIZE - offset);
> + /* xsk unaligned mode, desc will use two page */
> + if (m > 0)
> + n = 3;
> + else
> + n = 2;
>
> - sg_init_table(sq->sg, 2);
> + sg_init_table(sq->sg, n);
> sg_set_buf(sq->sg, &xsk_hdr, vi->hdr_len);
> - page = xsk_buff_xdp_get_page(pool, addr);
> - sg_set_page(sq->sg + 1, page, desc->len, offset);
>
> - err = virtqueue_add_outbuf(sq->vq, sq->sg, 2, NULL, GFP_ATOMIC);
> + copied = 0;
> + for (i = 1; i < n; ++i) {
> + copy = min_t(int, desc->len - copied, PAGE_SIZE - offset);
> +
> + page = xsk_buff_xdp_get_page(pool, addr + copied);
> +
> + sg_set_page(sq->sg + i, page, copy, offset);
> + copied += copy;
> + if (offset)
> + offset = 0;
> + }
Can we simplify the codes by using while here? Then I think we don't
need to determine the value of n.
Thanks
> +
> + err = virtqueue_add_outbuf(sq->vq, sq->sg, n, NULL, GFP_ATOMIC);
> if (unlikely(err))
> sq->xsk.last_desc = *desc;
>
next prev parent reply other threads:[~2021-04-06 6:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-31 7:11 [PATCH net-next v3 0/8] virtio-net support xdp socket zero copy xmit Xuan Zhuo
2021-03-31 7:11 ` [PATCH net-next v3 1/8] xsk: XDP_SETUP_XSK_POOL support option check_dma Xuan Zhuo
2021-03-31 7:11 ` [PATCH net-next v3 2/8] xsk: support get page by addr Xuan Zhuo
2021-03-31 7:11 ` [PATCH net-next v3 3/8] virtio-net: xsk zero copy xmit setup Xuan Zhuo
2021-04-06 4:27 ` Jason Wang
2021-04-07 10:02 ` Magnus Karlsson
2021-03-31 7:11 ` [PATCH net-next v3 4/8] virtio-net: xsk zero copy xmit implement wakeup and xmit Xuan Zhuo
2021-04-06 6:19 ` Jason Wang
2021-04-07 9:56 ` Magnus Karlsson
2021-03-31 7:11 ` [PATCH net-next v3 5/8] virtio-net: xsk zero copy xmit support xsk unaligned mode Xuan Zhuo
2021-04-06 6:55 ` Jason Wang [this message]
2021-03-31 7:11 ` [PATCH net-next v3 6/8] virtio-net: xsk zero copy xmit kick by threshold Xuan Zhuo
2021-04-06 6:59 ` Jason Wang
2021-03-31 7:11 ` [PATCH net-next v3 7/8] virtio-net: poll tx call xsk zerocopy xmit Xuan Zhuo
2021-04-06 7:03 ` Jason Wang
2021-03-31 7:11 ` [PATCH net-next v3 8/8] virtio-net: free old xmit handle xsk Xuan Zhuo
2021-04-06 7:16 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44b460db-d852-7151-9833-21fed25ecdc7@redhat.com \
--to=jasowang@redhat.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bjorn@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dust.li@linux.alibaba.com \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=jonathan.lemon@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=magnus.karlsson@intel.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=xuanzhuo@linux.alibaba.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).