From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 17DA91E376C for ; Sat, 6 Jun 2026 00:18:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780705093; cv=none; b=UoZY9IwZlB2FEr7olm/YS35xCrZgbm4dzzCsGjJaqrUZAQOa4vaYlLes0Xdkm99uSpZ8Zy/C5s5Z0OH9GwjuOZZG2aGLV8gR+40tGntE01RWfLSplzhhFtzBR6fPLlnM6gmq6GJAgVhhb/6KjAUFgEdwBiKIx8KGBkZXDY6HETE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780705093; c=relaxed/simple; bh=jnpuGcoR0Tjz606BS9f9sLpH13SL9TaRTI/FYhixEco=; h=Date:To:From:Subject:Message-Id; b=FoOQXwf5Hyber++7XYdqbEUtrCv6M/VhMWXbeRdu2Wok2VCu/+Jy76uvmXZoUenAzNLNKd2IMRCWMgTGv3WVi9I7xd2Plh8t3aNBvx1K8p5Q3kti+CqRvdnS1svD95SIef4DfImwE4SfsQS4EOajUudLgMcg/vYz6oGfqdR3zRA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=TkIgh/XF; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="TkIgh/XF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9DFC51F00893; Sat, 6 Jun 2026 00:18:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1780705091; bh=Qp6/JRmwOvKJCsVxbkAwvZWEq6ajwId6Qbw3xFUGx98=; h=Date:To:From:Subject; b=TkIgh/XFk1gTmI0zAZSIwlSy/Sd3Rh8bVKtMo/TiCNY/w4pdoBg466durmdl5uMlg 1BWcAc1NGnM/yelQB8fkV5mdTcCkK9PSI+Cb9+MGYeGzTBkUBt+51c6KafBpsTTjPy TolRWMrBSA0DpcREhRqo8Q0d4j7pFILtbip5oO7w= Date: Fri, 05 Jun 2026 17:18:11 -0700 To: mm-commits@vger.kernel.org,npache@redhat.com,akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] mm-khugepaged-introduce-collapse_allowable_orders-helper-function.patch removed from -mm tree Message-Id: <20260606001811.9DFC51F00893@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm/khugepaged: introduce collapse_allowable_orders helper function has been removed from the -mm tree. Its filename was mm-khugepaged-introduce-collapse_allowable_orders-helper-function.patch This patch was dropped because an updated version will be issued ------------------------------------------------------ From: Nico Pache Subject: mm/khugepaged: introduce collapse_allowable_orders helper function Date: Fri, 22 May 2026 09:00:05 -0600 Add collapse_allowable_orders() to generalize THP order eligibility. The function determines which THP orders are permitted based on collapse context (khugepaged vs madv_collapse). This consolidates collapse configuration logic and provides a clean interface for future mTHP collapse support where the orders may be different. Link: https://lore.kernel.org/20260522150009.121603-11-npache@redhat.com Signed-off-by: Nico Pache Reviewed-by: Baolin Wang Acked-by: David Hildenbrand (Arm) Cc: Alistair Popple Cc: Andrea Arcangeli Cc: Anshuman Khandual Cc: Bagas Sanjaya Cc: Barry Song Cc: Brendan Jackman Cc: Byungchul Park Cc: Catalin Marinas Cc: David Rientjes Cc: Dev Jain Cc: Gregory Price Cc: "Huang, Ying" Cc: Hugh Dickins Cc: Jan Kara Cc: Jann Horn Cc: Johannes Weiner Cc: Jonathan Corbet Cc: Joshua Hahn Cc: Kefeng Wang Cc: Lance Yang Cc: Liam R. Howlett Cc: Lorenzo Stoakes Cc: "Masami Hiramatsu (Google)" Cc: Mathieu Desnoyers Cc: Matthew Brost Cc: Matthew Wilcox (Oracle) Cc: Michal Hocko Cc: Mike Rapoport Cc: Nanyong Sun Cc: Pedro Falcato Cc: Peter Xu Cc: Rafael Aquini Cc: Rakie Kim Cc: Randy Dunlap Cc: Ryan Roberts Cc: Shivank Garg Cc: Steven Rostedt Cc: Suren Baghdasaryan Cc: Takashi Iwai (SUSE) Cc: Thomas Hellström Cc: Usama Arif Cc: Usama Arif Cc: Vishal Moola (Oracle) Cc: Vlastimil Babka Cc: Wei Yang Cc: Will Deacon Cc: Yang Shi Cc: Zach O'Keefe Cc: Zi Yan Signed-off-by: Andrew Morton --- mm/khugepaged.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) --- a/mm/khugepaged.c~mm-khugepaged-introduce-collapse_allowable_orders-helper-function +++ a/mm/khugepaged.c @@ -554,12 +554,21 @@ void __khugepaged_enter(struct mm_struct wake_up_interruptible(&khugepaged_wait); } +/* Check what orders are allowed based on the vma and collapse type */ +static unsigned long collapse_allowable_orders(struct vm_area_struct *vma, + vm_flags_t vm_flags, enum tva_type tva_flags) +{ + unsigned long orders = BIT(HPAGE_PMD_ORDER); + + return thp_vma_allowable_orders(vma, vm_flags, tva_flags, orders); +} + void khugepaged_enter_vma(struct vm_area_struct *vma, vm_flags_t vm_flags) { if (!mm_flags_test(MMF_VM_HUGEPAGE, vma->vm_mm) && hugepage_pmd_enabled()) { - if (thp_vma_allowable_order(vma, vm_flags, TVA_KHUGEPAGED, PMD_ORDER)) + if (collapse_allowable_orders(vma, vm_flags, TVA_KHUGEPAGED)) __khugepaged_enter(vma->vm_mm); } } @@ -2694,7 +2703,7 @@ static void collapse_scan_mm_slot(unsign cc->progress++; break; } - if (!thp_vma_allowable_order(vma, vma->vm_flags, TVA_KHUGEPAGED, PMD_ORDER)) { + if (!collapse_allowable_orders(vma, vma->vm_flags, TVA_KHUGEPAGED)) { cc->progress++; continue; } @@ -3004,7 +3013,7 @@ int madvise_collapse(struct vm_area_stru BUG_ON(vma->vm_start > start); BUG_ON(vma->vm_end < end); - if (!thp_vma_allowable_order(vma, vma->vm_flags, TVA_FORCED_COLLAPSE, PMD_ORDER)) + if (!collapse_allowable_orders(vma, vma->vm_flags, TVA_FORCED_COLLAPSE)) return -EINVAL; cc = kmalloc_obj(*cc); _ Patches currently in -mm which might be from npache@redhat.com are mm-khugepaged-introduce-mthp-collapse-support.patch mm-khugepaged-introduce-mthp-collapse-support-fix.patch mm-khugepaged-avoid-unnecessary-mthp-collapse-attempts.patch documentation-mm-update-the-admin-guide-for-mthp-collapse.patch