Skip to contentSkip to conversation

powerpc/vdso: Fix VDSO unmap check

PATCH In review Laurent Dufour 2 participants 3 messages Nov 3, 2020 – Mar 10, 2022 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/vdso: Fix VDSO unmap check

The check introduced by the commit 83d3f0e90c6c ("powerpc/mm: tracking vDSO remap") is wrong and is missing some partial unmaps of the VDSO.

To be complete the check needs the base and end address of the VDSO. Currently only the base is available in the mm_context of a task, but the end address can easily be computed because the size of VDSO is constant. However, there are 2 sizes for 32 or 64 bits task and they are stored in static variables in arch/powerpc/kernel/vdso.c.

Exporting a new function called vdso_pages() to get the number of pages of the VDSO based on the static variables from arch/powerpc/kernel/vdso.c.

Fixes 83d3f0e90c6c ("powerpc/mm: tracking vDSO remap")
Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
---
 arch/powerpc/include/asm/mmu_context.h | 18 ++++++++++++++++--
 arch/powerpc/kernel/vdso.c             | 14 ++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/mmu_context.h +16 -2
index e02aa793420b..ced80897b7a1 100644
@@ -259,11 +259,25 @@ static inline void enter_lazy_tlb(struct mm_struct *mm,
 
 extern void arch_exit_mmap(struct mm_struct *mm);
 
+extern int vdso_pages(void);
 static inline void arch_unmap(struct mm_struct *mm,
 			      unsigned long start, unsigned long end)
 {
-	if (start <= mm->context.vdso_base && mm->context.vdso_base < end)
-		mm->context.vdso_base = 0;
+	unsigned long vdso_end;
+
+	if (mm->context.vdso_base) {
+		/*
+		 * case 1   >  |     VDSO    |  <
+		 * case 2   >  |           < |
+		 * case 3      |  >        < |
+		 * case 4      |  >          |  <
+		 */
+		vdso_end = mm->context.vdso_base;
+		vdso_end += vdso_pages() << PAGE_SHIFT;
+
+		if (start < vdso_end && mm->context.vdso_base < end)
+			mm->context.vdso_base = 0;
+	}
 }
 
 #ifdef CONFIG_PPC_MEM_KEYS
arch/powerpc/kernel/vdso.c +14 -0
index 8dad44262e75..9defa35a1eba 100644
@@ -117,6 +117,20 @@ struct lib64_elfinfo
 	unsigned long	text;
 };
 
+/*
+ * Return the number of pages of the VDSO for the current task.
+ */
+int vdso_pages(void)
+{
+	int vdso_pages = vdso32_pages;
+
+#ifdef CONFIG_PPC64
+	if (!is_32bit_task())
+		vdso_pages = vdso64_pages;
+#endif
+
+	return vdso_pages + 1; /* Add the data page */
+}
 
 /*
  * This is called from binfmt_elf, we create the special vma for the
Signature · 1 line
2.29.2
#1 lore raw

Le 03/11/2020 à 18:13, Laurent Dufour a écrit :

Quoted 20 lines

The check introduced by the commit 83d3f0e90c6c ("powerpc/mm: tracking vDSO remap") is wrong and is missing some partial unmaps of the VDSO.

To be complete the check needs the base and end address of the VDSO. Currently only the base is available in the mm_context of a task, but the end address can easily be computed because the size of VDSO is constant. However, there are 2 sizes for 32 or 64 bits task and they are stored in static variables in arch/powerpc/kernel/vdso.c.

Exporting a new function called vdso_pages() to get the number of pages of the VDSO based on the static variables from arch/powerpc/kernel/vdso.c.

Fixes 83d3f0e90c6c ("powerpc/mm: tracking vDSO remap")
Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Quoted 4 lines
---
  arch/powerpc/include/asm/mmu_context.h | 18 ++++++++++++++++--
  arch/powerpc/kernel/vdso.c             | 14 ++++++++++++++
  2 files changed, 30 insertions(+), 2 deletions(-)

This patch doesn't apply anymore.

In the meantime there's a pending series from Dmitry, so I'm wondering if it is worth rebasing this series or not.

Christophe

#2 lore raw
Quoted 28 lines · Christophe Leroy

Le 03/11/2020 à 18:13, Laurent Dufour a écrit :

Quoted 20 lines

The check introduced by the commit 83d3f0e90c6c ("powerpc/mm: tracking vDSO remap") is wrong and is missing some partial unmaps of the VDSO.

To be complete the check needs the base and end address of the VDSO. Currently only the base is available in the mm_context of a task, but the end address can easily be computed because the size of VDSO is constant. However, there are 2 sizes for 32 or 64 bits task and they are stored in static variables in arch/powerpc/kernel/vdso.c.

Exporting a new function called vdso_pages() to get the number of pages of the VDSO based on the static variables from arch/powerpc/kernel/vdso.c.

Fixes 83d3f0e90c6c ("powerpc/mm: tracking vDSO remap")
Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Quoted 4 lines

---
  arch/powerpc/include/asm/mmu_context.h | 18 ++++++++++++++++-- arch/powerpc/kernel/vdso.c             | 14 ++++++++++++++

  2 files changed, 30 insertions(+), 2 deletions(-)
Quoted 4 lines

This patch doesn't apply anymore.

In the meantime there's a pending series from Dmitry, so I'm wondering if it is worth rebasing this series or not.

I agee, the Dimitry's series looks better, addressing the issue in the common code for all the architectures.

Laurent.