inet: frags: batch fqdir destroy works

[sfrench/cifs-2.6.git] / net / ipv4 / inet_fragment.c

diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index 10d31733297d7358b55b45d64bc447039365df1d..05cd198d7a6ba89ab9d12caf55108aba36c11fa0 100644 (file)
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -145,12 +145,16 @@ static void inet_frags_free_cb(void *ptr, void *arg)
                inet_frag_destroy(fq);
 }
 
-static void fqdir_work_fn(struct work_struct *work)
+static LLIST_HEAD(fqdir_free_list);
+
+static void fqdir_free_fn(struct work_struct *work)
 {
-       struct fqdir *fqdir = container_of(work, struct fqdir, destroy_work);
-       struct inet_frags *f = fqdir->f;
+       struct llist_node *kill_list;
+       struct fqdir *fqdir, *tmp;
+       struct inet_frags *f;
 
-       rhashtable_free_and_destroy(&fqdir->rhashtable, inet_frags_free_cb, NULL);
+       /* Atomically snapshot the list of fqdirs to free */
+       kill_list = llist_del_all(&fqdir_free_list);
 
        /* We need to make sure all ongoing call_rcu(..., inet_frag_destroy_rcu)
         * have completed, since they need to dereference fqdir.
@@ -158,10 +162,25 @@ static void fqdir_work_fn(struct work_struct *work)
         */
        rcu_barrier();
 
-       if (refcount_dec_and_test(&f->refcnt))
-               complete(&f->completion);
+       llist_for_each_entry_safe(fqdir, tmp, kill_list, free_list) {
+               f = fqdir->f;
+               if (refcount_dec_and_test(&f->refcnt))
+                       complete(&f->completion);
 
-       kfree(fqdir);
+               kfree(fqdir);
+       }
+}
+
+static DECLARE_WORK(fqdir_free_work, fqdir_free_fn);
+
+static void fqdir_work_fn(struct work_struct *work)
+{
+       struct fqdir *fqdir = container_of(work, struct fqdir, destroy_work);
+
+       rhashtable_free_and_destroy(&fqdir->rhashtable, inet_frags_free_cb, NULL);
+
+       if (llist_add(&fqdir->free_list, &fqdir_free_list))
+               queue_work(system_wq, &fqdir_free_work);
 }
 
 int fqdir_init(struct fqdir **fqdirp, struct inet_frags *f, struct net *net)
@@ -184,10 +203,22 @@ int fqdir_init(struct fqdir **fqdirp, struct inet_frags *f, struct net *net)
 }
 EXPORT_SYMBOL(fqdir_init);
 
+static struct workqueue_struct *inet_frag_wq;
+
+static int __init inet_frag_wq_init(void)
+{
+       inet_frag_wq = create_workqueue("inet_frag_wq");
+       if (!inet_frag_wq)
+               panic("Could not create inet frag workq");
+       return 0;
+}
+
+pure_initcall(inet_frag_wq_init);
+
 void fqdir_exit(struct fqdir *fqdir)
 {
        INIT_WORK(&fqdir->destroy_work, fqdir_work_fn);
-       queue_work(system_wq, &fqdir->destroy_work);
+       queue_work(inet_frag_wq, &fqdir->destroy_work);
 }
 EXPORT_SYMBOL(fqdir_exit);