From patchwork Thu Mar 3 18:16:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 12767893 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8805C433FE for ; Thu, 3 Mar 2022 18:16:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235688AbiCCSRh (ORCPT ); Thu, 3 Mar 2022 13:17:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235710AbiCCSRc (ORCPT ); Thu, 3 Mar 2022 13:17:32 -0500 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A3811A41E4 for ; Thu, 3 Mar 2022 10:16:43 -0800 (PST) Received: by mail-pg1-x530.google.com with SMTP id z4so5229143pgh.12 for ; Thu, 03 Mar 2022 10:16:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0UfD3Ua2RY/WS6DVGHr48mrEqKJbqecpmqNnN15gzRs=; b=j39y1LY/Q21Evxi58RhBZgQtCgiYNeWJcDGtiiKfzA04FkAaxpecNsq8taoHqsjgrE 969x9qXlQ0faMU7tBPoeBgL+Zj+0KmKaO/lnYp0AilaWoE8UEUVsVaw23OQILtJOGL9/ 4z2VJIS0wJ+cPveJVX8nLXjtIwaLpu2rxyumMFXd1naOr7X3wYVB8vwlApLPjSw1zrJG Rbs/JYFY61rE0nbMILap5AZfKslF7spdyFTzFxyYDAmFtUmzgMkaxrg065qBVuutV5+Q qb3oI/9/EjAq5gClQAlEaAdakjQKmuQSuJ5MeH56HLoWbHNneqzMlL1lmcJ3qunfVB1W 6CSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0UfD3Ua2RY/WS6DVGHr48mrEqKJbqecpmqNnN15gzRs=; b=sEEK/YeNuIaa2Fha82vcoundukEMdmPL9xvZBs4RyjgWK73XI230YL1DmAmdfaOHbx AY0bmU+uI00JWQtZ0I7bsczoJtX8PvQleosH+WGeK/qO7UUUaNl83ziimu3/PAiPSfR+ hsQg0FfJoI9GHJ0r0FbOQDJtGpkReXw+Ed82Z1VRnrF2++fjGsLSBFgs47wpk2vwuiM7 AYdYTmRSd7gIxkYXT6JJDviiK4SmnK2yklqhHqwbsNZ9BHltKpyQo/tAJn513QjTQj0D 6LkrACxLe6s8rjYDAizK9dnkyY4iik7Say6tNRXE+MVrKDJoWCVEeaytQuhoh1YUpRo9 RuCw== X-Gm-Message-State: AOAM531w17e8vfdSStfu6RzSmbCnTR61ZnarUZmWRsKrvengVZKrjBEj tsqP3AfeVXnl9LJkb9nCM7s= X-Google-Smtp-Source: ABdhPJyjPXcRR/Je0lEIdh8z07iurzHVh0jW+PYsr99nZuqWC0FCM606Kon6Ezw0VCFMk2leZj22yA== X-Received: by 2002:a05:6a00:1307:b0:4b0:b1c:6fd9 with SMTP id j7-20020a056a00130700b004b00b1c6fd9mr39456477pfu.27.1646331402729; Thu, 03 Mar 2022 10:16:42 -0800 (PST) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:5388:c313:5e37:a261]) by smtp.gmail.com with ESMTPSA id u14-20020a17090adb4e00b001bee5dd39basm7611016pjx.1.2022.03.03.10.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 10:16:42 -0800 (PST) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Eric Dumazet , Coco Li , David Ahern , Alexander Duyck , Eric Dumazet Subject: [PATCH v2 net-next 08/14] ipv6: Add hop-by-hop header to jumbograms in ip6_output Date: Thu, 3 Mar 2022 10:16:01 -0800 Message-Id: <20220303181607.1094358-9-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.35.1.616.g0bdcbb4464-goog In-Reply-To: <20220303181607.1094358-1-eric.dumazet@gmail.com> References: <20220303181607.1094358-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Coco Li Instead of simply forcing a 0 payload_len in IPv6 header, implement RFC 2675 and insert a custom extension header. Note that only TCP stack is currently potentially generating jumbograms, and that this extension header is purely local, it wont be sent on a physical link. This is needed so that packet capture (tcpdump and friends) can properly dissect these large packets. Signed-off-by: Coco Li Signed-off-by: Eric Dumazet --- include/linux/ipv6.h | 1 + net/ipv6/ip6_output.c | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 16870f86c74d3d1f5dfb7edac1e7db85f1ef6755..93b273db1c9926aba4199f486ce90778311916f5 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -144,6 +144,7 @@ struct inet6_skb_parm { #define IP6SKB_L3SLAVE 64 #define IP6SKB_JUMBOGRAM 128 #define IP6SKB_SEG6 256 +#define IP6SKB_FAKEJUMBO 512 }; #if defined(CONFIG_NET_L3_MASTER_DEV) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 50db9b20d746bc59c7ef7114492db8b9585c575b..38a8e1c9894cd99ecbec5968fcc97549ea0c7508 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -180,7 +180,9 @@ static int __ip6_finish_output(struct net *net, struct sock *sk, struct sk_buff #endif mtu = ip6_skb_dst_mtu(skb); - if (skb_is_gso(skb) && !skb_gso_validate_network_len(skb, mtu)) + if (skb_is_gso(skb) && + !(IP6CB(skb)->flags & IP6SKB_FAKEJUMBO) && + !skb_gso_validate_network_len(skb, mtu)) return ip6_finish_output_gso_slowpath_drop(net, sk, skb, mtu); if ((skb->len > mtu && !skb_is_gso(skb)) || @@ -251,6 +253,8 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, struct dst_entry *dst = skb_dst(skb); struct net_device *dev = dst->dev; struct inet6_dev *idev = ip6_dst_idev(dst); + struct hop_jumbo_hdr *hop_jumbo; + int hoplen = sizeof(*hop_jumbo); unsigned int head_room; struct ipv6hdr *hdr; u8 proto = fl6->flowi6_proto; @@ -258,7 +262,7 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, int hlimit = -1; u32 mtu; - head_room = sizeof(struct ipv6hdr) + LL_RESERVED_SPACE(dev); + head_room = sizeof(struct ipv6hdr) + hoplen + LL_RESERVED_SPACE(dev); if (opt) head_room += opt->opt_nflen + opt->opt_flen; @@ -281,6 +285,20 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, &fl6->saddr); } + if (unlikely(seg_len > IPV6_MAXPLEN)) { + hop_jumbo = skb_push(skb, hoplen); + + hop_jumbo->nexthdr = proto; + hop_jumbo->hdrlen = 0; + hop_jumbo->tlv_type = IPV6_TLV_JUMBO; + hop_jumbo->tlv_len = 4; + hop_jumbo->jumbo_payload_len = htonl(seg_len + hoplen); + + proto = IPPROTO_HOPOPTS; + seg_len = 0; + IP6CB(skb)->flags |= IP6SKB_FAKEJUMBO; + } + skb_push(skb, sizeof(struct ipv6hdr)); skb_reset_network_header(skb); hdr = ipv6_hdr(skb);