vDSO for sparc
Following patch is based on work done by Nick Alcock on 64-bit vDSO for sparc
in Oracle linux. I have extended it to include support for 32-bit vDSO for sparc
on 64-bit kernel.
vDSO for sparc is based on the X86 implementation. This patch
provides vDSO support for both 64-bit and 32-bit programs on 64-bit kernel.
vDSO will be disabled on 32-bit linux kernel on sparc.
*) vclock_gettime.c contains all the vdso functions. Since data page is mapped
before the vdso code page, the pointer to data page is got by subracting offset
from an address in the vdso code page. The return address stored in
%i7 is used for this purpose.
*) During compilation, both 32-bit and 64-bit vdso images are compiled and are
converted into raw bytes by vdso2c program to be ready for mapping into the
process. 32-bit images are compiled only if CONFIG_COMPAT is enabled. vdso2c
generates two files vdso-image-64.c and vdso-image-32.c which contains the
respective vDSO image in C structure.
*) During vdso initialization, required number of vdso pages are allocated and
raw bytes are copied into the pages.
*) During every exec, these pages are mapped into the process through
arch_setup_additional_pages and the location of mapping is passed on to the
process through aux vector AT_SYSINFO_EHDR which is used by glibc.
*) A new update_vsyscall routine for sparc is added to keep the data page in
vdso updated.
*) As vDSO cannot contain dynamically relocatable references, a new version of
cpu_relax is added for the use of vDSO.
This change also requires a putback to glibc to use vDSO. For testing,
programs planning to try vDSO can be compiled against the generated
vdso(64/32).so in the source.
Testing:
========
[root@localhost ~]# cat vdso_test.c
int main() {
struct timespec tv_start, tv_end;
struct timeval tv_tmp;
int i;
int count = 1 * 1000 * 10000;
long long diff;
clock_gettime(0, &tv_start);
for (i = 0; i < count; i++)
gettimeofday(&tv_tmp, NULL);
clock_gettime(0, &tv_end);
diff = (long long)(tv_end.tv_sec -
tv_start.tv_sec)*(1*1000*1000*1000);
diff += (tv_end.tv_nsec - tv_start.tv_nsec);
printf("Start sec: %d\n", tv_start.tv_sec);
printf("End sec : %d\n", tv_end.tv_sec);
printf("%d cycles in %lld ns = %f ns/cycle\n", count, diff,
(double)diff / (double)count);
return 0;
}
[root@localhost ~]# cc vdso_test.c -o t32_without_fix -m32 -lrt
[root@localhost ~]# ./t32_without_fix
Start sec: 1502396130
End sec : 1502396140
10000000 cycles in 9565148528 ns = 956.514853 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t32_with_fix -m32 ./vdso32.so.dbg
[root@localhost ~]# ./t32_with_fix
Start sec: 1502396168
End sec : 1502396169
10000000 cycles in 798141262 ns = 79.814126 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_without_fix -m64 -lrt
[root@localhost ~]# ./t64_without_fix
Start sec: 1502396208
End sec : 1502396218
10000000 cycles in 9846091800 ns = 984.609180 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_with_fix -m64 ./vdso64.so.dbg
[root@localhost ~]# ./t64_with_fix
Start sec: 1502396257
End sec : 1502396257
10000000 cycles in 380984048 ns = 38.098405 ns/cycle
V1 to V2 Changes:
=================
Added hot patching code to switch the read stick instruction to read
tick instruction based on the hardware.
V2 to V3 Changes:
=================
Merged latest changes from sparc-next and moved the initialization
of clocksource_tick.archdata.vclock_mode to time_init_early. Disabled
queued spinlock and rwlock configuration when simulating 32-bit config
to compile 32-bit VDSO.
V3 to V4 Changes:
=================
Hardcoded the page size as 8192 in linker script for both 64-bit and
32-bit binaries. Removed unused variables in vdso2c.h. Added -mv8plus flag to
Makefile to prevent the generation of relocation entries for __lshrdi3 in 32-bit
vdso binary.
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Signed-off-by: Nagarathnam Muthusamy <nagarathnam.muthusamy@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-21 23:05:31 +08:00
|
|
|
#
|
|
|
|
|
# Building vDSO images for sparc.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
KBUILD_CFLAGS += $(DISABLE_LTO)
|
|
|
|
|
|
|
|
|
|
VDSO64-$(CONFIG_SPARC64) := y
|
|
|
|
|
VDSOCOMPAT-$(CONFIG_COMPAT) := y
|
|
|
|
|
|
|
|
|
|
# files to link into the vdso
|
|
|
|
|
vobjs-y := vdso-note.o vclock_gettime.o
|
|
|
|
|
|
|
|
|
|
# files to link into kernel
|
|
|
|
|
obj-y += vma.o
|
|
|
|
|
|
|
|
|
|
# vDSO images to build
|
|
|
|
|
vdso_img-$(VDSO64-y) += 64
|
|
|
|
|
vdso_img-$(VDSOCOMPAT-y) += 32
|
|
|
|
|
|
|
|
|
|
vobjs := $(foreach F,$(vobjs-y),$(obj)/$F)
|
|
|
|
|
|
|
|
|
|
$(obj)/vdso.o: $(obj)/vdso.so
|
|
|
|
|
|
|
|
|
|
targets += vdso.lds $(vobjs-y)
|
|
|
|
|
|
|
|
|
|
# Build the vDSO image C files and link them in.
|
|
|
|
|
vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o)
|
|
|
|
|
vdso_img_cfiles := $(vdso_img-y:%=vdso-image-%.c)
|
|
|
|
|
vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg)
|
|
|
|
|
obj-y += $(vdso_img_objs)
|
|
|
|
|
targets += $(vdso_img_cfiles)
|
kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers
GNU Make automatically deletes intermediate files that are updated
in a chain of pattern rules.
Example 1) %.dtb.o <- %.dtb.S <- %.dtb <- %.dts
Example 2) %.o <- %.c <- %.c_shipped
A couple of makefiles mark such targets as .PRECIOUS to prevent Make
from deleting them, but the correct way is to use .SECONDARY.
.SECONDARY
Prerequisites of this special target are treated as intermediate
files but are never automatically deleted.
.PRECIOUS
When make is interrupted during execution, it may delete the target
file it is updating if the file was modified since make started.
If you mark the file as precious, make will never delete the file
if interrupted.
Both can avoid deletion of intermediate files, but the difference is
the behavior when Make is interrupted; .SECONDARY deletes the target,
but .PRECIOUS does not.
The use of .PRECIOUS is relatively rare since we do not want to keep
partially constructed (possibly corrupted) targets.
Another difference is that .PRECIOUS works with pattern rules whereas
.SECONDARY does not.
.PRECIOUS: $(obj)/%.lex.c
works, but
.SECONDARY: $(obj)/%.lex.c
has no effect. However, for the reason above, I do not want to use
.PRECIOUS which could cause obscure build breakage.
The targets specified as .SECONDARY must be explicit. $(targets)
contains all targets that need to include .*.cmd files. So, the
intermediates you want to keep are mostly in there. Therefore, mark
$(targets) as .SECONDARY. It means primary targets are also marked
as .SECONDARY, but I do not see any drawback for this.
I replaced some .SECONDARY / .PRECIOUS markers with 'targets'. This
will make Kbuild search for non-existing .*.cmd files, but this is
not a noticeable performance issue.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Frank Rowand <frowand.list@gmail.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
2018-03-23 21:04:39 +08:00
|
|
|
targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
|
vDSO for sparc
Following patch is based on work done by Nick Alcock on 64-bit vDSO for sparc
in Oracle linux. I have extended it to include support for 32-bit vDSO for sparc
on 64-bit kernel.
vDSO for sparc is based on the X86 implementation. This patch
provides vDSO support for both 64-bit and 32-bit programs on 64-bit kernel.
vDSO will be disabled on 32-bit linux kernel on sparc.
*) vclock_gettime.c contains all the vdso functions. Since data page is mapped
before the vdso code page, the pointer to data page is got by subracting offset
from an address in the vdso code page. The return address stored in
%i7 is used for this purpose.
*) During compilation, both 32-bit and 64-bit vdso images are compiled and are
converted into raw bytes by vdso2c program to be ready for mapping into the
process. 32-bit images are compiled only if CONFIG_COMPAT is enabled. vdso2c
generates two files vdso-image-64.c and vdso-image-32.c which contains the
respective vDSO image in C structure.
*) During vdso initialization, required number of vdso pages are allocated and
raw bytes are copied into the pages.
*) During every exec, these pages are mapped into the process through
arch_setup_additional_pages and the location of mapping is passed on to the
process through aux vector AT_SYSINFO_EHDR which is used by glibc.
*) A new update_vsyscall routine for sparc is added to keep the data page in
vdso updated.
*) As vDSO cannot contain dynamically relocatable references, a new version of
cpu_relax is added for the use of vDSO.
This change also requires a putback to glibc to use vDSO. For testing,
programs planning to try vDSO can be compiled against the generated
vdso(64/32).so in the source.
Testing:
========
[root@localhost ~]# cat vdso_test.c
int main() {
struct timespec tv_start, tv_end;
struct timeval tv_tmp;
int i;
int count = 1 * 1000 * 10000;
long long diff;
clock_gettime(0, &tv_start);
for (i = 0; i < count; i++)
gettimeofday(&tv_tmp, NULL);
clock_gettime(0, &tv_end);
diff = (long long)(tv_end.tv_sec -
tv_start.tv_sec)*(1*1000*1000*1000);
diff += (tv_end.tv_nsec - tv_start.tv_nsec);
printf("Start sec: %d\n", tv_start.tv_sec);
printf("End sec : %d\n", tv_end.tv_sec);
printf("%d cycles in %lld ns = %f ns/cycle\n", count, diff,
(double)diff / (double)count);
return 0;
}
[root@localhost ~]# cc vdso_test.c -o t32_without_fix -m32 -lrt
[root@localhost ~]# ./t32_without_fix
Start sec: 1502396130
End sec : 1502396140
10000000 cycles in 9565148528 ns = 956.514853 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t32_with_fix -m32 ./vdso32.so.dbg
[root@localhost ~]# ./t32_with_fix
Start sec: 1502396168
End sec : 1502396169
10000000 cycles in 798141262 ns = 79.814126 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_without_fix -m64 -lrt
[root@localhost ~]# ./t64_without_fix
Start sec: 1502396208
End sec : 1502396218
10000000 cycles in 9846091800 ns = 984.609180 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_with_fix -m64 ./vdso64.so.dbg
[root@localhost ~]# ./t64_with_fix
Start sec: 1502396257
End sec : 1502396257
10000000 cycles in 380984048 ns = 38.098405 ns/cycle
V1 to V2 Changes:
=================
Added hot patching code to switch the read stick instruction to read
tick instruction based on the hardware.
V2 to V3 Changes:
=================
Merged latest changes from sparc-next and moved the initialization
of clocksource_tick.archdata.vclock_mode to time_init_early. Disabled
queued spinlock and rwlock configuration when simulating 32-bit config
to compile 32-bit VDSO.
V3 to V4 Changes:
=================
Hardcoded the page size as 8192 in linker script for both 64-bit and
32-bit binaries. Removed unused variables in vdso2c.h. Added -mv8plus flag to
Makefile to prevent the generation of relocation entries for __lshrdi3 in 32-bit
vdso binary.
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Signed-off-by: Nagarathnam Muthusamy <nagarathnam.muthusamy@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-21 23:05:31 +08:00
|
|
|
|
|
|
|
|
export CPPFLAGS_vdso.lds += -P -C
|
|
|
|
|
|
|
|
|
|
VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
|
|
|
|
|
-Wl,--no-undefined \
|
|
|
|
|
-Wl,-z,max-page-size=8192 -Wl,-z,common-page-size=8192 \
|
|
|
|
|
$(DISABLE_LTO)
|
|
|
|
|
|
|
|
|
|
$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
|
|
|
|
|
$(call if_changed,vdso)
|
|
|
|
|
|
|
|
|
|
HOST_EXTRACFLAGS += -I$(srctree)/tools/include
|
|
|
|
|
hostprogs-y += vdso2c
|
|
|
|
|
|
|
|
|
|
quiet_cmd_vdso2c = VDSO2C $@
|
|
|
|
|
define cmd_vdso2c
|
|
|
|
|
$(obj)/vdso2c $< $(<:%.dbg=%) $@
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
$(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(obj)/vdso2c FORCE
|
|
|
|
|
$(call if_changed,vdso2c)
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Don't omit frame pointers for ease of userspace debugging, but do
|
|
|
|
|
# optimize sibling calls.
|
|
|
|
|
#
|
|
|
|
|
CFL := $(PROFILING) -mcmodel=medlow -fPIC -O2 -fasynchronous-unwind-tables \
|
|
|
|
|
-m64 -ffixed-g2 -ffixed-g3 -fcall-used-g4 -fcall-used-g5 -ffixed-g6 \
|
|
|
|
|
-ffixed-g7 $(filter -g%,$(KBUILD_CFLAGS)) \
|
|
|
|
|
$(call cc-option, -fno-stack-protector) -fno-omit-frame-pointer \
|
|
|
|
|
-foptimize-sibling-calls -DBUILD_VDSO
|
|
|
|
|
|
|
|
|
|
$(vobjs): KBUILD_CFLAGS += $(CFL)
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# vDSO code runs in userspace and -pg doesn't help with profiling anyway.
|
|
|
|
|
#
|
|
|
|
|
CFLAGS_REMOVE_vdso-note.o = -pg
|
|
|
|
|
CFLAGS_REMOVE_vclock_gettime.o = -pg
|
|
|
|
|
|
|
|
|
|
$(obj)/%.so: OBJCOPYFLAGS := -S
|
|
|
|
|
$(obj)/%.so: $(obj)/%.so.dbg
|
|
|
|
|
$(call if_changed,objcopy)
|
|
|
|
|
|
|
|
|
|
CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
|
|
|
|
|
VDSO_LDFLAGS_vdso32.lds = -m32 -Wl,-m,elf32_sparc,-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/vdso-note.o
|
|
|
|
|
targets += vdso32/vclock_gettime.o
|
|
|
|
|
|
|
|
|
|
KBUILD_AFLAGS_32 := $(filter-out -m64,$(KBUILD_AFLAGS)) -DBUILD_VDSO
|
|
|
|
|
$(obj)/vdso32.so.dbg: KBUILD_AFLAGS = $(KBUILD_AFLAGS_32)
|
|
|
|
|
$(obj)/vdso32.so.dbg: asflags-$(CONFIG_SPARC64) += -m32
|
|
|
|
|
|
|
|
|
|
KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS))
|
|
|
|
|
KBUILD_CFLAGS_32 := $(filter-out -mcmodel=medlow,$(KBUILD_CFLAGS_32))
|
|
|
|
|
KBUILD_CFLAGS_32 := $(filter-out -fno-pic,$(KBUILD_CFLAGS_32))
|
|
|
|
|
KBUILD_CFLAGS_32 := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS_32))
|
|
|
|
|
KBUILD_CFLAGS_32 += -m32 -msoft-float -fpic -mno-app-regs -ffixed-g7
|
|
|
|
|
KBUILD_CFLAGS_32 += $(call cc-option, -fno-stack-protector)
|
|
|
|
|
KBUILD_CFLAGS_32 += $(call cc-option, -foptimize-sibling-calls)
|
|
|
|
|
KBUILD_CFLAGS_32 += -fno-omit-frame-pointer
|
|
|
|
|
KBUILD_CFLAGS_32 += -DDISABLE_BRANCH_PROFILING
|
|
|
|
|
KBUILD_CFLAGS_32 += -mv8plus
|
|
|
|
|
$(obj)/vdso32.so.dbg: KBUILD_CFLAGS = $(KBUILD_CFLAGS_32)
|
|
|
|
|
|
|
|
|
|
$(obj)/vdso32.so.dbg: FORCE \
|
|
|
|
|
$(obj)/vdso32/vdso32.lds \
|
|
|
|
|
$(obj)/vdso32/vclock_gettime.o \
|
|
|
|
|
$(obj)/vdso32/vdso-note.o
|
|
|
|
|
$(call if_changed,vdso)
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# 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 cc-ldoption, -Wl$(comma)--hash-style=sysv) \
|
|
|
|
|
$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic
|
|
|
|
|
GCOV_PROFILE := n
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Install the unstripped copies of vdso*.so. If our toolchain supports
|
|
|
|
|
# build-id, install .build-id links as well.
|
|
|
|
|
#
|
|
|
|
|
quiet_cmd_vdso_install = INSTALL $(@:install_%=%)
|
|
|
|
|
define cmd_vdso_install
|
|
|
|
|
cp $< "$(MODLIB)/vdso/$(@:install_%=%)"; \
|
|
|
|
|
if readelf -n $< |grep -q 'Build ID'; then \
|
|
|
|
|
buildid=`readelf -n $< |grep 'Build ID' |sed -e 's/^.*Build ID: \(.*\)$$/\1/'`; \
|
|
|
|
|
first=`echo $$buildid | cut -b-2`; \
|
|
|
|
|
last=`echo $$buildid | cut -b3-`; \
|
|
|
|
|
mkdir -p "$(MODLIB)/vdso/.build-id/$$first"; \
|
|
|
|
|
ln -sf "../../$(@:install_%=%)" "$(MODLIB)/vdso/.build-id/$$first/$$last.debug"; \
|
|
|
|
|
fi
|
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
vdso_img_insttargets := $(vdso_img_sodbg:%.dbg=install_%)
|
|
|
|
|
|
|
|
|
|
$(MODLIB)/vdso: FORCE
|
|
|
|
|
@mkdir -p $(MODLIB)/vdso
|
|
|
|
|
|
|
|
|
|
$(vdso_img_insttargets): install_%: $(obj)/%.dbg $(MODLIB)/vdso FORCE
|
|
|
|
|
$(call cmd,vdso_install)
|
|
|
|
|
|
|
|
|
|
PHONY += vdso_install $(vdso_img_insttargets)
|
|
|
|
|
vdso_install: $(vdso_img_insttargets) FORCE
|