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

arch/s390: clean up hugetlb definitions 

s390 redefines functions that are already defined (and the same) in
include/asm-generic/hugetlb.h.

Do as the other architectures:
1) include include/asm-generic/hugetlb.h
2) drop the already defined functions in the generic hugetlb.h and
3) use the __HAVE_ARCH_HUGE_* macros to define our own.

This gets rid of quite some code.

Link: https://lkml.kernel.org/r/20241007075037.267650-9-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 cc92882e

arch/s390/include/asm/hugetlb.h

+16 −42
Original line number Diff line number Diff line
@@ -12,21 +12,24 @@ 
#include <linux/pgtable.h>

#include <asm/page.h>



#define hugetlb_free_pgd_range			free_pgd_range

#define hugepages_supported()			(MACHINE_HAS_EDAT1)



#define __HAVE_ARCH_HUGE_SET_HUGE_PTE_AT

void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

		     pte_t *ptep, pte_t pte, unsigned long sz);

void __set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

		     pte_t *ptep, pte_t pte);

pte_t huge_ptep_get(struct mm_struct *mm, unsigned long addr, pte_t *ptep);

pte_t huge_ptep_get_and_clear(struct mm_struct *mm,

#define __HAVE_ARCH_HUGE_PTEP_GET

extern pte_t huge_ptep_get(struct mm_struct *mm, unsigned long addr, pte_t *ptep);

#define __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR

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)

{
@@ -45,6 +48,7 @@ static inline void arch_clear_hugetlb_flags(struct folio *folio) 
}

#define arch_clear_hugetlb_flags arch_clear_hugetlb_flags



#define __HAVE_ARCH_HUGE_PTE_CLEAR

static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,

				  pte_t *ptep, unsigned long sz)

{
@@ -54,12 +58,14 @@ static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, 
		set_pte(ptep, __pte(_SEGMENT_ENTRY_EMPTY));

}



#define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH

static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,

					  unsigned long address, pte_t *ptep)

{

	return huge_ptep_get_and_clear(vma->vm_mm, address, ptep);

}



#define  __HAVE_ARCH_HUGE_PTEP_SET_ACCESS_FLAGS

static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,

					     unsigned long addr, pte_t *ptep,

					     pte_t pte, int dirty)
@@ -72,6 +78,7 @@ static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma, 
	return changed;

}



#define __HAVE_ARCH_HUGE_PTEP_SET_WRPROTECT

static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,

					   unsigned long addr, pte_t *ptep)

{
@@ -79,69 +86,36 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, 
	__set_huge_pte_at(mm, addr, ptep, pte_wrprotect(pte));

}



static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot)

{

	return mk_pte(page, pgprot);

}



#define __HAVE_ARCH_HUGE_PTE_NONE

static inline int huge_pte_none(pte_t pte)

{

	return pte_none(pte);

}



#define __HAVE_ARCH_HUGE_PTE_NONE_MOSTLY

static inline int huge_pte_none_mostly(pte_t pte)

{

	return huge_pte_none(pte);

}



static inline int huge_pte_write(pte_t pte)

{

	return pte_write(pte);

}



static inline int huge_pte_dirty(pte_t pte)

{

	return pte_dirty(pte);

}



static inline pte_t huge_pte_mkwrite(pte_t pte)

{

	return pte_mkwrite_novma(pte);

}



static inline pte_t huge_pte_mkdirty(pte_t pte)

{

	return pte_mkdirty(pte);

}



static inline pte_t huge_pte_wrprotect(pte_t pte)

{

	return pte_wrprotect(pte);

}



static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot)

{

	return pte_modify(pte, newprot);

}



#define __HAVE_ARCH_HUGE_PTE_MKUFFD_WP

static inline pte_t huge_pte_mkuffd_wp(pte_t pte)

{

	return pte;

}



#define __HAVE_ARCH_HUGE_PTE_CLEAR_UFFD_WP

static inline pte_t huge_pte_clear_uffd_wp(pte_t pte)

{

	return pte;

}



#define __HAVE_ARCH_HUGE_PTE_UFFD_WP

static inline int huge_pte_uffd_wp(pte_t pte)

{

	return 0;

}



static inline bool gigantic_page_runtime_supported(void)

{

	return true;

}

#include <asm-generic/hugetlb.h>



#endif /* _ASM_S390_HUGETLB_H */

include/asm-generic/hugetlb.h

+8 −0
Original line number Diff line number Diff line
@@ -42,20 +42,26 @@ static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot) 
	return pte_modify(pte, newprot);

}



#ifndef __HAVE_ARCH_HUGE_PTE_MKUFFD_WP

static inline pte_t huge_pte_mkuffd_wp(pte_t pte)

{

	return huge_pte_wrprotect(pte_mkuffd_wp(pte));

}

#endif



#ifndef __HAVE_ARCH_HUGE_PTE_CLEAR_UFFD_WP

static inline pte_t huge_pte_clear_uffd_wp(pte_t pte)

{

	return pte_clear_uffd_wp(pte);

}

#endif



#ifndef __HAVE_ARCH_HUGE_PTE_UFFD_WP

static inline int huge_pte_uffd_wp(pte_t pte)

{

	return pte_uffd_wp(pte);

}

#endif



#ifndef __HAVE_ARCH_HUGE_PTE_CLEAR

static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,
@@ -106,10 +112,12 @@ static inline int huge_pte_none(pte_t pte) 
#endif



/* Please refer to comments above pte_none_mostly() for the usage */

#ifndef __HAVE_ARCH_HUGE_PTE_NONE_MOSTLY

static inline int huge_pte_none_mostly(pte_t pte)

{

	return huge_pte_none(pte) || is_pte_marker(pte);

}

#endif



#ifndef __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE

static inline int prepare_hugepage_range(struct file *file,