From: "Michael S. Tsirkin" <mst@redhat•com>
To: Jason Wang <jasowang@redhat•com>
Cc: "Xuan Zhuo" <xuanzhuo@linux•alibaba.com>,
netdev@vger•kernel.org, "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>,
"Willem de Bruijn" <willemb@google•com>,
"Jiri Pirko" <jiri@resnulli•us>,
"Alvaro Karsz" <alvaro.karsz@solid-run•com>,
virtualization@lists•linux.dev
Subject: Re: [PATCH net v4 3/4] virtio-net: correct hdr_len handling for VIRTIO_NET_F_GUEST_HDRLEN
Date: Sun, 9 Nov 2025 16:41:27 -0500 [thread overview]
Message-ID: <20251109163911-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <CACGkMEu=Zs-T0WyD7mrWjuRDdufvRiz2DM=98neD+L2npP5_dQ@mail.gmail.com>
On Thu, Oct 30, 2025 at 10:53:01AM +0800, Jason Wang wrote:
> On Wed, Oct 29, 2025 at 11:09 AM Xuan Zhuo <xuanzhuo@linux•alibaba.com> wrote:
> >
> > The commit be50da3e9d4a ("net: virtio_net: implement exact header length
> > guest feature") introduces support for the VIRTIO_NET_F_GUEST_HDRLEN
> > feature in virtio-net.
> >
> > This feature requires virtio-net to set hdr_len to the actual header
> > length of the packet when transmitting, the number of
> > bytes from the start of the packet to the beginning of the
> > transport-layer payload.
> >
> > However, in practice, hdr_len was being set using skb_headlen(skb),
> > which is clearly incorrect. This commit fixes that issue.
>
> I still think it would be more safe to check the feature
which feature VIRTIO_NET_F_GUEST_HDRLEN ?
> and switch to
> the new behaviour if it is set. This seems to be more safe.
>
> But I'm fine if it's agreed that this could be the way to go.
>
> >
> > Fixes: be50da3e9d4a ("net: virtio_net: implement exact header length guest feature")
> > Signed-off-by: Xuan Zhuo <xuanzhuo@linux•alibaba.com>
> > ---
> > include/linux/virtio_net.h | 22 ++++++++++++++++------
> > 1 file changed, 16 insertions(+), 6 deletions(-)
> >
> > diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
> > index 710ae0d2d336..6ef0b737d548 100644
> > --- a/include/linux/virtio_net.h
> > +++ b/include/linux/virtio_net.h
> > @@ -217,25 +217,35 @@ static inline int virtio_net_hdr_from_skb(const struct sk_buff *skb,
> >
> > if (skb_is_gso(skb)) {
> > struct skb_shared_info *sinfo = skb_shinfo(skb);
> > + u16 hdr_len = 0;
> >
> > /* In certain code paths (such as the af_packet.c receive path),
> > * this function may be called without a transport header.
> > * In this case, we do not need to set the hdr_len.
> > */
> > if (skb_transport_header_was_set(skb))
> > - hdr->hdr_len = __cpu_to_virtio16(little_endian,
> > - skb_headlen(skb));
> > + hdr_len = skb_transport_offset(skb);
> >
> > hdr->gso_size = __cpu_to_virtio16(little_endian,
> > sinfo->gso_size);
> > - if (sinfo->gso_type & SKB_GSO_TCPV4)
> > + if (sinfo->gso_type & SKB_GSO_TCPV4) {
> > hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
> > - else if (sinfo->gso_type & SKB_GSO_TCPV6)
> > + if (hdr_len)
> > + hdr_len += tcp_hdrlen(skb);
> > + } else if (sinfo->gso_type & SKB_GSO_TCPV6) {
> > hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
> > - else if (sinfo->gso_type & SKB_GSO_UDP_L4)
> > + if (hdr_len)
> > + hdr_len += tcp_hdrlen(skb);
> > + } else if (sinfo->gso_type & SKB_GSO_UDP_L4) {
> > hdr->gso_type = VIRTIO_NET_HDR_GSO_UDP_L4;
> > - else
> > + if (hdr_len)
> > + hdr_len += sizeof(struct udphdr);
> > + } else {
> > return -EINVAL;
> > + }
> > +
> > + hdr->hdr_len = __cpu_to_virtio16(little_endian, hdr_len);
> > +
> > if (sinfo->gso_type & SKB_GSO_TCP_ECN)
> > hdr->gso_type |= VIRTIO_NET_HDR_GSO_ECN;
> > } else
> > --
> > 2.32.0.3.g01195cf9f
> >
>
> Thanks
next prev parent reply other threads:[~2025-11-09 21:41 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-29 3:09 [PATCH net v4 0/4] fixes two virtio-net related bugs Xuan Zhuo
2025-10-29 3:09 ` [PATCH net v4 1/4] virtio-net: fix incorrect flags recording in big mode Xuan Zhuo
2025-11-09 17:04 ` Alyssa Ross
2025-11-09 21:34 ` Michael S. Tsirkin
2025-10-29 3:09 ` [PATCH net v4 2/4] virtio-net: Ensure hdr_len is not set unless the header is forwarded to the device Xuan Zhuo
2025-10-30 2:42 ` Jason Wang
2025-11-09 21:37 ` Michael S. Tsirkin
2025-10-29 3:09 ` [PATCH net v4 3/4] virtio-net: correct hdr_len handling for VIRTIO_NET_F_GUEST_HDRLEN Xuan Zhuo
2025-10-30 2:53 ` Jason Wang
2025-11-09 21:41 ` Michael S. Tsirkin [this message]
2025-11-10 7:16 ` Jason Wang
2025-11-10 7:26 ` Michael S. Tsirkin
2025-11-10 7:39 ` Jason Wang
2025-11-10 16:10 ` Michael S. Tsirkin
2025-11-11 0:45 ` Jason Wang
2025-11-09 21:42 ` Michael S. Tsirkin
2025-10-29 3:09 ` [PATCH net v4 4/4] virtio-net: correct hdr_len handling for tunnel gso Xuan Zhuo
2025-10-29 9:51 ` Paolo Abeni
2025-10-30 8:02 ` [PATCH net v4 0/4] fixes two virtio-net related bugs Michael S. Tsirkin
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=20251109163911-mutt-send-email-mst@kernel.org \
--to=mst@redhat$(echo .)com \
--cc=alvaro.karsz@solid-run$(echo .)com \
--cc=andrew+netdev@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=eperezma@redhat$(echo .)com \
--cc=hengqi@linux$(echo .)alibaba.com \
--cc=jasowang@redhat$(echo .)com \
--cc=jiri@resnulli$(echo .)us \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=virtualization@lists$(echo .)linux.dev \
--cc=willemb@google$(echo .)com \
--cc=xuanzhuo@linux$(echo .)alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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