softlockup: ensure the task has been switched out once
PATCH 1/1 softlockup: ensure the task has been switched out once
When we check if a task has been switched out since the last scan, we might have a race condition on the following scenario:
_ the task is freshly created and scheduled
_ it puts its state to TASK_UNINTERRUPTIBLE and is not yet switched out _ check_hung_task() scans this task and will report a false positive because
t->nvcsw + t->nivcsw == t->last_switch_count == 0
Add a check for such cases.
--- kernel/hung_task.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
kernel/hung_task.c +7 -1
@@ -72,7 +72,13 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout) {unsigned long switch_count = t->nvcsw + t->nivcsw; -if (t->flags &PF_FROZEN ) +/* +* Ensure the task is not frozen. +* Also, when a freshly created task is scheduled once, changes +* its state to TASK_UNINTERRUPTIBLE without having ever been +* switched out once, it musn't be checked. +*/ +if (unlikely (t->flags &PF_FROZEN || !switch_count))return ;if (switch_count != t->last_switch_count) {
Signature · 1 line
1.6.1
Quoted 38 lines · Frederic Weisbecker
When we check if a task has been switched out since the last scan, we might have a race condition on the following scenario:
_ the task is freshly created and scheduled
_ it puts its state toTASK_UNINTERRUPTIBLEand is not yet switched out _check_hung_task()scans this task and will report a false positive because
t->nvcsw+t->nivcsw==t->last_switch_count== 0Add a check for such cases.
Signed-off-by Frederic Weisbecker <[email protected]>--- kernel/hung_task.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)kernel/hung_task.c +7
-1@@ -72,7 +72,13 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout) {unsigned long switch_count = t->nvcsw + t->nivcsw; -if (t->flags &PF_FROZEN ) +/* +* Ensure the task is not frozen. +* Also, when a freshly created task is scheduled once, changes +* its state to TASK_UNINTERRUPTIBLE without having ever been +* switched out once, it musn't be checked. +*/ +if (unlikely (t->flags &PF_FROZEN || !switch_count))return ;if (switch_count != t->last_switch_count) {Signature · 1 line
1.6.1
Looks good to me. Thanks for fixing this!
Ingo Molnar
AppliedQuoted 43 lines · Mandeep Singh Baines
Quoted 38 lines · Frederic Weisbecker
When we check if a task has been switched out since the last scan, we might have a race condition on the following scenario:
_ the task is freshly created and scheduled
_ it puts its state toTASK_UNINTERRUPTIBLEand is not yet switched out _check_hung_task()scans this task and will report a false positive because
t->nvcsw+t->nivcsw==t->last_switch_count== 0Add a check for such cases.
Signed-off-by Frederic Weisbecker <[email protected]>--- kernel/hung_task.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)kernel/hung_task.c +7
-1@@ -72,7 +72,13 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout) {unsigned long switch_count = t->nvcsw + t->nivcsw; -if (t->flags &PF_FROZEN ) +/* +* Ensure the task is not frozen. +* Also, when a freshly created task is scheduled once, changes +* its state to TASK_UNINTERRUPTIBLE without having ever been +* switched out once, it musn't be checked. +*/ +if (unlikely (t->flags &PF_FROZEN || !switch_count))return ;if (switch_count != t->last_switch_count) {Signature · 1 line
1.6.1Looks good to me. Thanks for fixing this!
Quoted 1 line
Applied to tip:core/softlockup, thanks guys!
Ingo