Skip to contentSkip to conversation

selftest/vDSO: Fix cross build for the random tests

PATCH In review Mark Brown 2 participants 8 messages Aug 30, 2024

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 selftest/vDSO: Fix cross build for the random tests

Unlike the check for the standalone x86 test the check for building the vDSO getrandom and chacaha tests looks at the architecture for the host rather than the architecture for the target when deciding if they should be built. Since the chacha test includes some assembler code this means that cross building with x86 as either the target or host is broken. Use a check for ARCH instead.

Fixes 4920a2590e91 ("selftests/vDSO: add tests for vgetrandom")

---
The x86_64 build is still broken for me because nothing installs tools/arch/x86_64/vdso/vgetrandom-chacha.S (I beleive it's supposed to be copied from ./arch/x86/entry/vdso/vgetrandom-chacha.S but I don't see how?) but this at least fixes all the other architectures.

---
 tools/testing/selftests/vDSO/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/vDSO/Makefile +1 -1
index e21e78aae24d..7fb59310718c 100644
@@ -10,7 +10,7 @@ ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64))
 TEST_GEN_PROGS += vdso_standalone_test_x86
 endif
 TEST_GEN_PROGS += vdso_test_correctness
-ifeq ($(uname_M),x86_64)
+ifeq ($(ARCH),$(filter $(ARCH),x86_64))
 TEST_GEN_PROGS += vdso_test_getrandom
 TEST_GEN_PROGS += vdso_test_chacha
 endif

---
base-commit: 985bf40edf4343dcb04c33f58b40b4a85c1776d4
change-id: 20240830-vdso-chacha-build-8d3789bf695c

Best regards,

Signature · 1 line
Mark Brown <[email protected]>
#1 lore raw
Quoted 9 lines · Mark Brown

Unlike the check for the standalone x86 test the check for building the vDSO getrandom and chacaha tests looks at the architecture for the host rather than the architecture for the target when deciding if they should be built. Since the chacha test includes some assembler code this means that cross building with x86 as either the target or host is broken. Use a check for ARCH instead.

Fixes 4920a2590e91 ("selftests/vDSO: add tests for vgetrandom")

Thanks for the patch. Seems reasonable; I'll queue it up.

Quoted 5 lines

---
The x86_64 build is still broken for me because nothing installs tools/arch/x86_64/vdso/vgetrandom-chacha.S (I beleive it's supposed to be copied from ./arch/x86/entry/vdso/vgetrandom-chacha.S but I don't see how?) but this at least fixes all the other architectures.

There should be a symlink installed for that. Are you using this tree?

https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git

That's where all these fixups are going for 6.12. (And yea, there are a lot.)

author
#2 lore raw
Quoted 7 lines · Jason A. Donenfeld
Quoted 4 lines · Mark Brown

The x86_64 build is still broken for me because nothing installs tools/arch/x86_64/vdso/vgetrandom-chacha.S (I beleive it's supposed to be copied from ./arch/x86/entry/vdso/vgetrandom-chacha.S but I don't see how?) but this at least fixes all the other architectures.

Quoted 6 lines

There should be a symlink installed for that. Are you using this tree?

https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git

That's where all these fixups are going for 6.12. (And yea, there are a lot.)

I was using -next, hopefully it's getting merged in there (I see the master branch is included). This is also breaking in for example kernelci:

https://storage.kernelci.org/next/master/next-20240830/x86_64/x86_64_defconfig/gcc-12/logs/kselftest.log

in the same way.

#3 lore raw
Quoted 16 lines · Mark Brown
Quoted 7 lines · Jason A. Donenfeld
Quoted 4 lines · Mark Brown

The x86_64 build is still broken for me because nothing installs tools/arch/x86_64/vdso/vgetrandom-chacha.S (I beleive it's supposed to be copied from ./arch/x86/entry/vdso/vgetrandom-chacha.S but I don't see how?) but this at least fixes all the other architectures.

Quoted 6 lines

There should be a symlink installed for that. Are you using this tree?

https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git

That's where all these fixups are going for 6.12. (And yea, there are a lot.)

Quoted 7 lines

I was using -next, hopefully it's getting merged in there (I see the master branch is included). This is also breaking in for example kernelci:

https://storage.kernelci.org/next/master/next-20240830/x86_64/x86_64_defconfig/gcc-12/logs/kselftest.log

in the same way.

Ahh yea it looks like that is running into the same thing as your v1, which the v2 I posted fixes via SRCARCH:

make[4]: *** No rule to make target '/tmp/kci/linux/tools/testing/selftests/../../../tools/arch/x86_64/vdso/vgetrandom-chacha.S', needed by '/tmp/kci/linux/build/kselftest/vDSO/vdso_test_chacha'.
Stop.

Here it's looking for arch/x86_64/ instead of arch/x86/, because $(ARCH) was used to interpolate the path instead of $(SRCARCH).

#4 lore raw
In reply to Mark Brown
Quoted 23 lines · Mark Brown

Unlike the check for the standalone x86 test the check for building the vDSO getrandom and chacaha tests looks at the architecture for the host rather than the architecture for the target when deciding if they should be built. Since the chacha test includes some assembler code this means that cross building with x86 as either the target or host is broken. Use a check for ARCH instead.

