system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

IPv6/GRO: generic helper to remove temporary HBH/jumbo header in driver

Browse source 
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.

Tested:
Compiled and ran with ethtool -K eth1 tso off
Could send Big TCP packets

Signed-off-by: Coco Li <lixiaoyan@google.com>
Link: https://lore.kernel.org/r/20221210041646.3587757-1-lixiaoyan@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Coco Li 2022-12-10 04:16:45 +00:00 committed by Jakub Kicinski
parent 8150f0cfb2
commit 89300468e2
2 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
include/net/ipv6.h
View file

@ -500,6 +500,39 @@ 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));
__skb_pull(skb, hophdr_len);
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

27
net/ipv6/ip6_offload.c
View file

@ -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;