path: root/mm/pagewalk.c
diff options
authorPunit Agrawal <>2017-07-06 15:39:42 -0700
committerLinus Torvalds <>2017-07-06 16:24:34 -0700
commit7868a2087ec13ec4a5df0c5e00999863be132ba8 (patch)
treeae49686ff18e3e90cb644c22a4fb92d0f8bd0e2a /mm/pagewalk.c
parentd63206ee32b6e64b0e12d46e5d6004afd9913713 (diff)
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: Signed-off-by: Punit Agrawal <> Acked-by: Steve Capper <> Cc: Catalin Marinas <> Cc: Will Deacon <> Cc: Tony Luck <> Cc: Fenghua Yu <> Cc: James Hogan <> (odd fixer:METAG ARCHITECTURE) Cc: Ralf Baechle <> (supporter:MIPS) Cc: "James E.J. Bottomley" <> Cc: Helge Deller <> Cc: Benjamin Herrenschmidt <> Cc: Paul Mackerras <> Cc: Michael Ellerman <> Cc: Martin Schwidefsky <> Cc: Heiko Carstens <> Cc: Yoshinori Sato <> Cc: Rich Felker <> Cc: "David S. Miller" <> Cc: Chris Metcalf <> Cc: Thomas Gleixner <> Cc: Ingo Molnar <> Cc: "H. Peter Anvin" <> Cc: Alexander Viro <> Cc: Michal Hocko <> Cc: Mike Kravetz <> Cc: Naoya Horiguchi <> Cc: "Aneesh Kumar K.V" <> Cc: "Kirill A. Shutemov" <> Cc: Hillf Danton <> Cc: Mark Rutland <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'mm/pagewalk.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/pagewalk.c b/mm/pagewalk.c
index 60f7856e508f..1a4197965415 100644
--- a/mm/pagewalk.c
+++ b/mm/pagewalk.c
@@ -180,12 +180,13 @@ static int walk_hugetlb_range(unsigned long addr, unsigned long end,
struct hstate *h = hstate_vma(vma);
unsigned long next;
unsigned long hmask = huge_page_mask(h);
+ unsigned long sz = huge_page_size(h);
pte_t *pte;
int err = 0;
do {
next = hugetlb_entry_end(h, addr, end);
- pte = huge_pte_offset(walk->mm, addr & hmask);
+ pte = huge_pte_offset(walk->mm, addr & hmask, sz);
if (pte && walk->hugetlb_entry)
err = walk->hugetlb_entry(pte, hmask, addr, next, walk);
if (err)