Skip to contentSkip to conversation

mm-ksm-remove-unnecessary-try_to_freeze.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Dec 20, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: ksm: remove unnecessary try_to_freeze()
has been removed from the -mm tree. Its filename was
mm-ksm-remove-unnecessary-try_to_freeze.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Kevin Hao <[email protected]>
Subject: mm: ksm: remove unnecessary try_to_freeze()
Date: Wed, 13 Dec 2023 17:09:06 +0800

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.

---

 mm/ksm.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
mm/ksm.c renamed from mm/ksm.c~mm-ksm-remove-unnecessary-try_to_freeze +1 -3
@@ -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 {

_

Patches currently in -mm which might be from [email protected] are

mm-khugepaged-remove-redundant-try_to_freeze.patch fork-remove-redundant-task_uninterruptible.patch nilfs2-add-missing-set_freezable-for-freezable-kthread.patch