Commit b0752f1a authored by Fan Ni's avatar Fan Ni Committed by Andrew Morton
Browse files

mm/hugetlb: pass folio instead of page to unmap_ref_private() 

Patch series "Let unmap_hugepage_range() and several related functions
take folio instead of page", v4.


This patch (of 4):

unmap_ref_private() has only a single user, which passes in &folio->page. 
Let it take the folio directly.

Link: https://lkml.kernel.org/r/20250505182345.506888-2-nifan.cxl@gmail.com
Link: https://lkml.kernel.org/r/20250505182345.506888-3-nifan.cxl@gmail.com


Signed-off-by: default avatarFan Ni <fan.ni@samsung.com>
Reviewed-by: default avatarMuchun Song <muchun.song@linux.dev>
Reviewed-by: default avatarSidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: "Vishal Moola (Oracle)" <vishal.moola@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 200577f6

mm/hugetlb.c

+4 −4
Original line number Diff line number Diff line
@@ -6071,7 +6071,7 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, 
 * same region.

 */

static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,

			      struct page *page, unsigned long address)

			      struct folio *folio, unsigned long address)

{

	struct hstate *h = hstate_vma(vma);

	struct vm_area_struct *iter_vma;
@@ -6115,7 +6115,8 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma, 
		 */

		if (!is_vma_resv_set(iter_vma, HPAGE_RESV_OWNER))

			unmap_hugepage_range(iter_vma, address,

					     address + huge_page_size(h), page, 0);

					     address + huge_page_size(h),

					     &folio->page, 0);

	}

	i_mmap_unlock_write(mapping);

}
@@ -6238,8 +6239,7 @@ static vm_fault_t hugetlb_wp(struct folio *pagecache_folio, 
			hugetlb_vma_unlock_read(vma);

			mutex_unlock(&hugetlb_fault_mutex_table[hash]);



			unmap_ref_private(mm, vma, &old_folio->page,

					vmf->address);

			unmap_ref_private(mm, vma, old_folio, vmf->address);



			mutex_lock(&hugetlb_fault_mutex_table[hash]);

			hugetlb_vma_lock_read(vma);