powerpc/mm: tracking vDSO remap

Some processes (CRIU) are moving the vDSO area using the mremap system
call.  As a consequence the kernel reference to the vDSO base address is
no more valid and the signal return frame built once the vDSO has been
moved is not pointing to the new sigreturn address.

This patch handles vDSO remapping and unmapping.

Signed-off-by: Laurent Dufour <[email protected]>
Reviewed-by: Ingo Molnar <[email protected]>
Cc: "Kirill A. Shutemov" <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Rik van Riel <[email protected]>
Cc: Mel Gorman <[email protected]>
Cc: Pavel Emelyanov <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Michael Ellerman <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/powerpc/include/asm/mm-arch-hooks.h b/arch/powerpc/include/asm/mm-arch-hooks.h
index 63091a19de9fdadfe4d06bb57969b5ff9614125f..f2a2da89589704f43e569148623b9feae3f0623d 100644 (file)
--- a/arch/powerpc/include/asm/mm-arch-hooks.h
+++ b/arch/powerpc/include/asm/mm-arch-hooks.h
@@ -12,4 +12,17 @@
 #ifndef _ASM_POWERPC_MM_ARCH_HOOKS_H
 #define _ASM_POWERPC_MM_ARCH_HOOKS_H
 
 #ifndef _ASM_POWERPC_MM_ARCH_HOOKS_H
 #define _ASM_POWERPC_MM_ARCH_HOOKS_H
 

+static inline void arch_remap(struct mm_struct *mm,
+                             unsigned long old_start, unsigned long old_end,
+                             unsigned long new_start, unsigned long new_end)
+{
+       /*
+        * mremap() doesn't allow moving multiple vmas so we can limit the
+        * check to old_start == vdso_base.
+        */
+       if (old_start == mm->context.vdso_base)
+               mm->context.vdso_base = new_start;
+}
+#define arch_remap arch_remap
+

 #endif /* _ASM_POWERPC_MM_ARCH_HOOKS_H */
 #endif /* _ASM_POWERPC_MM_ARCH_HOOKS_H */

diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h
index 3e5184210d9b984fca5aa57cfe3c70e6539d74bb..878c27771717260cb1bc5590ad4c6138b2b096f7 100644 (file)
--- a/arch/powerpc/include/asm/mmu_context.h
+++ b/arch/powerpc/include/asm/mmu_context.h
@@ -8,7 +8,6 @@
 #include <linux/spinlock.h>
 #include <asm/mmu.h>   
 #include <asm/cputable.h>
 #include <linux/spinlock.h>
 #include <asm/mmu.h>   
 #include <asm/cputable.h>

-#include <asm-generic/mm_hooks.h>

 #include <asm/cputhreads.h>
 
 /*
 #include <asm/cputhreads.h>
 
 /*


@@ -127,5 +126,27 @@ static inline void enter_lazy_tlb(struct mm_struct *mm,
 #endif
 }
 
 #endif
 }
 

+static inline void arch_dup_mmap(struct mm_struct *oldmm,
+                                struct mm_struct *mm)
+{
+}
+
+static inline void arch_exit_mmap(struct mm_struct *mm)
+{
+}
+
+static inline void arch_unmap(struct mm_struct *mm,
+                             struct vm_area_struct *vma,
+                             unsigned long start, unsigned long end)
+{
+       if (start <= mm->context.vdso_base && mm->context.vdso_base < end)
+               mm->context.vdso_base = 0;
+}
+
+static inline void arch_bprm_mm_init(struct mm_struct *mm,
+                                    struct vm_area_struct *vma)
+{
+}
+

 #endif /* __KERNEL__ */
 #endif /* __ASM_POWERPC_MMU_CONTEXT_H */
 #endif /* __KERNEL__ */
 #endif /* __ASM_POWERPC_MMU_CONTEXT_H */