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-07-05

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

2) Fix a WARN_ON with ipv6 that triggered because of a
   forgotten break statement. From Florian Westphal.

3)  Remove xfrmi_init_net, it is not needed.
    From Li RongQing.

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

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

6 files changed, 6 insertions, 82 deletions

diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 9c3afd550612..974179b3b314 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -590,8 +590,7 @@ static void __exit ah4_fini(void)
 {
         if (xfrm4_protocol_deregister(&ah4_protocol, IPPROTO_AH) < 0)
                 pr_info("%s: can't remove protocol\n", __func__);
-        if (xfrm_unregister_type(&ah_type, AF_INET) < 0)
-                pr_info("%s: can't remove xfrm type\n", __func__);
+        xfrm_unregister_type(&ah_type, AF_INET);
 }
 
 module_init(ah4_init);
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index b9ae95576084..5c967764041f 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -33,8 +33,6 @@ struct esp_output_extra {
 
 #define ESP_SKB_CB(__skb) ((struct esp_skb_cb *)&((__skb)->cb[0]))
 
-static u32 esp4_get_mtu(struct xfrm_state *x, int mtu);
-
 /*
  * Allocate an AEAD request structure with extra space for SG and IV.
  *
@@ -506,7 +504,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
                 struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);
                 u32 padto;
 
-                padto = min(x->tfcpad, esp4_get_mtu(x, dst->child_mtu_cached));
+                padto = min(x->tfcpad, xfrm_state_mtu(x, dst->child_mtu_cached));
                 if (skb->len < padto)
                         esp.tfclen = padto - skb->len;
         }
@@ -788,28 +786,6 @@ out:
         return err;
 }
 
-static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)
-{
-        struct crypto_aead *aead = x->data;
-        u32 blksize = ALIGN(crypto_aead_blocksize(aead), 4);
-        unsigned int net_adj;
-
-        switch (x->props.mode) {
-        case XFRM_MODE_TRANSPORT:
-        case XFRM_MODE_BEET:
-                net_adj = sizeof(struct iphdr);
-                break;
-        case XFRM_MODE_TUNNEL:
-                net_adj = 0;
-                break;
-        default:
-                BUG();
-        }
-
-        return ((mtu - x->props.header_len - crypto_aead_authsize(aead) -
-                 net_adj) & ~(blksize - 1)) + net_adj - 2;
-}
-
 static int esp4_err(struct sk_buff *skb, u32 info)
 {
         struct net *net = dev_net(skb->dev);
@@ -1035,7 +1011,6 @@ static const struct xfrm_type esp_type =
         .flags          = XFRM_TYPE_REPLAY_PROT,
         .init_state     = esp_init_state,
         .destructor     = esp_destroy,
-        .get_mtu        = esp4_get_mtu,
         .input          = esp_input,
         .output         = esp_output,
 };
@@ -1066,8 +1041,7 @@ static void __exit esp4_fini(void)
 {
         if (xfrm4_protocol_deregister(&esp4_protocol, IPPROTO_ESP) < 0)
                 pr_info("%s: can't remove protocol\n", __func__);
-        if (xfrm_unregister_type(&esp_type, AF_INET) < 0)
-                pr_info("%s: can't remove xfrm type\n", __func__);
+        xfrm_unregister_type(&esp_type, AF_INET);
 }
 
 module_init(esp4_init);
diff --git a/net/ipv4/esp4_offload.c b/net/ipv4/esp4_offload.c
index 2e5e377f50a1..0e4a7cf6bc87 100644
--- a/net/ipv4/esp4_offload.c
+++ b/net/ipv4/esp4_offload.c
@@ -312,9 +312,7 @@ static int __init esp4_offload_init(void)
 
 static void __exit esp4_offload_exit(void)
 {
-        if (xfrm_unregister_type_offload(&esp_type_offload, AF_INET) < 0)
-                pr_info("%s: can't remove xfrm type offload\n", __func__);
-
+        xfrm_unregister_type_offload(&esp_type_offload, AF_INET);
         inet_del_offload(&esp4_offload, IPPROTO_ESP);
 }
 
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index 2f4cdcc13d53..59bfa3825810 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -186,8 +186,7 @@ static void __exit ipcomp4_fini(void)
 {
         if (xfrm4_protocol_deregister(&ipcomp4_protocol, IPPROTO_COMP) < 0)
                 pr_info("%s: can't remove protocol\n", __func__);
-        if (xfrm_unregister_type(&ipcomp_type, AF_INET) < 0)
-                pr_info("%s: can't remove xfrm type\n", __func__);
+        xfrm_unregister_type(&ipcomp_type, AF_INET);
 }
 
 module_init(ipcomp4_init);
diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
index 80c40b4981bb..f8ed3c3bb928 100644
--- a/net/ipv4/xfrm4_state.c
+++ b/net/ipv4/xfrm4_state.c
@@ -15,46 +15,6 @@
 #include <linux/netfilter_ipv4.h>
 #include <linux/export.h>
 
-static int xfrm4_init_flags(struct xfrm_state *x)
-{
-        if (xs_net(x)->ipv4.sysctl_ip_no_pmtu_disc)
-                x->props.flags |= XFRM_STATE_NOPMTUDISC;
-        return 0;
-}
-
-static void
-__xfrm4_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl)
-{
-        const struct flowi4 *fl4 = &fl->u.ip4;
-
-        sel->daddr.a4 = fl4->daddr;
-        sel->saddr.a4 = fl4->saddr;
-        sel->dport = xfrm_flowi_dport(fl, &fl4->uli);
-        sel->dport_mask = htons(0xffff);
-        sel->sport = xfrm_flowi_sport(fl, &fl4->uli);
-        sel->sport_mask = htons(0xffff);
-        sel->family = AF_INET;
-        sel->prefixlen_d = 32;
-        sel->prefixlen_s = 32;
-        sel->proto = fl4->flowi4_proto;
-        sel->ifindex = fl4->flowi4_oif;
-}
-
-static void
-xfrm4_init_temprop(struct xfrm_state *x, const struct xfrm_tmpl *tmpl,
-                   const xfrm_address_t *daddr, const xfrm_address_t *saddr)
-{
-        x->id = tmpl->id;
-        if (x->id.daddr.a4 == 0)
-                x->id.daddr.a4 = daddr->a4;
-        x->props.saddr = tmpl->saddr;
-        if (x->props.saddr.a4 == 0)
-                x->props.saddr.a4 = saddr->a4;
-        x->props.mode = tmpl->mode;
-        x->props.reqid = tmpl->reqid;
-        x->props.family = AF_INET;
-}
-
 int xfrm4_extract_header(struct sk_buff *skb)
 {
         const struct iphdr *iph = ip_hdr(skb);
@@ -74,11 +34,6 @@ int xfrm4_extract_header(struct sk_buff *skb)
 static struct xfrm_state_afinfo xfrm4_state_afinfo = {
         .family                 = AF_INET,
         .proto                  = IPPROTO_IPIP,
-        .eth_proto              = htons(ETH_P_IP),
-        .owner                  = THIS_MODULE,
-        .init_flags             = xfrm4_init_flags,
-        .init_tempsel           = __xfrm4_init_tempsel,
-        .init_temprop           = xfrm4_init_temprop,
         .output                 = xfrm4_output,
         .output_finish          = xfrm4_output_finish,
         .extract_input          = xfrm4_extract_input,
diff --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c
index 5d00e54cd319..dc19aff7c2e0 100644
--- a/net/ipv4/xfrm4_tunnel.c
+++ b/net/ipv4/xfrm4_tunnel.c
@@ -108,8 +108,7 @@ static void __exit ipip_fini(void)
         if (xfrm4_tunnel_deregister(&xfrm_tunnel_handler, AF_INET))
                 pr_info("%s: can't remove xfrm handler for AF_INET\n",
                         __func__);
-        if (xfrm_unregister_type(&ipip_type, AF_INET) < 0)
-                pr_info("%s: can't remove xfrm type\n", __func__);
+        xfrm_unregister_type(&ipip_type, AF_INET);
 }
 
 module_init(ipip_init);