Skip to contentSkip to conversation

powerpc/64s: Fix THP PMD collapse serialisation

PATCH Applied Nicholas Piggin 4 participants 10 messages Jun 7, 2019 – Jun 12, 2019 PowerPC

lore
Share & tools
lore

Nicholas Piggin

author reviewer
#0 lore raw

PATCH 1/2 powerpc/64s: Fix THP PMD collapse serialisation

Commit 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian conversion in pte helpers") changed the actual bitwise tests in pte_access_permitted by using pte_write() and pte_present() helpers rather than raw bitwise testing _PAGE_WRITE and _PAGE_PRESENT bits.

The pte_present change now returns true for ptes which are !_PAGE_PRESENT and _PAGE_INVALID, which is the combination used by pmdp_invalidate to synchronize access from lock-free lookups. pte_access_permitted is used by pmd_access_permitted, so allowing GUP lock free access to proceed with such PTEs breaks this synchronisation.

This bug has been observed on HPT host, with random crashes and corruption in guests, usually together with bad PMD messages in the host.

Fix this by adding an explicit check in pmd_access_permitted, and documenting the condition explicitly.

The pte_write() change should be okay, and would prevent GUP from falling back to the slow path when encountering savedwrite ptes, which matches what x86 (that does not implement savedwrite) does.

Fixes 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian conversion in pte helpers")
Cc Aneesh Kumar K.V <[email protected]>
Cc Christophe Leroy <[email protected]>

---

I accounted for Aneesh's and Christophe's feedback, except I couldn't find a good way to replace the ifdef with IS_ENABLED because of _PAGE_INVALID etc., but at least cleaned that up a bit nicer.

Patch 1 solves a problem I can hit quite reliably running HPT/HPT KVM. Patch 2 was noticed by Aneesh when inspecting code for similar bugs. They should probably both be merged in stable kernels after upstream.

 arch/powerpc/include/asm/book3s/64/pgtable.h | 30 ++++++++++++++++++++
 arch/powerpc/mm/book3s64/pgtable.c           |  3 ++
 2 files changed, 33 insertions(+)
arch/powerpc/include/asm/book3s/64/pgtable.h +30 -0
index 7dede2e34b70..ccf00a8b98c6 100644
@@ -876,6 +876,23 @@ static inline int pmd_present(pmd_t pmd)
 	return false;
 }
 
