From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
To: Alexander Duyck <alexander.duyck@gmail.com>
Cc: Josh Hunt <johunt@akamai.com>, David Miller <davem@davemloft.net>,
Netdev <netdev@vger.kernel.org>,
Eric Dumazet <edumazet@google.com>,
"Duyck, Alexander H" <alexander.h.duyck@intel.com>
Subject: Re: [PATCH 1/2] udp: fix gso_segs calculations
Date: Tue, 1 Oct 2019 08:12:16 -0400 [thread overview]
Message-ID: <CA+FuTSdkBpKtm48maiTWrRDuW0_ntvpkgXA_TvYZ6uOhf06duw@mail.gmail.com> (raw)
In-Reply-To: <CAKgT0Ue092M4pMa8EjrqdF6KADK8WtFhA=17K3fuqW5=xKAeNg@mail.gmail.com>
On Mon, Sep 30, 2019 at 7:51 PM Alexander Duyck
<alexander.duyck@gmail.com> wrote:
>
> On Mon, Sep 30, 2019 at 3:15 PM Josh Hunt <johunt@akamai.com> wrote:
> >
> > Commit dfec0ee22c0a ("udp: Record gso_segs when supporting UDP segmentation offload")
> > added gso_segs calculation, but incorrectly got sizeof() the pointer and
> > not the underlying data type. It also does not account for v6 UDP GSO segs.
> >
> > Fixes: dfec0ee22c0a ("udp: Record gso_segs when supporting UDP segmentation offload")
> > Signed-off-by: Josh Hunt <johunt@akamai.com>
> > ---
> > net/ipv4/udp.c | 2 +-
> > net/ipv6/udp.c | 2 ++
> > 2 files changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
> > index cf755156a684..be98d0b8f014 100644
> > --- a/net/ipv4/udp.c
> > +++ b/net/ipv4/udp.c
> > @@ -856,7 +856,7 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4,
> >
> > skb_shinfo(skb)->gso_size = cork->gso_size;
> > skb_shinfo(skb)->gso_type = SKB_GSO_UDP_L4;
> > - skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(len - sizeof(uh),
> > + skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(len - sizeof(*uh),
> > cork->gso_size);
> > goto csum_partial;
> > }
> > diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
> > index aae4938f3dea..eb9a9934ac05 100644
> > --- a/net/ipv6/udp.c
> > +++ b/net/ipv6/udp.c
> > @@ -1143,6 +1143,8 @@ static int udp_v6_send_skb(struct sk_buff *skb, struct flowi6 *fl6,
> >
> > skb_shinfo(skb)->gso_size = cork->gso_size;
> > skb_shinfo(skb)->gso_type = SKB_GSO_UDP_L4;
> > + skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(len - sizeof(*uh),
> > + cork->gso_size);
> > goto csum_partial;
> > }
> >
>
> Fix looks good to me.
>
> You might also want to add the original commit since you are also
> addressing IPv6 changes which are unrelated to my commit that your
> referenced:
> Fixes: bec1f6f69736 ("udp: generate gso with UDP_SEGMENT")
>
> Reviewed-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Acked-by: Willem de Bruijn <willemb@google.com>
If resending, please target net: [PATCH net v2]
next prev parent reply other threads:[~2019-10-01 12:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-30 22:11 [PATCH 1/2] udp: fix gso_segs calculations Josh Hunt
2019-09-30 22:11 ` [PATCH 2/2] udp: only do GSO if # of segs > 1 Josh Hunt
2019-09-30 23:56 ` Alexander Duyck
2019-10-01 12:22 ` Willem de Bruijn
2019-10-01 15:08 ` Josh Hunt
2019-10-01 14:36 ` Josh Hunt
2019-10-01 15:05 ` Alexander Duyck
2019-09-30 23:51 ` [PATCH 1/2] udp: fix gso_segs calculations Alexander Duyck
2019-10-01 12:12 ` Willem de Bruijn [this message]
2019-10-01 14:31 ` Josh Hunt
2019-10-01 14:31 ` Josh Hunt
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=CA+FuTSdkBpKtm48maiTWrRDuW0_ntvpkgXA_TvYZ6uOhf06duw@mail.gmail.com \
--to=willemdebruijn.kernel@gmail.com \
--cc=alexander.duyck@gmail.com \
--cc=alexander.h.duyck@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=johunt@akamai.com \
--cc=netdev@vger.kernel.org \
/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).