Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2019-04-30

1) A lot of work to remove indirections from the xfrm code.
   From Florian Westphal.

2) Support ESP offload in combination with gso partial.
   From Boris Pismenny.

3) Remove some duplicated code from vti4.
   From Jeremy Sowden.

Please note that there is merge conflict

between commit:

8742dc86d0c7 ("xfrm4: Fix uninitialized memory read in _decode_session4")

from the ipsec tree and commit:

c53ac41e3720 ("xfrm: remove decode_session indirection from afinfo_policy")

from the ipsec-next tree. The merge conflict will appear
when those trees get merged during the merge window.
The conflict can be solved as it is done in linux-next:

https://lkml.org/lkml/2019/4/25/1207

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

11 files changed, 63 insertions, 675 deletions

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 613282c65a10..cd915e332c98 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -135,44 +135,11 @@ config INET6_TUNNEL
         tristate
         default n
 
-config INET6_XFRM_MODE_TRANSPORT
-        tristate "IPv6: IPsec transport mode"
-        default IPV6
-        select XFRM
-        ---help---
-          Support for IPsec transport mode.
-
-          If unsure, say Y.
-
-config INET6_XFRM_MODE_TUNNEL
-        tristate "IPv6: IPsec tunnel mode"
-        default IPV6
-        select XFRM
-        ---help---
-          Support for IPsec tunnel mode.
-
-          If unsure, say Y.
-
-config INET6_XFRM_MODE_BEET
-        tristate "IPv6: IPsec BEET mode"
-        default IPV6
-        select XFRM
-        ---help---
-          Support for IPsec BEET mode.
-
-          If unsure, say Y.
-
-config INET6_XFRM_MODE_ROUTEOPTIMIZATION
-        tristate "IPv6: MIPv6 route optimization mode"
-        select XFRM
-        ---help---
-          Support for MIPv6 route optimization mode.
-
 config IPV6_VTI
 tristate "Virtual (secure) IPv6: tunneling"
         select IPV6_TUNNEL
         select NET_IP_TUNNEL
-        depends on INET6_XFRM_MODE_TUNNEL
+        select XFRM
         ---help---
         Tunneling means encapsulating data of one protocol type within
         another protocol and sending it over a channel that understands the
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index e0026fa1261b..8ccf35514015 100644
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -35,10 +35,6 @@ obj-$(CONFIG_INET6_ESP_OFFLOAD) += esp6_offload.o
 obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o
 obj-$(CONFIG_INET6_XFRM_TUNNEL) += xfrm6_tunnel.o
 obj-$(CONFIG_INET6_TUNNEL) += tunnel6.o
-obj-$(CONFIG_INET6_XFRM_MODE_TRANSPORT) += xfrm6_mode_transport.o
-obj-$(CONFIG_INET6_XFRM_MODE_TUNNEL) += xfrm6_mode_tunnel.o
-obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o
-obj-$(CONFIG_INET6_XFRM_MODE_BEET) += xfrm6_mode_beet.o
 obj-$(CONFIG_IPV6_MIP6) += mip6.o
 obj-$(CONFIG_IPV6_ILA) += ila/
 obj-$(CONFIG_NETFILTER) += netfilter/
diff --git a/net/ipv6/esp6_offload.c b/net/ipv6/esp6_offload.c
index d46b4eb645c2..bff83279d76f 100644
--- a/net/ipv6/esp6_offload.c
+++ b/net/ipv6/esp6_offload.c
@@ -134,6 +134,44 @@ static void esp6_gso_encap(struct xfrm_state *x, struct sk_buff *skb)
         xo->proto = proto;
 }
 
