From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
To: Lorenzo Bianconi <lorenzo@kernel.org>
Cc: netdev@vger.kernel.org, davem@davemloft.net, tom@herbertland.com,
marcelo.leitner@gmail.com
Subject: Re: [PATCH net] net: gre: recompute gre csum for sctp over gre tunnels
Date: Fri, 31 Jul 2020 23:29:27 +0200 [thread overview]
Message-ID: <20200731212927.GA3149@lore-laptop-rh.lan> (raw)
In-Reply-To: <6722d2c4fe1b9b376a277b3f35cdf3eb3345874e.1596218124.git.lorenzo@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 2513 bytes --]
> The GRE tunnel can be used to transport traffic that does not rely on a
> Internet checksum (e.g. SCTP). The issue can be triggered creating a GRE
> or GRETAP tunnel and transmitting SCTP traffic ontop of it where CRC
> offload has been disabled. In order to fix the issue we need to
> recompute the GRE csum in gre_gso_segment() not relying on the inner
> checksum.
> The issue is still present when we have the CRC offload enabled.
> In this case we need to disable the CRC offload if we require GRE
> checksum since otherwise skb_checksum() will report a wrong value.
>
> Fixes: 4749c09c37030 ("gre: Call gso_make_checksum")
I put the wrong Fixes tag, reviewing it I guess the right one is:
Fixes: 90017accff61 ("sctp: Add GSO support")
sorry for the noise.
Regards,
Lorenzo
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> net/ipv4/gre_offload.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
> index 2e6d1b7a7bc9..e0a246575887 100644
> --- a/net/ipv4/gre_offload.c
> +++ b/net/ipv4/gre_offload.c
> @@ -15,12 +15,12 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
> netdev_features_t features)
> {
> int tnl_hlen = skb_inner_mac_header(skb) - skb_transport_header(skb);
> + bool need_csum, need_recompute_csum, gso_partial;
> struct sk_buff *segs = ERR_PTR(-EINVAL);
> u16 mac_offset = skb->mac_header;
> __be16 protocol = skb->protocol;
> u16 mac_len = skb->mac_len;
> int gre_offset, outer_hlen;
> - bool need_csum, gso_partial;
>
> if (!skb->encapsulation)
> goto out;
> @@ -41,6 +41,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
> skb->protocol = skb->inner_protocol;
>
> need_csum = !!(skb_shinfo(skb)->gso_type & SKB_GSO_GRE_CSUM);
> + need_recompute_csum = skb->csum_not_inet;
> skb->encap_hdr_csum = need_csum;
>
> features &= skb->dev->hw_enc_features;
> @@ -98,7 +99,15 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
> }
>
> *(pcsum + 1) = 0;
> - *pcsum = gso_make_checksum(skb, 0);
> + if (need_recompute_csum && !skb_is_gso(skb)) {
> + __wsum csum;
> +
> + csum = skb_checksum(skb, gre_offset,
> + skb->len - gre_offset, 0);
> + *pcsum = csum_fold(csum);
> + } else {
> + *pcsum = gso_make_checksum(skb, 0);
> + }
> } while ((skb = skb->next));
> out:
> return segs;
> --
> 2.26.2
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2020-07-31 21:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-31 18:12 [PATCH net] net: gre: recompute gre csum for sctp over gre tunnels Lorenzo Bianconi
2020-07-31 21:29 ` Lorenzo Bianconi [this message]
2020-07-31 22:04 ` Marcelo Ricardo Leitner
2020-08-03 22:30 ` David Miller
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=20200731212927.GA3149@lore-laptop-rh.lan \
--to=lorenzo.bianconi@redhat.com \
--cc=davem@davemloft.net \
--cc=lorenzo@kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=tom@herbertland.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).