From: Elliot Berman <quic_eberman@quicinc.com>
Date: Mon, 20 Nov 2023 17:36:32 +0000 (-0800)
Subject: freezer,sched: Clean saved_state when restoring it during thaw
X-Git-Tag: v6.8-rc1~183^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=418146e39891ef1fb2284dee4cabbfe616cd21cf;p=thirdparty%2Fkernel%2Flinux.git

freezer,sched: Clean saved_state when restoring it during thaw

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

diff --git a/kernel/freezer.c b/kernel/freezer.c
index c450fa8b8b5ef..43b1d1b94d9e6 100644
--- 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;
 	}