Commit e6c0c032 authored by Christophe Leroy's avatar Christophe Leroy Committed by Andrew Morton
Browse files

mm: provide mm_struct and address to huge_ptep_get() 

On powerpc 8xx huge_ptep_get() will need to know whether the given ptep is
a PTE entry or a PMD entry.  This cannot be known with the PMD entry
itself because there is no easy way to know it from the content of the
entry.

So huge_ptep_get() will need to know either the size of the page or get
the pmd.

In order to be consistent with huge_ptep_get_and_clear(), give mm and
address to huge_ptep_get().

Link: https://lkml.kernel.org/r/cc00c70dd384298796a4e1b25d6c4eb306d3af85.1719928057.git.christophe.leroy@csgroup.eu


Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 18d095b2

arch/arm/include/asm/hugetlb-3level.h

+2 −2
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ 


/*

 * If our huge pte is non-zero then mark the valid bit.

 * This allows pte_present(huge_ptep_get(ptep)) to return true for non-zero

 * This allows pte_present(huge_ptep_get(mm,addr,ptep)) to return true for non-zero

 * ptes.

 * (The valid bit is automatically cleared by set_pte_at for PROT_NONE ptes).

 */

#define __HAVE_ARCH_HUGE_PTEP_GET

static inline pte_t huge_ptep_get(pte_t *ptep)

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

{

	pte_t retval = *ptep;

	if (pte_val(retval))

arch/arm64/include/asm/hugetlb.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ extern pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, 
extern void huge_pte_clear(struct mm_struct *mm, unsigned long addr,

			   pte_t *ptep, unsigned long sz);

#define __HAVE_ARCH_HUGE_PTEP_GET

extern pte_t huge_ptep_get(pte_t *ptep);

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



void __init arm64_hugetlb_cma_reserve(void);

arch/arm64/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static inline int num_contig_ptes(unsigned long size, size_t *pgsize) 
	return contig_ptes;

}



pte_t huge_ptep_get(pte_t *ptep)

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

{

	int ncontig, i;

	size_t pgsize;

arch/riscv/include/asm/hugetlb.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, 
			       pte_t pte, int dirty);



#define __HAVE_ARCH_HUGE_PTEP_GET

pte_t huge_ptep_get(pte_t *ptep);

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



pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags);

#define arch_make_huge_pte arch_make_huge_pte

arch/riscv/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <linux/err.h>



#ifdef CONFIG_RISCV_ISA_SVNAPOT

pte_t huge_ptep_get(pte_t *ptep)

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

{

	unsigned long pte_num;

	int i;