lkml.org 
[lkml]   [2020]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 29/59] padata: purge get_cpu and reorder_via_wq from padata_do_serial
    Date
    From: Daniel Jordan <daniel.m.jordan@oracle.com>

    [ Upstream commit 065cf577135a4977931c7a1e1edf442bfd9773dd ]

    With the removal of the padata timer, padata_do_serial no longer
    needs special CPU handling, so remove it.

    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>
    Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/padata.c | 23 +++--------------------
    1 file changed, 3 insertions(+), 20 deletions(-)

    diff --git a/kernel/padata.c b/kernel/padata.c
    index 6d0cdee9d321..f56ec63f60ba 100644
    --- a/kernel/padata.c
    +++ b/kernel/padata.c
    @@ -323,24 +323,9 @@ static void padata_serial_worker(struct work_struct *serial_work)
    */
    void padata_do_serial(struct padata_priv *padata)
    {
    - int cpu;
    - struct padata_parallel_queue *pqueue;
    - struct parallel_data *pd;
    - int reorder_via_wq = 0;
    -
    - pd = padata->pd;
    -
    - cpu = get_cpu();
    -
    - /* We need to enqueue the padata object into the correct
    - * per-cpu queue.
    - */
    - if (cpu != padata->cpu) {
    - reorder_via_wq = 1;
    - cpu = padata->cpu;
    - }
    -
    - pqueue = per_cpu_ptr(pd->pqueue, cpu);
    + struct parallel_data *pd = padata->pd;
    + struct padata_parallel_queue *pqueue = per_cpu_ptr(pd->pqueue,
    + padata->cpu);

    spin_lock(&pqueue->reorder.lock);
    list_add_tail(&padata->list, &pqueue->reorder.list);
    @@ -354,8 +339,6 @@ void padata_do_serial(struct padata_priv *padata)
    */
    smp_mb__after_atomic();

    - put_cpu();
    -
    padata_reorder(pd);
    }
    EXPORT_SYMBOL(padata_do_serial);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-05-26 21:02    [W:5.329 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site