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 746A4C433F5 for ; Thu, 10 Mar 2022 00:29:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239009AbiCJAaN (ORCPT ); Wed, 9 Mar 2022 19:30:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239002AbiCJAaH (ORCPT ); Wed, 9 Mar 2022 19:30:07 -0500 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBFAA124C23 for ; Wed, 9 Mar 2022 16:29:02 -0800 (PST) Received: by mail-pg1-x52a.google.com with SMTP id e6so3349359pgn.2 for ; Wed, 09 Mar 2022 16:29:02 -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=bhvBzCoyUH5Q2UW9eaBJZ/pUOhsdMx7Q/qA4TYp9tCg=; b=D/CHl/2rXZ5rEKKAvoy3+rNBOclYYWVafmbHP554nZYp56575u2TczQUKqa52sVZMV L3HxnCbQItFjI+Bc5ljUcHHEoPmI0fV2sJ+LxSrtk0+0hUEn9vWZlssToqqx0pg2iwBT jMYg9IX514CPD+tE4tIvHbL14w625YsS4aBsGLXkRzFbzvXPKR2pHoGPU+FXCTQqiU12 xWsDG9ENy89Bf5FGm/+sLH1AzIWdryAiQjnr+5Qhj6ftOReIbp8c+4HnFFRNNwhYxQJG GiS/cZM9HbJr+g/IRUriZ5LW2/g5x8l8jqCKPVYwBBuSPRxsOVR0cWutORCYxpY5H9vU xuFA== 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=bhvBzCoyUH5Q2UW9eaBJZ/pUOhsdMx7Q/qA4TYp9tCg=; b=vCWUWyk11XdYA6jqNDXloN2dD9OVdJCk6M67anwwcAfgDO0hnfcUraA1tD4df1PLWE MhlO/Sh/zpnDL7zAYLBMusVke2s0mEqMsHNA6Zxs7Cu2Q9xytadGsKnhoR9LQuV4fDt6 hnWlqho1u6nrApSu/usc61Yf3w/Bcb4Au6VW6EftrawklNcLJSZWhIU+UQ3eBs/FF8ix VMG6uiWBOSYxewbaL9B2xozOJDYzC9lBUUB/xic6JYeANaX3vhacHj7AGK8ja7G0m1dB X/4RRESv4zhUee72k3Iyvzza93lXiNnZ8lKeQIPl2hGD+LL+0ZywXeRhQmngkfuRrWoe M77g== X-Gm-Message-State: AOAM530anh1E3jJEun4luZlaWbB3os94kMpfuVr0VtUqW2NkRShTg5uY umGS9fVOLyoapmOBepdvpl4= X-Google-Smtp-Source: ABdhPJw8AUIzAkuS3WfGLImGOogIjMZVWPNQO4gj62GjO134wfPK0VuCbJNdNcVXMDHvlfKy8O1YMA== X-Received: by 2002:aa7:81ca:0:b0:4f6:d297:4213 with SMTP id c10-20020aa781ca000000b004f6d2974213mr2308984pfn.59.1646872142297; Wed, 09 Mar 2022 16:29:02 -0800 (PST) Received: from edumazet1.svl.corp.google.com ([2620:15c:2c4:201:c6c7:6f77:9634:183c]) by smtp.gmail.com with ESMTPSA id nv4-20020a17090b1b4400b001bf64a39579sm7557660pjb.4.2022.03.09.16.29.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 16:29:01 -0800 (PST) From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski Cc: netdev , Alexander Duyck , Coco Li , Eric Dumazet , Eric Dumazet Subject: [PATCH v3 net-next 06/14] ipv6/gro: insert temporary HBH/jumbo header Date: Wed, 9 Mar 2022 16:28:38 -0800 Message-Id: <20220310002846.460907-7-eric.dumazet@gmail.com> X-Mailer: git-send-email 2.35.1.616.g0bdcbb4464-goog In-Reply-To: <20220310002846.460907-1-eric.dumazet@gmail.com> References: <20220310002846.460907-1-eric.dumazet@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet Following patch will add GRO_IPV6_MAX_SIZE, allowing gro to build BIG TCP ipv6 packets (bigger than 64K). This patch changes ipv6_gro_complete() to insert a HBH/jumbo header so that resulting packet can go through IPv6/TCP stacks. Signed-off-by: Eric Dumazet --- net/ipv6/ip6_offload.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c index a6a6c1539c28d242ef8c35fcd5ce900512ce912d..d12dba2dd5354dbb79bb80df4038dec2544cddeb 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -342,15 +342,43 @@ static struct sk_buff *ip4ip6_gro_receive(struct list_head *head, INDIRECT_CALLABLE_SCOPE int ipv6_gro_complete(struct sk_buff *skb, int nhoff) { const struct net_offload *ops; - struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + nhoff); + struct ipv6hdr *iph; int err = -ENOSYS; + u32 payload_len; if (skb->encapsulation) { skb_set_inner_protocol(skb, cpu_to_be16(ETH_P_IPV6)); skb_set_inner_network_header(skb, nhoff); } - iph->payload_len = htons(skb->len - nhoff - sizeof(*iph)); + payload_len = skb->len - nhoff - sizeof(*iph); + if (unlikely(payload_len > IPV6_MAXPLEN)) { + struct hop_jumbo_hdr *hop_jumbo; + int hoplen = sizeof(*hop_jumbo); + + /* Move network header left */ + memmove(skb_mac_header(skb) - hoplen, skb_mac_header(skb), + skb->transport_header - skb->mac_header); + skb->data -= hoplen; + skb->len += hoplen; + skb->mac_header -= hoplen; + skb->network_header -= hoplen; + iph = (struct ipv6hdr *)(skb->data + nhoff); + hop_jumbo = (struct hop_jumbo_hdr *)(iph + 1); + + /* Build hop-by-hop options */ + hop_jumbo->nexthdr = iph->nexthdr; + hop_jumbo->hdrlen = 0; + hop_jumbo->tlv_type = IPV6_TLV_JUMBO; + hop_jumbo->tlv_len = 4; + hop_jumbo->jumbo_payload_len = htonl(payload_len + hoplen); + + iph->nexthdr = NEXTHDR_HOP; + iph->payload_len = 0; + } else { + iph = (struct ipv6hdr *)(skb->data + nhoff); + iph->payload_len = htons(payload_len); + } nhoff += sizeof(*iph) + ipv6_exthdrs_len(iph, &ops); if (WARN_ON(!ops || !ops->callbacks.gro_complete)) -- 2.35.1.616.g0bdcbb4464-goog