On Wed, Jul 17, 2019 at 07:11:47PM +0800, Herbert Xu wrote:
> Note that we don't bother removing the work queue in
> padata_flush_queues because the whole premise is broken. You
> cannot flush async crypto requests so it makes no sense to even
> try. A subsequent patch will fix it by replacing it with a ref
> counting scheme.
Interested to see what happens with the ref counting.
You mean you don't bother removing the serial workqueue flushing, right, not
the parallel?
> @@ -122,10 +117,10 @@ struct padata_cpumask {
> * @reorder_objects: Number of objects waiting in the reorder queues.
> * @refcnt: Number of objects holding a reference on this parallel_data.
> * @max_seq_nr: Maximal used sequence number.
> + * @cpu: Next CPU to be processed.
Maybe something more specific...
@cpu: CPU of the next reorder queue to process.
> static struct padata_priv *padata_get_next(struct parallel_data *pd)
> {
> - int cpu, num_cpus;
> - unsigned int next_nr, next_index;
> struct padata_parallel_queue *next_queue;
> struct padata_priv *padata;
> struct padata_list *reorder;
> + int cpu = pd->cpu;
>
> - num_cpus = cpumask_weight(pd->cpumask.pcpu);
> -
> - /*
> - * Calculate the percpu reorder queue and the sequence
> - * number of the next object.
> - */
> - next_nr = pd->processed;
> - next_index = next_nr % num_cpus;
> - cpu = padata_index_to_cpu(pd, next_index);
After this patch padata_index_to_cpu has only one caller, so it doesn't need to
be a function anymore.
> @@ -246,7 +237,6 @@ static void padata_reorder(struct parallel_data *pd)
> * so exit immediately.
> */
> if (PTR_ERR(padata) == -ENODATA) {
> - del_timer(&pd->timer);
> spin_unlock_bh(&pd->lock);
> return;
> }
> @@ -265,70 +255,29 @@ static void padata_reorder(struct parallel_data *pd)
>
> /*
> * The next object that needs serialization might have arrived to
> - * the reorder queues in the meantime, we will be called again
> - * from the timer function if no one else cares for it.
> + * the reorder queues in the meantime.
> *
> - * Ensure reorder_objects is read after pd->lock is dropped so we see
> - * an increment from another task in padata_do_serial. Pairs with
> + * Ensure reorder queue is read after pd->lock is dropped so we see
> + * new objects from another task in padata_do_serial. Pairs with
> * smp_mb__after_atomic in padata_do_serial.
> */
> smp_mb();
> - if (atomic_read(&pd->reorder_objects)
> - && !(pinst->flags & PADATA_RESET))
> - mod_timer(&pd->timer, jiffies + HZ);
> - else
> - del_timer(&pd->timer);
>
> - return;
> + next_queue = per_cpu_ptr(pd->pqueue, pd->cpu);
> + if (!list_empty(&next_queue->reorder.list))
> + queue_work(pinst->wq, &pd->reorder_work);
It's possible that the work gets queued when it doesn't need to be when another
task adds a job to the reorder queue but hasn't grabbed pd->lock yet, but I
can't think of a way around it...and it does no harm anyway.
> @@ -376,9 +325,8 @@ void padata_do_serial(struct padata_priv *padata)
>
> cpu = get_cpu();
>
> - /* We need to run on the same CPU padata_do_parallel(.., padata, ..)
> - * was called on -- or, at least, enqueue the padata object into the
> - * correct per-cpu queue.
> + /* We need to enqueue the padata object into the correct
> + * per-cpu queue.
> */
> if (cpu != padata->cpu) {
> reorder_via_wq = 1;
reorder_via_wq and I think get_cpu/put_cpu can go away now that we're always
using padata->cpu to get the parallel queue and then running padata_reorder in
the current task.
Maybe Steffen can check my reasoning on the get_cpu thing. It looks like that
was added in the original padata commit to keep 'cpu' stable for getting the
parallel queue but is no longer needed because we just use padata->cpu.
> @@ -388,12 +336,12 @@ void padata_do_serial(struct padata_priv *padata)
> pqueue = per_cpu_ptr(pd->pqueue, cpu);
>
> spin_lock(&pqueue->reorder.lock);
> - atomic_inc(&pd->reorder_objects);
> list_add_tail(&padata->list, &pqueue->reorder.list);
> + atomic_inc(&pd->reorder_objects);
Why switch the lines? Seems ok to not do this.
> @@ -538,8 +479,6 @@ static void padata_flush_queues(struct parallel_data *pd)
> flush_work(&pqueue->work);
> }
>
> - del_timer_sync(&pd->timer);
> -
> if (atomic_read(&pd->reorder_objects))
> padata_reorder(pd);
I think we can do away with reorder_objects entirely by checking pd->cpu's
reorder queue here.
It's racy to read pd->cpu without pd->lock, but it doesn't matter. If there
are objects left to process and no other task is in padata_reorder, this path
will notice that, and if there's another task in padata_reorder changing
pd->cpu from under us, that task will finish the reordering so this path
doesn't have to.