+static inline int pmd_is_serializing(pmd_t pmd)
+{
+	/*
+	 * If the pmd is undergoing a split, the _PAGE_PRESENT bit is clear
+	 * and _PAGE_INVALID is set (see pmd_present, pmdp_invalidate).
+	 *
+	 * This condition may also occur when flushing a pmd while flushing
+	 * it (see ptep_modify_prot_start), so callers must ensure this
+	 * case is fine as well.
+	 */
+	if ((pmd_raw(pmd) & cpu_to_be64(_PAGE_PRESENT | _PAGE_INVALID)) ==
+						cpu_to_be64(_PAGE_INVALID))
+		return true;
+
+	return false;
+}
+
 static inline int pmd_bad(pmd_t pmd)
 {
 	if (radix_enabled())
@@ -1092,6 +1109,19 @@ static inline int pmd_protnone(pmd_t pmd)
 #define pmd_access_permitted pmd_access_permitted
 static inline bool pmd_access_permitted(pmd_t pmd, bool write)
 {
+	/*
+	 * pmdp_invalidate sets this combination (which is not caught by
+	 * !pte_present() check in pte_access_permitted), to prevent
+	 * lock-free lookups, as part of the serialize_against_pte_lookup()
+	 * synchronisation.
+	 *
+	 * This also catches the case where the PTE's hardware PRESENT bit is
+	 * cleared while TLB is flushed, which is suboptimal but should not
+	 * be frequent.
+	 */
+	if (pmd_is_serializing(pmd))
+		return false;
+
 	return pte_access_permitted(pmd_pte(pmd), write);
 }
 
arch/powerpc/mm/book3s64/pgtable.c +3 -0
index 16bda049187a..ff98b663c83e 100644
@@ -116,6 +116,9 @@ pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
 	/*
 	 * This ensures that generic code that rely on IRQ disabling
 	 * to prevent a parallel THP split work as expected.
+	 *
+	 * Marking the entry with _PAGE_INVALID && ~_PAGE_PRESENT requires
+	 * a special case check in pmd_access_permitted.
 	 */
 	serialize_against_pte_lookup(vma->vm_mm);
 	return __pmd(old_pmd);
Signature · 1 line
2.20.1
author reviewer
#1 lore raw

PATCH 2/2 powerpc/64s: __find_linux_pte synchronization vs pmdp_invalidate

The change to pmdp_invalidate to mark the pmd with _PAGE_INVALID broke the synchronisation against lock free lookups, __find_linux_pte's pmd_none check no longer returns true for such cases.

Fix this by adding a check for this condition as well.

Fixes da7ad366b497 ("powerpc/mm/book3s: Update pmd_present to look at _PAGE_PRESENT bit")
Cc Christophe Leroy <[email protected]>
---
 arch/powerpc/mm/pgtable.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
arch/powerpc/mm/pgtable.c +14 -2
index db4a6253df92..533fc6fa6726 100644
@@ -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;
Signature · 1 line
2.20.1
#6 lore raw
In reply to Nicholas Piggin

Le 07/06/2019 à 05:56, Nicholas Piggin a écrit :

Quoted 25 lines

Commit 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian conversion in pte helpers") changed the actual bitwise tests in pte_access_permitted by using pte_write() and pte_present() helpers rather than raw bitwise testing _PAGE_WRITE and _PAGE_PRESENT bits.

The pte_present change now returns true for ptes which are !_PAGE_PRESENT and _PAGE_INVALID, which is the combination used by pmdp_invalidate to synchronize access from lock-free lookups. pte_access_permitted is used by pmd_access_permitted, so allowing GUP lock free access to proceed with such PTEs breaks this synchronisation.

This bug has been observed on HPT host, with random crashes and corruption in guests, usually together with bad PMD messages in the host.

Fix this by adding an explicit check in pmd_access_permitted, and documenting the condition explicitly.

The pte_write() change should be okay, and would prevent GUP from falling back to the slow path when encountering savedwrite ptes, which matches what x86 (that does not implement savedwrite) does.

Fixes 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian conversion in pte helpers")
Cc Aneesh Kumar K.V <[email protected]>
Cc Christophe Leroy <[email protected]>
Quoted 5 lines

---

I accounted for Aneesh's and Christophe's feedback, except I couldn't find a good way to replace the ifdef with IS_ENABLED because of _PAGE_INVALID etc., but at least cleaned that up a bit nicer.

I guess the standard way is to add a pmd_is_serializing() which return always false in book3s/32/pgtable.h and in nohash/pgtable.h

Quoted 14 lines

Patch 1 solves a problem I can hit quite reliably running HPT/HPT KVM. Patch 2 was noticed by Aneesh when inspecting code for similar bugs. They should probably both be merged in stable kernels after upstream.

  arch/powerpc/include/asm/book3s/64/pgtable.h | 30 ++++++++++++++++++++
  arch/powerpc/mm/book3s64/pgtable.c           |  3 ++
  2 files changed, 33 insertions(+)
arch/powerpc/include/asm/book3s/64/pgtable.h +0 -0
index 7dede2e34b70..ccf00a8b98c6 100644

arch/powerpc/include/asm/book3s/64/pgtable.h static inline int pmd_present(pmd_t pmd) · line 879

Quoted 4 lines
arch/powerpc/include/asm/book3s/64/pgtable.h +1 -0
@@ -876,6 +876,23 @@ static inline int pmd_present(pmd_t pmd)
  	return false;
  }
 
+static inline int pmd_is_serializing(pmd_t pmd)

should be static inline bool instead of int ?

Christophe

