Commit bd40b053 authored by Oscar Salvador's avatar Oscar Salvador Committed by Andrew Morton
Browse files

mm: consolidate common checks in hugetlb_get_unmapped_area 

prepare_hugepage_range() performs almost the same checks for all
architectures that define it, with the exception of mips and loongarch
that also check for overflows.

The rest checks for the addr and len to be properly aligned, so we can
move that to hugetlb_get_unmapped_area() and get rid of a fair amount of
duplicated code.

[akpm@linux-foundation.org: remove now-unused local]
 Link: https://lore.kernel.org/oe-kbuild-all/202410081210.uNLbf3Jk-lkp@intel.com/
Link: https://lkml.kernel.org/r/20241007075037.267650-10-osalvador@suse.de


Signed-off-by: default avatarOscar Salvador <osalvador@suse.de>
Cc: David Hildenbrand <david@redhat.com>
Cc: Donet Tom <donettom@linux.ibm.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Peter Xu <peterx@redhat.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5b2f650d

arch/loongarch/include/asm/hugetlb.h

+0 −5
Original line number Diff line number Diff line
@@ -16,12 +16,7 @@ static inline int prepare_hugepage_range(struct file *file, 
					 unsigned long len)

{

	unsigned long task_size = STACK_TOP;

	struct hstate *h = hstate_file(file);



	if (len & ~huge_page_mask(h))

		return -EINVAL;

	if (addr & ~huge_page_mask(h))

		return -EINVAL;

	if (len > task_size)

		return -ENOMEM;

	if (task_size - len < addr)

arch/mips/include/asm/hugetlb.h

+0 −5
Original line number Diff line number Diff line
@@ -17,12 +17,7 @@ static inline int prepare_hugepage_range(struct file *file, 
					 unsigned long len)

{

	unsigned long task_size = STACK_TOP;

	struct hstate *h = hstate_file(file);



	if (len & ~huge_page_mask(h))

		return -EINVAL;

	if (addr & ~huge_page_mask(h))

		return -EINVAL;

	if (len > task_size)

		return -ENOMEM;

	if (task_size - len < addr)

arch/parisc/include/asm/hugetlb.h

+0 −15
Original line number Diff line number Diff line
@@ -12,21 +12,6 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, 
pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,

			      pte_t *ptep);



/*

 * If the arch doesn't supply something else, assume that hugepage

 * size aligned regions are ok without further preparation.

 */

#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE

static inline int prepare_hugepage_range(struct file *file,

			unsigned long addr, unsigned long len)

{

	if (len & ~HPAGE_MASK)

		return -EINVAL;

	if (addr & ~HPAGE_MASK)

		return -EINVAL;

	return 0;

}



#define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH

static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,

					  unsigned long addr, pte_t *ptep)

arch/s390/include/asm/hugetlb.h

+0 −17
Original line number Diff line number Diff line
@@ -25,23 +25,6 @@ extern pte_t huge_ptep_get(struct mm_struct *mm, unsigned long addr, pte_t *ptep 
extern pte_t huge_ptep_get_and_clear(struct mm_struct *mm,

			      unsigned long addr, pte_t *ptep);



/*

 * If the arch doesn't supply something else, assume that hugepage

 * size aligned regions are ok without further preparation.

 */

#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE

static inline int prepare_hugepage_range(struct file *file,

			unsigned long addr, unsigned long len)

{

	struct hstate *h = hstate_file(file);



	if (len & ~huge_page_mask(h))

		return -EINVAL;

	if (addr & ~huge_page_mask(h))

		return -EINVAL;

	return 0;

}



static inline void arch_clear_hugetlb_flags(struct folio *folio)

{

	clear_bit(PG_arch_1, &folio->flags);

arch/sh/include/asm/hugetlb.h

+0 −15
Original line number Diff line number Diff line
@@ -5,21 +5,6 @@ 
#include <asm/cacheflush.h>

#include <asm/page.h>



/*

 * If the arch doesn't supply something else, assume that hugepage

 * size aligned regions are ok without further preparation.

 */

#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE

static inline int prepare_hugepage_range(struct file *file,

			unsigned long addr, unsigned long len)

{

	if (len & ~HPAGE_MASK)

		return -EINVAL;

	if (addr & ~HPAGE_MASK)

		return -EINVAL;

	return 0;

}



#define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH

static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,

					  unsigned long addr, pte_t *ptep)