sparc64: Fix bugs in get_user_pages_fast() wrt. THP. (04df419d) · Commits · 戴 / test

The large PMD path needs to check _PAGE_VALID not _PAGE_PRESENT, to decide if it needs to bail and return 0. pmd_large() should therefore just check _PAGE_PMD_HUGE. Calls to gup_huge_pmd() are guarded with a check of pmd_large(), so we just need to add a valid bit check. Signed-off-by:

David S. Miller <davem@davemloft.net>

arch/sparc/include/asm/pgtable_64.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -633,7 +633,7 @@ static inline unsigned long pmd_large(pmd_t pmd)
		{
		pte_t pte = __pte(pmd_val(pmd));

		return (pte_val(pte) & _PAGE_PMD_HUGE) && pte_present(pte);
		return pte_val(pte) & _PAGE_PMD_HUGE;
		}

		#ifdef CONFIG_TRANSPARENT_HUGEPAGE

arch/sparc/mm/gup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ static int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
		struct page head, page, *tail;
		int refs;

		if (!pmd_large(pmd))
		if (!(pmd_val(pmd) & _PAGE_VALID))
		return 0;

		if (write && !pmd_write(pmd))

Admin message