netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Dumazet <eric.dumazet@gmail.com>
To: "David S . Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>
Cc: netdev <netdev@vger.kernel.org>,
	Alexander Duyck <alexanderduyck@fb.com>,
	Coco Li <lixiaoyan@google.com>,
	Eric Dumazet <edumazet@google.com>,
	Eric Dumazet <eric.dumazet@gmail.com>
Subject: [PATCH v4 net-next 06/14] ipv6/gro: insert temporary HBH/jumbo header
Date: Wed,  9 Mar 2022 21:46:55 -0800	[thread overview]
Message-ID: <20220310054703.849899-7-eric.dumazet@gmail.com> (raw)
In-Reply-To: <20220310054703.849899-1-eric.dumazet@gmail.com>

From: Eric Dumazet <edumazet@google.com>

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 <edumazet@google.com>
---
 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


  parent reply	other threads:[~2022-03-10  5:47 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-10  5:46 [PATCH v4 net-next 00/14] tcp: BIG TCP implementation Eric Dumazet
2022-03-10  5:46 ` [PATCH v4 net-next 01/14] net: add netdev->tso_ipv6_max_size attribute Eric Dumazet
2022-03-10  5:46 ` [PATCH v4 net-next 02/14] ipv6: add dev->gso_ipv6_max_size Eric Dumazet
2022-03-11 16:21   ` Alexander H Duyck
2022-03-15 15:57     ` Eric Dumazet
2022-03-10  5:46 ` [PATCH v4 net-next 03/14] tcp_cubic: make hystart_ack_delay() aware of BIG TCP Eric Dumazet
2022-03-10  5:46 ` [PATCH v4 net-next 04/14] ipv6: add struct hop_jumbo_hdr definition Eric Dumazet
2022-03-10  5:46 ` [PATCH v4 net-next 05/14] ipv6/gso: remove temporary HBH/jumbo header Eric Dumazet
2022-03-10  5:46 ` Eric Dumazet [this message]
2022-03-11 16:24   ` [PATCH v4 net-next 06/14] ipv6/gro: insert " Alexander H Duyck
2022-03-15 16:01     ` Eric Dumazet
2022-03-15 16:04       ` Alexander Duyck
2022-03-15 16:10         ` Eric Dumazet
2022-03-15 17:35           ` Alexander Duyck
2022-03-10  5:46 ` [PATCH v4 net-next 07/14] ipv6: add GRO_IPV6_MAX_SIZE Eric Dumazet
2022-03-10  5:46 ` [PATCH v4 net-next 08/14] ipv6: Add hop-by-hop header to jumbograms in ip6_output Eric Dumazet
2022-03-10  5:46 ` [PATCH v4 net-next 09/14] net: loopback: enable BIG TCP packets Eric Dumazet
2022-03-10  5:46 ` [PATCH v4 net-next 10/14] bonding: update dev->tso_ipv6_max_size Eric Dumazet
2022-03-10  5:47 ` [PATCH v4 net-next 11/14] macvlan: enable BIG TCP Packets Eric Dumazet
2022-03-10  5:47 ` [PATCH v4 net-next 12/14] ipvlan: " Eric Dumazet
2022-03-10  5:47 ` [PATCH v4 net-next 13/14] mlx4: support BIG TCP packets Eric Dumazet
2022-03-10  5:47 ` [PATCH v4 net-next 14/14] mlx5: " Eric Dumazet
2022-03-11 17:13 ` [PATCH v4 net-next 00/14] tcp: BIG TCP implementation Alexander H Duyck
2022-03-15 15:50   ` Eric Dumazet
2022-03-15 16:17     ` Alexander Duyck
2022-03-15 16:33       ` Eric Dumazet
2022-03-15 17:20         ` Alexander Duyck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220310054703.849899-7-eric.dumazet@gmail.com \
    --to=eric.dumazet@gmail.com \
    --cc=alexanderduyck@fb.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=lixiaoyan@google.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).