Skip to contentSkip to conversation

Two cross-compilation kselftest fixes

PATCH In review Björn Töpel 2 participants 6 messages Jun 29, 2023 – Jul 3, 2023

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover Two cross-compilation kselftest fixes

From: Björn Töpel <[email protected]>

When you're cross-building kselftest, in this case RISC-V:

  | make ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- O=/tmp/kselftest \
  |   HOSTCC=gcc FORMAT= SKIP_TARGETS="arm64 ia64 powerpc sparc64 x86 \
  |   sgx" -C tools/testing/selftests gen_tar

the components (paths) that fail to build are skipped. In this case, openat2 failed due to missing library support, and proc due to an x86-64 only test.

This tiny series addresses the problems above.

Björn

Björn Töpel (2):
selftests/openat2: Run-time check for -fsanitize=undefined selftests/proc: Do not build x86-64 tests on non-x86-64 builds

 tools/testing/selftests/openat2/Makefile | 9 ++++++++-
 tools/testing/selftests/proc/Makefile    | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

base-commit: 3a8a670eeeaa40d87bd38a587438952741980c18

Signature · 1 line
2.39.2
#1 lore raw

PATCH 1/2 selftests/openat2: Run-time check for -fsanitize=undefined

From: Björn Töpel <[email protected]>

Some architectures, e.g. riscv, does not have support for the GCC option '-fsanitize=undefined'.

Check for '-fsanitize=undefined' support, and only add it to CFLAGS if supported.

---
 tools/testing/selftests/openat2/Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
tools/testing/selftests/openat2/Makefile +8 -1
index 843ba56d8e49..f13ad02a18ea 100644
@@ -1,6 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined
+# We need this for the "try-run" macro.
+include ../../../build/Build.include
+
+CFLAGS += -Wall -O2 -g -fsanitize=address
+CFLAGS += $(call try-run, \
+	echo 'int main() {}' | $(CC) -fsanitize=undefined -x c - -o /dev/null, \
+	-fsanitize=undefined,)
+
 TEST_GEN_PROGS := openat2_test resolve_test rename_attack_test
 
 include ../lib.mk
Signature · 1 line
2.39.2
#2 lore raw

PATCH 2/2 selftests/proc: Do not build x86-64 tests on non-x86-64 builds

In reply to Björn Töpel

From: Björn Töpel <[email protected]>

The proc-empty-vm test is x86-64 only. Remove that test from non-x86-64 builds.

---
 tools/testing/selftests/proc/Makefile | 4 ++++
 1 file changed, 4 insertions(+)
tools/testing/selftests/proc/Makefile +4 -0
index cd95369254c0..35e765f79b6d 100644
@@ -8,7 +8,11 @@ TEST_GEN_PROGS += fd-001-lookup
 TEST_GEN_PROGS += fd-002-posix-eq
 TEST_GEN_PROGS += fd-003-kthread
 TEST_GEN_PROGS += proc-loadavg-001
+
+ifneq (,$(filter $(ARCH),x86_64))
 TEST_GEN_PROGS += proc-empty-vm
+endif
+
 TEST_GEN_PROGS += proc-pid-vm
 TEST_GEN_PROGS += proc-self-map-files-001
 TEST_GEN_PROGS += proc-self-map-files-002
Signature · 1 line
2.39.2
#3 lore raw

Re: [PATCH 2/2] selftests/proc: Do not build x86-64 tests on non-x86-64 builds

Quoted 6 lines · Björn Töpel

From: Björn Töpel <[email protected]>

The proc-empty-vm test is x86-64 only. Remove that test from non-x86-64 builds.

What's the address space size on risc-v?

Quoted 14 lines
tools/testing/selftests/proc/Makefile +4 -0
@@ -8,7 +8,11 @@ TEST_GEN_PROGS += fd-001-lookup
 TEST_GEN_PROGS += fd-002-posix-eq
 TEST_GEN_PROGS += fd-003-kthread
 TEST_GEN_PROGS += proc-loadavg-001
+
+ifneq (,$(filter $(ARCH),x86_64))
 TEST_GEN_PROGS += proc-empty-vm
+endif
+
 TEST_GEN_PROGS += proc-pid-vm
 TEST_GEN_PROGS += proc-self-map-files-001
 TEST_GEN_PROGS += proc-self-map-files-002
#4 lore raw

Re: [PATCH 2/2] selftests/proc: Do not build x86-64 tests on non-x86-64 builds

Quoted 9 lines · Alexey Dobriyan
Quoted 6 lines · Björn Töpel

From: Björn Töpel <[email protected]>

The proc-empty-vm test is x86-64 only. Remove that test from non-x86-64 builds.

What's the address space size on risc-v?

Different sizes are supported, 39b, 48b, and 57b:
Documentation/riscv/vm-layout.rst

Did you have anything particular in mind?

#5 lore raw
In reply to Björn Töpel
Quoted 8 lines · Björn Töpel

From: Björn Töpel <[email protected]>

When you're cross-building kselftest, in this case RISC-V:

  | make ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- O=/tmp/kselftest \
  |   HOSTCC=gcc FORMAT= SKIP_TARGETS="arm64 ia64 powerpc sparc64 x86 \
  |   sgx" -C tools/testing/selftests gen_tar
Quoted 5 lines

the components (paths) that fail to build are skipped. In this case, openat2 failed due to missing library support, and proc due to an x86-64 only test.

This tiny series addresses the problems above.

Shuah,

Alexey submitted a series [1] that makes the 2nd patch of this series unnecessary . It's on Andrew's -mm tree.

Patch 1 is still relevant. I guess it can go via your tree, or the RISC-V tree.

Björn

[1] https://lore.kernel.org/all/[email protected]/