From: "Michael S. Tsirkin" <mst@redhat.com>
To: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Cc: netdev@vger.kernel.org, "Jason Wang" <jasowang@redhat.com>,
"Eugenio Pérez" <eperezma@redhat.com>,
"Andrew Lunn" <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Heng Qi" <hengqi@linux.alibaba.com>,
virtualization@lists.linux.dev
Subject: Re: [PATCH net] virtio-net: fix incorrect flags recording in big mode
Date: Fri, 19 Sep 2025 04:07:03 -0400 [thread overview]
Message-ID: <20250919040401-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20250919013450.111424-1-xuanzhuo@linux.alibaba.com>
On Fri, Sep 19, 2025 at 09:34:50AM +0800, Xuan Zhuo wrote:
> The purpose of commit 703eec1b2422 ("virtio_net: fixing XDP for fully
> checksummed packets handling") is to record the flags in advance, as
> their value may be overwritten in the XDP case. However, the flags
> recorded under big mode are incorrect, because in big mode, the passed
> buf does not point to the rx buffer, but rather to the page of the
> submitted buffer. This commit fixes this issue.
>
> For the small mode, the commit c11a49d58ad2 ("virtio_net: Fix mismatched
> buf address when unmapping for small packets") fixed it.
>
> Fixes: 703eec1b2422 ("virtio_net: fixing XDP for fully checksummed packets handling")
> Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Thanks for the patch! Yet something to improve:
> ---
> drivers/net/virtio_net.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 975bdc5dab84..6e6e74390955 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -2630,13 +2630,19 @@ static void receive_buf(struct virtnet_info *vi, struct receive_queue *rq,
> */
> flags = ((struct virtio_net_common_hdr *)buf)->hdr.flags;
>
> - if (vi->mergeable_rx_bufs)
> + if (vi->mergeable_rx_bufs) {
> skb = receive_mergeable(dev, vi, rq, buf, ctx, len, xdp_xmit,
> stats);
> - else if (vi->big_packets)
> + } else if (vi->big_packets) {
> + void *p;
> +
> + p = page_address((struct page *)buf);
I'd move this assignment to where p is declared:
void *p = page_address((struct page *)buf);
> + flags = ((struct virtio_net_common_hdr *)p)->hdr.flags;
> +
> skb = receive_big(dev, vi, rq, buf, len, stats);
> - else
> + } else {
> skb = receive_small(dev, vi, rq, buf, ctx, len, xdp_xmit, stats);
> + }
>
> if (unlikely(!skb))
> return;
Indeed but let's please not do the initial
flags = ((struct virtio_net_common_hdr *)buf)->hdr.flags;
for the big mode at all, it's confusing, and only works because struct
page is bigger than struct virtio_net_common_hdr.
pls move it into the clauses for mergeable and small.
> --
> 2.32.0.3.g01195cf9f
prev parent reply other threads:[~2025-09-19 8:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-19 1:34 [PATCH net] virtio-net: fix incorrect flags recording in big mode Xuan Zhuo
2025-09-19 2:11 ` Jason Wang
2025-09-19 6:30 ` Xuan Zhuo
2025-09-19 8:08 ` Michael S. Tsirkin
2025-09-19 8:07 ` Michael S. Tsirkin [this message]
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=20250919040401-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eperezma@redhat.com \
--cc=hengqi@linux.alibaba.com \
--cc=jasowang@redhat.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=virtualization@lists.linux.dev \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.