From patchwork Tue Nov 29 20:06:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coco Li X-Patchwork-Id: 27485 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp544885wrr; Tue, 29 Nov 2022 12:09:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf7kTXvCRTlQ63ZqxsSy8DmY5FnyfOrf0EPR6CQR1KET/dJ3PzPBwYR6n4vkGoh3mmdsrdxA X-Received: by 2002:a17:906:dfef:b0:7ae:db2:f10a with SMTP id lc15-20020a170906dfef00b007ae0db2f10amr35294950ejc.709.1669752595527; Tue, 29 Nov 2022 12:09:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669752595; cv=none; d=google.com; s=arc-20160816; b=yhcvexb7A0UCpYWJW9PSUF/1F0leNrEXl6J9Jbn/8HAmeQ4hVhiaT1Agli0aXJS18m CWzbvRpX+rslYwduBgXUNa6Nmowiy65txGGE4KmnUz3oHpXdIYH3Jw0wVN7JCNb2YbJw DeJiRoeAFNyn+UeslxJ+01FkIhCj4bygCnmuCQaRxJ3EPDKRX1c4udMHeYAqPKENZE8h yXLKwbEb0thHzVmJXKudlJ40U219fJBVLb+yeGnU9Hh8JIk8YZeAHunwroB1iGbrfsUN QNR1d4hxecDBlFWZP4ZfKKgzM3l2vaP8L2IOCiK2EuOg3cUMRF6xeeDxad6ZGB8K97Sg 3Eyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=GYy/8BW3WAe+pF6I2ukMLCY23QDbJtir2+qtUsjll+s=; b=JjeFZgGBcftNUwOzhD7w5CYhGH86ESpVqoY2DxVlsuJQSNvBHXRsasX4y35m3IuOyJ xH1JomrUuj4Fvvq9Jmb1urdxCZ0Y89ua+UUE1LSo3vFBSK9z4N5csVD2SKmykyzXDgzN /B4BE+3WsJbo4EqYryI/EsssWjbt5UsPblof7ZQbjDTfDabb1yde5zC1wTWRLUM1AtLy sLuHxgjOLhyJ1sSDI+qcCCa0qAqQbqGg/4udp4soX5gkKiQS6/llgMMf3Xs1og34Jyvu Oz4AYeS/xrie4dmihSmQ3Mnne84ryYiL0Pw8kRX2cL5+KJgQcPPN//Mffy+5krDpALHl 42Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=GB2cmrUO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w22-20020a05640234d600b0045b293121f1si1496837edc.12.2022.11.29.12.09.30; Tue, 29 Nov 2022 12:09:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=GB2cmrUO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237212AbiK2UHC (ORCPT + 99 others); Tue, 29 Nov 2022 15:07:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237203AbiK2UG7 (ORCPT ); Tue, 29 Nov 2022 15:06:59 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 155882CCB8 for ; Tue, 29 Nov 2022 12:06:58 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id b13-20020a056a000a8d00b0057348c50123so12129244pfl.18 for ; Tue, 29 Nov 2022 12:06:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=GYy/8BW3WAe+pF6I2ukMLCY23QDbJtir2+qtUsjll+s=; b=GB2cmrUO3A78wrpfDHZV4b5pymx9bFEHccxTiTpmtkVerXODXn+CrBvnKsTzONHGu6 jBxJfKmv38lBbSM3DetdND9GBRjTB4CYk2o4ssEA8G/N4A65bGCTrpKrk5zlyrCTW7ae 6+aEVV/6JrX6+qHRlvSIjD8YIBqFm4MH9GqA9D4CdiUa4mztUi2qNo35O/BR+8xYiBJr up525YZ57m1zvrm1bDSs1jHtZZDydGvCfUE8kN7d/g7CeVeS5MagJlcRGkcHH+g2ZzRQ ITcS20qSQGbV1KOhgmjp18U/OB0qNYvfwy0/OSt6JQFyaNP8oGN9MfF5MQNUVEcdG4C+ j5Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=GYy/8BW3WAe+pF6I2ukMLCY23QDbJtir2+qtUsjll+s=; b=SyLbJp1tTiozrFrI1vpeyqaEZ8xzIBtgcMOPhiWojxOxB8J6+iteUnWvtZn1wz0/OZ PP/d1tM1EtTGJ9CZz+nQ7PRxQLfA1vK9SxcltnwVP54178HSolpnZxcvdPMPjpE+yfbY 1BnjtTWpy4NUCtSLWA2djroUpjbvRMX9cCztf5gPD/T/BovtCL+AGYZ32Bpu29VUmj7D WVdsRI0EG7f5wmyxd4gjBP0+g/BauIp7wpkkzRp8EmViNPG22vOz3K1Buxildjg0xObj eHpfIJXbrOTSnDmR0UXLC59uxlfeRmf9RF+iQQfnXycDv6KhjopWI6xJpNqc6pjbtBhS /zPA== X-Gm-Message-State: ANoB5pnsyOhC+0jCimDzi25rWsnCadqicMzM6xWtc4rTDRXFOmKxTG8l I+Q3/0q+mX43A+nZiRu10qQcLPYRD4RfiNs= X-Received: from coco0920.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:5738]) (user=lixiaoyan job=sendgmr) by 2002:a17:90a:458a:b0:214:166e:e202 with SMTP id v10-20020a17090a458a00b00214166ee202mr62027256pjg.165.1669752417447; Tue, 29 Nov 2022 12:06:57 -0800 (PST) Date: Tue, 29 Nov 2022 20:06:52 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221129200653.962019-1-lixiaoyan@google.com> Subject: [RFC net-next v3 1/2] IPv6/GRO: generic helper to remove temporary HBH/jumbo header in driver From: Coco Li To: "David S. Miller" , Hideaki YOSHIFUJI , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Chan Cc: netdev@vger.kernel.org, Daisuke Nishimura , linux-kernel@vger.kernel.org, Coco Li X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,HK_RANDOM_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750862497937501156?= X-GMAIL-MSGID: =?utf-8?q?1750862497937501156?= IPv6/TCP and GRO stacks can build big TCP packets with an added temporary Hop By Hop header. Is GSO is not involved, then the temporary header needs to be removed in the driver. This patch provides a generic helper for drivers that need to modify their headers in place. Signed-off-by: Coco Li --- include/net/ipv6.h | 35 +++++++++++++++++++++++++++++++++++ net/ipv6/ip6_offload.c | 27 ++++----------------------- 2 files changed, 39 insertions(+), 23 deletions(-) diff --git a/include/net/ipv6.h b/include/net/ipv6.h index d383c895592a..08adec74f067 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -500,6 +500,41 @@ static inline int ipv6_has_hopopt_jumbo(const struct sk_buff *skb) return jhdr->nexthdr; } +/* Return 0 if HBH header is successfully removed + * Or if HBH removal is unnecessary (packet is not big TCP) + * Return error to indicate dropping the packet + */ +static inline int ipv6_hopopt_jumbo_remove(struct sk_buff *skb) +{ + const int hophdr_len = sizeof(struct hop_jumbo_hdr); + int nexthdr = ipv6_has_hopopt_jumbo(skb); + struct ipv6hdr *h6; + + if (!nexthdr) + return 0; + + if (skb_cow_head(skb, 0)) + return -1; + + /* Remove the HBH header. + * Layout: [Ethernet header][IPv6 header][HBH][L4 Header] + */ + memmove(skb_mac_header(skb) + hophdr_len, skb_mac_header(skb), + skb_network_header(skb) - skb_mac_header(skb) + + sizeof(struct ipv6hdr)); + + if (unlikely(!pskb_may_pull(skb, hophdr_len))) + return -1; + + skb->network_header += hophdr_len; + skb->mac_header += hophdr_len; + + h6 = ipv6_hdr(skb); + h6->nexthdr = nexthdr; + + return 0; +} + static inline bool ipv6_accept_ra(struct inet6_dev *idev) { /* If forwarding is enabled, RA are not accepted unless the special diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c index 3ee345672849..00dc2e3b0184 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -77,7 +77,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, struct sk_buff *segs = ERR_PTR(-EINVAL); struct ipv6hdr *ipv6h; const struct net_offload *ops; - int proto, nexthdr; + int proto, err; struct frag_hdr *fptr; unsigned int payload_len; u8 *prevhdr; @@ -87,28 +87,9 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, bool gso_partial; skb_reset_network_header(skb); - nexthdr = ipv6_has_hopopt_jumbo(skb); - if (nexthdr) { - const int hophdr_len = sizeof(struct hop_jumbo_hdr); - int err; - - err = skb_cow_head(skb, 0); - if (err < 0) - return ERR_PTR(err); - - /* remove the HBH header. - * Layout: [Ethernet header][IPv6 header][HBH][TCP header] - */ - memmove(skb_mac_header(skb) + hophdr_len, - skb_mac_header(skb), - ETH_HLEN + sizeof(struct ipv6hdr)); - skb->data += hophdr_len; - skb->len -= hophdr_len; - skb->network_header += hophdr_len; - skb->mac_header += hophdr_len; - ipv6h = (struct ipv6hdr *)skb->data; - ipv6h->nexthdr = nexthdr; - } + err = ipv6_hopopt_jumbo_remove(skb); + if (err) + return ERR_PTR(err); nhoff = skb_network_header(skb) - skb_mac_header(skb); if (unlikely(!pskb_may_pull(skb, sizeof(*ipv6h)))) goto out;