mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-06 20:03:33 -04:00
padata: Reset next CPU when reorder sequence wraps around
[ Upstream commit 501302d5cee0d8e8ec2c4a5919c37e0df9abc99b ]
When seq_nr wraps around, the next reorder job with seq 0 is hashed to
the first CPU in padata_do_serial(). Correspondingly, need reset pd->cpu
to the first one when pd->processed wraps around. Otherwise, if the
number of used CPUs is not a power of 2, padata_find_next() will be
checking a wrong list, hence deadlock.
Fixes: 6fc4dbcf02 ("padata: Replace delayed timer with immediate workqueue in padata_reorder")
Cc: <stable@vger.kernel.org>
Signed-off-by: Xiao Liang <shaw.leon@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
[ moved from padata_reorder() to padata_find_next() function ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
07861d6371
commit
a39ae0d8f8
1 changed files with 5 additions and 1 deletions
|
|
@ -204,7 +204,11 @@ static struct padata_priv *padata_find_next(struct parallel_data *pd,
|
|||
list_del_init(&padata->list);
|
||||
atomic_dec(&pd->reorder_objects);
|
||||
++pd->processed;
|
||||
pd->cpu = cpumask_next_wrap(cpu, pd->cpumask.pcpu, -1, false);
|
||||
/* When sequence wraps around, reset to the first CPU. */
|
||||
if (unlikely(pd->processed == 0))
|
||||
pd->cpu = cpumask_first(pd->cpumask.pcpu);
|
||||
else
|
||||
pd->cpu = cpumask_next_wrap(cpu, pd->cpumask.pcpu, -1, false);
|
||||
}
|
||||
|
||||
spin_unlock(&reorder->lock);
|
||||
|
|
|
|||
Loading…
Reference in a new issue