From: Eric Dumazet <eric.dumazet@gmail.com>
To: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
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 v6 net-next 07/13] ipv6/gro: insert temporary HBH/jumbo header
Date: Mon, 9 May 2022 20:32:13 -0700 [thread overview]
Message-ID: <20220510033219.2639364-8-eric.dumazet@gmail.com> (raw)
In-Reply-To: <20220510033219.2639364-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.36.0.512.ge40c2bad7a-goog
next prev parent reply other threads:[~2022-05-10 3:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 3:32 [PATCH v6 net-next 00/13] tcp: BIG TCP implementation Eric Dumazet
2022-05-10 3:32 ` [PATCH v6 net-next 01/13] net: add IFLA_TSO_{MAX_SIZE|SEGS} attributes Eric Dumazet
2022-05-10 3:32 ` [PATCH v6 net-next 02/13] net: allow gso_max_size to exceed 65536 Eric Dumazet
2022-05-10 3:32 ` [PATCH v6 net-next 03/13] net: limit GSO_MAX_SIZE to 524280 bytes Eric Dumazet
2022-05-10 3:32 ` [PATCH v6 net-next 04/13] tcp_cubic: make hystart_ack_delay() aware of BIG TCP Eric Dumazet
2022-05-10 3:32 ` [PATCH v6 net-next 05/13] ipv6: add struct hop_jumbo_hdr definition Eric Dumazet
2022-05-10 3:32 ` [PATCH v6 net-next 06/13] ipv6/gso: remove temporary HBH/jumbo header Eric Dumazet
2022-05-10 3:32 ` Eric Dumazet [this message]
2022-05-10 3:32 ` [PATCH v6 net-next 08/13] net: allow gro_max_size to exceed 65536 Eric Dumazet
2022-05-10 3:32 ` [PATCH v6 net-next 09/13] ipv6: Add hop-by-hop header to jumbograms in ip6_output Eric Dumazet
2022-05-10 3:32 ` [PATCH v6 net-next 10/13] net: loopback: enable BIG TCP packets Eric Dumazet
2022-05-10 3:32 ` [PATCH v6 net-next 11/13] veth: " Eric Dumazet
2022-05-10 3:32 ` [PATCH v6 net-next 12/13] mlx4: support " Eric Dumazet
2022-05-10 3:32 ` [PATCH v6 net-next 13/13] mlx5: " Eric Dumazet
2022-05-12 8:40 ` Saeed Mahameed
2022-05-12 9:02 ` Paolo Abeni
2022-05-13 4:29 ` Saeed Mahameed
2022-05-13 4:34 ` Eric Dumazet
2022-05-13 5:49 ` Saeed Mahameed
2022-05-13 13:05 ` Eric Dumazet
2022-05-13 17:04 ` Jakub Kicinski
2022-05-13 17:12 ` Eric Dumazet
2022-05-10 19:49 ` [PATCH v6 net-next 00/13] tcp: BIG TCP implementation Alexander H 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=20220510033219.2639364-8-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 \
--cc=pabeni@redhat.com \
/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).