From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52EE7C83013 for ; Wed, 2 Jul 2025 06:01:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC1566B00CD; Wed, 2 Jul 2025 02:01:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E981D6B00CE; Wed, 2 Jul 2025 02:01:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DAF756B00CF; Wed, 2 Jul 2025 02:01:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CB6636B00CD for ; Wed, 2 Jul 2025 02:01:45 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8E1FCC0713 for ; Wed, 2 Jul 2025 06:01:45 +0000 (UTC) X-FDA: 83618278170.08.C99A7D4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id B0B6D100007 for ; Wed, 2 Jul 2025 06:01:43 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PW86EjYH; spf=pass (imf14.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751436103; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5nTPrWf9Aqck2ptKb2zyXs5vzzOQnB/G54DtwX2rrW0=; b=thcHC74j7G0RF4cW81P4GOAa1P628j86UcU4971O/OwlICEqy9AfueP45/fmlHfqvazU/H /VeCsDcnurGU3RHC//zUpVVSZUsQRvyEjAWudttvqO/vcHQeMT6PjpHz1F5ooa0udXxF/h uRtuJtL1r8XyNGGoE1GZeCwo75pxKT0= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PW86EjYH; spf=pass (imf14.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751436103; a=rsa-sha256; cv=none; b=cGExArT/RAKYZ3Qettcr/Qox2B5RSDYT50dTamF2+qKhF323FNlAlSeaIQJ8kTXB1V7FfC tQ3QjxK4jB8Vb5AWqImi4jJYoxfjY6J2vS50GaHKChur8VyVoEl1p7Meu/c9BcZyx+3ujB 0W32eTZLBTz7VqOkBZHQvVE4Equ+y3M= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751436103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5nTPrWf9Aqck2ptKb2zyXs5vzzOQnB/G54DtwX2rrW0=; b=PW86EjYHgT9SMSQwBEmroumFdd1o+Ld6yp6ACH7ZTVDXdRawtYeHDws0fI6q/BdjUcdlcu 4XfmpxV4QkrciA+r4d16f96DobUxPjZKOfLprTbh2ke3oWGHW5GSWKbmkizdkCix0szJO9 pKW0Z7lYdu04OXxwPkE3fKB+33YWOxs= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-62-aYZuKyN1MwOe2pokc-BKxA-1; Wed, 02 Jul 2025 02:01:38 -0400 X-MC-Unique: aYZuKyN1MwOe2pokc-BKxA-1 X-Mimecast-MFC-AGG-ID: aYZuKyN1MwOe2pokc-BKxA_1751436094 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 259231809C8B; Wed, 2 Jul 2025 06:01:34 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.112]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9ED7F18003FC; Wed, 2 Jul 2025 06:01:19 +0000 (UTC) From: Nico Pache To: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: david@redhat.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, ryan.roberts@arm.com, dev.jain@arm.com, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, akpm@linux-foundation.org, baohua@kernel.org, willy@infradead.org, peterx@redhat.com, wangkefeng.wang@huawei.com, usamaarif642@gmail.com, sunnanyong@huawei.com, vishal.moola@gmail.com, thomas.hellstrom@linux.intel.com, yang@os.amperecomputing.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, raquini@redhat.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, tiwai@suse.de, will@kernel.org, dave.hansen@linux.intel.com, jack@suse.cz, cl@gentwo.org, jglisse@google.com, surenb@google.com, zokeefe@google.com, hannes@cmpxchg.org, rientjes@google.com, mhocko@suse.com, rdunlap@infradead.org Subject: [PATCH v8 12/15] khugepaged: kick khugepaged for enabling none-PMD-sized mTHPs Date: Tue, 1 Jul 2025 23:57:39 -0600 Message-ID: <20250702055742.102808-13-npache@redhat.com> In-Reply-To: <20250702055742.102808-1-npache@redhat.com> References: <20250702055742.102808-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B0B6D100007 X-Stat-Signature: pt8gkd5kxbch637fnse1itghewnr4phg X-HE-Tag: 1751436103-442102 X-HE-Meta: U2FsdGVkX1/x3GUyDdDtjmWH+5VNLIa9xlp9yUNQQwF5CghG5uZgQohvfd0FgVHyNNH3yQk7ns4AR4NO3kzYld2vcDMp+7yyyGMeRR1nQqf+LfybnY5K68/mgKR/O59iIJQzRlbAJDPkUArUE3nJiqoL6UkfGNA21g7ncks8vv2iJAkfkqHD3LvvN+yateKBe0cprapBqfMus20fTXWy2A9yb0UUQSdYqCGVHxbg3uLRuWBvjFxSliP5+El9ddDvdu0G1H5wonDE4llOwPvwauk8523jhzuCXxLUeTmRnSh2qvKJq02QQvSdG4CMbb0ajmD9IwPwj2LJS4Fzq/5Xjw0rKtwElb3GfwltnkLBrGxWAdgfXX91Q8dkQ+SFuoy6orFFg9rzJNBC4Rcoil6QstH8MIaSmSLfmO0uek0ynE0hd5tgan1/gBLbZ5tobSZSG7DlkaZzj7ckmyfNi/l7wJxVr4gcLE0Po4ntiuBWTXeMqVK4yuaS28n/qjCduPIp82vjj/Eq7NomlOEJLHqQtr1JiGQrP3M745iWKsESkMbX1gIlqerpWbo+4+rcdPvTrV7sN+V4BI8bOMEC139x17OcO5x7E2obZGQYnxQdRlt9HCNqExTOavbhmFLsXdftpWKhXGzgyYkmHnbPGnMHFqbF35LpDqtVV2Vn0knQp271tojtrdf/4E3Ff4lrT/OXN+U7LoCehQiVPEK2lC3bLdozBHkSNt6lnSMaRWCrYdf5x3dj0PNsWjOrc0QppDddDgLl3FCqQnZio1+2X48TlYhtNWDiaSHspe1bAbLNJE4MUZRsmrwWwIwaObEDZ93x/bQlbmCMmmigUYiIcLOMm/032z5otfWh1VioNs6rYLMvmhdZdg+7YgKTW1/aWzcK3f/ys82rS9nFP9/RHoRp4L6uCeNIxAia+97320Ayc639AmHMVKOF07wVrALwsnGzQGg3bNGKgW5O0D8VVPf jHZBo4Qb Ej0wIHXwAMMvd2aZr2bekAsDWVIFYP+9ZqEOh1ztzbQw0AswtpXKzV/N8+gfD36KscBg6WMkQAZrLY7AVW0xwpCXLqgveBgNz4I+fiuRkex3hkKmJYUdoI5u0gyfD5s5ZvNKYpFOIbRA/NEe1Qqff9KgEaPbdvSRYLp/DuwWj/dhMOb1ziKIDLxE44jRtFRitC4xhN1dyd596y1+2gFwtA7NU1+rO3YQeVy6g4oym2xzxx57iGW83nlQkqnGv54GzU2Id6em6/6qtZThhPOk0F9FXgzmm/O0Yp/O88a8fnp2ik/GTAFzkpt39q8VcmwIjIiSrWImnWZzmrnHP1EDeesbAnrJpgt6PM19Tked9YOOcW7bXib1lNzDHjrFwbaixbzDFtnFI18lW5wnPK0USpyaPLyiaczoufQAa4bB1rqG1T08= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Baolin Wang When only non-PMD-sized mTHP is enabled (such as only 64K mTHP enabled), we should also allow kicking khugepaged to attempt scanning and collapsing 64K mTHP. Modify hugepage_pmd_enabled() to support mTHP collapse, and while we are at it, rename it to make the function name more clear. Signed-off-by: Baolin Wang Signed-off-by: Nico Pache --- mm/khugepaged.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 6ea681b81647..d20a217387ed 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -430,7 +430,7 @@ static inline int khugepaged_test_exit_or_disable(struct mm_struct *mm) test_bit(MMF_DISABLE_THP, &mm->flags); } -static bool hugepage_pmd_enabled(void) +static bool hugepage_enabled(void) { /* * We cover the anon, shmem and the file-backed case here; file-backed @@ -442,11 +442,11 @@ static bool hugepage_pmd_enabled(void) if (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && hugepage_global_enabled()) return true; - if (test_bit(PMD_ORDER, &huge_anon_orders_always)) + if (READ_ONCE(huge_anon_orders_always)) return true; - if (test_bit(PMD_ORDER, &huge_anon_orders_madvise)) + if (READ_ONCE(huge_anon_orders_madvise)) return true; - if (test_bit(PMD_ORDER, &huge_anon_orders_inherit) && + if (READ_ONCE(huge_anon_orders_inherit) && hugepage_global_enabled()) return true; if (IS_ENABLED(CONFIG_SHMEM) && shmem_hpage_pmd_enabled()) @@ -490,7 +490,7 @@ void khugepaged_enter_vma(struct vm_area_struct *vma, vm_flags_t vm_flags) { if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags) && - hugepage_pmd_enabled()) { + hugepage_enabled()) { unsigned long orders = vma_is_anonymous(vma) ? THP_ORDERS_ALL_ANON : BIT(PMD_ORDER); @@ -2702,7 +2702,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, static int khugepaged_has_work(void) { - return !list_empty(&khugepaged_scan.mm_head) && hugepage_pmd_enabled(); + return !list_empty(&khugepaged_scan.mm_head) && hugepage_enabled(); } static int khugepaged_wait_event(void) @@ -2775,7 +2775,7 @@ static void khugepaged_wait_work(void) return; } - if (hugepage_pmd_enabled()) + if (hugepage_enabled()) wait_event_freezable(khugepaged_wait, khugepaged_wait_event()); } @@ -2806,7 +2806,7 @@ static void set_recommended_min_free_kbytes(void) int nr_zones = 0; unsigned long recommended_min; - if (!hugepage_pmd_enabled()) { + if (!hugepage_enabled()) { calculate_min_free_kbytes(); goto update_wmarks; } @@ -2856,7 +2856,7 @@ int start_stop_khugepaged(void) int err = 0; mutex_lock(&khugepaged_mutex); - if (hugepage_pmd_enabled()) { + if (hugepage_enabled()) { if (!khugepaged_thread) khugepaged_thread = kthread_run(khugepaged, NULL, "khugepaged"); @@ -2882,7 +2882,7 @@ int start_stop_khugepaged(void) void khugepaged_min_free_kbytes_update(void) { mutex_lock(&khugepaged_mutex); - if (hugepage_pmd_enabled() && khugepaged_thread) + if (hugepage_enabled() && khugepaged_thread) set_recommended_min_free_kbytes(); mutex_unlock(&khugepaged_mutex); } -- 2.49.0