net: gso: add HBH extension header offload support

This commit adds net_offload to IPv6 Hop-by-Hop extension headers (as it
is done for routing and dstopts) since it is supported in GSO and GRO.
This allows to remove specific HBH conditionals in GSO and GRO when
pulling and parsing an incoming packet.

Signed-off-by: Richard Gobert <richardbgobert@gmail.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/d4f8825a-1d55-4b12-9d67-a254dbbfa6ae@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv6/exthdrs_offload.c b/net/ipv6/exthdrs_offload.c
index 06750d65d48005369dbd74954f64e6dc5c13b2fb..4c00398f4dca7ee57cc2394ead2122280d05841b 100644 (file)
--- a/net/ipv6/exthdrs_offload.c
+++ b/net/ipv6/exthdrs_offload.c
@@ -16,6 +16,10 @@ static const struct net_offload dstopt_offload = {
        .flags          =       INET6_PROTO_GSO_EXTHDR,
 };
 
+static const struct net_offload hbh_offload = {
+       .flags          =       INET6_PROTO_GSO_EXTHDR,
+};
+
 int __init ipv6_exthdrs_offload_init(void)
 {
        int ret;
@@ -28,9 +32,16 @@ int __init ipv6_exthdrs_offload_init(void)
        if (ret)
                goto out_rt;
 
+       ret = inet6_add_offload(&hbh_offload, IPPROTO_HOPOPTS);
+       if (ret)
+               goto out_dstopts;
+
 out:
        return ret;
 
+out_dstopts:
+       inet6_del_offload(&dstopt_offload, IPPROTO_DSTOPTS);
+
 out_rt:
        inet6_del_offload(&rthdr_offload, IPPROTO_ROUTING);
        goto out;

diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index d6314287338da1d7c80459899fca620833cd6dc9..0e0b5fed0995254d6966d0d592a4d4d53e11fa5e 100644 (file)
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -45,15 +45,13 @@ static int ipv6_gso_pull_exthdrs(struct sk_buff *skb, int proto)
                struct ipv6_opt_hdr *opth;
                int len;
 
-               if (proto != NEXTHDR_HOP) {
-                       ops = rcu_dereference(inet6_offloads[proto]);
+               ops = rcu_dereference(inet6_offloads[proto]);
 
-                       if (unlikely(!ops))
-                               break;
+               if (unlikely(!ops))
+                       break;
 
-                       if (!(ops->flags & INET6_PROTO_GSO_EXTHDR))
-                               break;
-               }
+               if (!(ops->flags & INET6_PROTO_GSO_EXTHDR))
+                       break;
 
                if (unlikely(!pskb_may_pull(skb, 8)))
                        break;
@@ -171,13 +169,12 @@ static int ipv6_exthdrs_len(struct ipv6hdr *iph,
 
        proto = iph->nexthdr;
        for (;;) {
-               if (proto != NEXTHDR_HOP) {
-                       *opps = rcu_dereference(inet6_offloads[proto]);
-                       if (unlikely(!(*opps)))
-                               break;
-                       if (!((*opps)->flags & INET6_PROTO_GSO_EXTHDR))
-                               break;
-               }
+               *opps = rcu_dereference(inet6_offloads[proto]);
+               if (unlikely(!(*opps)))
+                       break;
+               if (!((*opps)->flags & INET6_PROTO_GSO_EXTHDR))
+                       break;
+
                opth = (void *)opth + optlen;
                optlen = ipv6_optlen(opth);
                len += optlen;