+static struct sk_buff *xfrm6_tunnel_gso_segment(struct xfrm_state *x,
+                                                struct sk_buff *skb,
+                                                netdev_features_t features)
+{
+        __skb_push(skb, skb->mac_len);
+        return skb_mac_gso_segment(skb, features);
+}
+
+static struct sk_buff *xfrm6_transport_gso_segment(struct xfrm_state *x,
+                                                   struct sk_buff *skb,
+                                                   netdev_features_t features)
+{
+        const struct net_offload *ops;
+        struct sk_buff *segs = ERR_PTR(-EINVAL);
+        struct xfrm_offload *xo = xfrm_offload(skb);
+
+        skb->transport_header += x->props.header_len;
+        ops = rcu_dereference(inet6_offloads[xo->proto]);
+        if (likely(ops && ops->callbacks.gso_segment))
+                segs = ops->callbacks.gso_segment(skb, features);
+
+        return segs;
+}
+
+static struct sk_buff *xfrm6_outer_mode_gso_segment(struct xfrm_state *x,
+                                                    struct sk_buff *skb,
+                                                    netdev_features_t features)
+{
+        switch (x->outer_mode.encap) {
+        case XFRM_MODE_TUNNEL:
+                return xfrm6_tunnel_gso_segment(x, skb, features);
+        case XFRM_MODE_TRANSPORT:
+                return xfrm6_transport_gso_segment(x, skb, features);
+        }
+
+        return ERR_PTR(-EOPNOTSUPP);
+}
+
 static struct sk_buff *esp6_gso_segment(struct sk_buff *skb,
                                         netdev_features_t features)
 {
@@ -172,7 +210,7 @@ static struct sk_buff *esp6_gso_segment(struct sk_buff *skb,
 
         xo->flags |= XFRM_GSO_SEGMENT;
 
-        return x->outer_mode->gso_segment(x, skb, esp_features);
+        return xfrm6_outer_mode_gso_segment(x, skb, esp_features);
 }
 
 static int esp6_input_tail(struct xfrm_state *x, struct sk_buff *skb)
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 8b6eefff2f7e..218a0dedc8f4 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -342,7 +342,7 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)
         struct net_device *dev;
         struct pcpu_sw_netstats *tstats;
         struct xfrm_state *x;
-        struct xfrm_mode *inner_mode;
+        const struct xfrm_mode *inner_mode;
         struct ip6_tnl *t = XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6;
         u32 orig_mark = skb->mark;
         int ret;
@@ -361,7 +361,7 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)
 
         x = xfrm_input_state(skb);
 
-        inner_mode = x->inner_mode;
+        inner_mode = &x->inner_mode;
 
         if (x->sel.family == AF_UNSPEC) {
                 inner_mode = xfrm_ip2inner_mode(x, XFRM_MODE_SKB_CB(skb)->protocol);
@@ -372,7 +372,7 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)
                 }
         }
 
-        family = inner_mode->afinfo->family;
+        family = inner_mode->family;
 
         skb->mark = be32_to_cpu(t->parms.i_key);
         ret = xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family);
diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c
deleted file mode 100644
index 57fd314ec2b8..000000000000
--- a/net/ipv6/xfrm6_mode_beet.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * xfrm6_mode_beet.c - BEET mode encapsulation for IPv6.
- *
- * Copyright (c) 2006 Diego Beltrami <diego.beltrami@gmail.com>
- *                    Miika Komu     <miika@iki.fi>
- *                    Herbert Xu     <herbert@gondor.apana.org.au>
- *                    Abhinav Pathak <abhinav.pathak@hiit.fi>
- *                    Jeff Ahrenholz <ahrenholz@gmail.com>
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/skbuff.h>
-#include <linux/stringify.h>
-#include <net/dsfield.h>
-#include <net/dst.h>
-#include <net/inet_ecn.h>
-#include <net/ipv6.h>
-#include <net/xfrm.h>
-
-static void xfrm6_beet_make_header(struct sk_buff *skb)
-{
-        struct ipv6hdr *iph = ipv6_hdr(skb);
-
-        iph->version = 6;
-
-        memcpy(iph->flow_lbl, XFRM_MODE_SKB_CB(skb)->flow_lbl,
-               sizeof(iph->flow_lbl));
-        iph->nexthdr = XFRM_MODE_SKB_CB(skb)->protocol;
-
-        ipv6_change_dsfield(iph, 0, XFRM_MODE_SKB_CB(skb)->tos);
-        iph->hop_limit = XFRM_MODE_SKB_CB(skb)->ttl;
-}
-
-/* Add encapsulation header.
- *
- * The top IP header will be constructed per draft-nikander-esp-beet-mode-06.txt.
- */
-static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
-{
-        struct ipv6hdr *top_iph;
-        struct ip_beet_phdr *ph;
-        int optlen, hdr_len;
-
-        hdr_len = 0;
-        optlen = XFRM_MODE_SKB_CB(skb)->optlen;
-        if (unlikely(optlen))
-                hdr_len += IPV4_BEET_PHMAXLEN - (optlen & 4);
-
-        skb_set_network_header(skb, -x->props.header_len - hdr_len);
-        if (x->sel.family != AF_INET6)
-                skb->network_header += IPV4_BEET_PHMAXLEN;
-        skb->mac_header = skb->network_header +
-                          offsetof(struct ipv6hdr, nexthdr);
-        skb->transport_header = skb->network_header + sizeof(*top_iph);
-        ph = __skb_pull(skb, XFRM_MODE_SKB_CB(skb)->ihl - hdr_len);
-
-        xfrm6_beet_make_header(skb);
-
-        top_iph = ipv6_hdr(skb);
-        if (unlikely(optlen)) {
-
-                BUG_ON(optlen < 0);
-
-                ph->padlen = 4 - (optlen & 4);
-                ph->hdrlen = optlen / 8;
-                ph->nexthdr = top_iph->nexthdr;
-                if (ph->padlen)
-                        memset(ph + 1, IPOPT_NOP, ph->padlen);
-
-                top_iph->nexthdr = IPPROTO_BEETPH;
-        }
-
-        top_iph->saddr = *(struct in6_addr *)&x->props.saddr;
-        top_iph->daddr = *(struct in6_addr *)&x->id.daddr;
-        return 0;
-}
-
-static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb)
-{
-        struct ipv6hdr *ip6h;
-        int size = sizeof(struct ipv6hdr);
-        int err;
-
-        err = skb_cow_head(skb, size + skb->mac_len);
-        if (err)
-                goto out;
-
-        __skb_push(skb, size);
-        skb_reset_network_header(skb);
-        skb_mac_header_rebuild(skb);
-
-        xfrm6_beet_make_header(skb);
-
-        ip6h = ipv6_hdr(skb);
-        ip6h->payload_len = htons(skb->len - size);
-        ip6h->daddr = x->sel.daddr.in6;
-        ip6h->saddr = x->sel.saddr.in6;
-        err = 0;
-out:
-        return err;
-}
-
-static struct xfrm_mode xfrm6_beet_mode = {
-        .input2 = xfrm6_beet_input,
-        .input = xfrm_prepare_input,
-        .output2 = xfrm6_beet_output,
-        .output = xfrm6_prepare_output,
-        .owner = THIS_MODULE,
-        .encap = XFRM_MODE_BEET,
-        .flags = XFRM_MODE_FLAG_TUNNEL,
-};
-
-static int __init xfrm6_beet_init(void)
-{
-        return xfrm_register_mode(&xfrm6_beet_mode, AF_INET6);
-}
-
-static void __exit xfrm6_beet_exit(void)
-{
-        int err;
-
-        err = xfrm_unregister_mode(&xfrm6_beet_mode, AF_INET6);
-        BUG_ON(err);
-}
-
-module_init(xfrm6_beet_init);
-module_exit(xfrm6_beet_exit);
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_XFRM_MODE(AF_INET6, XFRM_MODE_BEET);
diff --git a/net/ipv6/xfrm6_mode_ro.c b/net/ipv6/xfrm6_mode_ro.c
deleted file mode 100644
index da28e4407b8f..000000000000
--- a/net/ipv6/xfrm6_mode_ro.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * xfrm6_mode_ro.c - Route optimization mode for IPv6.
- *
- * Copyright (C)2003-2006 Helsinki University of Technology
- * Copyright (C)2003-2006 USAGI/WIDE Project
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-/*
- * Authors:
- *      Noriaki TAKAMIYA @USAGI
- *      Masahide NAKAMURA @USAGI
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/stringify.h>
-#include <linux/time.h>
-#include <net/ipv6.h>
-#include <net/xfrm.h>
-
-/* Add route optimization header space.
- *
- * The IP header and mutable extension headers will be moved forward to make
- * space for the route optimization header.
- */
-static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb)
-{
-        struct ipv6hdr *iph;
-        u8 *prevhdr;
-        int hdr_len;
-
-        iph = ipv6_hdr(skb);
-
-        hdr_len = x->type->hdr_offset(x, skb, &prevhdr);
-        if (hdr_len < 0)
-                return hdr_len;
-        skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data);
-        skb_set_network_header(skb, -x->props.header_len);
-        skb->transport_header = skb->network_header + hdr_len;
-        __skb_pull(skb, hdr_len);
-        memmove(ipv6_hdr(skb), iph, hdr_len);
-
-        x->lastused = ktime_get_real_seconds();
-
-        return 0;
-}
-
-static struct xfrm_mode xfrm6_ro_mode = {
-        .output = xfrm6_ro_output,
-        .owner = THIS_MODULE,
-        .encap = XFRM_MODE_ROUTEOPTIMIZATION,
-};
-
-static int __init xfrm6_ro_init(void)
-{
-        return xfrm_register_mode(&xfrm6_ro_mode, AF_INET6);
-}
-
-static void __exit xfrm6_ro_exit(void)
-{
-        int err;
-
-        err = xfrm_unregister_mode(&xfrm6_ro_mode, AF_INET6);
-        BUG_ON(err);
-}
-
-module_init(xfrm6_ro_init);
-module_exit(xfrm6_ro_exit);
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_XFRM_MODE(AF_INET6, XFRM_MODE_ROUTEOPTIMIZATION);
diff --git a/net/ipv6/xfrm6_mode_transport.c b/net/ipv6/xfrm6_mode_transport.c
deleted file mode 100644
index 3c29da5defe6..000000000000
--- a/net/ipv6/xfrm6_mode_transport.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * xfrm6_mode_transport.c - Transport mode encapsulation for IPv6.
- *
- * Copyright (C) 2002 USAGI/WIDE Project
- * Copyright (c) 2004-2006 Herbert Xu <herbert@gondor.apana.org.au>
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/skbuff.h>
-#include <linux/stringify.h>
-#include <net/dst.h>
-#include <net/ipv6.h>
-#include <net/xfrm.h>
-#include <net/protocol.h>
-
-/* Add encapsulation header.
- *
- * The IP header and mutable extension headers will be moved forward to make
- * space for the encapsulation header.
- */
-static int xfrm6_transport_output(struct xfrm_state *x, struct sk_buff *skb)
-{
-        struct ipv6hdr *iph;
-        u8 *prevhdr;
-        int hdr_len;
-
-        iph = ipv6_hdr(skb);
-        skb_set_inner_transport_header(skb, skb_transport_offset(skb));
-
-        hdr_len = x->type->hdr_offset(x, skb, &prevhdr);
-        if (hdr_len < 0)
-                return hdr_len;
-        skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data);
-        skb_set_network_header(skb, -x->props.header_len);
-        skb->transport_header = skb->network_header + hdr_len;
-        __skb_pull(skb, hdr_len);
-        memmove(ipv6_hdr(skb), iph, hdr_len);
-        return 0;
-}
-
-/* Remove encapsulation header.
- *
- * The IP header will be moved over the top of the encapsulation header.
- *
- * On entry, skb->h shall point to where the IP header should be and skb->nh
- * shall be set to where the IP header currently is.  skb->data shall point
- * to the start of the payload.
- */
-static int xfrm6_transport_input(struct xfrm_state *x, struct sk_buff *skb)
-{
-        int ihl = skb->data - skb_transport_header(skb);
-
-        if (skb->transport_header != skb->network_header) {
-                memmove(skb_transport_header(skb),
-                        skb_network_header(skb), ihl);
-                skb->network_header = skb->transport_header;
-        }
-        ipv6_hdr(skb)->payload_len = htons(skb->len + ihl -
-                                           sizeof(struct ipv6hdr));
-        skb_reset_transport_header(skb);
-        return 0;
-}
-
-static struct sk_buff *xfrm4_transport_gso_segment(struct xfrm_state *x,
-                                                   struct sk_buff *skb,
-                                                   netdev_features_t features)
-{
-        const struct net_offload *ops;
-        struct sk_buff *segs = ERR_PTR(-EINVAL);
-        struct xfrm_offload *xo = xfrm_offload(skb);
-
-        skb->transport_header += x->props.header_len;
-        ops = rcu_dereference(inet6_offloads[xo->proto]);
-        if (likely(ops && ops->callbacks.gso_segment))
-                segs = ops->callbacks.gso_segment(skb, features);
-
-        return segs;
-}
-
-static void xfrm6_transport_xmit(struct xfrm_state *x, struct sk_buff *skb)
-{
-        struct xfrm_offload *xo = xfrm_offload(skb);
-
-        skb_reset_mac_len(skb);
-        pskb_pull(skb, skb->mac_len + sizeof(struct ipv6hdr) + x->props.header_len);
-
-        if (xo->flags & XFRM_GSO_SEGMENT) {
-                 skb_reset_transport_header(skb);
-                 skb->transport_header -= x->props.header_len;
-        }
-}
-
-
-static struct xfrm_mode xfrm6_transport_mode = {
-        .input = xfrm6_transport_input,
-        .output = xfrm6_transport_output,
-        .gso_segment = xfrm4_transport_gso_segment,
-        .xmit = xfrm6_transport_xmit,
-        .owner = THIS_MODULE,
-        .encap = XFRM_MODE_TRANSPORT,
-};
-
-static int __init xfrm6_transport_init(void)
-{
-        return xfrm_register_mode(&xfrm6_transport_mode, AF_INET6);
-}
-
-static void __exit xfrm6_transport_exit(void)
-{
-        int err;
-
-        err = xfrm_unregister_mode(&xfrm6_transport_mode, AF_INET6);
-        BUG_ON(err);
-}
-
-module_init(xfrm6_transport_init);
-module_exit(xfrm6_transport_exit);
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_XFRM_MODE(AF_INET6, XFRM_MODE_TRANSPORT);
diff --git a/net/ipv6/xfrm6_mode_tunnel.c b/net/ipv6/xfrm6_mode_tunnel.c
deleted file mode 100644
index de1b0b8c53b0..000000000000
--- a/net/ipv6/xfrm6_mode_tunnel.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * xfrm6_mode_tunnel.c - Tunnel mode encapsulation for IPv6.
- *
- * Copyright (C) 2002 USAGI/WIDE Project
- * Copyright (c) 2004-2006 Herbert Xu <herbert@gondor.apana.org.au>
- */
-
-#include <linux/gfp.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/skbuff.h>
-#include <linux/stringify.h>
-#include <net/dsfield.h>
-#include <net/dst.h>
-#include <net/inet_ecn.h>
-#include <net/ip6_route.h>
-#include <net/ipv6.h>
-#include <net/xfrm.h>
-
-static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)
-{
-        struct ipv6hdr *inner_iph = ipipv6_hdr(skb);
-
-        if (INET_ECN_is_ce(XFRM_MODE_SKB_CB(skb)->tos))
-                IP6_ECN_set_ce(skb, inner_iph);
-}
-
-/* Add encapsulation header.
- *
- * The top IP header will be constructed per RFC 2401.
- */
-static int xfrm6_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
-{
-        struct dst_entry *dst = skb_dst(skb);
-        struct ipv6hdr *top_iph;
-        int dsfield;
-
-        skb_set_inner_network_header(skb, skb_network_offset(skb));
-        skb_set_inner_transport_header(skb, skb_transport_offset(skb));
-
-        skb_set_network_header(skb, -x->props.header_len);
-        skb->mac_header = skb->network_header +
-                          offsetof(struct ipv6hdr, nexthdr);
-        skb->transport_header = skb->network_header + sizeof(*top_iph);
-        top_iph = ipv6_hdr(skb);
-
-        top_iph->version = 6;
-
-        memcpy(top_iph->flow_lbl, XFRM_MODE_SKB_CB(skb)->flow_lbl,
-               sizeof(top_iph->flow_lbl));
-        top_iph->nexthdr = xfrm_af2proto(skb_dst(skb)->ops->family);
-
-        if (x->props.extra_flags & XFRM_SA_XFLAG_DONT_ENCAP_DSCP)
-                dsfield = 0;
-        else
-                dsfield = XFRM_MODE_SKB_CB(skb)->tos;
-        dsfield = INET_ECN_encapsulate(dsfield, XFRM_MODE_SKB_CB(skb)->tos);
-        if (x->props.flags & XFRM_STATE_NOECN)
-                dsfield &= ~INET_ECN_MASK;
-        ipv6_change_dsfield(top_iph, 0, dsfield);
-        top_iph->hop_limit = ip6_dst_hoplimit(xfrm_dst_child(dst));
-        top_iph->saddr = *(struct in6_addr *)&x->props.saddr;
-        top_iph->daddr = *(struct in6_addr *)&x->id.daddr;
-        return 0;
-}
-
-#define for_each_input_rcu(head, handler)       \
-        for (handler = rcu_dereference(head);   \
-             handler != NULL;                   \
-             handler = rcu_dereference(handler->next))
-
-
-static int xfrm6_mode_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
-{
-        int err = -EINVAL;
-
-        if (XFRM_MODE_SKB_CB(skb)->protocol != IPPROTO_IPV6)
-                goto out;
-        if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
-                goto out;
-
-        err = skb_unclone(skb, GFP_ATOMIC);
-        if (err)
-                goto out;
-
-        if (x->props.flags & XFRM_STATE_DECAP_DSCP)
-                ipv6_copy_dscp(ipv6_get_dsfield(ipv6_hdr(skb)),
-                               ipipv6_hdr(skb));
-        if (!(x->props.flags & XFRM_STATE_NOECN))
-                ipip6_ecn_decapsulate(skb);
-
-        skb_reset_network_header(skb);
-        skb_mac_header_rebuild(skb);
-        if (skb->mac_len)
-                eth_hdr(skb)->h_proto = skb->protocol;
-
-        err = 0;
-
-out:
-        return err;
-}
-
-static struct sk_buff *xfrm6_mode_tunnel_gso_segment(struct xfrm_state *x,
-                                                     struct sk_buff *skb,
-                                                     netdev_features_t features)
-{
-        __skb_push(skb, skb->mac_len);
-        return skb_mac_gso_segment(skb, features);
-}
-
-static void xfrm6_mode_tunnel_xmit(struct xfrm_state *x, struct sk_buff *skb)
-{
-        struct xfrm_offload *xo = xfrm_offload(skb);
-
-        if (xo->flags & XFRM_GSO_SEGMENT)
-                skb->transport_header = skb->network_header + sizeof(struct ipv6hdr);
-
-        skb_reset_mac_len(skb);
-        pskb_pull(skb, skb->mac_len + x->props.header_len);
-}
-
-static struct xfrm_mode xfrm6_tunnel_mode = {
-        .input2 = xfrm6_mode_tunnel_input,
-        .input = xfrm_prepare_input,
-        .output2 = xfrm6_mode_tunnel_output,
-        .output = xfrm6_prepare_output,
-        .gso_segment = xfrm6_mode_tunnel_gso_segment,
-        .xmit = xfrm6_mode_tunnel_xmit,
-        .owner = THIS_MODULE,
-        .encap = XFRM_MODE_TUNNEL,
-        .flags = XFRM_MODE_FLAG_TUNNEL,
-};
-
-static int __init xfrm6_mode_tunnel_init(void)
-{
-        return xfrm_register_mode(&xfrm6_tunnel_mode, AF_INET6);
-}
-
-static void __exit xfrm6_mode_tunnel_exit(void)
-{
-        int err;
-
-        err = xfrm_unregister_mode(&xfrm6_tunnel_mode, AF_INET6);
-        BUG_ON(err);
-}
-
-module_init(xfrm6_mode_tunnel_init);
-module_exit(xfrm6_mode_tunnel_exit);
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_XFRM_MODE(AF_INET6, XFRM_MODE_TUNNEL);
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 6a74080005cf..8ad5e54eb8ca 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -111,21 +111,6 @@ int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb)
         return xfrm6_extract_header(skb);
 }
 
