Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7868a208 authored by Punit Agrawal's avatar Punit Agrawal Committed by Linus Torvalds
Browse files

mm/hugetlb: add size parameter to huge_pte_offset() 

A poisoned or migrated hugepage is stored as a swap entry in the page
tables.  On architectures that support hugepages consisting of
contiguous page table entries (such as on arm64) this leads to ambiguity
in determining the page table entry to return in huge_pte_offset() when
a poisoned entry is encountered.

Let's remove the ambiguity by adding a size parameter to convey
additional information about the requested address.  Also fixup the
definition/usage of huge_pte_offset() throughout the tree.

Link: http://lkml.kernel.org/r/20170522133604.11392-4-punit.agrawal@arm.com


Signed-off-by: default avatarPunit Agrawal <punit.agrawal@arm.com>
Acked-by: default avatarSteve Capper <steve.capper@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: James Hogan <james.hogan@imgtec.com> (odd fixer:METAG ARCHITECTURE)
Cc: Ralf Baechle <ralf@linux-mips.org> (supporter:MIPS)
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@mellanox.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d63206ee

arch/arm64/mm/hugetlbpage.c

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, 
	return pte;

}



pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)

pte_t *huge_pte_offset(struct mm_struct *mm,

		       unsigned long addr, unsigned long sz)

{

	pgd_t *pgd;

	pud_t *pud;

arch/ia64/mm/hugetlbpage.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) 
}



pte_t *

huge_pte_offset (struct mm_struct *mm, unsigned long addr)

huge_pte_offset (struct mm_struct *mm, unsigned long addr, unsigned long sz)

{

	unsigned long taddr = htlbpage_to_page(addr);

	pgd_t *pgd;
@@ -92,7 +92,7 @@ struct page *follow_huge_addr(struct mm_struct *mm, unsigned long addr, int writ 
	if (REGION_NUMBER(addr) != RGN_HPAGE)

		return ERR_PTR(-EINVAL);



	ptep = huge_pte_offset(mm, addr);

	ptep = huge_pte_offset(mm, addr, HPAGE_SIZE);

	if (!ptep || pte_none(*ptep))

		return NULL;

	page = pte_page(*ptep);

arch/metag/mm/hugetlbpage.c

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, 
	return pte;

}



pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)

pte_t *huge_pte_offset(struct mm_struct *mm,

		       unsigned long addr, unsigned long sz)

{

	pgd_t *pgd;

	pud_t *pud;

arch/mips/mm/hugetlbpage.c

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, 
	return pte;

}



pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)

pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr,

		       unsigned long sz)

{

	pgd_t *pgd;

	pud_t *pud;

arch/parisc/mm/hugetlbpage.c

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, 
	return pte;

}



pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)

pte_t *huge_pte_offset(struct mm_struct *mm,

		       unsigned long addr, unsigned long sz)

{

	pgd_t *pgd;

	pud_t *pud;