Commit fd1feade authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/vdso: Merge vdso64 and vdso32 into a single directory 



merge vdso64 into vdso32 and rename it vdso.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/4dbe05cc130f6a0858d09ac72e436c373cb08b70.1642782130.git.christophe.leroy@csgroup.eu
parent d88378d8

arch/powerpc/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -421,9 +421,9 @@ ifeq ($(KBUILD_EXTMOD),) 
prepare: vdso_prepare

vdso_prepare: prepare0

	$(if $(CONFIG_VDSO32),$(Q)$(MAKE) \

		$(build)=arch/powerpc/kernel/vdso32 include/generated/vdso32-offsets.h)

		$(build)=arch/powerpc/kernel/vdso include/generated/vdso32-offsets.h)

	$(if $(CONFIG_PPC64),$(Q)$(MAKE) \

		$(build)=arch/powerpc/kernel/vdso64 include/generated/vdso64-offsets.h)

		$(build)=arch/powerpc/kernel/vdso include/generated/vdso64-offsets.h)

endif



archprepare: checkbin

arch/powerpc/kernel/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ targets += prom_init_check 
clean-files := vmlinux.lds



# Force dependency (incbin is bad)

$(obj)/vdso32_wrapper.o : $(obj)/vdso32/vdso32.so.dbg

$(obj)/vdso64_wrapper.o : $(obj)/vdso64/vdso64.so.dbg

$(obj)/vdso32_wrapper.o : $(obj)/vdso/vdso32.so.dbg

$(obj)/vdso64_wrapper.o : $(obj)/vdso/vdso64.so.dbg



# for cleaning

subdir- += vdso32 vdso64
 
subdir- += vdso

arch/powerpc/kernel/vdso32/.gitignore→arch/powerpc/kernel/vdso/.gitignore

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

vdso32.lds

vdso32.so.dbg

vdso64.lds

vdso64.so.dbg

arch/powerpc/kernel/vdso32/Makefile→arch/powerpc/kernel/vdso/Makefile

+35 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ ARCH_REL_TYPE_ABS := R_PPC_JUMP_SLOT|R_PPC_GLOB_DAT|R_PPC_ADDR32|R_PPC_ADDR24|R_ 
include $(srctree)/lib/vdso/Makefile



obj-vdso32 = sigtramp32-32.o gettimeofday-32.o datapage-32.o cacheflush-32.o note-32.o getcpu-32.o

obj-vdso64 = sigtramp64-64.o gettimeofday-64.o datapage-64.o cacheflush-64.o note-64.o getcpu-64.o



ifneq ($(c-gettimeofday-y),)

  CFLAGS_vgettimeofday-32.o += -include $(c-gettimeofday-y)
@@ -15,6 +16,17 @@ ifneq ($(c-gettimeofday-y),) 
  CFLAGS_vgettimeofday-32.o += -ffreestanding -fasynchronous-unwind-tables

  CFLAGS_REMOVE_vgettimeofday-32.o = $(CC_FLAGS_FTRACE)

  CFLAGS_REMOVE_vgettimeofday-32.o += -mcmodel=medium -mabi=elfv1 -mabi=elfv2 -mcall-aixdesc

  CFLAGS_vgettimeofday-64.o += -include $(c-gettimeofday-y)

  CFLAGS_vgettimeofday-64.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)

  CFLAGS_vgettimeofday-64.o += $(call cc-option, -fno-stack-protector)

  CFLAGS_vgettimeofday-64.o += -DDISABLE_BRANCH_PROFILING

  CFLAGS_vgettimeofday-64.o += -ffreestanding -fasynchronous-unwind-tables

  CFLAGS_REMOVE_vgettimeofday-64.o = $(CC_FLAGS_FTRACE)

# Go prior to 1.16.x assumes r30 is not clobbered by any VDSO code. That used to be true

# by accident when the VDSO was hand-written asm code, but may not be now that the VDSO is

# compiler generated. To avoid breaking Go tell GCC not to use r30. Impact on code

# generation is minimal, it will just use r29 instead.

  CFLAGS_vgettimeofday-64.o += $(call cc-option, -ffixed-r30)

endif



# Build rules
@@ -27,6 +39,8 @@ endif 


targets := $(obj-vdso32) vdso32.so.dbg vgettimeofday-32.o

obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32))

targets += $(obj-vdso64) vdso64.so.dbg vgettimeofday-64.o

obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64))



GCOV_PROFILE := n

KCOV_INSTRUMENT := n
@@ -38,26 +52,42 @@ ccflags-y := -shared -fno-common -fno-builtin -nostdlib -Wl,--hash-style=both 
CC32FLAGS := -Wl,-soname=linux-vdso32.so.1 -m32

AS32FLAGS := -D__VDSO32__ -s



CC64FLAGS := -Wl,-soname=linux-vdso64.so.1

AS64FLAGS := -D__VDSO64__ -s



targets += vdso32.lds

CPPFLAGS_vdso32.lds += -P -C -Upowerpc

targets += vdso64.lds

CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)



# link rule for the .so file, .lds has to be first

$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o FORCE

	$(call if_changed,vdso32ld_and_check)

$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o FORCE

	$(call if_changed,vdso64ld_and_check)



# assembly rules for the .S files

$(obj-vdso32): %-32.o: %.S FORCE

	$(call if_changed_dep,vdso32as)

$(obj)/vgettimeofday-32.o: %-32.o: %.c FORCE

	$(call if_changed_dep,vdso32cc)

$(obj-vdso64): %-64.o: %.S FORCE

	$(call if_changed_dep,vdso64as)

$(obj)/vgettimeofday-64.o: %-64.o: %.c FORCE

	$(call if_changed_dep,cc_o_c)



# Generate VDSO offsets using helper script

gen-vdso32sym := $(srctree)/$(src)/gen_vdso32_offsets.sh

quiet_cmd_vdso32sym = VDSO32SYM $@

      cmd_vdso32sym = $(NM) $< | $(gen-vdso32sym) | LC_ALL=C sort > $@

gen-vdso64sym := $(srctree)/$(src)/gen_vdso64_offsets.sh

quiet_cmd_vdso64sym = VDSO64SYM $@

      cmd_vdso64sym = $(NM) $< | $(gen-vdso64sym) | LC_ALL=C sort > $@



include/generated/vdso32-offsets.h: $(obj)/vdso32.so.dbg FORCE

	$(call if_changed,vdso32sym)

include/generated/vdso64-offsets.h: $(obj)/vdso64.so.dbg FORCE

	$(call if_changed,vdso64sym)



# actual build commands

quiet_cmd_vdso32ld_and_check = VDSO32L $@
@@ -66,3 +96,8 @@ quiet_cmd_vdso32as = VDSO32A $@ 
      cmd_vdso32as = $(VDSOCC) $(a_flags) $(CC32FLAGS) $(AS32FLAGS) -c -o $@ $<

quiet_cmd_vdso32cc = VDSO32C $@

      cmd_vdso32cc = $(VDSOCC) $(c_flags) $(CC32FLAGS) -c -o $@ $<



quiet_cmd_vdso64ld_and_check = VDSO64L $@

      cmd_vdso64ld_and_check = $(VDSOCC) $(c_flags) $(CC64FLAGS) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^) ; $(cmd_vdso_check)

quiet_cmd_vdso64as = VDSO64A $@

      cmd_vdso64as = $(VDSOCC) $(a_flags) $(CC64FLAGS) $(AS64FLAGS) -c -o $@ $<