-int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb)
-{
-        int err;
-
-        err = xfrm_inner_extract_output(x, skb);
-        if (err)
-                return err;
-
-        skb->ignore_df = 1;
-        skb->protocol = htons(ETH_P_IPV6);
-
-        return x->outer_mode->output2(x, skb);
-}
-EXPORT_SYMBOL(xfrm6_prepare_output);
-
 int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb)
 {
         memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
@@ -137,11 +122,28 @@ int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb)
         return xfrm_output(sk, skb);
 }
 
+static int __xfrm6_output_state_finish(struct xfrm_state *x, struct sock *sk,
+                                       struct sk_buff *skb)
+{
+        const struct xfrm_state_afinfo *afinfo;
+        int ret = -EAFNOSUPPORT;
+
+        rcu_read_lock();
+        afinfo = xfrm_state_afinfo_get_rcu(x->outer_mode.family);
+        if (likely(afinfo))
+                ret = afinfo->output_finish(sk, skb);
+        else
+                kfree_skb(skb);
+        rcu_read_unlock();
+
+        return ret;
+}
+
 static int __xfrm6_output_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
 {
         struct xfrm_state *x = skb_dst(skb)->xfrm;
 
-        return x->outer_mode->afinfo->output_finish(sk, skb);
+        return __xfrm6_output_state_finish(x, sk, skb);
 }
 
 static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