Quoted 54 lines
arch/powerpc/include/asm/book3s/64/pgtable.h +29 -0
+{
+	/*
+	 * If the pmd is undergoing a split, the _PAGE_PRESENT bit is clear
+	 * and _PAGE_INVALID is set (see pmd_present, pmdp_invalidate).
+	 *
+	 * This condition may also occur when flushing a pmd while flushing
+	 * it (see ptep_modify_prot_start), so callers must ensure this
+	 * case is fine as well.
+	 */
+	if ((pmd_raw(pmd) & cpu_to_be64(_PAGE_PRESENT | _PAGE_INVALID)) ==
+						cpu_to_be64(_PAGE_INVALID))
+		return true;
+
+	return false;
+}
+
  static inline int pmd_bad(pmd_t pmd)
  {
  	if (radix_enabled())
@@ -1092,6 +1109,19 @@ static inline int pmd_protnone(pmd_t pmd)
  #define pmd_access_permitted pmd_access_permitted
  static inline bool pmd_access_permitted(pmd_t pmd, bool write)
  {
+	/*
+	 * pmdp_invalidate sets this combination (which is not caught by
+	 * !pte_present() check in pte_access_permitted), to prevent
+	 * lock-free lookups, as part of the serialize_against_pte_lookup()
+	 * synchronisation.
+	 *
+	 * This also catches the case where the PTE's hardware PRESENT bit is
+	 * cleared while TLB is flushed, which is suboptimal but should not
+	 * be frequent.
+	 */
+	if (pmd_is_serializing(pmd))
+		return false;
+
  	return pte_access_permitted(pmd_pte(pmd), write);
  }
 
arch/powerpc/mm/book3s64/pgtable.c +3 -0
index 16bda049187a..ff98b663c83e 100644
@@ -116,6 +116,9 @@ pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
  	/*
  	 * This ensures that generic code that rely on IRQ disabling
  	 * to prevent a parallel THP split work as expected.
+	 *
+	 * Marking the entry with _PAGE_INVALID && ~_PAGE_PRESENT requires
+	 * a special case check in pmd_access_permitted.
  	 */
  	serialize_against_pte_lookup(vma->vm_mm);
  	return __pmd(old_pmd);
Reviewed-by on v1 1/2
#8 lore raw
In reply to Nicholas Piggin
Quoted 14 lines · Nicholas Piggin

Commit 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian conversion in pte helpers") changed the actual bitwise tests in pte_access_permitted by using pte_write() and pte_present() helpers rather than raw bitwise testing _PAGE_WRITE and _PAGE_PRESENT bits.

The pte_present change now returns true for ptes which are !_PAGE_PRESENT and _PAGE_INVALID, which is the combination used by pmdp_invalidate to synchronize access from lock-free lookups. pte_access_permitted is used by pmd_access_permitted, so allowing GUP lock free access to proceed with such PTEs breaks this synchronisation.

This bug has been observed on HPT host, with random crashes and corruption in guests, usually together with bad PMD messages in the host.

Quoted 7 lines

Fix this by adding an explicit check in pmd_access_permitted, and documenting the condition explicitly.

The pte_write() change should be okay, and would prevent GUP from falling back to the slow path when encountering savedwrite ptes, which matches what x86 (that does not implement savedwrite) does.

Quoted 82 lines
Fixes 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian conversion in pte helpers")
Cc Aneesh Kumar K.V <[email protected]>
Cc Christophe Leroy <[email protected]>

---

I accounted for Aneesh's and Christophe's feedback, except I couldn't find a good way to replace the ifdef with IS_ENABLED because of _PAGE_INVALID etc., but at least cleaned that up a bit nicer.

Patch 1 solves a problem I can hit quite reliably running HPT/HPT KVM. Patch 2 was noticed by Aneesh when inspecting code for similar bugs. They should probably both be merged in stable kernels after upstream.

 arch/powerpc/include/asm/book3s/64/pgtable.h | 30 ++++++++++++++++++++
 arch/powerpc/mm/book3s64/pgtable.c           |  3 ++
 2 files changed, 33 insertions(+)
arch/powerpc/include/asm/book3s/64/pgtable.h +30 -0
index 7dede2e34b70..ccf00a8b98c6 100644
@@ -876,6 +876,23 @@ static inline int pmd_present(pmd_t pmd)
 	return false;
 }
 
