sched/wait: Fix a kthread_park race with wait_woken()
PATCH RESEND v2 1/1 sched/wait: Fix a kthread_park race with wait_woken()
From: Arve Hjønnevåg <[email protected]>
kthread_park and wait_woken have a similar race that kthread_stop and wait_woken used to have before it was fixed in commit cb6538e740d7 ("sched/wait: Fix a kthread race with wait_woken()"). Extend that fix to also cover kthread_park.
[jstultz: Made changes suggested by Peter to optimize
memory loads]
---
v2:
* Commit message tweaks, suggested by Peter
* Move logic to kthread.c & optimize to avoid duplicate memory loads, also suggested by Peter
--- include/linux/kthread.h | 1 + kernel/kthread.c | 10 ++++++++++ kernel/sched/wait.c | 7 +------ 3 files changed, 12 insertions(+), 6 deletions(-)
include/linux/kthread.h +1 -0
@@ -89,6 +89,7 @@ int kthread_stop(struct task_struct *k);bool kthread_should_stop (void );bool kthread_should_park (void );bool __kthread_should_park (struct task_struct *k); +bool kthread_should_stop_or_park (void );bool kthread_freezable_should_stop (bool *was_frozen);void *kthread_func (struct task_struct *k);void *kthread_data (struct task_struct *k);
kernel/kthread.c +10 -0
@@ -182,6 +182,16 @@ bool kthread_should_park(void) }EXPORT_SYMBOL_GPL (kthread_should_park); +bool kthread_should_stop_or_park (void ) +{ +struct kthread *kthread =__to_kthread (current); + +if (!kthread) +return false; + +return kthread->flags & (BIT (KTHREAD_SHOULD_STOP ) |BIT (KTHREAD_SHOULD_PARK )); +} +/** * kthread_freezable_should_stop - should this freezable kthread return now? * @was_frozen: optional out parameter, indicates whether %current was frozen
kernel/sched/wait.c +1 -6
@@ -425,11 +425,6 @@ int autoremove_wake_function(struct wait_queue_entry *wq_entry, unsigned mode, i }EXPORT_SYMBOL (autoremove_wake_function); -static inline bool is_kthread_should_stop (void ) -{ -return (current->flags &PF_KTHREAD ) &&kthread_should_stop (); -} -/* * DEFINE_WAIT_FUNC(wait, woken_wake_func); *
@@ -459,7 +454,7 @@ long wait_woken(struct wait_queue_entry *wq_entry, unsigned mode, long timeout)* or woken_wake_function() sees our store to current->state. */ set_current_state (mode);/* A */ -if (!(wq_entry->flags &WQ_FLAG_WOKEN ) && !is_kthread_should_stop ()) +if (!(wq_entry->flags &WQ_FLAG_WOKEN ) && !kthread_should_stop_or_park ()) timeout =schedule_timeout (timeout);__set_current_state (TASK_RUNNING );
Signature · 1 line
2.41.0.rc2.161.g9c6817b8e7-goog
Quoted 19 lines · John Stultz
From: Arve Hjønnevåg <[email protected]>
kthread_parkandwait_wokenhave a similar race thatkthread_stopandwait_wokenused to have before it was fixed in commitcb6538e740d7("sched/wait: Fix a kthread race withwait_woken()"). Extend that fix to also coverkthread_park.Cc Ingo Molnar <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Juri Lelli <[email protected]>Cc Vincent Guittot <[email protected]>Cc Dietmar Eggemann <[email protected]>Cc Steven Rostedt <[email protected]>Cc Ben Segall <[email protected]>Cc Mel Gorman <[email protected]>Cc Daniel Bristot de Oliveira <[email protected]>Cc Valentin Schneider <[email protected]>Cc android-kernel-team <[email protected]>Signed-off-by Arve Hjønnevåg <[email protected]>
Quoted 3 lines
[jstultz: Made changes suggested by Peter to optimize
memory loads]Signed-off-by John Stultz <[email protected]>
Funny one, IIUC this will happen with any wakeup of a wait_woken()-user that doesn't touch the wait_queue entry.
I do have on question: what about signals? Browsing through wait_woken() users, it looks like a few of them have a wait-loop break condition hinging on signal_pending() (iio_buffer_read() is one of them). signal_wake_up() doesn't touch the wait_queue entry, so is that a similar issue or am I looking at a non-problem?
The following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 4b85308dac750b16bd273b0f4e9c9b478fbb886b Gitweb: https://git.kernel.org/tip/4b85308dac750b16bd273b0f4e9c9b478fbb886b Author: Arve Hjønnevåg <[email protected]> AuthorDate: Fri, 02 Jun 2023 21:23:46 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 15 Jun 2023 13:28:21 +02:00
sched/wait: Fix a kthread_park race with wait_woken()
kthread_park and wait_woken have a similar race that kthread_stop and wait_woken used to have before it was fixed in commit cb6538e740d7 ("sched/wait: Fix a kthread race with wait_woken()"). Extend that fix to also cover kthread_park.
[jstultz: Made changes suggested by Peter to optimize
memory loads]
--- include/linux/kthread.h | 1 + kernel/kthread.c | 10 ++++++++++ kernel/sched/wait.c | 7 +------ 3 files changed, 12 insertions(+), 6 deletions(-)
include/linux/kthread.h +1 -0
@@ -89,6 +89,7 @@ int kthread_stop(struct task_struct *k);bool kthread_should_stop (void );bool kthread_should_park (void );bool __kthread_should_park (struct task_struct *k); +bool kthread_should_stop_or_park (void );bool kthread_freezable_should_stop (bool *was_frozen);void *kthread_func (struct task_struct *k);void *kthread_data (struct task_struct *k);
kernel/kthread.c +10 -0
@@ -182,6 +182,16 @@ bool kthread_should_park(void) }EXPORT_SYMBOL_GPL (kthread_should_park); +bool kthread_should_stop_or_park (void ) +{ +struct kthread *kthread =__to_kthread (current); + +if (!kthread) +return false; + +return kthread->flags & (BIT (KTHREAD_SHOULD_STOP ) |BIT (KTHREAD_SHOULD_PARK )); +} +/** * kthread_freezable_should_stop - should this freezable kthread return now? * @was_frozen: optional out parameter, indicates whether %current was frozen
kernel/sched/wait.c +1 -6
@@ -425,11 +425,6 @@ int autoremove_wake_function(struct wait_queue_entry *wq_entry, unsigned mode, i }EXPORT_SYMBOL (autoremove_wake_function); -static inline bool is_kthread_should_stop (void ) -{ -return (current->flags &PF_KTHREAD ) &&kthread_should_stop (); -} -/* * DEFINE_WAIT_FUNC(wait, woken_wake_func); *
@@ -459,7 +454,7 @@ long wait_woken(struct wait_queue_entry *wq_entry, unsigned mode, long timeout)* or woken_wake_function() sees our store to current->state. */ set_current_state (mode);/* A */ -if (!(wq_entry->flags &WQ_FLAG_WOKEN ) && !is_kthread_should_stop ()) +if (!(wq_entry->flags &WQ_FLAG_WOKEN ) && !kthread_should_stop_or_park ()) timeout =schedule_timeout (timeout);__set_current_state (TASK_RUNNING );
The following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: ef73d6a4ef0b35524125c3cfc6deafc26a0c966a Gitweb: https://git.kernel.org/tip/ef73d6a4ef0b35524125c3cfc6deafc26a0c966a Author: Arve Hjønnevåg <[email protected]> AuthorDate: Fri, 02 Jun 2023 21:23:46 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 16 Jun 2023 17:08:01 +02:00
sched/wait: Fix a kthread_park race with wait_woken()
kthread_park and wait_woken have a similar race that kthread_stop and wait_woken used to have before it was fixed in commit cb6538e740d7 ("sched/wait: Fix a kthread race with wait_woken()"). Extend that fix to also cover kthread_park.
[jstultz: Made changes suggested by Peter to optimize
memory loads]
--- include/linux/kthread.h | 1 + kernel/kthread.c | 10 ++++++++++ kernel/sched/wait.c | 7 +------ 3 files changed, 12 insertions(+), 6 deletions(-)
include/linux/kthread.h +1 -0
@@ -89,6 +89,7 @@ int kthread_stop(struct task_struct *k);bool kthread_should_stop (void );bool kthread_should_park (void );bool __kthread_should_park (struct task_struct *k); +bool kthread_should_stop_or_park (void );bool kthread_freezable_should_stop (bool *was_frozen);void *kthread_func (struct task_struct *k);void *kthread_data (struct task_struct *k);
kernel/kthread.c +10 -0
@@ -182,6 +182,16 @@ bool kthread_should_park(void) }EXPORT_SYMBOL_GPL (kthread_should_park); +bool kthread_should_stop_or_park (void ) +{ +struct kthread *kthread =__to_kthread (current); + +if (!kthread) +return false; + +return kthread->flags & (BIT (KTHREAD_SHOULD_STOP ) |BIT (KTHREAD_SHOULD_PARK )); +} +/** * kthread_freezable_should_stop - should this freezable kthread return now? * @was_frozen: optional out parameter, indicates whether %current was frozen
kernel/sched/wait.c +1 -6
@@ -425,11 +425,6 @@ int autoremove_wake_function(struct wait_queue_entry *wq_entry, unsigned mode, i }EXPORT_SYMBOL (autoremove_wake_function); -static inline bool is_kthread_should_stop (void ) -{ -return (current->flags &PF_KTHREAD ) &&kthread_should_stop (); -} -/* * DEFINE_WAIT_FUNC(wait, woken_wake_func); *
@@ -459,7 +454,7 @@ long wait_woken(struct wait_queue_entry *wq_entry, unsigned mode, long timeout)* or woken_wake_function() sees our store to current->state. */ set_current_state (mode);/* A */ -if (!(wq_entry->flags &WQ_FLAG_WOKEN ) && !is_kthread_should_stop ()) +if (!(wq_entry->flags &WQ_FLAG_WOKEN ) && !kthread_should_stop_or_park ()) timeout =schedule_timeout (timeout);__set_current_state (TASK_RUNNING );