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>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
virtualization@lists.linux-foundation.org, bpf@vger.kernel.org
Subject: Re: [PATCH net 2/2] virtio-net: get build_skb() buf by data ptr
Date: Mon, 31 May 2021 14:10:55 +0800 [thread overview]
Message-ID: <2920ec92-43ac-714f-69b5-281467d1d5ad@redhat.com> (raw)
In-Reply-To: <20210514151637.117596-3-xuanzhuo@linux.alibaba.com>
在 2021/5/14 下午11:16, Xuan Zhuo 写道:
> In the case of merge, the page passed into page_to_skb() may be a head
> page, not the page where the current data is located.
I don't get how this can happen?
Maybe you can explain a little bit more?
receive_mergeable() call page_to_skb() in two places:
1) XDP_PASS for linearized page , in this case we use xdp_page
2) page_to_skb() for "normal" page, in this case the page contains the data
Thanks
> So when trying to
> get the buf where the data is located, you should directly use the
> pointer(p) to get the address corresponding to the page.
>
> At the same time, the offset of the data in the page should also be
> obtained using offset_in_page().
>
> This patch solves this problem. But if you don’t use this patch, the
> original code can also run, because if the page is not the page of the
> current data, the calculated tailroom will be less than 0, and will not
> enter the logic of build_skb() . The significance of this patch is to
> modify this logical problem, allowing more situations to use
> build_skb().
>
> Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> drivers/net/virtio_net.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 3e46c12dde08..073fec4c0df1 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -407,8 +407,12 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
> * see add_recvbuf_mergeable() + get_mergeable_buf_len()
> */
> truesize = PAGE_SIZE;
> - tailroom = truesize - len - offset;
> - buf = page_address(page);
> +
> + /* page maybe head page, so we should get the buf by p, not the
> + * page
> + */
> + tailroom = truesize - len - offset_in_page(p);
> + buf = (char *)((unsigned long)p & PAGE_MASK);
> } else {
> tailroom = truesize - len;
> buf = p;
next prev parent reply other threads:[~2021-05-31 6:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-14 15:16 [PATCH net 0/2] virtio-net: fix for build_skb() Xuan Zhuo
2021-05-14 15:16 ` [PATCH net 1/2] virtio-net: fix for unable to handle page fault for address Xuan Zhuo
2021-05-31 3:50 ` Jason Wang
2021-05-14 15:16 ` [PATCH net 2/2] virtio-net: get build_skb() buf by data ptr Xuan Zhuo
2021-05-31 6:10 ` Jason Wang [this message]
[not found] <1622458734.837168-1-xuanzhuo@linux.alibaba.com>
2021-06-01 3:03 ` Jason Wang
[not found] <1622516885.7439268-1-xuanzhuo@linux.alibaba.com>
2021-06-01 3:27 ` Jason Wang
[not found] <1622527177.2087624-1-xuanzhuo@linux.alibaba.com>
2021-06-01 6:17 ` 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=2920ec92-43ac-714f-69b5-281467d1d5ad@redhat.com \
--to=jasowang@redhat.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=xuanzhuo@linux.alibaba.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).