+static inline int pmd_is_serializing(pmd_t pmd)
+{
+	/*
+	 * If the pmd is undergoing a split, the _PAGE_PRESENT bit is clear
+	 * and _PAGE_INVALID is set (see pmd_present, pmdp_invalidate).
+	 *
+	 * This condition may also occur when flushing a pmd while flushing
+	 * it (see ptep_modify_prot_start), so callers must ensure this
+	 * case is fine as well.
+	 */
+	if ((pmd_raw(pmd) & cpu_to_be64(_PAGE_PRESENT | _PAGE_INVALID)) ==
+						cpu_to_be64(_PAGE_INVALID))
+		return true;
+
+	return false;
+}
+
 static inline int pmd_bad(pmd_t pmd)
 {
 	if (radix_enabled())
@@ -1092,6 +1109,19 @@ static inline int pmd_protnone(pmd_t pmd)
 #define pmd_access_permitted pmd_access_permitted
 static inline bool pmd_access_permitted(pmd_t pmd, bool write)
 {
+	/*
+	 * pmdp_invalidate sets this combination (which is not caught by
+	 * !pte_present() check in pte_access_permitted), to prevent
+	 * lock-free lookups, as part of the serialize_against_pte_lookup()
+	 * synchronisation.
+	 *
+	 * This also catches the case where the PTE's hardware PRESENT bit is
+	 * cleared while TLB is flushed, which is suboptimal but should not
+	 * be frequent.
+	 */
+	if (pmd_is_serializing(pmd))
+		return false;
+
 	return pte_access_permitted(pmd_pte(pmd), write);
 }
 
arch/powerpc/mm/book3s64/pgtable.c +3 -0
index 16bda049187a..ff98b663c83e 100644
@@ -116,6 +116,9 @@ pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
 	/*
 	 * This ensures that generic code that rely on IRQ disabling
 	 * to prevent a parallel THP split work as expected.
+	 *
+	 * Marking the entry with _PAGE_INVALID && ~_PAGE_PRESENT requires
+	 * a special case check in pmd_access_permitted.
 	 */
 	serialize_against_pte_lookup(vma->vm_mm);
 	return __pmd(old_pmd);
Signature · 1 line
2.20.1
#2 lore raw

Re: [PATCH 2/2] powerpc/64s: __find_linux_pte synchronization vs pmdp_invalidate

In reply to Nicholas Piggin

Le 07/06/2019 à 05:56, Nicholas Piggin a écrit :

Quoted 33 lines

The change to pmdp_invalidate to mark the pmd with _PAGE_INVALID broke the synchronisation against lock free lookups, __find_linux_pte's pmd_none check no longer returns true for such cases.

Fix this by adding a check for this condition as well.

Fixes da7ad366b497 ("powerpc/mm/book3s: Update pmd_present to look at _PAGE_PRESENT bit")
Cc Christophe Leroy <[email protected]>
---
  arch/powerpc/mm/pgtable.c | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
arch/powerpc/mm/pgtable.c +4 -2
index db4a6253df92..533fc6fa6726 100644
@@ -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

arch/powerpc/mm/pgtable.c pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea, · line 393

Quoted 10 lines
arch/powerpc/mm/pgtable.c +10 -0
+	/*
+	 * 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
+

Could get rid of that #ifdef by adding the following in book3s32 and nohash pgtable.h:

static inline bool pmd_is_serializing() { return false; }

Christophe

Quoted 4 lines
arch/powerpc/mm/pgtable.c +0 -0
  	if (pmd_trans_huge(pmd) || pmd_devmap(pmd)) {
  		if (is_thp)
  			*is_thp = true;
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] powerpc/64s: __find_linux_pte synchronization vs pmdp_invalidate

In reply to Nicholas Piggin
Quoted 6 lines · Nicholas Piggin

The change to pmdp_invalidate to mark the pmd with _PAGE_INVALID broke the synchronisation against lock free lookups, __find_linux_pte's pmd_none check no longer returns true for such cases.

Fix this by adding a check for this condition as well.

Quoted 42 lines
Fixes da7ad366b497 ("powerpc/mm/book3s: Update pmd_present to look at _PAGE_PRESENT bit")
Cc Christophe Leroy <[email protected]>
---
 arch/powerpc/mm/pgtable.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
arch/powerpc/mm/pgtable.c +14 -2
index db4a6253df92..533fc6fa6726 100644
@@ -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;
Signature · 1 line
2.20.1
author reviewer
#3 lore raw

Re: [PATCH 2/2] powerpc/64s: __find_linux_pte synchronization vs pmdp_invalidate

In reply to Christophe Leroy

Christophe Leroy's on June 7, 2019 3:35 pm:

Quoted 50 lines

Le 07/06/2019 à 05:56, Nicholas Piggin a écrit :

Quoted 33 lines

The change to pmdp_invalidate to mark the pmd with _PAGE_INVALID broke the synchronisation against lock free lookups, __find_linux_pte's pmd_none check no longer returns true for such cases.

Fix this by adding a check for this condition as well.

Fixes da7ad366b497 ("powerpc/mm/book3s: Update pmd_present to look at _PAGE_PRESENT bit")
Cc Christophe Leroy <[email protected]>
---
  arch/powerpc/mm/pgtable.c | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
arch/powerpc/mm/pgtable.c +4 -2
index db4a6253df92..533fc6fa6726 100644
@@ -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

arch/powerpc/mm/pgtable.c pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea, · line 393

Quoted 10 lines
arch/powerpc/mm/pgtable.c +10 -0
+	/*
+	 * 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
+

Could get rid of that #ifdef by adding the following in book3s32 and nohash pgtable.h:

Quoted 1 line

static inline bool pmd_is_serializing() { return false; }

I don't mind either way. If it's an isolated case like this, sometimes I'm against polluting the sub arch code with it.

It's up to you I can change that if you prefer.

Thanks,
Nick

author reviewer
#7 lore raw
In reply to Christophe Leroy

Christophe Leroy's on June 7, 2019 3:34 pm:

Quoted 56 lines

Le 07/06/2019 à 05:56, Nicholas Piggin a écrit :

Quoted 25 lines

Commit 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian conversion in pte helpers") changed the actual bitwise tests in pte_access_permitted by using pte_write() and pte_present() helpers rather than raw bitwise testing _PAGE_WRITE and _PAGE_PRESENT bits.

The pte_present change now returns true for ptes which are !_PAGE_PRESENT and _PAGE_INVALID, which is the combination used by pmdp_invalidate to synchronize access from lock-free lookups. pte_access_permitted is used by pmd_access_permitted, so allowing GUP lock free access to proceed with such PTEs breaks this synchronisation.

This bug has been observed on HPT host, with random crashes and corruption in guests, usually together with bad PMD messages in the host.

Fix this by adding an explicit check in pmd_access_permitted, and documenting the condition explicitly.

The pte_write() change should be okay, and would prevent GUP from falling back to the slow path when encountering savedwrite ptes, which matches what x86 (that does not implement savedwrite) does.

Fixes 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian conversion in pte helpers")
Cc Aneesh Kumar K.V <[email protected]>
Cc Christophe Leroy <[email protected]>
Quoted 5 lines

---

I accounted for Aneesh's and Christophe's feedback, except I couldn't find a good way to replace the ifdef with IS_ENABLED because of _PAGE_INVALID etc., but at least cleaned that up a bit nicer.

I guess the standard way is to add a pmd_is_serializing() which return always false in book3s/32/pgtable.h and in nohash/pgtable.h

Quoted 17 lines

Patch 1 solves a problem I can hit quite reliably running HPT/HPT KVM. Patch 2 was noticed by Aneesh when inspecting code for similar bugs. They should probably both be merged in stable kernels after upstream.

  arch/powerpc/include/asm/book3s/64/pgtable.h | 30 ++++++++++++++++++++
  arch/powerpc/mm/book3s64/pgtable.c           |  3 ++
  2 files changed, 33 insertions(+)
arch/powerpc/include/asm/book3s/64/pgtable.h +0 -0
index 7dede2e34b70..ccf00a8b98c6 100644
@@ -876,6 +876,23 @@ static inline int pmd_present(pmd_t pmd)
  	return false;
  }
 
Quoted 3 lines

arch/powerpc/include/asm/book3s/64/pgtable.h static inline int pmd_present(pmd_t pmd) · line 879

Quoted 1 line
arch/powerpc/include/asm/book3s/64/pgtable.h +1 -0
+static inline int pmd_is_serializing(pmd_t pmd)

should be static inline bool instead of int ?

I think just about all the p?d_blah boolean functions in the tree are int at the moment, so I followed that pattern.

May be a good tree wide change to make at some point.

Thanks,
Nick

#9 lore raw
In reply to Nicholas Piggin
Quoted 21 lines · Nicholas Piggin

Commit 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian conversion in pte helpers") changed the actual bitwise tests in pte_access_permitted by using pte_write() and pte_present() helpers rather than raw bitwise testing _PAGE_WRITE and _PAGE_PRESENT bits.

The pte_present change now returns true for ptes which are !_PAGE_PRESENT and _PAGE_INVALID, which is the combination used by pmdp_invalidate to synchronize access from lock-free lookups. pte_access_permitted is used by pmd_access_permitted, so allowing GUP lock free access to proceed with such PTEs breaks this synchronisation.

This bug has been observed on HPT host, with random crashes and corruption in guests, usually together with bad PMD messages in the host.

Fix this by adding an explicit check in pmd_access_permitted, and documenting the condition explicitly.

The pte_write() change should be okay, and would prevent GUP from falling back to the slow path when encountering savedwrite ptes, which matches what x86 (that does not implement savedwrite) does.

Quoted 5 lines
Fixes 1b2443a547f9 ("powerpc/book3s64: Avoid multiple endian conversion in pte helpers")
Cc Aneesh Kumar K.V <[email protected]>
Cc Christophe Leroy <[email protected]>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/33258a1db165cf43a9e6382587ad06e9

cheers

#5 lore raw

Re: [PATCH 2/2] powerpc/64s: __find_linux_pte synchronization vs pmdp_invalidate

In reply to Nicholas Piggin
Quoted 11 lines · Nicholas Piggin

The change to pmdp_invalidate to mark the pmd with _PAGE_INVALID broke the synchronisation against lock free lookups, __find_linux_pte's pmd_none check no longer returns true for such cases.

Fix this by adding a check for this condition as well.

Fixes da7ad366b497 ("powerpc/mm/book3s: Update pmd_present to look at _PAGE_PRESENT bit")
Cc Christophe Leroy <[email protected]>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/a00196a272161338d4b1d66ec69e3d57

cheers