1 files changed, 71 insertions, 115 deletions

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 178baaa037e5..3edbf4b26116 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -173,7 +173,7 @@ static DEFINE_SPINLOCK(xfrm_state_gc_lock);
 int __xfrm_state_delete(struct xfrm_state *x);
 
 int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol);
-bool km_is_alive(const struct km_event *c);
+static bool km_is_alive(const struct km_event *c);
 void km_state_expired(struct xfrm_state *x, int hard, u32 portid);
 
 static DEFINE_SPINLOCK(xfrm_type_lock);
@@ -330,100 +330,67 @@ static void xfrm_put_type_offload(const struct xfrm_type_offload *type)
         module_put(type->owner);
 }
 
-static DEFINE_SPINLOCK(xfrm_mode_lock);
-int xfrm_register_mode(struct xfrm_mode *mode, int family)
-{
-        struct xfrm_state_afinfo *afinfo;
-        struct xfrm_mode **modemap;
-        int err;
-
-        if (unlikely(mode->encap >= XFRM_MODE_MAX))
-                return -EINVAL;
-
-        afinfo = xfrm_state_get_afinfo(family);
-        if (unlikely(afinfo == NULL))
-                return -EAFNOSUPPORT;
-
-        err = -EEXIST;
-        modemap = afinfo->mode_map;
-        spin_lock_bh(&xfrm_mode_lock);
-        if (modemap[mode->encap])
-                goto out;
-
-        err = -ENOENT;
-        if (!try_module_get(afinfo->owner))
-                goto out;
-
-        mode->afinfo = afinfo;
-        modemap[mode->encap] = mode;
-        err = 0;
-
-out:
-        spin_unlock_bh(&xfrm_mode_lock);
-        rcu_read_unlock();
-        return err;
-}
-EXPORT_SYMBOL(xfrm_register_mode);
-
-int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
-{
-        struct xfrm_state_afinfo *afinfo;
-        struct xfrm_mode **modemap;
-        int err;
-
-        if (unlikely(mode->encap >= XFRM_MODE_MAX))
-                return -EINVAL;
-
-        afinfo = xfrm_state_get_afinfo(family);
-        if (unlikely(afinfo == NULL))
-                return -EAFNOSUPPORT;
-
-        err = -ENOENT;
-        modemap = afinfo->mode_map;
-        spin_lock_bh(&xfrm_mode_lock);
-        if (likely(modemap[mode->encap] == mode)) {
-                modemap[mode->encap] = NULL;
-                module_put(mode->afinfo->owner);
-                err = 0;
-        }
-
-        spin_unlock_bh(&xfrm_mode_lock);
-        rcu_read_unlock();
-        return err;
-}
-EXPORT_SYMBOL(xfrm_unregister_mode);
-
-static struct xfrm_mode *xfrm_get_mode(unsigned int encap, int family)
-{
-        struct xfrm_state_afinfo *afinfo;
-        struct xfrm_mode *mode;
-        int modload_attempted = 0;
+static const struct xfrm_mode xfrm4_mode_map[XFRM_MODE_MAX] = {
+        [XFRM_MODE_BEET] = {
+                .encap = XFRM_MODE_BEET,
+                .flags = XFRM_MODE_FLAG_TUNNEL,
+                .family = AF_INET,
+        },
+        [XFRM_MODE_TRANSPORT] = {
+                .encap = XFRM_MODE_TRANSPORT,
+                .family = AF_INET,
+        },
+        [XFRM_MODE_TUNNEL] = {
+                .encap = XFRM_MODE_TUNNEL,
+                .flags = XFRM_MODE_FLAG_TUNNEL,
+                .family = AF_INET,
+        },
+};
+
+static const struct xfrm_mode xfrm6_mode_map[XFRM_MODE_MAX] = {
+        [XFRM_MODE_BEET] = {
+                .encap = XFRM_MODE_BEET,
+                .flags = XFRM_MODE_FLAG_TUNNEL,
+                .family = AF_INET6,
+        },
+        [XFRM_MODE_ROUTEOPTIMIZATION] = {
+                .encap = XFRM_MODE_ROUTEOPTIMIZATION,
+                .family = AF_INET6,
+        },
+        [XFRM_MODE_TRANSPORT] = {
+                .encap = XFRM_MODE_TRANSPORT,
+                .family = AF_INET6,
+        },
+        [XFRM_MODE_TUNNEL] = {
+                .encap = XFRM_MODE_TUNNEL,
+                .flags = XFRM_MODE_FLAG_TUNNEL,
+                .family = AF_INET6,
+        },
+};
+
+static const struct xfrm_mode *xfrm_get_mode(unsigned int encap, int family)
+{
+        const struct xfrm_mode *mode;
 
         if (unlikely(encap >= XFRM_MODE_MAX))
                 return NULL;
 
-retry:
-        afinfo = xfrm_state_get_afinfo(family);
-        if (unlikely(afinfo == NULL))
-                return NULL;
-
-        mode = READ_ONCE(afinfo->mode_map[encap]);
-        if (unlikely(mode && !try_module_get(mode->owner)))
-                mode = NULL;
-
-        rcu_read_unlock();
-        if (!mode && !modload_attempted) {
-                request_module("xfrm-mode-%d-%d", family, encap);
-                modload_attempted = 1;
-                goto retry;
+        switch (family) {
+        case AF_INET:
+                mode = &xfrm4_mode_map[encap];
+                if (mode->family == family)
+                        return mode;
+                break;
+        case AF_INET6:
+                mode = &xfrm6_mode_map[encap];
+                if (mode->family == family)
+                        return mode;
+                break;
+        default:
+                break;
         }
 
-        return mode;
-}
-
-static void xfrm_put_mode(struct xfrm_mode *mode)
-{
-        module_put(mode->owner);
+        return NULL;
 }
 
 void xfrm_state_free(struct xfrm_state *x)
@@ -444,12 +411,6 @@ static void ___xfrm_state_destroy(struct xfrm_state *x)
         kfree(x->coaddr);
         kfree(x->replay_esn);
         kfree(x->preplay_esn);
-        if (x->inner_mode)
-                xfrm_put_mode(x->inner_mode);
-        if (x->inner_mode_iaf)
-                xfrm_put_mode(x->inner_mode_iaf);
-        if (x->outer_mode)
-                xfrm_put_mode(x->outer_mode);
         if (x->type_offload)
                 xfrm_put_type_offload(x->type_offload);
         if (x->type) {
@@ -590,8 +551,6 @@ struct xfrm_state *xfrm_state_alloc(struct net *net)
                 x->lft.hard_packet_limit = XFRM_INF;
                 x->replay_maxage = 0;
                 x->replay_maxdiff = 0;
-                x->inner_mode = NULL;
-                x->inner_mode_iaf = NULL;
                 spin_lock_init(&x->lock);
         }
         return x;
@@ -2066,7 +2025,7 @@ int km_report(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address
 }
 EXPORT_SYMBOL(km_report);
 
-bool km_is_alive(const struct km_event *c)
+static bool km_is_alive(const struct km_event *c)
 {
         struct xfrm_mgr *km;
         bool is_alive = false;
@@ -2082,7 +2041,6 @@ bool km_is_alive(const struct km_event *c)
 
         return is_alive;
 }
-EXPORT_SYMBOL(km_is_alive);
 
 int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen)
 {
@@ -2195,6 +2153,7 @@ struct xfrm_state_afinfo *xfrm_state_afinfo_get_rcu(unsigned int family)
 
         return rcu_dereference(xfrm_state_afinfo[family]);
 }
+EXPORT_SYMBOL_GPL(xfrm_state_afinfo_get_rcu);
 
 struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned int family)
 {
@@ -2242,8 +2201,9 @@ int xfrm_state_mtu(struct xfrm_state *x, int mtu)
 
 int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)
 {
-        struct xfrm_state_afinfo *afinfo;
-        struct xfrm_mode *inner_mode;
+        const struct xfrm_state_afinfo *afinfo;
+        const struct xfrm_mode *inner_mode;
+        const struct xfrm_mode *outer_mode;
         int family = x->props.family;
         int err;
 
@@ -2269,25 +2229,22 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)
                         goto error;
 
                 if (!(inner_mode->flags & XFRM_MODE_FLAG_TUNNEL) &&
-                    family != x->sel.family) {
-                        xfrm_put_mode(inner_mode);
+                    family != x->sel.family)
                         goto error;
-                }
 
-                x->inner_mode = inner_mode;
+                x->inner_mode = *inner_mode;
         } else {
-                struct xfrm_mode *inner_mode_iaf;
+                const struct xfrm_mode *inner_mode_iaf;
                 int iafamily = AF_INET;
 
                 inner_mode = xfrm_get_mode(x->props.mode, x->props.family);
                 if (inner_mode == NULL)
                         goto error;
 
-                if (!(inner_mode->flags & XFRM_MODE_FLAG_TUNNEL)) {
-                        xfrm_put_mode(inner_mode);
+                if (!(inner_mode->flags & XFRM_MODE_FLAG_TUNNEL))
                         goto error;
-                }
-                x->inner_mode = inner_mode;
+
+                x->inner_mode = *inner_mode;
 
                 if (x->props.family == AF_INET)
                         iafamily = AF_INET6;
@@ -2295,9 +2252,7 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)
                 inner_mode_iaf = xfrm_get_mode(x->props.mode, iafamily);
                 if (inner_mode_iaf) {
                         if (inner_mode_iaf->flags & XFRM_MODE_FLAG_TUNNEL)
-                                x->inner_mode_iaf = inner_mode_iaf;
-                        else
-                                xfrm_put_mode(inner_mode_iaf);
+                                x->inner_mode_iaf = *inner_mode_iaf;
                 }
         }
 
@@ -2311,12 +2266,13 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)
         if (err)
                 goto error;
 
-        x->outer_mode = xfrm_get_mode(x->props.mode, family);
-        if (x->outer_mode == NULL) {
+        outer_mode = xfrm_get_mode(x->props.mode, family);
+        if (!outer_mode) {
                 err = -EPROTONOSUPPORT;
                 goto error;
         }
 
+        x->outer_mode = *outer_mode;
         if (init_replay) {
                 err = xfrm_init_replay(x);
                 if (err)