Messages in this thread Patch in this message | | | Date | Mon, 26 Sep 2022 20:06:46 +0200 | From | Peter Zijlstra <> | Subject | Re: [PATCH v3 6/6] freezer,sched: Rewrite core freezer logic |
| |
On Mon, Sep 26, 2022 at 05:49:16PM +0200, Christian Borntraeger wrote:
> Hmm, > > #define ___wait_is_interruptible(state) \ > (!__builtin_constant_p(state) || \ > state == TASK_INTERRUPTIBLE || state == TASK_KILLABLE) \ > > That would not trigger when state is also TASK_FREEZABLE, no?
Spot on!
signal_pending_state() writes that as:
state & (TASK_INTERRUPTIBLE | TASK_WAKEKILL)
which is the correct form.
diff --git a/include/linux/wait.h b/include/linux/wait.h index 14ad8a0e9fac..7f5a51aae0a7 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -281,7 +281,7 @@ static inline void wake_up_pollfree(struct wait_queue_head *wq_head) #define ___wait_is_interruptible(state) \ (!__builtin_constant_p(state) || \ - state == TASK_INTERRUPTIBLE || state == TASK_KILLABLE) \ + (state & (TASK_INTERRUPTIBLE | TASK_WAKEKILL))) extern void init_wait_entry(struct wait_queue_entry *wq_entry, int flags); Let me go git-grep some to see if there's more similar fail.
| |