Received-SPF: pass (google.com: domain of linux-kernel+bounces-159655-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240426065143.4667-1-nbd@nbd.name> <20240426065143.4667-3-nbd@nbd.name>
In-Reply-To: <20240426065143.4667-3-nbd@nbd.name>
From: Eric Dumazet <edumazet@google.com>
Date: Fri, 26 Apr 2024 09:44:40 +0200
Message-ID: <CANn89iJKfgQNNXUL10-7aVZTn+ttqvVNZbnKi6jCdQGwzbFFYQ@mail.gmail.com>
Subject: Re: [PATCH v3 net-next v3 2/6] net: add support for segmenting TCP
 fraglist GSO packets
To: Felix Fietkau <nbd@nbd.name>
Cc: netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>, 
	David Ahern <dsahern@kernel.org>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, 
	willemdebruijn.kernel@gmail.com, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, Apr 26, 2024 at 8:51=E2=80=AFAM Felix Fietkau <nbd@nbd.name> wrote:
>
> Preparation for adding TCP fraglist GRO support. It expects packets to be
> combined in a similar way as UDP fraglist GSO packets.
> For IPv4 packets, NAT is handled in the same way as UDP fraglist GSO.
>
> Signed-off-by: Felix Fietkau <nbd@nbd.name>
> ---
>  net/ipv4/tcp_offload.c   | 65 ++++++++++++++++++++++++++++++++++++++++
>  net/ipv6/tcpv6_offload.c |  3 ++
>  2 files changed, 68 insertions(+)
>
> diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c
> index fab0973f995b..c493e95e09a5 100644
> --- a/net/ipv4/tcp_offload.c
> +++ b/net/ipv4/tcp_offload.c
> @@ -28,6 +28,68 @@ static void tcp_gso_tstamp(struct sk_buff *skb, unsign=
ed int ts_seq,
>         }
>  }
>
> +static void __tcpv4_gso_segment_csum(struct sk_buff *seg,
> +                                    __be32 *oldip, __be32 *newip,
> +                                    __be16 *oldport, __be16 *newport)


Do we really need pointers for newip and newport ?

> +{
> +       struct tcphdr *th;
> +       struct iphdr *iph;
> +
> +       if (*oldip =3D=3D *newip && *oldport =3D=3D *newport)
> +               return;
> +
> +       th =3D tcp_hdr(seg);
> +       iph =3D ip_hdr(seg);
> +
> +       inet_proto_csum_replace4(&th->check, seg, *oldip, *newip, true);
> +       inet_proto_csum_replace2(&th->check, seg, *oldport, *newport, fal=
se);
> +       *oldport =3D *newport;
> +
> +       csum_replace4(&iph->check, *oldip, *newip);
> +       *oldip =3D *newip;
> +}
> +
> +static struct sk_buff *__tcpv4_gso_segment_list_csum(struct sk_buff *seg=
s)
> +{
> +       struct sk_buff *seg;
> +       struct tcphdr *th, *th2;
> +       struct iphdr *iph, *iph2;

I would probably add a const qualifier to th and iph

> +
> +       seg =3D segs;
> +       th =3D tcp_hdr(seg);
> +       iph =3D ip_hdr(seg);
> +       th2 =3D tcp_hdr(seg->next);
> +       iph2 =3D ip_hdr(seg->next);
> +
> +       if (!(*(u32 *)&th->source ^ *(u32 *)&th2->source) &&


> +           iph->daddr =3D=3D iph2->daddr && iph->saddr =3D=3D iph2->sadd=
r)
> +               return segs;
> +
> +       while ((seg =3D seg->next)) {
> +               th2 =3D tcp_hdr(seg);
> +               iph2 =3D ip_hdr(seg);
> +
> +               __tcpv4_gso_segment_csum(seg,
> +                                        &iph2->saddr, &iph->saddr,
> +                                        &th2->source, &th->source);
> +               __tcpv4_gso_segment_csum(seg,
> +                                        &iph2->daddr, &iph->daddr,
> +                                        &th2->dest, &th->dest);
> +       }
> +
> +       return segs;
> +}
>