From: Zqiang <qiang.zhang@xxxxxxxxxxxxx> The set CPU affinity func 'do_set_cpus_allowed' may be operate 'task_rq', need add rq lock protect, replace 'pi_lock' spinlock protect with task_rq_lock func. Signed-off-by: Zqiang <qiang.zhang@xxxxxxxxxxxxx> --- fs/io-wq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/io-wq.c b/fs/io-wq.c index d3165ce339c2..6ea3e0224e63 100644 --- a/fs/io-wq.c +++ b/fs/io-wq.c @@ -1209,11 +1209,13 @@ static bool io_wq_worker_affinity(struct io_worker *worker, void *data) { struct task_struct *task = worker->task; unsigned long flags; + struct rq_flags rf; + struct rq *rq; - raw_spin_lock_irqsave(&task->pi_lock, flags); + rq = task_rq_lock(task, &rf); do_set_cpus_allowed(task, cpumask_of_node(worker->wqe->node)); task->flags |= PF_NO_SETAFFINITY; - raw_spin_unlock_irqrestore(&task->pi_lock, flags); + task_rq_unlock(rq, task, &rf); return false; } -- 2.17.1