Skip to contentSkip to conversation

mm,hwpoison: Don't call task_work_add when there is same work in the queue

PATCH New yaozhenguo 1 participant 1 message Jul 9, 2021

Subsystems (3)
lore
Share & tools
lore

yaozhenguo

author
#0 lore raw

PATCH 1/1 mm,hwpoison: Don't call task_work_add when there is same work in the queue

queue_task_work can be called more than once in one task before this task work is running. it can lead to task->task_works becomes an endless loop list and the task will never return to user mode. Don't call task_work_add when there is same work in the queue.

---
 arch/x86/kernel/cpu/mce/core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/mce/core.c +3 -1
index 22791aa..62c67ad 100644
@@ -1299,7 +1299,9 @@ static void queue_task_work(struct mce *m, int kill_current_task)
 	else
 		current->mce_kill_me.func = kill_me_maybe;
 
-	task_work_add(current, &current->mce_kill_me, TWA_RESUME);
+	/* Avoid endless loops in task_work_run */
+	if (READ_ONCE(current->task_works) != &current->mce_kill_me)
+		task_work_add(current, &current->mce_kill_me, TWA_RESUME);
 }
 
 /*
Signature · 1 line
1.8.3.1