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 30FABC369D5 for ; Mon, 28 Apr 2025 18:13:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 642CB6B00AA; Mon, 28 Apr 2025 14:13:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5F3296B00AC; Mon, 28 Apr 2025 14:13:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 46D666B00AD; Mon, 28 Apr 2025 14:13:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 25F916B00AA for ; Mon, 28 Apr 2025 14:13:36 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 26E291A10F7 for ; Mon, 28 Apr 2025 18:13:36 +0000 (UTC) X-FDA: 83384250432.23.7E7CAB6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 66CA1A0008 for ; Mon, 28 Apr 2025 18:13:34 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="E/JBTh+D"; spf=pass (imf25.hostedemail.com: domain of npache@redhat.com designates 170.10.129.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=1745864014; 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=5P5xWMoPPMey88TbUIMFKq0k2NJVFjtZk5Hx8qz+wZs=; b=GDdsvGAQ7pqoLluexpoCt954NEl5oGY0mPRj+7D8QFjgMG2wR/hJcCXklDzCjacDn+NZQV Smp+qe4jNG7g9G+caWwjxDYJP+3RgusXWeJQab2Qc45FKZru5TtzPA9G2FOc43TDQ3LYor RsdycY1XJf9YvfdxOa+tVBdHfimLJrM= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="E/JBTh+D"; spf=pass (imf25.hostedemail.com: domain of npache@redhat.com designates 170.10.129.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=1745864014; a=rsa-sha256; cv=none; b=OKjhZazLt94vXjoUKA7Gp2x6cRXuVy9QbaCYq6dBYxBtjMpILWZo/7LErQZXbPCkAFH/ty XZKZ0LXjHX/8Vltn33uFOJMsqPn2vIcw9atA13UFILb4MINaiT6aD96/s7SeyJ56FMMpsn 6/DkOdL/3CoHpo6a1FPpB3m/tsVuA4A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745864013; 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=5P5xWMoPPMey88TbUIMFKq0k2NJVFjtZk5Hx8qz+wZs=; b=E/JBTh+DwbsnT0pn55cfl7tg5bNAegfCmoDVfmdzs+s7xJRxX7BKkAO1hgZq7pp4g699+E 1eZWxJmewYvBN4KTxp5eFEqorENmXw+vylDa7XxgR2gBUZak5jpr41iWHqE+pe56QT2O0S ppIy3a/qD00+vPhuDM4JZR5mrRnoV00= Received: from mx-prod-mc-05.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-145-PBSKMQ46N2WAHSPATUlI1Q-1; Mon, 28 Apr 2025 14:13:31 -0400 X-MC-Unique: PBSKMQ46N2WAHSPATUlI1Q-1 X-Mimecast-MFC-AGG-ID: PBSKMQ46N2WAHSPATUlI1Q_1745864007 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D0F06195609D; Mon, 28 Apr 2025 18:13:26 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.65.12]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E551A180087B; Mon, 28 Apr 2025 18:13: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: akpm@linux-foundation.org, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, david@redhat.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ziy@nvidia.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, dev.jain@arm.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, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com Subject: [PATCH v5 05/12] khugepaged: generalize __collapse_huge_page_* for mTHP support Date: Mon, 28 Apr 2025 12:12:11 -0600 Message-ID: <20250428181218.85925-6-npache@redhat.com> In-Reply-To: <20250428181218.85925-1-npache@redhat.com> References: <20250428181218.85925-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 66CA1A0008 X-Stat-Signature: 9k5g3xpe4395jrdtfpktmaryfucmn87o X-HE-Tag: 1745864014-784185 X-HE-Meta: U2FsdGVkX18OTiSAdU3lKYnyycRY94xqvD4O0+zB9uk7dEqvAf69d7Ki9omqvgQQJPm0OxRIUB3CJOIykMb42bUqymLU2EMvJoketDiaMQXiWemcxcKXNr1olxHegmMoVaDmjK6g8e8vbzOejkzLWdy/8ndD4cRMpc//ZYduWMhBWjBA0/fzFammdsa8TvS5giFz8C504GY0jyhAmPEW6T3ZhuQVu1zhiaARw09FEXI9Kzoep8TpuTWCSm/6QTY0lftP44NFZ5gLn4okHWT2KQ8VQvH/NWsvZ+a7XZrVe27fhG8YYcHtxW9FicJjbtPlIpGhSj+ZnKFiW8mWxGN/VRDw1ZrvvL4w2yUf2weWxQw0OFPga2RlbgcS3rd8lWnh5AWoY0445e7L05ibmCYSasEMSC4OWZmPgWWyZcnvdUl90M0eWWn3nya9E3Kw8jeQYrF68hzbe6UyDDJM7n0m7LjIe7s73uF1hAudh20ETLNrlokljxPRTq1NlSGWGh4xHf+fAFhwJGOqp0AqtgejmC2mw4E/PsnZFoe94TBU+usUB6zViJECfJnk1b4JlQQldgIHvsi1uA3LljFHfKhx7QPNoufwz7WT0KBNjHTm1pFdNudd718lRzgdCdEYd+Q4IWXwhR//kNatBCTEdXzA8G8mrBfu3PdvTSjrmi1cPP+zy54kYF/OHFICfMwKQzmnckoq133CpTtToNoGOO2LLwFRV0zSUM9iVJM6n71gAeQJh788KFFUDBwGGtQEWEPZ76R3QdIinyQ0cqwd4LBKmh5JZOyS8wR3ZWMWQd+Y78VN4SSuuCzD685k7SC3YdgxngCixGilHLIhaYA39A58bQ4ZHi/kLv7z7MBKRDR1QqaDOl8OtaZgoTtsf290soFtEQLHj5HTcMtXWuwXZxh0M9+XiftCp6tWHYq8Jy34Z60wpWvM97CZFYKpOf50rz4kbRQ+Et8BJAgqg6bkbQ1 F2FBunoh Be0rbjlqXjtouarhXHC2oHaOgsoeWL3rC8EWrDf/HOijDD1QoSAl0Ozw/ADGENRI1//hvnFhTDd2s6qCk5at1aTgGKRleOIx5KYxDFHknTqCZKwcX/OHCf8fC/tRYBa9T4fZhzWMwqz/8bxWc8a7skSkwR/YO1/wNUE31mYk4CUf8i4IJns2ql1pKgnpgTXFMJLMKKIQ24KlGo0YF+flgAwOYef7uDQooqP7/D3v5llh+ypCqwOHHQNOYqPcUFcyvfMubSkBPcum8oyo7uwCcNJAqkoj36KoS+3avn01RNs9vHHUtx0UIJWyW/UJ0gusDmEL9mh3fgSh0v6u6mMFfVqAUnZe9b8jvMGnwqmNcCvlmeGrkiNujkrxQAXL7s1cEgfxg8bZPvchuB4ryhaTjyl1boqTTnIYIWYExSt8PBeQy5FEYUhRVuKnu0QmpS/inzsYmtRGD+T25vcft4jsr8OW6ELqcYJL1YFQm5vhZ3homlurh/XMr9ZrD1iPHbmdfa4f++kaKLlMtfqpSDNk2Ic7QHQ== 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 | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 16b5b3761f95..e21998a06253 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -565,15 +565,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) && @@ -581,7 +583,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; @@ -609,8 +611,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; @@ -711,13 +713,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))) { @@ -764,7 +767,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; @@ -781,7 +785,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); } /* @@ -802,7 +806,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; @@ -810,7 +814,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; @@ -829,10 +833,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; } @@ -1000,11 +1004,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; @@ -1035,6 +1039,12 @@ 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) { + result = SCAN_EXCEED_SWAP_PTE; + goto out; + } + vmf.pte = pte; vmf.ptl = ptl; ret = do_swap_page(&vmf); @@ -1154,7 +1164,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; } @@ -1201,7 +1211,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; @@ -1231,7 +1241,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.48.1