kselftest.rst states that flags must be specified before including lib.mk, but the vDSO selftest Makefile does not follow this order. As a result, changes made by lib.mk to flags and other variables are overwritten by the Makefile. For example, it is impossible to pass CFLAGS to the compiler via Make. Rectify this by including lib.mk after assigning flag values.
Also change the paths of the generated programs from absolute to relative paths as lib.mk will now correctly prepend the output directory path to the program name as intended.
Signed-off-by: Aditya Deshpande aditya.deshpande@arm.com --- Hello, This patch fixes the vDSO Makefile so that we can pass flags to it via the command line. This lets us build the vDSO selftests for Morello by exporting USERCFLAGS with the appropriate flags. Note that this patch is based off kernel version 6.4, as it relies on features added to lib.mk in the 6.2 release by: Commit de3ee3f63400a23954e7 ("selftests: Use optional USERCFLAGS and USERLDFLAGS").
Sending for review here before sending to the main kernel list.
Changes available at: https://git.morello-project.org/aditya/linux-kevin-fork/-/commit/3025e6659e4... --- tools/testing/selftests/vDSO/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile index d53a4d8008f9..9bf048498313 100644 --- a/tools/testing/selftests/vDSO/Makefile +++ b/tools/testing/selftests/vDSO/Makefile @@ -1,16 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 -include ../lib.mk - 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/)
-TEST_GEN_PROGS := $(OUTPUT)/vdso_test_gettimeofday $(OUTPUT)/vdso_test_getcpu -TEST_GEN_PROGS += $(OUTPUT)/vdso_test_abi -TEST_GEN_PROGS += $(OUTPUT)/vdso_test_clock_getres +TEST_GEN_PROGS := vdso_test_gettimeofday +TEST_GEN_PROGS += vdso_test_getcpu +TEST_GEN_PROGS += vdso_test_abi +TEST_GEN_PROGS += vdso_test_clock_getres ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64)) -TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86 +TEST_GEN_PROGS += vdso_standalone_test_x86 endif -TEST_GEN_PROGS += $(OUTPUT)/vdso_test_correctness +TEST_GEN_PROGS += vdso_test_correctness
CFLAGS := -std=gnu99 CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector @@ -19,6 +18,8 @@ ifeq ($(CONFIG_X86_32),y) LDLIBS += -lgcc_s endif
+include ../lib.mk + all: $(TEST_GEN_PROGS) $(OUTPUT)/vdso_test_gettimeofday: parse_vdso.c vdso_test_gettimeofday.c $(OUTPUT)/vdso_test_getcpu: parse_vdso.c vdso_test_getcpu.c
On 11/07/2023 12:52, Aditya Deshpande wrote:
kselftest.rst states that flags must be specified before including lib.mk, but the vDSO selftest Makefile does not follow this order. As a result, changes made by lib.mk to flags and other variables are overwritten by the Makefile. For example, it is impossible to pass CFLAGS to the compiler via Make. Rectify this by including lib.mk after assigning flag values.
Also change the paths of the generated programs from absolute to relative paths as lib.mk will now correctly prepend the output directory path to the program name as intended.
Signed-off-by: Aditya Deshpande aditya.deshpande@arm.com
Hello, This patch fixes the vDSO Makefile so that we can pass flags to it via the command line. This lets us build the vDSO selftests for Morello by exporting USERCFLAGS with the appropriate flags. Note that this patch is based off kernel version 6.4, as it relies on features added to lib.mk in the 6.2 release by: Commit de3ee3f63400a23954e7 ("selftests: Use optional USERCFLAGS and USERLDFLAGS").
Sending for review here before sending to the main kernel list.
Changes available at: https://git.morello-project.org/aditya/linux-kevin-fork/-/commit/3025e6659e4...
tools/testing/selftests/vDSO/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile index d53a4d8008f9..9bf048498313 100644 --- a/tools/testing/selftests/vDSO/Makefile +++ b/tools/testing/selftests/vDSO/Makefile @@ -1,16 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 -include ../lib.mk
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/) -TEST_GEN_PROGS := $(OUTPUT)/vdso_test_gettimeofday $(OUTPUT)/vdso_test_getcpu -TEST_GEN_PROGS += $(OUTPUT)/vdso_test_abi -TEST_GEN_PROGS += $(OUTPUT)/vdso_test_clock_getres +TEST_GEN_PROGS := vdso_test_gettimeofday +TEST_GEN_PROGS += vdso_test_getcpu +TEST_GEN_PROGS += vdso_test_abi +TEST_GEN_PROGS += vdso_test_clock_getres ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64)) -TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86 +TEST_GEN_PROGS += vdso_standalone_test_x86 endif -TEST_GEN_PROGS += $(OUTPUT)/vdso_test_correctness +TEST_GEN_PROGS += vdso_test_correctness CFLAGS := -std=gnu99 CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector @@ -19,6 +18,8 @@ ifeq ($(CONFIG_X86_32),y) LDLIBS += -lgcc_s endif +include ../lib.mk
all: $(TEST_GEN_PROGS)
Nice patch! It's a clear improvement to that Makefile, regardless of our specific Morello interests, which means it should be welcome upstream.
Just a suggestion, since you've started doing some cleanup in that Makefile to use lib.mk functionalities: I think you should be able to remove this rule, as lib.mk already includes it.
Kevin
$(OUTPUT)/vdso_test_gettimeofday: parse_vdso.c vdso_test_gettimeofday.c $(OUTPUT)/vdso_test_getcpu: parse_vdso.c vdso_test_getcpu.c
Hi Kevin,
On 7/12/23 11:39, Kevin Brodsky wrote:
Nice patch! It's a clear improvement to that Makefile, regardless of our specific Morello interests, which means it should be welcome upstream.
Thank you for the kind feedback!
Just a suggestion, since you've started doing some cleanup in that Makefile to use lib.mk functionalities: I think you should be able to remove this rule, as lib.mk already includes it.
Kevin
$(OUTPUT)/vdso_test_gettimeofday: parse_vdso.c vdso_test_gettimeofday.c $(OUTPUT)/vdso_test_getcpu: parse_vdso.c vdso_test_getcpu.c
Apologies, I'm not quite 100% sure what you mean here. From what I understand, we'd still need these lines due to the dependency on parse_vdso.c for each test binary. I tried removing those lines and the Makefile didn't work. Please let me know if I've missed something. However, as we explicitly state recipes, we can remove the $(TEST_GEN_PROGS) after the all target like so:
-all: $(TEST_GEN_PROGS) +all:
If you agree with this approach, please let me know and I'll amend the patch.
Thanks, Aditya
On 13/07/2023 18:31, Aditya Deshpande wrote:
Just a suggestion, since you've started doing some cleanup in that Makefile to use lib.mk functionalities: I think you should be able to remove this rule, as lib.mk already includes it.
Kevin
$(OUTPUT)/vdso_test_gettimeofday: parse_vdso.c vdso_test_gettimeofday.c $(OUTPUT)/vdso_test_getcpu: parse_vdso.c vdso_test_getcpu.c
Apologies, I'm not quite 100% sure what you mean here. From what I understand, we'd still need these lines due to the dependency on parse_vdso.c for each test binary. I tried removing those lines and the Makefile didn't work. Please let me know if I've missed something.
Sorry, I should probably have clarified that I meant specifically the line that I was replying to (that is "all: $(TEST_GEN_PROGS)").
However, as we explicitly state recipes, we can remove the $(TEST_GEN_PROGS) after the all target like so:
-all: $(TEST_GEN_PROGS) +all:
I think we can remove it altogether. lib.mk already has this rule:
all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
Kevin
linux-morello@op-lists.linaro.org
-
Aditya Deshpande -
Kevin Brodsky