freezer,sched: Clean saved_state when restoring it during thaw

commit 418146e39891ef1fb2284dee4cabbfe616cd21cf upstream.

Clean saved_state after using it during thaw. Cleaning the saved_state
allows us to avoid some unnecessary branches in ttwu_state_match.

Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20231120-freezer-state-multiple-thaws-v1-2-f2e1dd7ce5a2@quicinc.com
Signed-off-by: Chen Ridong <chenridong@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/kernel/freezer.c b/kernel/freezer.c
index 759006a9a91026a99d3a5022e605a94eea73a6a5..f57aaf96b8291cfea5c9e7174e011df6463a926a 100644 (file)
--- a/kernel/freezer.c
+++ b/kernel/freezer.c
@@ -187,6 +187,7 @@ static int __restore_freezer_state(struct task_struct *p, void *arg)
 
        if (state != TASK_RUNNING) {
                WRITE_ONCE(p->__state, state);
+               p->saved_state = TASK_RUNNING;
                return 1;
        }