aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@amacapital.net>2014-09-23 13:50:51 -0400
committerIngo Molnar <mingo@kernel.org>2014-10-28 06:22:08 -0400
commitb93590901a01a6d036b3b7c856bcc5724fdb9911 (patch)
tree9268cd56f39157f6b18c912fb98229941bedcc7a /arch/x86/mm
parentcac7f2429872d3733dc3f9915857b1691da2eb2f (diff)
x86_64/vsyscall: Move all of the gate_area code to vsyscall_64.c
This code exists for the sole purpose of making the vsyscall page look sort of like real userspace memory. Move it so that it lives with the rest of the vsyscall code. Signed-off-by: Andy Lutomirski <luto@amacapital.net> Link: http://lkml.kernel.org/r/a7ee266773671a05f00b7175ca65a0dd812d2e4b.1411494540.git.luto@amacapital.net Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/init_64.c49
1 files changed, 0 insertions, 49 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 4cb8763868fc..dd9ca9becc0f 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1193,55 +1193,6 @@ int kern_addr_valid(unsigned long addr)
1193 return pfn_valid(pte_pfn(*pte)); 1193 return pfn_valid(pte_pfn(*pte));
1194} 1194}
1195 1195
1196/*
1197 * A pseudo VMA to allow ptrace access for the vsyscall page. This only
1198 * covers the 64bit vsyscall page now. 32bit has a real VMA now and does
1199 * not need special handling anymore:
1200 */
1201static const char *gate_vma_name(struct vm_area_struct *vma)
1202{
1203 return "[vsyscall]";
1204}
1205static struct vm_operations_struct gate_vma_ops = {
1206 .name = gate_vma_name,
1207};
1208static struct vm_area_struct gate_vma = {
1209 .vm_start = VSYSCALL_ADDR,
1210 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
1211 .vm_page_prot = PAGE_READONLY_EXEC,
1212 .vm_flags = VM_READ | VM_EXEC,
1213 .vm_ops = &gate_vma_ops,
1214};
1215
1216struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
1217{
1218#ifdef CONFIG_IA32_EMULATION
1219 if (!mm || mm->context.ia32_compat)
1220 return NULL;
1221#endif
1222 return &gate_vma;
1223}
1224
1225int in_gate_area(struct mm_struct *mm, unsigned long addr)
1226{
1227 struct vm_area_struct *vma = get_gate_vma(mm);
1228
1229 if (!vma)
1230 return 0;
1231
1232 return (addr >= vma->vm_start) && (addr < vma->vm_end);
1233}
1234
1235/*
1236 * Use this when you have no reliable mm, typically from interrupt
1237 * context. It is less reliable than using a task's mm and may give
1238 * false positives.
1239 */
1240int in_gate_area_no_mm(unsigned long addr)
1241{
1242 return (addr & PAGE_MASK) == VSYSCALL_ADDR;
1243}
1244
1245static unsigned long probe_memory_block_size(void) 1196static unsigned long probe_memory_block_size(void)
1246{ 1197{
1247 /* start from 2g */ 1198 /* start from 2g */