3 files changed, 26 insertions, 1 deletions

diff --git a/include/net/flow.h b/include/net/flow.h
index bee3741e5a6f..64fd24836650 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -219,6 +219,7 @@ struct flow_cache_object *flow_cache_lookup(struct net *net,
                                             u8 dir, flow_resolve_t resolver,
                                             void *ctx);
 int flow_cache_init(struct net *net);
+void flow_cache_fini(struct net *net);
 
 void flow_cache_flush(struct net *net);
 void flow_cache_flush_deferred(struct net *net);
diff --git a/net/core/flow.c b/net/core/flow.c
index 102f8ea2eb6e..31cfb365e0c6 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -484,3 +484,22 @@ err:
         return -ENOMEM;
 }
 EXPORT_SYMBOL(flow_cache_init);
+
+void flow_cache_fini(struct net *net)
+{
+        int i;
+        struct flow_cache *fc = &net->xfrm.flow_cache_global;
+
+        del_timer_sync(&fc->rnd_timer);
+        unregister_hotcpu_notifier(&fc->hotcpu_notifier);
+
+        for_each_possible_cpu(i) {
+                struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, i);
+                kfree(fcp->hash_table);
+                fcp->hash_table = NULL;
+        }
+
+        free_percpu(fc->percpu);
+        fc->percpu = NULL;
+}
+EXPORT_SYMBOL(flow_cache_fini);
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index a75fae4b045a..f02f511b7107 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2913,15 +2913,19 @@ static int __net_init xfrm_net_init(struct net *net)
         rv = xfrm_sysctl_init(net);
         if (rv < 0)
                 goto out_sysctl;
+        rv = flow_cache_init(net);
+        if (rv < 0)
+                goto out;
 
         /* Initialize the per-net locks here */
         spin_lock_init(&net->xfrm.xfrm_state_lock);
         rwlock_init(&net->xfrm.xfrm_policy_lock);
         mutex_init(&net->xfrm.xfrm_cfg_mutex);
 
-        flow_cache_init(net);
         return 0;
 
+out:
+        xfrm_sysctl_fini(net);
 out_sysctl:
         xfrm_policy_fini(net);
 out_policy:
@@ -2934,6 +2938,7 @@ out_statistics:
 
 static void __net_exit xfrm_net_exit(struct net *net)
 {
+        flow_cache_fini(net);
         xfrm_sysctl_fini(net);
         xfrm_policy_fini(net);
         xfrm_state_fini(net);