padata: remove padata_parallel_queue

Only its reorder field is actually used now, so remove the struct and
embed @reorder directly in parallel_data.

No functional change, just a cleanup.

Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/include/linux/padata.h b/include/linux/padata.h
index 070a7d43e8af858202682a29cfba3c87e686ef1c..a433f13fc4bf7b17f0bcb867e5503c0d64162b84 100644 (file)
--- a/include/linux/padata.h
+++ b/include/linux/padata.h
@@ -66,17 +66,6 @@ struct padata_serial_queue {
        struct parallel_data *pd;
 };
 
-/**
- * struct padata_parallel_queue - The percpu padata parallel queue
- *
- * @reorder: List to wait for reordering after parallel processing.
- * @num_obj: Number of objects that are processed by this cpu.
- */
-struct padata_parallel_queue {
-       struct padata_list    reorder;
-       atomic_t              num_obj;
-};
-
 /**
  * struct padata_cpumask - The cpumasks for the parallel/serial workers
  *
@@ -93,7 +82,7 @@ struct padata_cpumask {
  * that depends on the cpumask in use.
  *
  * @ps: padata_shell object.
- * @pqueue: percpu padata queues used for parallelization.
+ * @reorder_list: percpu reorder lists
  * @squeue: percpu padata queues used for serialuzation.
  * @refcnt: Number of objects holding a reference on this parallel_data.
  * @seq_nr: Sequence number of the parallelized data object.
@@ -105,7 +94,7 @@ struct padata_cpumask {
  */
 struct parallel_data {
        struct padata_shell             *ps;
-       struct padata_parallel_queue    __percpu *pqueue;
+       struct padata_list              __percpu *reorder_list;
        struct padata_serial_queue      __percpu *squeue;
        atomic_t                        refcnt;
        unsigned int                    seq_nr;

diff --git a/kernel/padata.c b/kernel/padata.c
index 1c0b97891edb86da6d344370a5e603aa4facacf8..16cb894dc272b13a5501ace7d512b7ccd6c44ed6 100644 (file)
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -250,13 +250,11 @@ EXPORT_SYMBOL(padata_do_parallel);
 static struct padata_priv *padata_find_next(struct parallel_data *pd,
                                            bool remove_object)
 {
-       struct padata_parallel_queue *next_queue;
        struct padata_priv *padata;
        struct padata_list *reorder;
        int cpu = pd->cpu;
 
-       next_queue = per_cpu_ptr(pd->pqueue, cpu);
-       reorder = &next_queue->reorder;
+       reorder = per_cpu_ptr(pd->reorder_list, cpu);
 
        spin_lock(&reorder->lock);
        if (list_empty(&reorder->list)) {
@@ -291,7 +289,7 @@ static void padata_reorder(struct parallel_data *pd)
        int cb_cpu;
        struct padata_priv *padata;
        struct padata_serial_queue *squeue;
-       struct padata_parallel_queue *next_queue;
+       struct padata_list *reorder;
 
        /*
         * We need to ensure that only one cpu can work on dequeueing of
@@ -339,9 +337,8 @@ static void padata_reorder(struct parallel_data *pd)
         */
        smp_mb();
 
-       next_queue = per_cpu_ptr(pd->pqueue, pd->cpu);
-       if (!list_empty(&next_queue->reorder.list) &&
-           padata_find_next(pd, false))
+       reorder = per_cpu_ptr(pd->reorder_list, pd->cpu);
+       if (!list_empty(&reorder->list) && padata_find_next(pd, false))
                queue_work(pinst->serial_wq, &pd->reorder_work);
 }
 
@@ -401,17 +398,16 @@ void padata_do_serial(struct padata_priv *padata)
 {
        struct parallel_data *pd = padata->pd;
        int hashed_cpu = padata_cpu_hash(pd, padata->seq_nr);
-       struct padata_parallel_queue *pqueue = per_cpu_ptr(pd->pqueue,
-                                                          hashed_cpu);
+       struct padata_list *reorder = per_cpu_ptr(pd->reorder_list, hashed_cpu);
        struct padata_priv *cur;
 
-       spin_lock(&pqueue->reorder.lock);
+       spin_lock(&reorder->lock);
        /* Sort in ascending order of sequence number. */
-       list_for_each_entry_reverse(cur, &pqueue->reorder.list, list)
+       list_for_each_entry_reverse(cur, &reorder->list, list)
                if (cur->seq_nr < padata->seq_nr)
                        break;
        list_add(&padata->list, &cur->list);
-       spin_unlock(&pqueue->reorder.lock);
+       spin_unlock(&reorder->lock);
 
        /*
         * Ensure the addition to the reorder list is ordered correctly
@@ -553,17 +549,15 @@ static void padata_init_squeues(struct parallel_data *pd)
        }
 }
 
-/* Initialize all percpu queues used by parallel workers */
-static void padata_init_pqueues(struct parallel_data *pd)
+/* Initialize per-CPU reorder lists */
+static void padata_init_reorder_list(struct parallel_data *pd)
 {
        int cpu;
-       struct padata_parallel_queue *pqueue;
+       struct padata_list *list;
 
        for_each_cpu(cpu, pd->cpumask.pcpu) {
-               pqueue = per_cpu_ptr(pd->pqueue, cpu);
-
-               __padata_list_init(&pqueue->reorder);
-               atomic_set(&pqueue->num_obj, 0);
+               list = per_cpu_ptr(pd->reorder_list, cpu);
+               __padata_list_init(list);
        }
 }
 
@@ -577,13 +571,13 @@ static struct parallel_data *padata_alloc_pd(struct padata_shell *ps)
        if (!pd)
                goto err;
 
-       pd->pqueue = alloc_percpu(struct padata_parallel_queue);
-       if (!pd->pqueue)
+       pd->reorder_list = alloc_percpu(struct padata_list);
+       if (!pd->reorder_list)
                goto err_free_pd;
 
        pd->squeue = alloc_percpu(struct padata_serial_queue);
        if (!pd->squeue)
-               goto err_free_pqueue;
+               goto err_free_reorder_list;
 
        pd->ps = ps;
 
@@ -595,7 +589,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_shell *ps)
        cpumask_and(pd->cpumask.pcpu, pinst->cpumask.pcpu, cpu_online_mask);
        cpumask_and(pd->cpumask.cbcpu, pinst->cpumask.cbcpu, cpu_online_mask);
 
-       padata_init_pqueues(pd);
+       padata_init_reorder_list(pd);
        padata_init_squeues(pd);
        pd->seq_nr = -1;
        atomic_set(&pd->refcnt, 1);
@@ -609,8 +603,8 @@ err_free_pcpu:
        free_cpumask_var(pd->cpumask.pcpu);
 err_free_squeue:
        free_percpu(pd->squeue);
-err_free_pqueue:
-       free_percpu(pd->pqueue);
+err_free_reorder_list:
+       free_percpu(pd->reorder_list);
 err_free_pd:
        kfree(pd);
 err:
@@ -621,7 +615,7 @@ static void padata_free_pd(struct parallel_data *pd)
 {
        free_cpumask_var(pd->cpumask.pcpu);
        free_cpumask_var(pd->cpumask.cbcpu);
-       free_percpu(pd->pqueue);
+       free_percpu(pd->reorder_list);
        free_percpu(pd->squeue);
        kfree(pd);
 }