Commit 32960f75 authored by Usama Arif's avatar Usama Arif Committed by Andrew Morton
Browse files

mm/huge_memory: remove enforce_sysfs from __thp_vma_allowable_orders 

Using forced_collapse directly is clearer and enforce_sysfs is not really
needed.

Link: https://lkml.kernel.org/r/20250821150038.2025521-1-usamaarif642@gmail.com


Signed-off-by: default avatarUsama Arif <usamaarif642@gmail.com>
Acked-by: default avatarZi Yan <ziy@nvidia.com>
Reviewed-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: default avatarDev Jain <dev.jain@arm.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarSeongJae Park <sj@kernel.org>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mariano Pache <npache@redhat.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent ce32123b

mm/huge_memory.c

+3 −4
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, 
	const bool smaps = type == TVA_SMAPS;

	const bool in_pf = type == TVA_PAGEFAULT;

	const bool forced_collapse = type == TVA_FORCED_COLLAPSE;

	const bool enforce_sysfs = !forced_collapse;

	unsigned long supported_orders;



	/* Check the intersection of requested and supported orders. */
@@ -168,14 +167,14 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, 
	if (!in_pf && shmem_file(vma->vm_file))

		return orders & shmem_allowable_huge_orders(file_inode(vma->vm_file),

						   vma, vma->vm_pgoff, 0,

						   !enforce_sysfs);

						   forced_collapse);



	if (!vma_is_anonymous(vma)) {

		/*

		 * Enforce sysfs THP requirements as necessary. Anonymous vmas

		 * Enforce THP collapse requirements as necessary. Anonymous vmas

		 * were already handled in thp_vma_allowable_orders().

		 */

		if (enforce_sysfs &&

		if (!forced_collapse &&

		    (!hugepage_global_enabled() || (!(vm_flags & VM_HUGEPAGE) &&

						    !hugepage_global_always())))

			return 0;