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 538E0C7EE30 for ; Wed, 2 Jul 2025 05:59:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E96226B00C0; Wed, 2 Jul 2025 01:59:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E6DDF6B00C1; Wed, 2 Jul 2025 01:59:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D83BD6B00C2; Wed, 2 Jul 2025 01:59:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C920C6B00C0 for ; Wed, 2 Jul 2025 01:59:55 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 93EDB124772 for ; Wed, 2 Jul 2025 05:59:55 +0000 (UTC) X-FDA: 83618273550.02.9C376F7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf07.hostedemail.com (Postfix) with ESMTP id 571DD40006 for ; Wed, 2 Jul 2025 05:59:52 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Oag+aRl9; spf=pass (imf07.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=1751435993; 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=sIH9BDMaqlzsWlJNg+YrL5p/TLctNhwLDQLMETbbVIg=; b=wfdk9a2EQEwraFi7ije+HlxKuZ1HtbU+zYIDa+tRpH+oTGlYSFdG+RJOuYtDCYZhcBgrK+ VawW1Il4NnemEQyLozQdfMCeJG1Y1s85H4cMY4Hl92fMH8dOjc9goI4OXGO0aYOg3bgzPi ZF3B4+i44HEy0MXrRju00JVm/OapPr8= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Oag+aRl9; spf=pass (imf07.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=1751435993; a=rsa-sha256; cv=none; b=qHzBa5vOA6mTEay+0jlGsPSNz1Jek/4xCxHXo+ctbQKI1CvfzcWM8f3WPYlpSVi+l4yBrE wE0xK0GJPUNHw1A5CNq4Us7JUK9XpjUfbD78znefrBYMcdKnPFLwLtm7WfgUrlqRe3NRZZ aQ6XACJtz2u7L9oqkc3nozTdukmLjMo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751435991; 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=sIH9BDMaqlzsWlJNg+YrL5p/TLctNhwLDQLMETbbVIg=; b=Oag+aRl9cwm66ixsMEPKXnKwryl9DaEaJj6t4OJ29jZh8NDm3xRAAzSKIaKbs17dKCbiLU 6BeMGCtss1S56XXAq4GIZo9K25naCYYq3NF2OHw5BYHd4BRwERM9n2yr9veKXrEYTsaNyt gRTo+j5Zi5EO5tNneqb3CAcONX2jmI8= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-410-azsAXXNdMmySHwJ0VGwUkg-1; Wed, 02 Jul 2025 01:59:49 -0400 X-MC-Unique: azsAXXNdMmySHwJ0VGwUkg-1 X-Mimecast-MFC-AGG-ID: azsAXXNdMmySHwJ0VGwUkg_1751435985 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8B8BF1955EC1; Wed, 2 Jul 2025 05:59:44 +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 66DED18003FC; Wed, 2 Jul 2025 05:59:29 +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 05/15] khugepaged: generalize __collapse_huge_page_* for mTHP support Date: Tue, 1 Jul 2025 23:57:32 -0600 Message-ID: <20250702055742.102808-6-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: rspam10 X-Rspamd-Queue-Id: 571DD40006 X-Stat-Signature: zzco94p9srk9m7qsghabz7ugmitjw6ho X-HE-Tag: 1751435992-406390 X-HE-Meta: U2FsdGVkX1/76/jPlNoMJipK71C2eaSU/ByZmkhxk3HCjkFTpRa/Frm81GaX/8GptXotxZBaUSY4OEg+F9izzfC0EdaGnV+3gnVAusy1fEu2DqC2q0TehjOM5oiXKyhWTKixcGqxDdg2I0Cgspk5MZoXnVB2YPux5/GFJQtXfPju+YTG6gaIoVdJjnlljJvKyMoR4E0vpTUt7dL21yEQvvWaruK+UplCFAr9jGEUwBfeRbHXq0kkwFPJpPxzVM/0HufVZaEidV9i6VDEV2dE0T9PI3UU/YihrbfMa1+r5RUQSFZSuPbSx9VFC/7SbFG9aSu2KN4croJrqDHwR6VoUlvKRCACE8/t+TIAhT6IaQRlkQyn2DEpgoTiBUeTPlEH+A711bQCEDDnF8Trw67RKeBOmdHeVNNJWnO7orgyzcm4ihAS5YV+xBBEtEgcCJWd1n8k/zDlQ1MkS5wVA/hHUbngv0/34sMuOptRCXHDKdFUy8NfSv3OqaU43M9NOH1XMyGPDXk9lRVrbM6Wo2RRluXIYI/1YJuvjvD8I0m3S5p3zGBXZ/kJv2qx6thohxA0tY2kgGrsVQ9yKV03Cfzznr4y9GlzIC6lRrBhqUcH/xEIuskc/TzweZYF1wVQ5Ce4gHXq0uwme0W8qCYheGCfbmqkLdcjq0jMgeWlcCd/wr6b0uJLrFo/j2KvZUilBLErCW2dfeSMI1xIRVTCKM6OzkE8G/wJJfSjdkZEMS/nB43PscOMMwdV2Ie12ctIFlxwQ/tVCmC0g3asZG78LQ2MkUzh+b0SLnppzjLRJm//CMRQSDZyNMrKRN9ObkajPaMy22HnNmegoDRF+R3nICVjoiIrxrc7P4cUhYut2yFcjBF5JWze6ihuJreaZyABfo679K8Im+hVcaNMcUDJ++oSTr/sRJDPIZX/JdL7xMIDxCROkF4oXd3ohkznLeE3T+4JRFc/kXh9E+6tza8c8Zq ITZIYuLr YrO6CdTlNgqIwwRUBO9YLojp25CNfI8XzjZ6eXaVqkLRsUCQcF1w/UOR0aw5z4XQpQjlgVyUXnNrUXdUcajYQyuF0F5KfknYDPGRwbW4ZwUtabbL0SuLcS8IthpDlPkLI2Cx6I3zgZJ3qpGMUwrVj/MXvbMoAepuJSgyELo4QEouWHlZ/l8Fs96ZkiJZ2oSXFHSaQGsLGM2wKUYE3SZdYT599rBWXdvcHKzt0ZjqcAY82DsCOyhRkAMLAHe+K5/YjUBIkB9YOj9h6G2kqnHNTLLWe/YpiYrBlQVLniXPlMMkUFVqeJ0yRq0d+F7kjpGuc0+qGfhpNPz05WmGyNuwL465rHMyFOs2S3u+DA7GxVyU9MtrBky1ag4zLWuH8/6WebgbA93NHsBcq4AFXU7yRIoHegDgkVERv1hw7fcGpXRts2uI1EOXGDezsrC6pXYA0/4QnVXDbb7nSsHqeCAYFxpyynNl9SP1lsD/a6wXfxM7UO1502zKIVERFeScpJZSuB7AXYUtd1qXyMA4O7yRawOX+MQ== 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: generalize the order of the __collapse_huge_page_* functions to support future mTHP collapse. mTHP collapse can suffer from incosistant behavior, and memory waste "creep". disable swapin and shared support for mTHP collapse. No functional changes in this patch. Reviewed-by: Baolin Wang Co-developed-by: Dev Jain Signed-off-by: Dev Jain Signed-off-by: Nico Pache --- mm/khugepaged.c | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 5ff4a5bdf5f6..7a176f3b7729 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -552,15 +552,17 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, unsigned long address, pte_t *pte, struct collapse_control *cc, - struct list_head *compound_pagelist) + struct list_head *compound_pagelist, + u8 order) { struct page *page = NULL; struct folio *folio = NULL; pte_t *_pte; int none_or_zero = 0, shared = 0, result = SCAN_FAIL, referenced = 0; bool writable = false; + int scaled_none = khugepaged_max_ptes_none >> (HPAGE_PMD_ORDER - order); - for (_pte = pte; _pte < pte + HPAGE_PMD_NR; + for (_pte = pte; _pte < pte + (1 << order); _pte++, address += PAGE_SIZE) { pte_t pteval = ptep_get(_pte); if (pte_none(pteval) || (pte_present(pteval) && @@ -568,7 +570,7 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, ++none_or_zero; if (!userfaultfd_armed(vma) && (!cc->is_khugepaged || - none_or_zero <= khugepaged_max_ptes_none)) { + none_or_zero <= scaled_none)) { continue; } else { result = SCAN_EXCEED_NONE_PTE; @@ -596,8 +598,8 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, /* See hpage_collapse_scan_pmd(). */ if (folio_maybe_mapped_shared(folio)) { ++shared; - if (cc->is_khugepaged && - shared > khugepaged_max_ptes_shared) { + if (order != HPAGE_PMD_ORDER || (cc->is_khugepaged && + shared > khugepaged_max_ptes_shared)) { result = SCAN_EXCEED_SHARED_PTE; count_vm_event(THP_SCAN_EXCEED_SHARED_PTE); goto out; @@ -698,13 +700,14 @@ static void __collapse_huge_page_copy_succeeded(pte_t *pte, struct vm_area_struct *vma, unsigned long address, spinlock_t *ptl, - struct list_head *compound_pagelist) + struct list_head *compound_pagelist, + u8 order) { struct folio *src, *tmp; pte_t *_pte; pte_t pteval; - for (_pte = pte; _pte < pte + HPAGE_PMD_NR; + for (_pte = pte; _pte < pte + (1 << order); _pte++, address += PAGE_SIZE) { pteval = ptep_get(_pte); if (pte_none(pteval) || is_zero_pfn(pte_pfn(pteval))) { @@ -751,7 +754,8 @@ static void __collapse_huge_page_copy_failed(pte_t *pte, pmd_t *pmd, pmd_t orig_pmd, struct vm_area_struct *vma, - struct list_head *compound_pagelist) + struct list_head *compound_pagelist, + u8 order) { spinlock_t *pmd_ptl; @@ -768,7 +772,7 @@ static void __collapse_huge_page_copy_failed(pte_t *pte, * Release both raw and compound pages isolated * in __collapse_huge_page_isolate. */ - release_pte_pages(pte, pte + HPAGE_PMD_NR, compound_pagelist); + release_pte_pages(pte, pte + (1 << order), compound_pagelist); } /* @@ -789,7 +793,7 @@ static void __collapse_huge_page_copy_failed(pte_t *pte, static int __collapse_huge_page_copy(pte_t *pte, struct folio *folio, pmd_t *pmd, pmd_t orig_pmd, struct vm_area_struct *vma, unsigned long address, spinlock_t *ptl, - struct list_head *compound_pagelist) + struct list_head *compound_pagelist, u8 order) { unsigned int i; int result = SCAN_SUCCEED; @@ -797,7 +801,7 @@ static int __collapse_huge_page_copy(pte_t *pte, struct folio *folio, /* * Copying pages' contents is subject to memory poison at any iteration. */ - for (i = 0; i < HPAGE_PMD_NR; i++) { + for (i = 0; i < (1 << order); i++) { pte_t pteval = ptep_get(pte + i); struct page *page = folio_page(folio, i); unsigned long src_addr = address + i * PAGE_SIZE; @@ -816,10 +820,10 @@ static int __collapse_huge_page_copy(pte_t *pte, struct folio *folio, if (likely(result == SCAN_SUCCEED)) __collapse_huge_page_copy_succeeded(pte, vma, address, ptl, - compound_pagelist); + compound_pagelist, order); else __collapse_huge_page_copy_failed(pte, pmd, orig_pmd, vma, - compound_pagelist); + compound_pagelist, order); return result; } @@ -986,11 +990,11 @@ static int check_pmd_still_valid(struct mm_struct *mm, static int __collapse_huge_page_swapin(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long haddr, pmd_t *pmd, - int referenced) + int referenced, u8 order) { int swapped_in = 0; vm_fault_t ret = 0; - unsigned long address, end = haddr + (HPAGE_PMD_NR * PAGE_SIZE); + unsigned long address, end = haddr + (PAGE_SIZE << order); int result; pte_t *pte = NULL; spinlock_t *ptl; @@ -1021,6 +1025,14 @@ static int __collapse_huge_page_swapin(struct mm_struct *mm, if (!is_swap_pte(vmf.orig_pte)) continue; + /* Dont swapin for mTHP collapse */ + if (order != HPAGE_PMD_ORDER) { + pte_unmap(pte); + mmap_read_unlock(mm); + result = SCAN_EXCEED_SWAP_PTE; + goto out; + } + vmf.pte = pte; vmf.ptl = ptl; ret = do_swap_page(&vmf); @@ -1141,7 +1153,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, * that case. Continuing to collapse causes inconsistency. */ result = __collapse_huge_page_swapin(mm, vma, address, pmd, - referenced); + referenced, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) goto out_nolock; } @@ -1189,7 +1201,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, pte = pte_offset_map_lock(mm, &_pmd, address, &pte_ptl); if (pte) { result = __collapse_huge_page_isolate(vma, address, pte, cc, - &compound_pagelist); + &compound_pagelist, HPAGE_PMD_ORDER); spin_unlock(pte_ptl); } else { result = SCAN_PMD_NULL; @@ -1219,7 +1231,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, result = __collapse_huge_page_copy(pte, folio, pmd, _pmd, vma, address, pte_ptl, - &compound_pagelist); + &compound_pagelist, HPAGE_PMD_ORDER); pte_unmap(pte); if (unlikely(result != SCAN_SUCCEED)) goto out_up_write; -- 2.49.0