Skip to contentSkip to conversation

sched/wait: Fix a kthread_park race with wait_woken()

PATCH New Arve Hjønnevåg 3 participants 5 messages Apr 6, 2023 – May 12, 2023 Scheduler

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 cb6538e740d7543cd989128625cf8cac4b471e0a. Extend that fix to also cover kthread_park.

---
 kernel/sched/wait.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/wait.c +3 -3
index 133b74730738..a9cf49da884b 100644
@@ -425,9 +425,9 @@ 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)
+static inline bool is_kthread_should_stop_or_park(void)
 {
-	return (current->flags & PF_KTHREAD) && kthread_should_stop();
+	return (current->flags & PF_KTHREAD) && (kthread_should_stop() || kthread_should_park());
 }
 
 /*
@@ -459,7 +459,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) && !is_kthread_should_stop_or_park())
 		timeout = schedule_timeout(timeout);
 	__set_current_state(TASK_RUNNING);
 
Signature · 1 line
2.40.0.577.gac1e443424-goog
#1 lore raw

PATCH 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 cb6538e740d7543cd989128625cf8cac4b471e0a. Extend that fix to also cover kthread_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]>

---
This seemingly slipped by, so I wanted to resend it for review.

---
 kernel/sched/wait.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/wait.c +3 -3
index 133b74730738..a9cf49da884b 100644
@@ -425,9 +425,9 @@ 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)
+static inline bool is_kthread_should_stop_or_park(void)
 {
-	return (current->flags & PF_KTHREAD) && kthread_should_stop();
+	return (current->flags & PF_KTHREAD) && (kthread_should_stop() || kthread_should_park());
 }
 
 /*
@@ -459,7 +459,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) && !is_kthread_should_stop_or_park())
 		timeout = schedule_timeout(timeout);
 	__set_current_state(TASK_RUNNING);
 
Signature · 1 line
2.40.1.606.ga4b1b128d6-goog
maintainer
#2 lore raw
Quoted 5 lines · John Stultz

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 cb6538e740d7543cd989128625cf8cac4b471e0a. Extend that fix to also cover

cb6538e740d7 ("sched/wait: Fix a kthread race with wait_woken()")

Quoted 27 lines

kthread_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]>

---
This seemingly slipped by, so I wanted to resend it for review.

---
 kernel/sched/wait.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/wait.c +0 -0
index 133b74730738..a9cf49da884b 100644
@@ -425,9 +425,9 @@ int autoremove_wake_function(struct wait_queue_entry *wq_entry, unsigned mode, i
 }

kernel/sched/wait.c int autoremove_wake_function(struct wait_queue_entry *wq_entry, unsigned mode, i · line 433

Quoted 10 lines
kernel/sched/wait.c +2 -2
 EXPORT_SYMBOL(autoremove_wake_function);
 
-static inline bool is_kthread_should_stop(void)
+static inline bool is_kthread_should_stop_or_park(void)
 {
-	return (current->flags & PF_KTHREAD) && kthread_should_stop();
+	return (current->flags & PF_KTHREAD) && (kthread_should_stop() || kthread_should_park());
 }
 
 /*

That's a bit sad; that two function calls for checking two consecutive bits in the same word :-(

If we move this to kthread.c and write it like:

	kthread = __to_kthread(current);
	if (!kthread)
		return false;

	return test_bit(KTHREAD_SHOULD_STOP, &kthread->flags) ||
	       test_bit(KTHREAD_SHOULD_PARK, &kthread->flags);

Then the compiler should be able to merge the two bits in a single load and test due to constant_test_bit() -- do check though.

Quoted 12 lines
kernel/sched/wait.c +1 -1
@@ -459,7 +459,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) && !is_kthread_should_stop_or_park())
 		timeout = schedule_timeout(timeout);
 	__set_current_state(TASK_RUNNING);
 
Signature · 1 line
2.40.1.606.ga4b1b128d6-goog
#3 lore raw
Quoted 60 lines · Peter Zijlstra
Quoted 5 lines · John Stultz

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 cb6538e740d7543cd989128625cf8cac4b471e0a. Extend that fix to also cover

cb6538e740d7 ("sched/wait: Fix a kthread race with wait_woken()")

Quoted 27 lines

kthread_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]>

---
This seemingly slipped by, so I wanted to resend it for review.

---
 kernel/sched/wait.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/wait.c +0 -0
index 133b74730738..a9cf49da884b 100644
@@ -425,9 +425,9 @@ int autoremove_wake_function(struct wait_queue_entry *wq_entry, unsigned mode, i
 }

kernel/sched/wait.c int autoremove_wake_function(struct wait_queue_entry *wq_entry, unsigned mode, i · line 433

Quoted 10 lines
kernel/sched/wait.c +2 -2
 EXPORT_SYMBOL(autoremove_wake_function);
 
-static inline bool is_kthread_should_stop(void)
+static inline bool is_kthread_should_stop_or_park(void)
 {
-     return (current->flags & PF_KTHREAD) && kthread_should_stop();
+     return (current->flags & PF_KTHREAD) && (kthread_should_stop() || kthread_should_park());
 }
 
 /*

That's a bit sad; that two function calls for checking two consecutive bits in the same word :-(

If we move this to kthread.c and write it like:

        kthread = __to_kthread(current);
        if (!kthread)
                return false;

        return test_bit(KTHREAD_SHOULD_STOP, &kthread->flags) ||
               test_bit(KTHREAD_SHOULD_PARK, &kthread->flags);
Quoted 2 lines

Then the compiler should be able to merge the two bits in a single load and test due to constant_test_bit() -- do check though.

Hrm. Apologies, as it's been awhile since I've looked at disassembled asm, so I may be wrong, but I don't think that's happening here.

With the logic above I'm seeing it build as:
0000000000000a50 <kthread_should_stop_or_park>:

     a50:       65 48 8b 14 25 00 00    mov    %gs:0x0,%rdx
     a57:       00 00
     a59:       48 8b 8a 78 0a 00 00    mov    0xa78(%rdx),%rcx
     a60:       31 c0                   xor    %eax,%eax
     a62:       48 85 c9                test   %rcx,%rcx
     a65:       74 11                   je     a78
<kthread_should_stop_or_park+0x28>
     a67:       f6 42 2e 20             testb  $0x20,0x2e(%rdx)
     a6b:       74 0b                   je     a78
<kthread_should_stop_or_park+0x28>
     a6d:       48 8b 01                mov    (%rcx),%rax
     a70:       48 d1 e8                shr    %rax
     a73:       83 e0 01                and    $0x1,%eax
     a76:       74 05                   je     a7d
<kthread_should_stop_or_park+0x2d>
     a78:       e9 00 00 00 00          jmp    a7d
<kthread_should_stop_or_park+0x2d>
     a7d:       48 8b 01                mov    (%rcx),%rax
     a80:       48 c1 e8 02             shr    $0x2,%rax
     a84:       83 e0 01                and    $0x1,%eax
     a87:       e9 00 00 00 00          jmp    a8c
<kthread_should_stop_or_park+0x3c>
     a8c:       0f 1f 40 00             nopl   0x0(%rax)

Where as if I drop the second test_bit() to see if it was similar, I see:
0000000000000a50 <kthread_should_stop_or_park>:

     a50:       65 48 8b 14 25 00 00    mov    %gs:0x0,%rdx
     a57:       00 00
     a59:       48 8b 8a 78 0a 00 00    mov    0xa78(%rdx),%rcx
     a60:       31 c0                   xor    %eax,%eax
     a62:       48 85 c9                test   %rcx,%rcx
     a65:       74 14                   je     a7b
<kthread_should_stop_or_park+0x2b>
     a67:       f6 42 2e 20             testb  $0x20,0x2e(%rdx)
     a6b:       74 0e                   je     a7b
<kthread_should_stop_or_park+0x2b>
     a6d:       48 8b 01                mov    (%rcx),%rax
     a70:       48 d1 e8                shr    %rax
     a73:       83 e0 01                and    $0x1,%eax
     a76:       e9 00 00 00 00          jmp    a7b
<kthread_should_stop_or_park+0x2b>
     a7b:       e9 00 00 00 00          jmp    a80

<__pfx_kthread_freezable_should_stop>

Despite that, should I still re-submit the change this way?

thanks
-john

maintainer
#4 lore raw
Quoted 79 lines · John Stultz
Quoted 60 lines · Peter Zijlstra
Quoted 5 lines · John Stultz

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 cb6538e740d7543cd989128625cf8cac4b471e0a. Extend that fix to also cover

cb6538e740d7 ("sched/wait: Fix a kthread race with wait_woken()")

Quoted 27 lines

kthread_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]>

---
This seemingly slipped by, so I wanted to resend it for review.

---
 kernel/sched/wait.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/wait.c +0 -0
index 133b74730738..a9cf49da884b 100644
@@ -425,9 +425,9 @@ int autoremove_wake_function(struct wait_queue_entry *wq_entry, unsigned mode, i
 }

kernel/sched/wait.c int autoremove_wake_function(struct wait_queue_entry *wq_entry, unsigned mode, i · line 433

Quoted 10 lines
kernel/sched/wait.c +2 -2
 EXPORT_SYMBOL(autoremove_wake_function);
 
-static inline bool is_kthread_should_stop(void)
+static inline bool is_kthread_should_stop_or_park(void)
 {
-     return (current->flags & PF_KTHREAD) && kthread_should_stop();
+     return (current->flags & PF_KTHREAD) && (kthread_should_stop() || kthread_should_park());
 }
 
 /*

That's a bit sad; that two function calls for checking two consecutive bits in the same word :-(

If we move this to kthread.c and write it like:

        kthread = __to_kthread(current);
        if (!kthread)
                return false;

        return test_bit(KTHREAD_SHOULD_STOP, &kthread->flags) ||
               test_bit(KTHREAD_SHOULD_PARK, &kthread->flags);
Quoted 2 lines

Then the compiler should be able to merge the two bits in a single load and test due to constant_test_bit() -- do check though.

Hrm. Apologies, as it's been awhile since I've looked at disassembled asm, so I may be wrong, but I don't think that's happening here.

With the logic above I'm seeing it build as:
0000000000000a50 <kthread_should_stop_or_park>:

     a50:       65 48 8b 14 25 00 00    mov    %gs:0x0,%rdx
     a57:       00 00
     a59:       48 8b 8a 78 0a 00 00    mov    0xa78(%rdx),%rcx
     a60:       31 c0                   xor    %eax,%eax
     a62:       48 85 c9                test   %rcx,%rcx
     a65:       74 11                   je     a78  <kthread_should_stop_or_park+0x28>
     a67:       f6 42 2e 20             testb  $0x20,0x2e(%rdx)
     a6b:       74 0b                   je     a78  <kthread_should_stop_or_park+0x28>
     a6d:       48 8b 01                mov    (%rcx),%rax
     a70:       48 d1 e8                shr    %rax
Quoted 8 lines
     a73:       83 e0 01                and    $0x1,%eax
     a76:       74 05                   je     a7d  <kthread_should_stop_or_park+0x2d>
     a78:       e9 00 00 00 00          jmp    a7d  <kthread_should_stop_or_park+0x2d>
     a7d:       48 8b 01                mov    (%rcx),%rax
     a80:       48 c1 e8 02             shr    $0x2,%rax
     a84:       83 e0 01                and    $0x1,%eax
     a87:       e9 00 00 00 00          jmp    a8c  <kthread_should_stop_or_park+0x3c>
     a8c:       0f 1f 40 00             nopl   0x0(%rax)

Moo, where is that optimization pass when you need it ;-)

If we forgo test_bit() and write it plainly it seems to work:

kernel/kthread.c +9 -0
index 7e6751b29101..36f94616cae5 100644
@@ -164,6 +164,15 @@ bool __kthread_should_park(struct task_struct *k)
 }
 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_should_park - should this kthread park now?
  *

0000000000001850 <kthread_should_stop_or_park>:

    1850:       f3 0f 1e fa             endbr64
    1854:       65 48 8b 04 25 00 00 00 00      mov    %gs:0x0,%rax     1859: R_X86_64_32S      pcpu_hot
    185d:       48 8b 88 08 06 00 00    mov    0x608(%rax),%rcx
    1864:       31 d2                   xor    %edx,%edx
    1866:       48 85 c9                test   %rcx,%rcx
    1869:       74 0c                   je     1877 <kthread_should_stop_or_park+0x27>
    186b:       f6 40 2e 20             testb  $0x20,0x2e(%rax)
    186f:       74 06                   je     1877 <kthread_should_stop_or_park+0x27>
    1871:       f6 01 06                testb  $0x6,(%rcx)
    1874:       0f 95 c2                setne  %dl
    1877:       89 d0                   mov    %edx,%eax
    1879:       e9 00 00 00 00          jmp    187e <kthread_should_stop_or_park+0x2e>  187a: R_X86_64_PLT32    __x86_return_thunk-0x4