From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0601DC43331 for ; Wed, 1 Apr 2020 09:00:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAF7E20772 for ; Wed, 1 Apr 2020 09:00:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kG0PMMJe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732164AbgDAJAT (ORCPT ); Wed, 1 Apr 2020 05:00:19 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:33120 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732110AbgDAJAS (ORCPT ); Wed, 1 Apr 2020 05:00:18 -0400 Received: by mail-pl1-f196.google.com with SMTP id g18so9375868plq.0 for ; Wed, 01 Apr 2020 02:00:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=53H96W01sX/tuSMQwSCJYe3+Y9mtiJYnthRS8yEOVzw=; b=kG0PMMJepxwS8iVH/F92aRo4ajKoveUyFwUPl3FtSSorcd4Ksxd3WOpOAeHrOBsvZl O9RBSg5cqG4guTKyzdYpCTDzAM89keLw4hEIXiTcAuA8EVFbTSwvFyswb4rJdIIbPacO +OrKaDZPvgrbW7UvrMrkXeX1YzVRIWQsXYazsmONvoA1uMGgPupiSSxqgK0iCCqZ2wVU s8eOSj54i+ldiR35HCkOwN6bLWsI2VJlCucT+jAEVE5Vv5NALmaYEooNxyDmKSMTydkj cig16tx4TDSVaOuDWlLP59wLt/gbvbG6ghA24tF92VA64TW2PLErSR3ecut8W9RKxV1s 6jew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=53H96W01sX/tuSMQwSCJYe3+Y9mtiJYnthRS8yEOVzw=; b=o/E9WoZ+MfT6WlYh0rCoPfJulBffp4hW+PqoZkQUabKGB4hOvXrPCsRXcAbIbHP8F/ hgqffGqvy6a3Ce4Mu7F1vHH73RLTJHNtUZhNMr18ghzWOFe+8OsolbfgITgY521Nsvrm mVEK86Micz974O9dX0z1nsqONjkmPzJbljGIjM3Ca51Bk/ADMwcyeSDBqPjIa3Gm++L4 Rk2NojiD76lL+pbRcH22xD0SNttwPQwhQ0eFYVFZdAOforSC/U5QqKjNv41pEEgbiXOT dpQwOxxVIhbzhW66bdmJzHBaM0zr2Wf4pn6MNC0nahUUJXr55nj3LmjAGL0CiJ7HzhC1 FpMQ== X-Gm-Message-State: AGi0PubYMmR0BoS6uur5qQz5rnozQRJHNVv62QhjpYq5pqd9TZjD74qV ASIJbgkmuow6XXzAZgAHSYjss9r+ X-Google-Smtp-Source: APiQypJ5JB6SmnkD7Pcz2e7sdpoihaOcLzr3x9bKwJGFCcGSZQC0ppJK2uiPuVk68JLxZEuw6dgTwg== X-Received: by 2002:a17:90a:fe0f:: with SMTP id ck15mr3551852pjb.192.1585731615931; Wed, 01 Apr 2020 02:00:15 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id y7sm1101000pfq.159.2020.04.01.02.00.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Apr 2020 02:00:15 -0700 (PDT) From: Xin Long To: netdev@vger.kernel.org Cc: Steffen Klassert , Herbert Xu , "David S. Miller" , Sabrina Dubroca Subject: [PATCH ipsec-next 5/5] esp4: support ipv6 nexthdrs process for beet gso segment Date: Wed, 1 Apr 2020 16:59:25 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <585191d693fc74273d314d4dea9a781ccc7712c2.1585731430.git.lucien.xin@gmail.com> References: <59aafccde155f156544d54db1145d54ecd018d74.1585731430.git.lucien.xin@gmail.com> <3f782f13de69081251addd3b7b37d155805feba2.1585731430.git.lucien.xin@gmail.com> <585191d693fc74273d314d4dea9a781ccc7712c2.1585731430.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For beet mode, when it's ipv6 inner address with nexthdrs set, the packet format might be: ---------------------------------------------------- | outer | | dest | | | ESP | ESP | | IP hdr | ESP | opts.| TCP | Data | Trailer | ICV | ---------------------------------------------------- Before doing gso segment in xfrm4_beet_gso_segment(), the same thing is needed as it does in xfrm6_beet_gso_segment() in last patch 'esp6: support ipv6 nexthdrs process for beet gso segment'. Signed-off-by: Xin Long --- net/ipv4/esp4_offload.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/net/ipv4/esp4_offload.c b/net/ipv4/esp4_offload.c index 731022c..9dde4e3 100644 --- a/net/ipv4/esp4_offload.c +++ b/net/ipv4/esp4_offload.c @@ -139,7 +139,7 @@ static struct sk_buff *xfrm4_beet_gso_segment(struct xfrm_state *x, struct xfrm_offload *xo = xfrm_offload(skb); struct sk_buff *segs = ERR_PTR(-EINVAL); const struct net_offload *ops; - int proto = xo->proto; + u8 proto = xo->proto; skb->transport_header += x->props.header_len; @@ -148,10 +148,16 @@ static struct sk_buff *xfrm4_beet_gso_segment(struct xfrm_state *x, skb->transport_header += ph->hdrlen * 8; proto = ph->nexthdr; - } else if (x->sel.family != AF_INET6) { + } else if (x->sel.family == AF_INET6) { + int offset = skb_transport_offset(skb); + __be16 frag; + + offset = ipv6_skip_exthdr(skb, offset, &proto, &frag); + skb->transport_header += offset; + if (proto == IPPROTO_TCP) + skb_shinfo(skb)->gso_type |= SKB_GSO_TCPV4; + } else { skb->transport_header -= IPV4_BEET_PHMAXLEN; - } else if (proto == IPPROTO_TCP) { - skb_shinfo(skb)->gso_type |= SKB_GSO_TCPV4; } __skb_pull(skb, skb_transport_offset(skb)); -- 2.1.0