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 84C44C83F17 for ; Mon, 14 Jul 2025 00:35:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 20EA16B0095; Sun, 13 Jul 2025 20:35:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 197AE6B0099; Sun, 13 Jul 2025 20:35:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 038726B009D; Sun, 13 Jul 2025 20:35:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E1F546B0095 for ; Sun, 13 Jul 2025 20:35:26 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id ABA89C0432 for ; Mon, 14 Jul 2025 00:35:26 +0000 (UTC) X-FDA: 83661001452.26.0BA66E7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id EBE80120003 for ; Mon, 14 Jul 2025 00:35:24 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="MLA2BA/E"; spf=pass (imf29.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=1752453325; 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=uOFU3HEhV8SnfXYDhncuj6HdsbX8p30mN92yCMnfwIs=; b=7t8KlPjaDxK83Uj5HqY6Lve2m0HLhg99yrI9xq5fSJiWeSSchyehfCEvU7Pvpm36CFu5oa YCqD6KF8fzeecYHgHAvsbuwwjNPRsH1b+kGv/6HX2NHpHo0JuqvLboadk04k75vc1cxa+v RguR2ZIYRMTMkaZll7Pnps4F4EJfHE4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752453325; a=rsa-sha256; cv=none; b=VzpcD9HitEHOSG2oDszPJFs+9r7BOYCLZOkQbrvHLmcUFwMmMIR7iw+ss6ql5Ay9W1vA8M 0snSSyo0auMQ0Rc926+zIKwFxKm6xVr4g3itCOGKdBcIROrFGOSnyGWsEijpPnUDYpyzzB ORFDqI/jo/Db5gT8JCotqVjUTp8iFzk= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="MLA2BA/E"; spf=pass (imf29.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752453324; 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=uOFU3HEhV8SnfXYDhncuj6HdsbX8p30mN92yCMnfwIs=; b=MLA2BA/E/fFkRGV9L0rWdeYjtdxEM7SS8Vq2O6MD3K16xsxPrCoWNEvXHhmB1+eXukJ1Go I4wriAAALMTjScKCkgOuus+sGxBm67ZeR+V3fG+K+yChRHzVxrMUKdra3/aZnpdPkhaivz pV1VUrofQZ8a5cAjdDaoijTDlEJS0G0= Received: from mx-prod-mc-06.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-592-u3M4V6djMSuLRS3lTcxq4w-1; Sun, 13 Jul 2025 20:35:19 -0400 X-MC-Unique: u3M4V6djMSuLRS3lTcxq4w-1 X-Mimecast-MFC-AGG-ID: u3M4V6djMSuLRS3lTcxq4w_1752453315 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CA6DE1801210; Mon, 14 Jul 2025 00:35:14 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.9]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BB61030001A1; Mon, 14 Jul 2025 00:35:01 +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, hughd@google.com Subject: [PATCH v9 11/14] khugepaged: kick khugepaged for enabling none-PMD-sized mTHPs Date: Sun, 13 Jul 2025 18:32:04 -0600 Message-ID: <20250714003207.113275-12-npache@redhat.com> In-Reply-To: <20250714003207.113275-1-npache@redhat.com> References: <20250714003207.113275-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: EBE80120003 X-Stat-Signature: r8dun6g5y3uiqesxt59yep1q5h1hc35n X-Rspam-User: X-HE-Tag: 1752453324-667036 X-HE-Meta: U2FsdGVkX197OkQDsD8BLMBxHrv5m3wZxEHV2XtjayGvIr2MklSUs+F3HRMFR9eEoZq1PgxtEWyhXhkkmWt35x8Xxu+m077kKgo5ftHbGWdwPjSzjt7KDSkKD8BKYb3W8qLnRdRfZky3f4Jwr36p31ItiONdYjnswD5EdW2LW/56MAz+1PTbXCSSJNrkcvTyBGriCGHAgpX6s+MQ12LVlV5WYHAn34QBm8MkQHh+qhEmDDzhu//7xESgbflEFBFKao2fttuUXLpiQVQPIP9Z8NbyBREm0rpMRYUn1vr6/n98iojRcGhmyDIYpoZINSRCFmjxqg3KhTK35tiGU7sZX9/Lfkf/EJr9TltdLG0f5qKrrjusKIN+Kxop0UrjxWfiI4PqnmWwUvUmP3G3sdM2Ag7xOpuG247a/IzImJ7WiX3BPahy26TwcaI7ao5ZsunzTJqFSG9aFKIvz9F9KHuCL56jEYKOtj3G2xitzl3ae8aKRD9gk9ERrDXSHt1wnRksVpoLSJPj3ZqfbV6rQFL6odErCFQsiB4imArgxNDM4RP4wLTialhQlCkMNZq1w+JLYMloW6/ykEsNT3u9ZSw8sNM1RkdrE9dKi8e0G+fhuh8m8ze9uFpeD+Rzq80K37+zJwJZ242+lHJ1XfCypEMkBDvA/q3trAirYD3Rt4CFniLV4t6ey92C59HB7sELegp+/K6wr4JgBSSoeNrnWGE/KE1ni/9qrub2Bydp93X9Z71hD7wvWHdg++1hbTWJKHSXBC/NfqAKm1Ho1UOsrdH1KIR1pRAtOPHjTKFw9Al883lwqsSUTzcfcT0hYI554b9OJS7X/0uymYogY0kwVvyBXot9OK7Y5jlPDfpGK1pwYDpTQKU+Iq5GIa71WLyG9mCaM64ccGYv+RWrLzwUmqTpVgyiAUR+zbDXf445RySiNjMyt1hVoq3++zgS5Gmbz5Kq3pNbMPfHtx8x0YNZlqt rrLQHaaG jOLt2Z02ZzArYLWDecLljzFhCwmTU7O8ttVzukGFmZGlZ0N4A1L6N/iuFnnT05BnREmcZeuUe4pCCHAhPK4I9qTouN7cPMWI3rQJTywlonIA4xrHxe9gHduUQ+wgb1qP+yu2TzmOZHhymxNJFWZTg31kkyh7jDoAUzaspLGJRoWF8D9ixcWTLQ8AixJQXR4lEdyi3VJ+ljwLoFX36Lza142FeoZQQNwPMFlXczRlSNkFnk/BlUbx5daPdKRaSC1xxVIjq9zbJYsjZ6zUSeixQVo5uc9/divAysd4nylH+5m5RGwp/D8BYJdE/bLlZQvJgq3psPii7n8FM0NLD/I8WATEl3pjZWeBaJ4U/gUNw/LWrbzhNisKwpVT/LsTyfZN2jgBXoN5WG8KD2hDCO4rioaUNlFt9ZUasRwJj+P8fT/HXrsA= 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 3772dc0d78ea..65cb8c58bbf8 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -430,7 +430,7 @@ static inline int collapse_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); @@ -2714,7 +2714,7 @@ static unsigned int collapse_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) @@ -2787,7 +2787,7 @@ static void khugepaged_wait_work(void) return; } - if (hugepage_pmd_enabled()) + if (hugepage_enabled()) wait_event_freezable(khugepaged_wait, khugepaged_wait_event()); } @@ -2818,7 +2818,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; } @@ -2868,7 +2868,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"); @@ -2894,7 +2894,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.50.0