[PATCH] x86_64: Use a VMA for the 32bit vsyscall

Use a real VMA to map the 32bit vsyscall page

This interacts better with Hugh's upcomming VMA walk optimization
Also removes some ugly special cases.

Code roughly modelled after the ppc64 vdso version from Ben Herrenschmidt.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 8 insertions, 30 deletions

diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index 5724370475cc..d4676ca09144 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -458,17 +458,6 @@ bad_area:
         up_read(&mm->mmap_sem);
 
 bad_area_nosemaphore:
-
-#ifdef CONFIG_IA32_EMULATION
-        /* 32bit vsyscall. map on demand. */
-        if (test_thread_flag(TIF_IA32) &&
-            address >= VSYSCALL32_BASE && address < VSYSCALL32_END) {
-                if (map_syscall32(mm, address) < 0)
-                        goto out_of_memory2;
-                return;
-        }
-#endif
-
         /* User mode accesses just cause a SIGSEGV */
         if (error_code & 4) {
                 if (is_prefetch(regs, address, error_code))
@@ -550,7 +539,6 @@ no_context:
  */
 out_of_memory:
         up_read(&mm->mmap_sem);
-out_of_memory2:
         if (current->pid == 1) { 
                 yield();
                 goto again;
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index b0d604551d86..dbe53b4c7e66 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -583,9 +583,9 @@ static __init int x8664_sysctl_init(void)
 __initcall(x8664_sysctl_init);
 #endif
 
-/* Pseudo VMAs to allow ptrace access for the vsyscall pages.  x86-64 has two
-   different ones: one for 32bit and one for 64bit. Use the appropiate
-   for the target task. */
+/* A pseudo VMAs to allow ptrace access for the vsyscall page.   This only
+   covers the 64bit vsyscall page now. 32bit has a real VMA now and does
+   not need special handling anymore. */
 
 static struct vm_area_struct gate_vma = {
         .vm_start = VSYSCALL_START,
@@ -593,22 +593,11 @@ static struct vm_area_struct gate_vma = {
         .vm_page_prot = PAGE_READONLY
 };
 
-static struct vm_area_struct gate32_vma = {
-        .vm_start = VSYSCALL32_BASE,
-        .vm_end = VSYSCALL32_END,
-        .vm_page_prot = PAGE_READONLY
-};
-
 struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
 {
 #ifdef CONFIG_IA32_EMULATION
-        if (test_tsk_thread_flag(tsk, TIF_IA32)) {
-                /* lookup code assumes the pages are present. set them up
-                   now */
-                if (__map_syscall32(tsk->mm, VSYSCALL32_BASE) < 0)
-                        return NULL;
-                return &gate32_vma;
-        }
+        if (test_tsk_thread_flag(tsk, TIF_IA32))
+                return NULL;
 #endif
         return &gate_vma;
 }
@@ -616,6 +605,8 @@ struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
 int in_gate_area(struct task_struct *task, unsigned long addr)
 {
         struct vm_area_struct *vma = get_gate_vma(task);
+        if (!vma)
+                return 0;
         return (addr >= vma->vm_start) && (addr < vma->vm_end);
 }
 
@@ -625,6 +616,5 @@ int in_gate_area(struct task_struct *task, unsigned long addr)
  */
 int in_gate_area_no_task(unsigned long addr)
 {
-        return (((addr >= VSYSCALL_START) && (addr < VSYSCALL_END)) ||
-                ((addr >= VSYSCALL32_BASE) && (addr < VSYSCALL32_END)));
+        return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
 }