The vdsocheck tool validates the object files and final .so library.
It can detect if the compiler created relocations which are incompatible
with the vDSO which need to be worked around.
Wire it up for the architecture.
Signed-off-by: Thomas Weißschuh <thomas.weisssc...@linutronix.de>
---
arch/riscv/kernel/vdso/Makefile | 4 ++--
lib/vdso/Kconfig | 1 +
lib/vdso/check/vdsocheck.rs | 25 +++++++++++++++++++++++++
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile
index
9f1bf5bae9bd473e43d9fd3022e9e1a185128b73..05725a72eaca70a867f59c352a6381402e91c317
100644
--- a/arch/riscv/kernel/vdso/Makefile
+++ b/arch/riscv/kernel/vdso/Makefile
@@ -58,7 +58,7 @@ CFLAGS_REMOVE_hwprobe.o = $(CFLAGS_REMOVE_VDSO)
$(obj)/vdso.o: $(obj)/vdso.so
# link rule for the .so file, .lds has to be first
-$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE
+$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) $(vdsocheck) FORCE
$(call if_changed,vdsold_and_check)
LDFLAGS_vdso.so.dbg = -shared -soname=linux-vdso.so.1 \
--build-id=sha1 --eh-frame-hdr
@@ -80,7 +80,7 @@ include/generated/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE
# The DSO images are built using a special linker script
# Make sure only to export the intended __vdso_xxx symbol offsets.
quiet_cmd_vdsold_and_check = VDSOLD $@
- cmd_vdsold_and_check = $(LD) $(ld_flags) -T $(filter-out FORCE,$^) -o
$@.tmp && \
+ cmd_vdsold_and_check = $(LD) $(ld_flags) -T $(filter-out FORCE
$(vdsocheck),$^) -o $@.tmp && \
$(OBJCOPY) $(patsubst %, -G __vdso_%, $(vdso-syms)) $@.tmp
$@ && \
rm $@.tmp && \
$(cmd_vdso_check)
diff --git a/lib/vdso/Kconfig b/lib/vdso/Kconfig
index
8994419d90e7b5c66ac77449b6c3bd96c968983d..441ff03e1028f7bde5104bd01941c6a9b006e21f
100644
--- a/lib/vdso/Kconfig
+++ b/lib/vdso/Kconfig
@@ -55,6 +55,7 @@ config HAVE_VDSOCHECK
default y if ARM
default y if ARM64
default y if PPC
+ default y if RISCV
help
Selected for architectures that are supported by the 'vdsocheck'
progam.
Only transitional.
diff --git a/lib/vdso/check/vdsocheck.rs b/lib/vdso/check/vdsocheck.rs
index
54372a547b1cde05c1a4454b9a21de357b22b0df..d48c9da6f18270afe883d167955f73f061b9c472
100644
--- a/lib/vdso/check/vdsocheck.rs
+++ b/lib/vdso/check/vdsocheck.rs
@@ -90,6 +90,31 @@ fn allowed_relocations_for_machine(machine: u16) ->
Option<AllowedRelocations<'s
bindings::R_PPC64_REL16_HA,
],
}),
+ bindings::EM_RISCV => Some(AllowedRelocations {
+ ignored_object_file_sections: None,
+ in_object_file: &[
+ bindings::R_RISCV_BRANCH,
+ bindings::R_RISCV_JAL,
+ bindings::R_RISCV_CALL,
+ bindings::R_RISCV_CALL_PLT,
+ bindings::R_RISCV_PCREL_HI20,
+ bindings::R_RISCV_PCREL_LO12_I,
+ bindings::R_RISCV_PCREL_LO12_S,
+ bindings::R_RISCV_ADD8,
+ bindings::R_RISCV_ADD16,
+ bindings::R_RISCV_ADD32,
+ bindings::R_RISCV_ADD64,
+ bindings::R_RISCV_SUB8,
+ bindings::R_RISCV_SUB16,
+ bindings::R_RISCV_SUB32,
+ bindings::R_RISCV_SUB64,
+ bindings::R_RISCV_ALIGN,
+ bindings::R_RISCV_RVC_BRANCH,
+ bindings::R_RISCV_RVC_JUMP,
+ bindings::R_RISCV_RELAX,
+ bindings::R_RISCV_32_PCREL,
+ ],
+ }),
_ => None,
}
}
--
2.50.1
