From nobody Thu Apr 2 15:42:29 2026 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 76C3113D503 for ; Wed, 11 Feb 2026 03:00:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770778848; cv=none; b=qW9Z7KJmtNCOHerUvuNbetKw9UpuhYupDynT8fS9qROGqnKs+a4exO3d5eNVYhSvUxsTydZPX+Dm3pBZW9EI3WkjpPQEPfRjDjNFNkxXh+0L4/joyPqjwzlNK4pFSMAU1+LXBzHM6+0/n+uFKYbvPxzxSicaqDJmTLF3HQxOMvg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770778848; c=relaxed/simple; bh=QUQf68R/u9aRj9YdkniJxlbH+bwVC8m/vSLl3Lv/0Bg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rRyhNTG+ABSzpWDzwKJsUhs1X/E+3bgMr88cYrAiik3cNqvHQ7iBGs0l0tlZnp9ssKLfe3lAZgd6O6W2GJ/bl43KHSMsO63JePETcvE7p1G/O05AlZm1wNbKnclCnKSIAY0w4Rm2Au9lfslqYQTqKzKGEy16kCOmRM7XS8WQBQM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=J7t2Bhzr; arc=none smtp.client-ip=209.85.215.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="J7t2Bhzr" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c62239decbeso1780796a12.2 for ; Tue, 10 Feb 2026 19:00:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1770778847; x=1771383647; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=snQGKzM9krQ2e/nG+wxub5/+NEsJEn7FFGNgMKn8dWM=; b=J7t2BhzrF0wV8gVUMkp/UktTssoj3ooo748cxb0esMRmkRqsrvJ0gke6KRW59r8sdi yI23+JUPh9hAzstDvrcywYLEC1VV4KUIKYheNedf1pMdVFwPB5SH4kwIcak62UFZUsr8 rdV1iI2XNLBPVfigQQjP+XsWCCE8kucL1upWw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770778847; x=1771383647; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=snQGKzM9krQ2e/nG+wxub5/+NEsJEn7FFGNgMKn8dWM=; b=Td28PrUyPeFIbksX3eCHNb6ka3+aqeNYQZ4QUgKBpX2l6r4Bzi1qZ7f6mjIIfTuJVw /NvimgUh+l5s5wGv4HCFluvE6GKwnpGYgLOqAs4q2Umby+5ufiL+2LLtGAbZhEcvxU/Q E41/IMX4sCnGsx+eiSjBPEayZ6LU4XKGDYeaK0wAk/2fad9ztw0FAxANCn74BHHiQBHx tjpD+/Pdm/+qPZUmyHA28qoKLOTN1Epvva53mQ2DbleN+bWTMGu2wrhqqHXLaHbsquvM b82uGUm6mdPPmQZv6wzUHNEZaTf9xh3YZEUsv88IlFSeuslbTOExbkEVjIb1wUxeQoVp 42Bw== X-Forwarded-Encrypted: i=1; AJvYcCUr0PrATQ4Eqe7lBEnCGXGKV1dqsprO6pZRdNujybNHsLUO2kSeil/ihU4KeUTuIlu5F//l2PjTMkKY8so=@vger.kernel.org X-Gm-Message-State: AOJu0YwetnBvimMFxQyYSyleigxXKSS8CRDKHKP0+/cj/JQ38cpLSmUf gnTFCohL1Wh3RtZu7OK4OksqZOSkfjBU9+wyBr0zUqGIJc54YHLXM9n2Eq8vWm6Q6Q== X-Gm-Gg: AZuq6aIxl6eqQYFGKtUc9P8Qkphi82vX8gWFPFh5/SRykCDrkJu6lGlNRVA3ffXvuVh IHhg/p7wsdplpwYo8Sp8C9JT9NpWvGsLf5ts3TbblzrBQn+aloGs3WHId6G5aH0u87BNjilqcVR ppN65LzVuRfiZO+WJROEmI8L0ANz5OgBiPnbBs50aQc3Gi3G0YQEQK2ZRMT5HagOY1yr5DL4ugX 8UuHeexIFoXVw5Br9JV3SKdjjyufKz40NPhL/RSGJAkrvs0W49GTHmW1uszXmj79hEpsSHk6ooa ck6TQX2O11paTCOGzfjaFLTYUIMAiN+hfB2xwP24nDisX315yIbnf1VnbidjzK64DSeDpNlWQ0N YB85W7HBwvaxRoGyxu2u/jEb8JZx7zMoD0TTTYIfZQBOYL1EZWSucpLNp3neSPeDCBalqVKMrzi Dz8YYIprhOfocs8gIM3CASQDeppoV7ws+/jNUnSs7wxjNGspKnA8xVOLwKB9XW+hW+smImI18IP 34OL3CuSEHpdg1IueizeCg= X-Received: by 2002:a05:6a20:6a2c:b0:364:be7:6ffc with SMTP id adf61e73a8af0-3942e3a189dmr1362393637.18.1770778846732; Tue, 10 Feb 2026 19:00:46 -0800 (PST) Received: from tigerii.tok.corp.google.com ([2a00:79e0:2031:6:ec5:3497:e96b:e7be]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c6e196accf9sm399528a12.13.2026.02.10.19.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Feb 2026 19:00:46 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang Cc: "Liam R . Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH] mm: khugepaged: make scan loops suspend aware Date: Wed, 11 Feb 2026 11:59:55 +0900 Message-ID: <20260211030024.232964-1-senozhatsky@chromium.org> X-Mailer: git-send-email 2.53.0.239.g8d8fc8a987-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A number of khugepaaged's loops, e.g. khugepaged_scan_mm_slot(), are time unbound, which can become problematic during system suspend: PM: suspend entry (s2idle) Filesystems sync: 0.003 seconds Freezing user space processes Freezing user space processes completed (elapsed 0.003 seconds) OOM killer disabled. Freezing remaining freezable tasks Freezing remaining freezable tasks failed after 20.004 seconds (1 tasks ref= using to freeze, wq_busy=3D0): task:khugepaged state:D stack:0 pid:1345 ppid:2 flags:0x0000= 4000 Call Trace: schedule+0x523/0x16a0 schedule_timeout+0x23b/0x6e0 io_schedule_timeout+0x3f/0x80 wait_for_completion_io_timeout+0xe4/0x170 submit_bio_wait+0x79/0xc0 swap_readpage+0x150/0x2d0 swap_cluster_readahead+0x3be/0x750 shmem_swapin+0xa7/0x100 shmem_swapin_folio+0xcd/0x2e0 shmem_get_folio+0x237/0x580 collapse_file+0x247/0x1280 hpage_collapse_scan_file+0x26e/0x380 khugepaged+0x43b/0x810 kthread+0xfb/0x120 Make hpage_collapse_test_exit_or_disable() suspend aware so that khugepaaged's scan loops can terminate in a timely manner and let system enter the sleep state. Co-developed-by: Baolin Wang Signed-off-by: Sergey Senozhatsky --- mm/khugepaged.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index eff9e3061925..9b3201fb6840 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -392,10 +392,18 @@ static inline int hpage_collapse_test_exit(struct mm_= struct *mm) return atomic_read(&mm->mm_users) =3D=3D 0; } =20 -static inline int hpage_collapse_test_exit_or_disable(struct mm_struct *mm) +static inline int hpage_collapse_test_exit_or_disable(struct mm_struct *mm, + struct collapse_control *cc) { + bool was_frozen =3D false; + + if (cc->is_khugepaged && + unlikely(kthread_freezable_should_stop(&was_frozen))) + return 1; + return hpage_collapse_test_exit(mm) || - mm_flags_test(MMF_DISABLE_THP_COMPLETELY, mm); + mm_flags_test(MMF_DISABLE_THP_COMPLETELY, mm) || + was_frozen; } =20 static bool hugepage_pmd_enabled(void) --=20 2.53.0.239.g8d8fc8a987-goog