From patchwork Tue Feb 11 11:13:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13969527 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 6E51FC021A1 for ; Tue, 11 Feb 2025 11:16:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D58346B0082; Tue, 11 Feb 2025 06:16:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CE1406B0088; Tue, 11 Feb 2025 06:16:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B5E0E6B0093; Tue, 11 Feb 2025 06:16:07 -0500 (EST) 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 943876B0082 for ; Tue, 11 Feb 2025 06:16:07 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 2774F1C94E7 for ; Tue, 11 Feb 2025 11:15:39 +0000 (UTC) X-FDA: 83107408440.04.FC0DE7C Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf11.hostedemail.com (Postfix) with ESMTP id 6DB8040011 for ; Tue, 11 Feb 2025 11:15:37 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf11.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739272537; 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; bh=JRcfpllcre96RyoGVaAk/jWyIQ4JWR8C1VWKHOtp9b8=; b=ICvBPJfV5TBn4Rho61NggJm8RnjvF30H3hMZlYDcm1Wodx8xi5SAeVIa95Kke9UOavrgzb QzHXCwU2BVfLhy8OyYQ3DRQ+rHi6TRZVYTJWjy1elkVx+ev2m9LzKcPzb4ii+huZ9wgh4N edqu821W2J/xDIB+zFPxK/nHiWvpZ5s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739272537; a=rsa-sha256; cv=none; b=jxD5sP82nXgWEm0LU1G9t1EYySs49WWOAviQqa3gHrQ0r9oxYl/jiHhQqTYa+f85f0wAB5 SZ8iKT8XqWLkyvculRldkoCUC3r6KxP+cxcUP4aOAOFi6/GzqXrmmU/B2RNGEO4e23NkIp eIKTtvfZpsXxziSlxf7W+0O26UTDgak= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf11.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 03FCF13D5; Tue, 11 Feb 2025 03:15:58 -0800 (PST) Received: from K4MQJ0H1H2.emea.arm.com (K4MQJ0H1H2.blr.arm.com [10.162.40.80]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3600B3F5A1; Tue, 11 Feb 2025 03:15:25 -0800 (PST) From: Dev Jain To: akpm@linux-foundation.org, david@redhat.com, willy@infradead.org, kirill.shutemov@linux.intel.com Cc: npache@redhat.com, ryan.roberts@arm.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, cl@gentwo.org, vbabka@suse.cz, mhocko@suse.com, apopple@nvidia.com, dave.hansen@linux.intel.com, will@kernel.org, baohua@kernel.org, jack@suse.cz, srivatsa@csail.mit.edu, haowenchao22@gmail.com, hughd@google.com, aneesh.kumar@kernel.org, yang@os.amperecomputing.com, peterx@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ziy@nvidia.com, jglisse@google.com, surenb@google.com, vishal.moola@gmail.com, zokeefe@google.com, zhengqi.arch@bytedance.com, jhubbard@nvidia.com, 21cnbao@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Dev Jain Subject: [PATCH v2 11/17] khugepaged: Enable sysfs to control order of collapse Date: Tue, 11 Feb 2025 16:43:20 +0530 Message-Id: <20250211111326.14295-12-dev.jain@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20250211111326.14295-1-dev.jain@arm.com> References: <20250211111326.14295-1-dev.jain@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 6DB8040011 X-Rspamd-Server: rspam07 X-Stat-Signature: ipu61c9e9u7muiw83cozqch7kdaqtqjb X-HE-Tag: 1739272537-505162 X-HE-Meta: U2FsdGVkX18XlB9EkbEIIDxAbb3MDVEKYcnmX6JdsXY0IIqVUaylexvegSzsstkigYgaHgDhSwXBU1YQJqFN4Wcoufk65wYZAXKXimivInQjH/G/T/sBopuvmlpSRu54pdBclAP1kySXbz0H3HfaTOJTwXrmEAwDs+nxr3lTbysMvw0tvZ/SRiyCibfkmsQ8NnChZYZEPNtsFltsROS8nL9oEvFy52kf1mFtvgXpo7+pPcQRY8jybeUhlkUj6sEhiapnFEUKJllSqdN/ZiSeGJwvEL6HgkQNotvQn4/xvI0jTjdPLcx5PQcwgFqJHauRnXf1Cs/IDCyC5DWZ+ilQomqrWAxTQhaQZtAys2cyghAJ+ds6IuwZmGXFsO2E8qJPVFM6WEs8HQbU6kFEb7RZyZiScTimffDKp65s3UI36YoXVpQ7XyBVVju/C7gi9QRvpxXlcfzVBA8uS0V9YokP1rn4uJCCJ1r1R58wzsg57P19RllKFZMnLT7HZbPHk4Ei1uDMZzD+vg/YCPSsCVz44xK6FeU/IDXPeZ+7xgpseTMiyPUFU/Ntmj8r5FhcgcWuexGsBcNyO9P+pFSXDmOrvo4fuhdCLT188xFVE2SEHnDaWL4F8+O44mngwcOd/7tRRrpil1vrL2A+9eJQIBp8/ZiW4RiTAyHP8lmQ2RAKQX2azpTMqJhUJ8g8zzOB4iOSoReXBJ7DKMFf6LjorE8UNGwaj8btztwATgJHmwk2LQr0DXulWXBqIq3Xfh2o3HtqqFZeHB6Sa2BCXO+W7pFY7DhWWr8Wfv0zp5UEViDjBXTrWSO3XRoEf08Yz26o2wrP5ILFZm6GG+hzAal8E7Ey7aKaj99jpP/EjcGDhdZXt/V+5PROpf0IZnb+vtAKqjd6Ate53SUCKqBUF9cBuT6Avtzeer9oBkIBE0zUWw4+yOOHDFF0EUSMpODWJsDYv+NxM3jFo+IV92NZy0wzvUo OgmCTkc8 Xw59qS297s/oKpenfxEBp/kjerfjXqUbslDaXvo09Npv/itRAMuZzQbKbNn3+h8Q87QUsH+3QIqiF6lePVNfajADgVa3nzLpU8ebWCfoePbRjpgYIiklk/JidzTSWZe0yzWvLxVvO6o8vYIVXEJVw0HLTZKOopRNiHFZawJ3zIyrsCXUVYKswabfoV1gjKE6EwTTVWna8Vl/AAENKE6BQQSpGlnKLZM0h+dUF 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: Activate khugepaged for anonymous collapse even if a single order is activated. This condition will be updated upon by subsequent patches. Signed-off-by: Dev Jain --- mm/khugepaged.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index baa5b44968ac..37cfa7beba3d 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -415,24 +415,20 @@ static inline int hpage_collapse_test_exit_or_disable(struct mm_struct *mm) test_bit(MMF_DISABLE_THP, &mm->flags); } -static bool hugepage_pmd_enabled(void) +static bool thp_enabled(void) { /* * We cover the anon, shmem and the file-backed case here; file-backed * hugepages, when configured in, are determined by the global control. - * Anon pmd-sized hugepages are determined by the pmd-size control. + * Anon mTHPs are determined by the per-size control. * Shmem pmd-sized hugepages are also determined by its pmd-size control, * except when the global shmem_huge is set to SHMEM_HUGE_DENY. */ if (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && hugepage_global_enabled()) return true; - if (test_bit(PMD_ORDER, &huge_anon_orders_always)) - return true; - if (test_bit(PMD_ORDER, &huge_anon_orders_madvise)) - return true; - if (test_bit(PMD_ORDER, &huge_anon_orders_inherit) && - hugepage_global_enabled()) + if (huge_anon_orders_always || huge_anon_orders_madvise || + (huge_anon_orders_inherit && hugepage_global_enabled())) return true; if (IS_ENABLED(CONFIG_SHMEM) && shmem_hpage_pmd_enabled()) return true; @@ -475,9 +471,9 @@ void khugepaged_enter_vma(struct vm_area_struct *vma, unsigned long vm_flags) { if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags) && - hugepage_pmd_enabled()) { - if (thp_vma_allowable_order(vma, vm_flags, TVA_ENFORCE_SYSFS, - PMD_ORDER)) + thp_enabled()) { + if (thp_vma_allowable_orders(vma, vm_flags, TVA_ENFORCE_SYSFS, + THP_ORDERS_ALL_ANON)) __khugepaged_enter(vma->vm_mm); } } @@ -2679,8 +2675,8 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, progress++; break; } - if (!thp_vma_allowable_order(vma, vma->vm_flags, - TVA_ENFORCE_SYSFS, PMD_ORDER)) { + if (!thp_vma_allowable_orders(vma, vma->vm_flags, + TVA_ENFORCE_SYSFS, THP_ORDERS_ALL_ANON)) { skip: progress++; continue; @@ -2704,6 +2700,10 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, khugepaged_scan.address + HPAGE_PMD_SIZE > hend); if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) { + if (!thp_vma_allowable_order(vma, vma->vm_flags, + TVA_ENFORCE_SYSFS, PMD_ORDER)) + break; + struct file *file = get_file(vma->vm_file); pgoff_t pgoff = linear_page_index(vma, khugepaged_scan.address); @@ -2782,7 +2782,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) && thp_enabled(); } static int khugepaged_wait_event(void) @@ -2855,7 +2855,7 @@ static void khugepaged_wait_work(void) return; } - if (hugepage_pmd_enabled()) + if (thp_enabled()) wait_event_freezable(khugepaged_wait, khugepaged_wait_event()); } @@ -2886,7 +2886,7 @@ static void set_recommended_min_free_kbytes(void) int nr_zones = 0; unsigned long recommended_min; - if (!hugepage_pmd_enabled()) { + if (!thp_enabled()) { calculate_min_free_kbytes(); goto update_wmarks; } @@ -2936,7 +2936,7 @@ int start_stop_khugepaged(void) int err = 0; mutex_lock(&khugepaged_mutex); - if (hugepage_pmd_enabled()) { + if (thp_enabled()) { if (!khugepaged_thread) khugepaged_thread = kthread_run(khugepaged, NULL, "khugepaged"); @@ -2962,7 +2962,7 @@ int start_stop_khugepaged(void) void khugepaged_min_free_kbytes_update(void) { mutex_lock(&khugepaged_mutex); - if (hugepage_pmd_enabled() && khugepaged_thread) + if (thp_enabled() && khugepaged_thread) set_recommended_min_free_kbytes(); mutex_unlock(&khugepaged_mutex); }