Skip to content

Commit 251716d

Browse files
minipligregkh
authored andcommitted
padata: set cpu_index of unused CPUs to -1
[ Upstream commit 1bd845b ] The parallel queue per-cpu data structure gets initialized only for CPUs in the 'pcpu' CPU mask set. This is not sufficient as the reorder timer may run on a different CPU and might wrongly decide it's the target CPU for the next reorder item as per-cpu memory gets memset(0) and we might be waiting for the first CPU in cpumask.pcpu, i.e. cpu_index 0. Make the '__this_cpu_read(pd->pqueue->cpu_index) == next_queue->cpu_index' compare in padata_get_next() fail in this case by initializing the cpu_index member of all per-cpu parallel queues. Use -1 for unused ones. Signed-off-by: Mathias Krause <[email protected]> Signed-off-by: Herbert Xu <[email protected]> Signed-off-by: Daniel Jordan <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent c0d3439 commit 251716d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

kernel/padata.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,14 @@ static void padata_init_pqueues(struct parallel_data *pd)
462462
struct padata_parallel_queue *pqueue;
463463

464464
cpu_index = 0;
465-
for_each_cpu(cpu, pd->cpumask.pcpu) {
465+
for_each_possible_cpu(cpu) {
466466
pqueue = per_cpu_ptr(pd->pqueue, cpu);
467+
468+
if (!cpumask_test_cpu(cpu, pd->cpumask.pcpu)) {
469+
pqueue->cpu_index = -1;
470+
continue;
471+
}
472+
467473
pqueue->pd = pd;
468474
pqueue->cpu_index = cpu_index;
469475
cpu_index++;

0 commit comments

Comments
 (0)