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 D72EAC83F1A for ; Mon, 14 Jul 2025 00:34:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 344368D0003; Sun, 13 Jul 2025 20:34:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 31BC68D0001; Sun, 13 Jul 2025 20:34:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 231288D0003; Sun, 13 Jul 2025 20:34:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 117CF8D0001 for ; Sun, 13 Jul 2025 20:34:05 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 910471D9F6F for ; Mon, 14 Jul 2025 00:34:04 +0000 (UTC) X-FDA: 83660998008.11.B6FCCF0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf14.hostedemail.com (Postfix) with ESMTP id C1430100004 for ; Mon, 14 Jul 2025 00:34:02 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Lk3+beuB; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf14.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752453242; 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=EoRH+kStQ3aqXNZ/dhK5FJTZj9XLujnqaCkMuiFSjys=; b=Tmwekspb7X/BCbNIDVCg/S0ufyVACq2FPS6/4Xey/9xC7f7RmRlxB+7ycIaSOeVUkOgFyF WuZfvL7DF+IxFbhtH6yXGpKD5IEzEb/n70cnT1HPqViXF9D44xQDYY4KvteIH7BYR3mLGa g2DT3/SYDFfMOcmYoFctMvF+PktokWU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752453242; a=rsa-sha256; cv=none; b=7Br0ZRe5HeI0NuY5Pst0lHMUmZAVZ44iZgEFmWcfjw1bXcz5odhmdE7RYnsDTK3Ds+bzXZ KghbRLc+ZY+DRcw9qW5dO5UTMHc4KgB0bpRfmYl9XwY5VZbpS9N7gFE1jBKb451Ao+HIy/ z2iUB/lXnyv9iiZzqkQ0DVoMv3bH5ag= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Lk3+beuB; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf14.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752453242; 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=EoRH+kStQ3aqXNZ/dhK5FJTZj9XLujnqaCkMuiFSjys=; b=Lk3+beuBkKFXjOGvny5P+uNNhpoEvtSAX5iZ/D4QhKMTe5HhpyDoBT5NBv22l7UzFtqOZw eLLkOhWLxDQzI0ZtwyZXOS3f+e4PUOz5ZbCTkUGCLeXXka7ug805K8TgeqD7wnmObxbeH1 iZOdFSO/uvzP75Gu1DEVpCLbRjZ7fSM= 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-671-vmakS4vuPsmh1ghP5sKzHw-1; Sun, 13 Jul 2025 20:33:57 -0400 X-MC-Unique: vmakS4vuPsmh1ghP5sKzHw-1 X-Mimecast-MFC-AGG-ID: vmakS4vuPsmh1ghP5sKzHw_1752453233 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 60C1A18011DF; Mon, 14 Jul 2025 00:33:53 +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 E7FCD30001A1; Mon, 14 Jul 2025 00:33:38 +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 05/14] khugepaged: generalize __collapse_huge_page_* for mTHP support Date: Sun, 13 Jul 2025 18:31:58 -0600 Message-ID: <20250714003207.113275-6-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-Queue-Id: C1430100004 X-Stat-Signature: 7kf6o3f6wobpu9uksth3h8ux9fc37ffi X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1752453242-852185 X-HE-Meta: U2FsdGVkX1/dl7ARVNP8OHLO+xMtyfoNM8X4BWd/nziaaWTCSBmDQfkPnpJCq/MqELLOUQmhkYRx0DC4xSY9wWtVmEMNsnMYURTwhOyzRhuoiUvvfOY+JJ25vs4Sq/IgyHWXCbYt3zRliLJStiF1svHyH0f+dFLgDx+FwnEmROKIKRVCp8EGZQB0muwty+85eNhjOi6kYPfcp+5p/arPjV/N6lZw2qPeATWZpRt3IVBIyQJiwRi4rgT55UvkAQNloxPmPGXRrYzYVEJVaOjAw2E327Hy3QaGE86N4DOBr06s6vlf5qPqhFWG5pwwxwz6IL1B9KafrgtCPa6qHDbHaHAmATVCC+YzFo9To7mcaiD6y7ZbvG+buzvDY/4iSDFofQjhT1o/v/+LjsYKaxRw7QDTwus5iLBNhsneaDbXs9MSzRPwZtOwlO0k32uKKjRmpigfszdc65yLfANssLece2WZpsTYKd32lF940b6KMHtqeP0iGnguAbcm2wIpdd9OjtGiTBpN/TVRwjOg04/1HNZ1yWqGGmRnl0ruYxDnLgrane8HT5AvpnzYgWpc4lRXvS9ldw2cLqVa4VzdPvTNpdg4ItIgE7T50jR+HV9LB3OdjhXYP7zRoWUycQAIrwSaR5bkHoZbXnGzv8W9N3VxvgDyUQnOQtskeOCk9jlg6qjlrDeP41qo0PPOCLhzOsghjnmV6iwHF5GklanyAAbCHaV3NMt3HiBgonk1wvRRL4jukohWkuCrqPbkwCX3sRKgyzTEe4IBFyNyvpd7hgIEAmxcMpRyTemqT8UrDM029MLrcYBP8EurJjw58m0p8p3737yFzrFjGWxxtCBjfunADg4dUJDSh2Ef1nmSjpqW1FLjNsmIyDg4Y6jyrMYAyuIUsVFujVpO6XMHlIxSXWcFtfjLquhuv8heaDpQLlx1RNK0XYkxIKe+8AIPD/3aWUSUqzgImMeNtHYeGMbYPho OnzIZu4e Qp9j19htsLk5V4boQu4ND9K8K0tUNYC9hSpeO/AsAfBj2yBwBPQWh7M5Bjp+XKdxquFvSBMep/XjkyMAk9QL3ZuO8fFWwtFWkoRGa2COcJmvT9h3lcPiior1EMPyBunqAZFU9ail0GALbO7txUU5tEh0MAtyxdZEO1ez/PXKE7Xd7zk89P30z/zQ+I+hbuY6tBzbIe2Kv5PbrGlCQH3QziWKvcUzBeKKObpnOe/IHz7bgP1TVOQZT/QfCfz21IBC3Mkd1clZwtJYBmpebLW9wvdDcdbal/0Hot1x4RWmaRF3US8bAXP5XWMw0ZIhxbn2x6BHDLmdoW1R2oiC51aec230QLD9FrKlxzndmiNdxYMLxNqew1f7FSOqmwgetWm2dx0AFGSwgUkkbcMGjMGHCSQqs+70HJ+TJeeLDJ90bvmjUm6smRzh9+ufHs6qHdx/TBZ91TKgG51dAC/DkyOdQkpoc/UFORkrCcX3LM6m83QBDaHIaGxD8+BtblXZR1A2CjeVYNDQaf2lQFcYzk0bufSkRwQ== 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 | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index cc9a35185604..ee54e3c1db4e 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; } @@ -994,11 +998,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; @@ -1029,6 +1033,15 @@ 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) { + count_mthp_stat(order, MTHP_STAT_COLLAPSE_EXCEED_SWAP); + 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); @@ -1149,7 +1162,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; } @@ -1197,7 +1210,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; @@ -1227,7 +1240,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.50.0