x86/vdso changes for v3.17
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: 53b884ac3745353de220d92ef792515c3ae692f0 x86_64/vsyscall: Fix warn_bad_vsyscall log output
Further simplifications and improvements to the VDSO code, by Andy Lutomirski.
Thanks,
Ingo
------------------>
Andy Lutomirski (4):
x86, vdso: Move the vvar area before the vdso text x86, vdso: Get rid of the fake section mechanism x86/vdso: Set VM_MAYREAD for the vvar vma x86_64/vsyscall: Fix warn_bad_vsyscall log output
arch/x86/include/asm/vdso.h | 18 +-- arch/x86/kernel/vsyscall_64.c | 8 +- arch/x86/vdso/Makefile | 16 ++- arch/x86/vdso/vdso-fakesections.c | 21 ---- arch/x86/vdso/vdso-layout.lds.S | 44 ++++---- arch/x86/vdso/vdso2c.c | 128 ++++++++++++++++----- arch/x86/vdso/vdso2c.h | 227 +++++++------------------------------- arch/x86/vdso/vma.c | 22 ++-- 8 files changed, 193 insertions(+), 291 deletions(-) delete mode 100644 arch/x86/vdso/vdso-fakesections.c
arch/x86/include/asm/vdso.h +9 -9
@@ -18,15 +18,15 @@ struct vdso_image {unsigned long alt, alt_len; -unsigned long sym_end_mapping;/* Total size of the mapping */ - -unsigned long sym_vvar_page; -unsigned long sym_hpet_page; -unsigned long sym_VDSO32_NOTE_MASK; -unsigned long sym___kernel_sigreturn; -unsigned long sym___kernel_rt_sigreturn; -unsigned long sym___kernel_vsyscall; -unsigned long sym_VDSO32_SYSENTER_RETURN; +long sym_vvar_start;/* Negative offset to the vvar area */ + +long sym_vvar_page; +long sym_hpet_page; +long sym_VDSO32_NOTE_MASK; +long sym___kernel_sigreturn; +long sym___kernel_rt_sigreturn; +long sym___kernel_vsyscall; +long sym_VDSO32_SYSENTER_RETURN; };#ifdef CONFIG_X86_64
arch/x86/kernel/vsyscall_64.c +4 -4
@@ -81,10 +81,10 @@ static void warn_bad_vsyscall(const char *level, struct pt_regs *regs,if (!show_unhandled_signals)return ; -pr_notice_ratelimited ("%s%s[%d] %s ip:%lx cs:%lx sp:%lx ax:%lx si:%lx di:%lx\n" , - level, current->comm,task_pid_nr (current), - message, regs->ip, regs->cs, - regs->sp, regs->ax, regs->si, regs->di); +printk_ratelimited ("%s%s[%d] %s ip:%lx cs:%lx sp:%lx ax:%lx si:%lx di:%lx\n" , + level, current->comm,task_pid_nr (current), + message, regs->ip, regs->cs, + regs->sp, regs->ax, regs->si, regs->di); }static int addr_to_vsyscall_nr (unsigned long addr)
arch/x86/vdso/Makefile +10 -6
@@ -10,7 +10,7 @@ VDSO32-$(CONFIG_X86_32) := y VDSO32-$(CONFIG_COMPAT) := y # files to link into the vdso -vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vdso-fakesections.o +vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o # files to link into kernel obj-y += vma.o
@@ -37,7 +37,8 @@ vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg) obj-y += $(vdso_img_objs) targets += $(vdso_img_cfiles) targets += $(vdso_img_sodbg) -.SECONDARY: $(vdso_img-y:%=$(obj)/vdso-image-%.c) +.SECONDARY: $(vdso_img-y:%=$(obj)/vdso-image-%.c) \ + $(vdso_img-y:%=$(obj)/vdso%.so) export CPPFLAGS_vdso.lds += -P -C
@@ -54,10 +55,10 @@ hostprogs-y += vdso2c quiet_cmd_vdso2c = VDSO2C $@ define cmd_vdso2c - $(obj)/vdso2c $< $@ + $(obj)/vdso2c $< $(<:%.dbg=%) $@ endef -$(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso2c FORCE +$(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(obj)/vdso2c FORCE $(call if_changed,vdso2c) #
@@ -113,6 +114,10 @@ $(obj)/%-x32.o: $(obj)/%.o FORCE targets += vdsox32.lds $(vobjx32s-y) +$(obj)/%.so: OBJCOPYFLAGS := -S +$(obj)/%.so: $(obj)/%.so.dbg + $(call if_changed,objcopy) + $(obj)/vdsox32.so.dbg: $(src)/vdsox32.lds $(vobjx32s) FORCE $(call if_changed,vdso)
@@ -134,7 +139,7 @@ override obj-dirs = $(dir $(obj)) $(obj)/vdso32/ targets += vdso32/vdso32.lds targets += vdso32/note.o vdso32/vclock_gettime.o $(vdso32.so-y:%=vdso32/%.o) -targets += vdso32/vclock_gettime.o vdso32/vdso-fakesections.o +targets += vdso32/vclock_gettime.o $(obj)/vdso32.o: $(vdso32-images:%=$(obj)/%)
@@ -156,7 +161,6 @@ $(vdso32-images:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_32) $(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \ $(obj)/vdso32/vdso32.lds \ $(obj)/vdso32/vclock_gettime.o \ - $(obj)/vdso32/vdso-fakesections.o \ $(obj)/vdso32/note.o \ $(obj)/vdso32/%.o $(call if_changed,vdso)
arch/x86/vdso/vdso-fakesections.c deleted +0 -21
@@ -1,21 +0,0 @@ -/* -* Copyright 2014 Andy Lutomirski -* Subject to the GNU Public License, v.2 -* -* String table for loadable section headers. See vdso2c.h for why -* this exists. -*/ - -const char fake_shstrtab[] __attribute__((section(".fake_shstrtab"))) = -".hash\0" -".dynsym\0" -".dynstr\0" -".gnu.version\0" -".gnu.version_d\0" -".dynamic\0" -".rodata\0" -".fake_shstrtab\0" /* Yay, self-referential code. */ -".note\0" -".eh_frame_hdr\0" -".eh_frame\0" -".text" ;
arch/x86/vdso/vdso-layout.lds.S +19 -25
56 lines not on this page · raw message
arch/x86/vdso/vdso2c.c +98 -30
198 lines not on this page · raw message
arch/x86/vdso/vdso2c.h +41 -186
321 lines not on this page · raw message
arch/x86/vdso/vma.c +12 -10
@@ -93,7 +93,7 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr) {struct mm_struct *mm = current->mm;struct vm_area_struct *vma; -unsigned long addr; +unsigned long addr, text_start;int ret =0 ;static struct page *no_pages[] = {NULL };static struct vm_special_mapping vvar_mapping = {
@@ -103,26 +103,28 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)if (calculate_addr) { addr =vdso_addr (current->mm->start_stack, - image->sym_end_mapping); + image->size - image->sym_vvar_start); }else { addr =0 ; }down_write (&mm->mmap_sem); - addr =get_unmapped_area (NULL , addr, image->sym_end_mapping,0 ,0 ); + addr =get_unmapped_area (NULL , addr, + image->size - image->sym_vvar_start,0 ,0 );if (IS_ERR_VALUE (addr)) { ret = addr; goto up_fail; } - current->mm->context.vdso = (void __user *)addr; + text_start = addr - image->sym_vvar_start; + current->mm->context.vdso = (void __user *)text_start;/* * MAYWRITE to allow gdb to COW and set breakpoints */ vma = _install_special_mapping(mm, - addr, + text_start, image->size, VM_READ|VM_EXEC| VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
@@ -134,9 +136,9 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr) } vma =_install_special_mapping (mm, - addr + image->size, - image->sym_end_mapping - image->size, -VM_READ , + addr, + -image->sym_vvar_start, +VM_READ |VM_MAYREAD , &vvar_mapping);if (IS_ERR (vma)) {
@@ -146,7 +148,7 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)if (image->sym_vvar_page) ret =remap_pfn_range (vma, - addr + image->sym_vvar_page, + text_start + image->sym_vvar_page,__pa_symbol (&__vvar_page) >>PAGE_SHIFT ,PAGE_SIZE ,PAGE_READONLY );
@@ -157,7 +159,7 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)#ifdef CONFIG_HPET_TIMER if (hpet_address && image->sym_hpet_page) { ret =io_remap_pfn_range (vma, - addr + image->sym_hpet_page, + text_start + image->sym_hpet_page, hpet_address >>PAGE_SHIFT ,PAGE_SIZE ,pgprot_noncached (PAGE_READONLY ));