@@ -183,7 +185,7 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
                                     __xfrm6_output_finish);
 
 skip_frag:
-        return x->outer_mode->afinfo->output_finish(sk, skb);
+        return __xfrm6_output_state_finish(x, sk, skb);
 }
 
 int xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 769f8f78d3b8..699e0730ce8e 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -22,9 +22,6 @@
 #include <net/ipv6.h>
 #include <net/ip6_route.h>
 #include <net/l3mdev.h>
-#if IS_ENABLED(CONFIG_IPV6_MIP6)
-#include <net/mip6.h>
-#endif
 
 static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif,
                                           const xfrm_address_t *saddr,
@@ -71,24 +68,6 @@ static int xfrm6_get_saddr(struct net *net, int oif,
         return 0;
 }
 
-static int xfrm6_get_tos(const struct flowi *fl)
-{
-        return 0;
-}
-
-static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst,
-                           int nfheader_len)
-{
-        if (dst->ops->family == AF_INET6) {
-                struct rt6_info *rt = (struct rt6_info *)dst;
-                path->path_cookie = rt6_get_cookie(rt);
-        }
-
-        path->u.rt6.rt6i_nfheader_len = nfheader_len;
-
-        return 0;
-}
-
 static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
                           const struct flowi *fl)
 {
@@ -118,108 +97,6 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
         return 0;
 }
 
