af65d64845
This makes x86_64's ia32 emulation support share the sources used in the 32-bit kernel for the 32-bit vDSO and much of its setup code. The 32-bit vDSO mapping now behaves the same on x86_64 as on native 32-bit. The abi.syscall32 sysctl on x86_64 now takes the same values that vm.vdso_enabled takes on the 32-bit kernel. That is, 1 means a randomized vDSO location, 2 means the fixed old address. The CONFIG_COMPAT_VDSO option is now available to make this the default setting, the same meaning it has for the 32-bit kernel. (This does not affect the 64-bit vDSO.) The argument vdso32=[012] can be used on both 32-bit and 64-bit kernels to set this paramter at boot time. The vdso=[012] argument still does this same thing on the 32-bit kernel. Signed-off-by: Roland McGrath <roland@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
144 lines
4.3 KiB
Makefile
144 lines
4.3 KiB
Makefile
#
|
|
# Building vDSO images for x86.
|
|
#
|
|
|
|
VDSO64-$(CONFIG_X86_64) := y
|
|
VDSO32-$(CONFIG_X86_32) := y
|
|
VDSO32-$(CONFIG_COMPAT) := y
|
|
|
|
vdso-install-$(VDSO64-y) += vdso.so
|
|
vdso-install-$(VDSO32-y) += $(vdso32-y:=.so)
|
|
|
|
|
|
# files to link into the vdso
|
|
vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vvar.o
|
|
|
|
# files to link into kernel
|
|
obj-$(VDSO64-y) += vma.o vdso.o
|
|
obj-$(VDSO32-y) += vdso32.o vdso32-setup.o
|
|
|
|
vobjs := $(foreach F,$(vobjs-y),$(obj)/$F)
|
|
|
|
$(obj)/vdso.o: $(obj)/vdso.so
|
|
|
|
targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y)
|
|
|
|
# The DSO images are built using a special linker script.
|
|
quiet_cmd_syscall = SYSCALL $@
|
|
cmd_syscall = $(CC) -m elf_x86_64 -nostdlib $(SYSCFLAGS_$(@F)) \
|
|
-Wl,-T,$(filter-out FORCE,$^) -o $@
|
|
|
|
export CPPFLAGS_vdso.lds += -P -C
|
|
|
|
vdso-flags = -fPIC -shared -Wl,-soname=linux-vdso.so.1 \
|
|
$(call ld-option, -Wl$(comma)--hash-style=sysv) \
|
|
-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096
|
|
SYSCFLAGS_vdso.so = $(vdso-flags)
|
|
SYSCFLAGS_vdso.so.dbg = $(vdso-flags)
|
|
|
|
$(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so
|
|
|
|
$(obj)/vdso.so: $(src)/vdso.lds $(vobjs) FORCE
|
|
|
|
$(obj)/vdso.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
|
|
$(call if_changed,syscall)
|
|
|
|
$(obj)/%.so: OBJCOPYFLAGS := -S
|
|
$(obj)/%.so: $(obj)/%.so.dbg FORCE
|
|
$(call if_changed,objcopy)
|
|
|
|
CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64
|
|
|
|
$(obj)/vclock_gettime.o: KBUILD_CFLAGS = $(CFL)
|
|
$(obj)/vgetcpu.o: KBUILD_CFLAGS = $(CFL)
|
|
|
|
targets += vdso-syms.lds
|
|
obj-$(VDSO64-y) += vdso-syms.lds
|
|
|
|
#
|
|
# Match symbols in the DSO that look like VDSO*; produce a file of constants.
|
|
#
|
|
sed-vdsosym := -e 's/^00*/0/' \
|
|
-e 's/^\([0-9a-fA-F]*\) . \(VDSO[a-zA-Z0-9_]*\)$$/\2 = 0x\1;/p'
|
|
quiet_cmd_vdsosym = VDSOSYM $@
|
|
cmd_vdsosym = $(NM) $< | sed -n $(sed-vdsosym) | LC_ALL=C sort > $@
|
|
|
|
$(obj)/%-syms.lds: $(obj)/%.so.dbg FORCE
|
|
$(call if_changed,vdsosym)
|
|
|
|
#
|
|
# Build multiple 32-bit vDSO images to choose from at boot time.
|
|
#
|
|
obj-$(VDSO32-y) += vdso32-syms.lds
|
|
vdso32.so-$(CONFIG_X86_32) += int80
|
|
vdso32.so-$(CONFIG_COMPAT) += syscall
|
|
vdso32.so-$(VDSO32-y) += sysenter
|
|
|
|
CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
|
|
VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -Wl,-soname=linux-gate.so.1
|
|
|
|
# This makes sure the $(obj) subdirectory exists even though vdso32/
|
|
# is not a kbuild sub-make subdirectory.
|
|
override obj-dirs = $(dir $(obj)) $(obj)/vdso32/
|
|
|
|
targets += vdso32/vdso32.lds
|
|
targets += $(vdso32.so-y:%=vdso32-%.so.dbg) $(vdso32.so-y:%=vdso32-%.so)
|
|
targets += vdso32/note.o $(vdso32.so-y:%=vdso32/%.o)
|
|
|
|
extra-y += $(vdso32.so-y:%=vdso32-%.so)
|
|
|
|
$(obj)/vdso32.o: $(vdso32.so-y:%=$(obj)/vdso32-%.so)
|
|
|
|
KBUILD_AFLAGS_32 := $(filter-out -m64,$(KBUILD_AFLAGS))
|
|
$(vdso32.so-y:%=$(obj)/vdso32-%.so.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_32)
|
|
$(vdso32.so-y:%=$(obj)/vdso32-%.so.dbg): asflags-$(CONFIG_X86_64) += -m32
|
|
|
|
$(vdso32.so-y:%=$(obj)/vdso32-%.so.dbg): $(obj)/vdso32-%.so.dbg: FORCE \
|
|
$(obj)/vdso32/vdso32.lds \
|
|
$(obj)/vdso32/note.o \
|
|
$(obj)/vdso32/%.o
|
|
$(call if_changed,vdso)
|
|
|
|
# Make vdso32-*-syms.lds from each image, and then make sure they match.
|
|
# The only difference should be that some do not define VDSO32_SYSENTER_RETURN.
|
|
|
|
targets += vdso32-syms.lds $(vdso32.so-y:%=vdso32-%-syms.lds)
|
|
|
|
quiet_cmd_vdso32sym = VDSOSYM $@
|
|
define cmd_vdso32sym
|
|
if LC_ALL=C sort -u $(filter-out FORCE,$^) > $(@D)/.tmp_$(@F) && \
|
|
$(foreach H,$(filter-out FORCE,$^),\
|
|
if grep -q VDSO32_SYSENTER_RETURN $H; \
|
|
then diff -u $(@D)/.tmp_$(@F) $H; \
|
|
else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) | \
|
|
diff -u - $H; fi &&) : ;\
|
|
then mv -f $(@D)/.tmp_$(@F) $@; \
|
|
else rm -f $(@D)/.tmp_$(@F); exit 1; \
|
|
fi
|
|
endef
|
|
|
|
$(obj)/vdso32-syms.lds: $(vdso32.so-y:%=$(obj)/vdso32-%-syms.lds) FORCE
|
|
$(call if_changed,vdso32sym)
|
|
|
|
#
|
|
# The DSO images are built using a special linker script.
|
|
#
|
|
quiet_cmd_vdso = VDSO $@
|
|
cmd_vdso = $(CC) -nostdlib -o $@ \
|
|
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
|
|
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
|
|
|
|
VDSO_LDFLAGS = -fPIC -shared $(call ld-option, -Wl$(comma)--hash-style=sysv)
|
|
|
|
#
|
|
# Install the unstripped copy of vdso*.so listed in $(vdso-install-y).
|
|
#
|
|
quiet_cmd_vdso_install = INSTALL $@
|
|
cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@
|
|
$(vdso-install-y): %.so: $(obj)/%.so.dbg FORCE
|
|
@mkdir -p $(MODLIB)/vdso
|
|
$(call cmd,vdso_install)
|
|
|
|
PHONY += vdso_install $(vdso-install-y)
|
|
vdso_install: $(vdso-install-y)
|