1 files changed, 14 insertions, 2 deletions

diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
index db4a6253df92..533fc6fa6726 100644
--- a/arch/powerpc/mm/pgtable.c
+++ b/arch/powerpc/mm/pgtable.c
@@ -372,13 +372,25 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea,
         pdshift = PMD_SHIFT;
         pmdp = pmd_offset(&pud, ea);
         pmd  = READ_ONCE(*pmdp);
+
         /*
-         * A hugepage collapse is captured by pmd_none, because
-         * it mark the pmd none and do a hpte invalidate.
+         * A hugepage collapse is captured by this condition, see
+         * pmdp_collapse_flush.
          */
         if (pmd_none(pmd))
                 return NULL;
 
+#ifdef CONFIG_PPC_BOOK3S_64
+        /*
+         * A hugepage split is captured by this condition, see
+         * pmdp_invalidate.
+         *
+         * Huge page modification can be caught here too.
+         */
+        if (pmd_is_serializing(pmd))
+                return NULL;
+#endif
+
         if (pmd_trans_huge(pmd) || pmd_devmap(pmd)) {
                 if (is_thp)
                         *is_thp = true;