-static inline void
-_decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
-{
-        struct flowi6 *fl6 = &fl->u.ip6;
-        int onlyproto = 0;
-        const struct ipv6hdr *hdr = ipv6_hdr(skb);
-        u32 offset = sizeof(*hdr);
-        struct ipv6_opt_hdr *exthdr;
-        const unsigned char *nh = skb_network_header(skb);
-        u16 nhoff = IP6CB(skb)->nhoff;
-        int oif = 0;
-        u8 nexthdr;
-
-        if (!nhoff)
-                nhoff = offsetof(struct ipv6hdr, nexthdr);
-
-        nexthdr = nh[nhoff];
-
-        if (skb_dst(skb))
-                oif = skb_dst(skb)->dev->ifindex;
-
-        memset(fl6, 0, sizeof(struct flowi6));
-        fl6->flowi6_mark = skb->mark;
-        fl6->flowi6_oif = reverse ? skb->skb_iif : oif;
-
-        fl6->daddr = reverse ? hdr->saddr : hdr->daddr;
-        fl6->saddr = reverse ? hdr->daddr : hdr->saddr;
-
-        while (nh + offset + sizeof(*exthdr) < skb->data ||
-               pskb_may_pull(skb, nh + offset + sizeof(*exthdr) - skb->data)) {
-                nh = skb_network_header(skb);
-                exthdr = (struct ipv6_opt_hdr *)(nh + offset);
-
-                switch (nexthdr) {
-                case NEXTHDR_FRAGMENT:
-                        onlyproto = 1;
-                        /* fall through */
-                case NEXTHDR_ROUTING:
-                case NEXTHDR_HOP:
-                case NEXTHDR_DEST:
-                        offset += ipv6_optlen(exthdr);
-                        nexthdr = exthdr->nexthdr;
-                        exthdr = (struct ipv6_opt_hdr *)(nh + offset);
-                        break;
-
-                case IPPROTO_UDP:
-                case IPPROTO_UDPLITE:
-                case IPPROTO_TCP:
-                case IPPROTO_SCTP:
-                case IPPROTO_DCCP:
-                        if (!onlyproto && (nh + offset + 4 < skb->data ||
-                             pskb_may_pull(skb, nh + offset + 4 - skb->data))) {
-                                __be16 *ports;
-
-                                nh = skb_network_header(skb);
-                                ports = (__be16 *)(nh + offset);
-                                fl6->fl6_sport = ports[!!reverse];
-                                fl6->fl6_dport = ports[!reverse];
-                        }
-                        fl6->flowi6_proto = nexthdr;
-                        return;
-
-                case IPPROTO_ICMPV6:
-                        if (!onlyproto && (nh + offset + 2 < skb->data ||
-                            pskb_may_pull(skb, nh + offset + 2 - skb->data))) {
-                                u8 *icmp;
-
-                                nh = skb_network_header(skb);
-                                icmp = (u8 *)(nh + offset);
-                                fl6->fl6_icmp_type = icmp[0];
-                                fl6->fl6_icmp_code = icmp[1];
-                        }
-                        fl6->flowi6_proto = nexthdr;
-                        return;
-
-#if IS_ENABLED(CONFIG_IPV6_MIP6)
-                case IPPROTO_MH:
-                        offset += ipv6_optlen(exthdr);
-                        if (!onlyproto && (nh + offset + 3 < skb->data ||
-                            pskb_may_pull(skb, nh + offset + 3 - skb->data))) {
-                                struct ip6_mh *mh;
-
-                                nh = skb_network_header(skb);
-                                mh = (struct ip6_mh *)(nh + offset);
-                                fl6->fl6_mh_type = mh->ip6mh_type;
-                        }
-                        fl6->flowi6_proto = nexthdr;
-                        return;
-#endif
-
-                /* XXX Why are there these headers? */
-                case IPPROTO_AH:
-                case IPPROTO_ESP:
-                case IPPROTO_COMP:
-                default:
-                        fl6->fl6_ipsec_spi = 0;
-                        fl6->flowi6_proto = nexthdr;
-                        return;
-                }
-        }
-}
-
 static void xfrm6_update_pmtu(struct dst_entry *dst, struct sock *sk,
                               struct sk_buff *skb, u32 mtu)
 {
@@ -291,9 +168,6 @@ static const struct xfrm_policy_afinfo xfrm6_policy_afinfo = {
         .dst_ops =              &xfrm6_dst_ops_template,
         .dst_lookup =           xfrm6_dst_lookup,
         .get_saddr =            xfrm6_get_saddr,
-        .decode_session =       _decode_session6,
-        .get_tos =              xfrm6_get_tos,
-        .init_path =            xfrm6_init_path,
         .fill_dst =             xfrm6_fill_dst,
         .blackhole_route =      ip6_blackhole_route,
 };
diff --git a/net/ipv6/xfrm6_protocol.c b/net/ipv6/xfrm6_protocol.c
index cc979b702c89..aaacac7fdbce 100644
--- a/net/ipv6/xfrm6_protocol.c
+++ b/net/ipv6/xfrm6_protocol.c
@@ -46,7 +46,7 @@ static inline struct xfrm6_protocol __rcu **proto_handlers(u8 protocol)
              handler != NULL;                           \
              handler = rcu_dereference(handler->next))  \
 
-int xfrm6_rcv_cb(struct sk_buff *skb, u8 protocol, int err)
+static int xfrm6_rcv_cb(struct sk_buff *skb, u8 protocol, int err)
 {
         int ret;
         struct xfrm6_protocol *handler;
@@ -61,7 +61,6 @@ int xfrm6_rcv_cb(struct sk_buff *skb, u8 protocol, int err)
 
         return 0;
 }
-EXPORT_SYMBOL(xfrm6_rcv_cb);
 
 static int xfrm6_esp_rcv(struct sk_buff *skb)
 {