From f55afd954c12ae9a0beb242e749d671555334fce Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Wed, 13 Dec 2023 17:09:06 +0800 Subject: [PATCH] mm: ksm: remove unnecessary try_to_freeze() A freezable kernel thread can enter frozen state during freezing by either calling try_to_freeze() or using wait_event_freezable() and its variants. However, there is no need to use both methods simultaneously. Link: https://lkml.kernel.org/r/20231213090906.1070985-1-haokexin@gmail.com Signed-off-by: Kevin Hao Acked-by: David Hildenbrand Cc: Andrea Arcangeli Cc: "Rafael J. Wysocki" Cc: Pavel Machek Signed-off-by: Andrew Morton --- mm/ksm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index b93389a3780e..c0e1995fb444 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2604,11 +2604,9 @@ static int ksm_scan_thread(void *nothing) ksm_do_scan(ksm_thread_pages_to_scan); mutex_unlock(&ksm_thread_mutex); - try_to_freeze(); - if (ksmd_should_run()) { sleep_ms = READ_ONCE(ksm_thread_sleep_millisecs); - wait_event_interruptible_timeout(ksm_iter_wait, + wait_event_freezable_timeout(ksm_iter_wait, sleep_ms != READ_ONCE(ksm_thread_sleep_millisecs), msecs_to_jiffies(sleep_ms)); } else {