Fixes 4920a2590e91 ("selftests/vDSO: add tests for vgetrandom")

---
The x86_64 build is still broken for me because nothing installs tools/arch/x86_64/vdso/vgetrandom-chacha.S (I beleive it's supposed to be copied from ./arch/x86/entry/vdso/vgetrandom-chacha.S but I don't see how?) but this at least fixes all the other architectures.

---
 tools/testing/selftests/vDSO/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/vDSO/Makefile +0 -0
index e21e78aae24d..7fb59310718c 100644

tools/testing/selftests/vDSO/Makefile ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64)) · line 13

Quoted 5 lines
tools/testing/selftests/vDSO/Makefile +1 -1
@@ -10,7 +10,7 @@ ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64))
 TEST_GEN_PROGS += vdso_standalone_test_x86
 endif
 TEST_GEN_PROGS += vdso_test_correctness
-ifeq ($(uname_M),x86_64)
+ifeq ($(ARCH),$(filter $(ARCH),x86_64))

Actually... this doesn't work. Because:

ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)

The x86_64 gets turned into an x86. It's a little trickier when considering subarch. I'll send a followup here and not queue this.

author
#5 lore raw
Quoted 8 lines · Jason A. Donenfeld
Quoted 1 line

+ifeq ($(ARCH),$(filter $(ARCH),x86_64))

Actually... this doesn't work. Because:

ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)

The x86_64 gets turned into an x86. It's a little trickier when considering subarch. I'll send a followup here and not queue this.

Ah, right - I originally had copied the line above with both x86 and x86_64 when I tested and did a last minute edit during final review after I'd switched away.

#6 lore raw

PATCH v2 1/1 selftests: vDSO: fix cross build for getrandom and chacha tests

From: Mark Brown <[email protected]>

Unlike the check for the standalone x86 test, the check for building the vDSO getrandom and chacaha tests looks at the architecture for the host rather than the architecture for the target when deciding if they should be built. Since the chacha test includes some assembler code this means that cross building with x86 as either the target or host is broken. Use a check for ARCH instead.

This also handles s a small complication in conditionalizing on x86_64 but not x86, which requires defining the standard SRCARCH variable and being careful about which uname-m substitutions are done.

Fixes 4920a2590e91 ("selftests/vDSO: add tests for vgetrandom")

---
Mark - is this okay with you? I fixed the issue I mentioned.

 tools/testing/selftests/vDSO/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/vDSO/Makefile +5 -5
index e21e78aae24d..5ead6b1f0478 100644
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
-uname_M := $(shell uname -m 2>/dev/null || echo not)
-ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
+ARCH ?= $(shell uname -m | sed -e s/i.86/x86/)
+SRCARCH := $(subst x86_64,x86,$(ARCH))
 
 TEST_GEN_PROGS := vdso_test_gettimeofday
 TEST_GEN_PROGS += vdso_test_getcpu
@@ -10,7 +10,7 @@ ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64))
 TEST_GEN_PROGS += vdso_standalone_test_x86
 endif
 TEST_GEN_PROGS += vdso_test_correctness
-ifeq ($(uname_M),x86_64)
+ifeq ($(ARCH),$(filter $(ARCH),x86_64))
 TEST_GEN_PROGS += vdso_test_getrandom
 TEST_GEN_PROGS += vdso_test_chacha
 endif
@@ -38,8 +38,8 @@ $(OUTPUT)/vdso_test_getrandom: CFLAGS += -isystem $(top_srcdir)/tools/include \
                                          $(KHDR_INCLUDES) \
                                          -isystem $(top_srcdir)/include/uapi
 
-$(OUTPUT)/vdso_test_chacha: $(top_srcdir)/tools/arch/$(ARCH)/vdso/vgetrandom-chacha.S
+$(OUTPUT)/vdso_test_chacha: $(top_srcdir)/tools/arch/$(SRCARCH)/vdso/vgetrandom-chacha.S
 $(OUTPUT)/vdso_test_chacha: CFLAGS += -idirafter $(top_srcdir)/tools/include \
-                                      -idirafter $(top_srcdir)/arch/$(ARCH)/include \
+                                      -idirafter $(top_srcdir)/arch/$(SRCARCH)/include \
                                       -idirafter $(top_srcdir)/include \
                                       -D__ASSEMBLY__ -Wa,--noexecstack
Signature · 1 line
2.46.0
author Tested-by Reviewed-by on v2 1/1
#7 lore raw

Re: [PATCH v2] selftests: vDSO: fix cross build for getrandom and chacha tests

Quoted 13 lines · Jason A. Donenfeld

From: Mark Brown <[email protected]>

Unlike the check for the standalone x86 test, the check for building the vDSO getrandom and chacaha tests looks at the architecture for the host rather than the architecture for the target when deciding if they should be built. Since the chacha test includes some assembler code this means that cross building with x86 as either the target or host is broken. Use a check for ARCH instead.

This also handles s a small complication in conditionalizing on x86_64 but not x86, which requires defining the standard SRCARCH variable and being careful about which uname-m substitutions are done.

Quoted 5 lines
Fixes 4920a2590e91 ("selftests/vDSO: add tests for vgetrandom")

---
Mark - is this okay with you? I fixed the issue I mentioned.

That makes sense and appears to work for me so: