x86/vdso tree changes for v3.19
Subsystems (3)
Linus,
Please pull the latest x86-vdso-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-vdso-for-linus
# HEAD: 26893107aa717cd11010f0c278d02535defa1ac9 x86_64/vsyscall: Restore orig_ax after vsyscall seccomp
Various vDSO updates from Andy Lutomirski, mostly cleanups and reorganization to improve maintainability, but also some micro-optimizations and robustization changes.
Thanks,
Ingo
------------------>
Andrew Morton (1):
x86: vdso: Fix build with older gcc
Andy Lutomirski (13):
x86_64/vsyscall: Move all of the gate_area code to vsyscall_64.c x86_64/vdso: Move getcpu code from vsyscall_64.c to vdso/vma.c x86/vdso: Change the PER_CPU segment to use struct desc_struct x86/vdso: Make the PER_CPU segment start out accessed x86/vdso: Make the PER_CPU segment 32 bits
x86_64/vdso: Remove jiffies from the vvar page
x86_64/vdso: Clean up vgetcpu init and merge the vdso initcalls x86,vdso: Use LSL unconditionally for vgetcpu
x86_64, vsyscall: Turn vsyscalls all the way off when vsyscall==none x86_64, vsyscall: Rewrite comment and clean up headers in vsyscall code x86_64,vsyscall: Make vsyscall emulation configurable
x86_64: Add a comment explaining the TASK_SIZE_MAX guard page x86_64/vsyscall: Restore orig_ax after vsyscall seccomp
arch/x86/Kconfig | 18 +++++ arch/x86/include/asm/fixmap.h | 2 + arch/x86/include/asm/page_64.h | 4 +- arch/x86/include/asm/processor.h | 8 ++- arch/x86/include/asm/vgtod.h | 19 +++++ arch/x86/include/asm/vsyscall.h | 33 ++------- arch/x86/include/asm/vvar.h | 2 - arch/x86/kernel/Makefile | 3 +- arch/x86/kernel/cpu/common.c | 10 --- arch/x86/kernel/setup.c | 2 - arch/x86/kernel/time.c | 2 +- arch/x86/kernel/vsyscall_64.c | 147 +++++++++++++++++---------------------- arch/x86/mm/init_64.c | 49 ------------- arch/x86/vdso/vgetcpu.c | 2 - arch/x86/vdso/vma.c | 83 +++++++++++++++++----- arch/x86/xen/mmu.c | 6 +- 16 files changed, 190 insertions(+), 200 deletions(-)
arch/x86/Kconfig +18 -0
@@ -984,6 +984,24 @@ config X86_ESPFIX64 def_bool y depends on X86_16BIT && X86_64 +config X86_VSYSCALL_EMULATION + bool "Enable vsyscall emulation" if EXPERT + default y + depends on X86_64 + ---help--- + This enables emulation of the legacy vsyscall page. Disabling + it is roughly equivalent to booting with vsyscall=none, except + that it will also disable the helpful warning if a program + tries to use a vsyscall. With this option set to N, offending + programs will just segfault, citing addresses of the form + 0xffffffffff600?00. + + This option is required by many programs built before 2013, and + care should be used even with newer programs if set to N. + + Disabling this option saves about 7K of kernel size and + possibly 4K of additional runtime pagetable memory. + config TOSHIBA tristate "Toshiba Laptop support" depends on X86_32
arch/x86/include/asm/fixmap.h +2 -0
@@ -69,7 +69,9 @@ enum fixed_addresses {#ifdef CONFIG_X86_32 FIX_HOLE,#else +#ifdef CONFIG_X86_VSYSCALL_EMULATION VSYSCALL_PAGE = (FIXADDR_TOP - VSYSCALL_ADDR) >> PAGE_SHIFT, +#endif #ifdef CONFIG_PARAVIRT_CLOCK PVCLOCK_FIXMAP_BEGIN , PVCLOCK_FIXMAP_END = PVCLOCK_FIXMAP_BEGIN+PVCLOCK_VSYSCALL_NR_PAGES-1,
arch/x86/include/asm/page_64.h +3 -1
@@ -39,6 +39,8 @@ void copy_page(void *to, void *from);#endif /* !__ASSEMBLY__ */ -#define __HAVE_ARCH_GATE_AREA 1 +#ifdef CONFIG_X86_VSYSCALL_EMULATION +# define __HAVE_ARCH_GATE_AREA 1 +#endif #endif /* _ASM_X86_PAGE_64_H */
arch/x86/include/asm/processor.h +7 -1
@@ -893,7 +893,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);#else /* -* User space process size. 47bits minus one guard page. +* User space process size. 47bits minus one guard page. The guard +* page is necessary on Intel CPUs: if a SYSCALL instruction is at +* the highest possible canonical userspace address, then that +* syscall will enter the kernel with a non-canonical return +* address, and SYSRET will explode dangerously. We avoid this +* particular problem by preventing anything from being mapped +* at the maximum canonical address. */ #define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
arch/x86/include/asm/vgtod.h +19 -0
@@ -70,4 +70,23 @@ static inline void gtod_write_end(struct vsyscall_gtod_data *s) ++s->seq; } +#ifdef CONFIG_X86_64 + +#define VGETCPU_CPU_MASK 0xfff + +static inline unsigned int __getcpu (void ) +{ +unsigned int p; + +/* +* Load per CPU data from GDT. LSL is faster than RDTSCP and +* works on all CPUs. +*/ + asm("lsl %1,%0" :"=r" (p) :"r" (__PER_CPU_SEG)); + +return p; +} + +#endif /* CONFIG_X86_64 */ +#endif /* _ASM_X86_VGTOD_H */
arch/x86/include/asm/vsyscall.h +6 -27
@@ -4,15 +4,7 @@#include <linux/seqlock.h> #include <uapi/asm/vsyscall.h> -#define VGETCPU_RDTSCP 1 -#define VGETCPU_LSL 2 - -/* kernel space (writeable) */ -extern int vgetcpu_mode; -extern struct timezone sys_tz; - -#include <asm/vvar.h> - +#ifdef CONFIG_X86_VSYSCALL_EMULATION extern void map_vsyscall (void );/*
@@ -20,25 +12,12 @@ extern void map_vsyscall(void);* Returns true if handled. */ extern bool emulate_vsyscall (struct pt_regs *regs,unsigned long address); - -#ifdef CONFIG_X86_64 - -#define VGETCPU_CPU_MASK 0xfff - -static inline unsigned int __getcpu (void ) +#else +static inline void map_vsyscall (void ) {} +static inline bool emulate_vsyscall (struct pt_regs *regs,unsigned long address) { -unsigned int p; - -if (VVAR (vgetcpu_mode) ==VGETCPU_RDTSCP ) { -/* Load per CPU data from RDTSCP */ -native_read_tscp (&p); - }else { -/* Load per CPU data from GDT */ - asm("lsl %1,%0" :"=r" (p) :"r" (__PER_CPU_SEG)); - } - -return p; +return false; } -#endif /* CONFIG_X86_64 */ +#endif #endif /* _ASM_X86_VSYSCALL_H */
arch/x86/include/asm/vvar.h +0 -2
@@ -44,8 +44,6 @@ extern char __vvar_page;/* DECLARE_VVAR(offset, type, name) */ -DECLARE_VVAR(0, volatile unsigned long, jiffies) -DECLARE_VVAR(16, int, vgetcpu_mode) DECLARE_VVAR(128, struct vsyscall_gtod_data, vsyscall_gtod_data)#undef DECLARE_VVAR
arch/x86/kernel/Makefile +1 -2
@@ -28,8 +28,7 @@ obj-$(CONFIG_X86_32) += i386_ksyms_32.o obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o obj-$(CONFIG_X86_64) += mcount_64.o obj-y += syscall_$(BITS).o vsyscall_gtod.o -obj-$(CONFIG_X86_64) += vsyscall_64.o -obj-$(CONFIG_X86_64) += vsyscall_emu_64.o +obj-$(CONFIG_X86_VSYSCALL_EMULATION) += vsyscall_64.o vsyscall_emu_64.o obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o obj-$(CONFIG_SYSFS) += ksysfs.o obj-y += bootflag.o e820.o
arch/x86/kernel/cpu/common.c +0 -10
@@ -956,14 +956,6 @@ static void identify_cpu(struct cpuinfo_x86 *c) }#ifdef CONFIG_X86_64 -static void vgetcpu_set_mode (void ) -{ -if (cpu_has (&boot_cpu_data,X86_FEATURE_RDTSCP )) - vgetcpu_mode =VGETCPU_RDTSCP ; -else - vgetcpu_mode =VGETCPU_LSL ; -} -#ifdef CONFIG_IA32_EMULATION /* May not be __init: called during resume */ static void syscall32_cpu_init (void )
@@ -1006,8 +998,6 @@ void __init identify_boot_cpu(void)#ifdef CONFIG_X86_32 sysenter_setup ();enable_sep_cpu (); -#else -vgetcpu_set_mode ();#endif cpu_detect_tlb (&boot_cpu_data); }
arch/x86/kernel/setup.c +0 -2
@@ -1190,9 +1190,7 @@ void __init setup_arch(char **cmdline_p)tboot_probe (); -#ifdef CONFIG_X86_64 map_vsyscall (); -#endif generic_apic_probe ();
arch/x86/kernel/time.c +1 -1
@@ -23,7 +23,7 @@#include <asm/time.h> #ifdef CONFIG_X86_64 -__visible DEFINE_VVAR (volatile unsigned long ,jiffies ) =INITIAL_JIFFIES ; +__visible volatile unsigned long jiffies __cacheline_aligned = INITIAL_JIFFIES;#endif unsigned long profile_pc (struct pt_regs *regs)
arch/x86/kernel/vsyscall_64.c +64 -83
199 lines not on this page · raw message
arch/x86/mm/init_64.c +0 -49
55 lines not on this page · raw message
arch/x86/vdso/vgetcpu.c +0 -2
@@ -7,9 +7,7 @@#include <linux/kernel.h> #include <linux/getcpu.h> -#include <linux/jiffies.h> #include <linux/time.h> -#include <asm/vsyscall.h> #include <asm/vgtod.h> notrace long
arch/x86/vdso/vma.c +65 -18
112 lines not on this page · raw message
arch/x86/xen/mmu.c +4 -2
@@ -1457,8 +1457,10 @@ static int xen_pgd_alloc(struct mm_struct *mm) page->private = (unsigned long )user_pgd;if (user_pgd !=NULL ) { +#ifdef CONFIG_X86_VSYSCALL_EMULATION user_pgd[pgd_index (VSYSCALL_ADDR )] =__pgd (__pa (level3_user_vsyscall) | _PAGE_TABLE); +#endif ret =0 ; }
@@ -2021,7 +2023,7 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)# ifdef CONFIG_HIGHMEM case FIX_KMAP_BEGIN ... FIX_KMAP_END:# endif -#else +#elif defined(CONFIG_X86_VSYSCALL_EMULATION )case VSYSCALL_PAGE :#endif case FIX_TEXT_POKE0 :
@@ -2060,7 +2062,7 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)__native_set_fixmap (idx, pte); -#ifdef CONFIG_X86_64 +#ifdef CONFIG_X86_VSYSCALL_EMULATION /* Replicate changes to map the vsyscall page into the user pagetable vsyscall mapping. */ if (idx ==VSYSCALL_PAGE ) {