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 7E4D5C3ABC3 for ; Thu, 15 May 2025 03:24:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB3A16B0083; Wed, 14 May 2025 23:24:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D3C836B00B9; Wed, 14 May 2025 23:24:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B41F86B00BC; Wed, 14 May 2025 23:24:14 -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 903B76B0083 for ; Wed, 14 May 2025 23:24:14 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 616A05CFCD for ; Thu, 15 May 2025 03:24:15 +0000 (UTC) X-FDA: 83443698870.04.989DD75 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id AB26D40003 for ; Thu, 15 May 2025 03:24:13 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=h2Xydibw; spf=pass (imf04.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=1747279453; 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=jUd8UnFkJTtPK4IgdH54O/pbcO1DToD7H68z+e10DIQ=; b=zRg0MKdx30M7P+q+gqBYS7duvqFghi3sTc9GG4/2Gy4PjvpEFelZaAVaX1t+5ejEjki0B4 zjV4Ux24Qst1VNlh611xj6AQdor6bn1EiL/LZepREi/733YmmXPUPmLtIJpWycVqqDTAcN R2ixlenHiK38vWrRyrO9s70zyxq4zHc= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=h2Xydibw; spf=pass (imf04.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=1747279453; a=rsa-sha256; cv=none; b=ggwpZo/vD5/xc05zsg89e86Arjfv1kt0re6/+fsQ/x4PL5sLuxx/XjPUTiODXYaKR/yFwp R4oLFC3w/GsHwTfbBlABG67UBzENJYEQRpCvO2pbUFmAAJy2vK7Gs0fuUBaoTuYpLluv9x WvzsiftlHFvsBHtG1yUj2q3R3p0g4yo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747279453; 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=jUd8UnFkJTtPK4IgdH54O/pbcO1DToD7H68z+e10DIQ=; b=h2Xydibwm5eVbKLlE7cgpueuWu8/Uo7nI/R0yvd6dmeGuLewSI9U1+Hu7gh0N8j4GZcDOl 5bZmxZqq9BUAqsqrba8yaM0lpkwqrchb1n1mQRZeyDHeF1FaiQIRsnKc03igFGWPIO6mWW 2HtXmVYSXA28hX1IlckWN1YIZurHKj8= 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-497-pqds0aOXPoyjf5mmLxCN3A-1; Wed, 14 May 2025 23:24:11 -0400 X-MC-Unique: pqds0aOXPoyjf5mmLxCN3A-1 X-Mimecast-MFC-AGG-ID: pqds0aOXPoyjf5mmLxCN3A_1747279447 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2223D18003FC; Thu, 15 May 2025 03:24:07 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 344C6180087A; Thu, 15 May 2025 03:23:51 +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 v7 05/12] khugepaged: generalize __collapse_huge_page_* for mTHP support Date: Wed, 14 May 2025 21:22:19 -0600 Message-ID: <20250515032226.128900-6-npache@redhat.com> In-Reply-To: <20250515032226.128900-1-npache@redhat.com> References: <20250515032226.128900-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-Stat-Signature: jhhpk65bk9hcoz3xahjbb7mwex73apas X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: AB26D40003 X-HE-Tag: 1747279453-214170 X-HE-Meta: U2FsdGVkX1+y0f3fWM6b7pQIvpCgf721HtY076/TleFtuzr/MHl/zyhs59NOnuyhWNPjwPnYmW0aoQL8bHciCE0pzQrlPbjeFzlyG3wp4sudhUboYdFw5lxGJHdcihYWyjg6jb5N76IFqb7zIlYXZEMMds+1I3E7hoMTuw42Y2eY3tnei/6hiG/YL2NXV8Hxh1kTlhj2hpazeeZKYcU76T5XRw5ZLUgDLXy+8Je5CiWE1FEOrWj65zyrphgVP3aZXmDsD4i8xsyYcHzPCcr9u0RMYITICI3b0iCUbyd9v+m0vGaTGRDEK/UjAUrNX4TqIP94QKqzsS/IH7BZGxZEuTctjKXtM+6im1eTkF0c4YWkQLnqKZxbTje3wWQSI5EdmOriCWls3DumygIdSGqj/vgRAKbC+eMTM+JEAOxh4YId8k/OBvyO+8D9ee9rQQZwxTsN8B18kSoBwO74afrA0tS7lqgEdr4gwnX1gPXy1BfbYKLCYCm6aSOhT3milLT0VHIAXZJfvCmOmJgJw8ywMZIrZxqbViSvalXI382lnDwpr3IVN8EED4ySry6MnXR/mqZohpmGJ6cA8UMAtt0a+G/2k+C238AWhRFffuJGn40fnFLpeq5tkx+t1SzWINHw8QarS3x1wpP1RmbBDWnESS+E25j4fFgyDu+NmxELJ7xtl1QkLHZnmi6NTNum07zlaagGsN0T7h/OoIaMl75IzqUF04CMC4CNSdZu9c0lPCb/rud2neI7Tbx7jzZCsH3v6woM8BOSavun/b6DQEAvbgu9jgNnuqTB61o2F87U8o1T15oS3jbaOkLKRzlIcsPWMV9dqoyK+e7J+KoIK4OBCRxlpLTpH8lOTvIFo6xxkEuAiYC6mRuOW8mTiRWOWrsMr5yvnlgW//Jqal+VekFnu/XjB1fewueap+4LDQBK8Y/bMAqHpngSvF558DRP7Zz8pHjTucBb+JHgH3ZeKGn tdm7H81e co5rX53L5Olyvoes1SBUsUGRCbeiPYPWNrGKzOyICYXiucPLboODACroaQhLViKJ7Akliy2TWWaFsKWv4by/IYlESWwa7yQp9P+JlWt/ck8oFhX2gOiN/0RwA1bxzEYi3KkcZkl+rPg/6I7gWNSvkjg2a0YfcjuPSQs4KdYpIrWl9GV69nC9CmnCb2+q4cQ5KWhZWW3x3tW+g10Crl/HIca0Qb3ulvroKmgZ9hAUOsM64hK1oIskpFBvp+uczxIXoHtEDxe7/4yBuxKG7yQuaSW90yvf9U3MNKpqUg7QK9ySkLf8RwWMC7IBAJe1LuXcCrbbIuyWltheV8VvJWBDj9R9MRXtU0xoNU7zxUY2KTBz5PtFf1YkSIfssY6UUJMzUrldCjpANM7FJ4WQGwrcoSyfPBrEdBmQedazECUYDyMoSr6u8qOo9hHsb503YEll+URX9YbTcwTXumDLIfyRfZyZqZYVykFvxiPyY3ryFnuOjtBCWg9LbLmdP9dSpWG7wld4BWHleN0gSoDXr9Lt4ktLKgA== 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 cf94ccdfe751..2af8f50855d4 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,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); @@ -1154,7 +1166,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 +1213,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 +1243,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