diff mbox series

[v6] selftests: add headers_install to lib.mk

Message ID 20180904104721.27535-1-anders.roxell@linaro.org
State Accepted
Commit b2d35fa5fc80c27e868e393dcab4c94a0d71737f
Headers show
Series [v6] selftests: add headers_install to lib.mk | expand

Commit Message

Anders Roxell Sept. 4, 2018, 10:47 a.m. UTC 
If the kernel headers aren't installed we can't build all the tests.
Add a new make target rule 'khdr' in the file lib.mk to generate the
kernel headers and that gets include for every test-dir Makefile that
includes lib.mk If the testdir in turn have its own sub-dirs the
top_srcdir needs to be set to the linux-rootdir to be able to generate
the kernel headers.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

Reviewed-by: Fathi Boudra <fathi.boudra@linaro.org>

---

I sent this (v5) a month ago and wondered if it got lost. Resending
unchanged.

Cheers,
Anders

 Makefile                                           | 14 +-------------
 scripts/subarch.include                            | 13 +++++++++++++
 tools/testing/selftests/android/Makefile           |  2 +-
 tools/testing/selftests/android/ion/Makefile       |  2 ++
 tools/testing/selftests/futex/functional/Makefile  |  1 +
 tools/testing/selftests/gpio/Makefile              |  7 ++-----
 tools/testing/selftests/kvm/Makefile               |  7 ++-----
 tools/testing/selftests/lib.mk                     | 12 ++++++++++++
 tools/testing/selftests/net/Makefile               |  1 +
 .../selftests/networking/timestamping/Makefile     |  1 +
 tools/testing/selftests/vm/Makefile                |  4 ----
 11 files changed, 36 insertions(+), 28 deletions(-)
 create mode 100644 scripts/subarch.include

-- 
2.18.0

Comments

shuah Sept. 5, 2018, 2:13 p.m. UTC | #1 
On 09/04/2018 04:47 AM, Anders Roxell wrote:
> If the kernel headers aren't installed we can't build all the tests.

> Add a new make target rule 'khdr' in the file lib.mk to generate the

> kernel headers and that gets include for every test-dir Makefile that

> includes lib.mk If the testdir in turn have its own sub-dirs the

> top_srcdir needs to be set to the linux-rootdir to be able to generate

> the kernel headers.

> 

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> Reviewed-by: Fathi Boudra <fathi.boudra@linaro.org>

> ---

> 

> I sent this (v5) a month ago and wondered if it got lost. Resending

> unchanged.

> 

> Cheers,

> Anders

> 

>  Makefile                                           | 14 +-------------

>  scripts/subarch.include                            | 13 +++++++++++++

>  tools/testing/selftests/android/Makefile           |  2 +-

>  tools/testing/selftests/android/ion/Makefile       |  2 ++

>  tools/testing/selftests/futex/functional/Makefile  |  1 +

>  tools/testing/selftests/gpio/Makefile              |  7 ++-----

>  tools/testing/selftests/kvm/Makefile               |  7 ++-----

>  tools/testing/selftests/lib.mk                     | 12 ++++++++++++

>  tools/testing/selftests/net/Makefile               |  1 +

>  .../selftests/networking/timestamping/Makefile     |  1 +

>  tools/testing/selftests/vm/Makefile                |  4 ----

>  11 files changed, 36 insertions(+), 28 deletions(-)

>  create mode 100644 scripts/subarch.include

> 

> diff --git a/Makefile b/Makefile

> index 19948e556941..9c781e77fa24 100644

> --- a/Makefile

> +++ b/Makefile

> @@ -299,19 +299,7 @@ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)

>  KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)

>  export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION

>  

> -# SUBARCH tells the usermode build what the underlying arch is.  That is set

> -# first, and if a usermode build is happening, the "ARCH=um" on the command

> -# line overrides the setting of ARCH below.  If a native build is happening,

> -# then ARCH is assigned, getting whatever value it gets normally, and

> -# SUBARCH is subsequently ignored.

> -

> -SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \

> -				  -e s/sun4u/sparc64/ \

> -				  -e s/arm.*/arm/ -e s/sa110/arm/ \

> -				  -e s/s390x/s390/ -e s/parisc64/parisc/ \

> -				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \

> -				  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \

> -				  -e s/riscv.*/riscv/)

> +include scripts/subarch.include

>  

>  # Cross compiling and selecting different set of gcc/bin-utils

>  # ---------------------------------------------------------------------------

> diff --git a/scripts/subarch.include b/scripts/subarch.include

> new file mode 100644

> index 000000000000..650682821126

> --- /dev/null

> +++ b/scripts/subarch.include

> @@ -0,0 +1,13 @@

> +# SUBARCH tells the usermode build what the underlying arch is.  That is set

> +# first, and if a usermode build is happening, the "ARCH=um" on the command

> +# line overrides the setting of ARCH below.  If a native build is happening,

> +# then ARCH is assigned, getting whatever value it gets normally, and

> +# SUBARCH is subsequently ignored.

> +

> +SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \

> +				  -e s/sun4u/sparc64/ \

> +				  -e s/arm.*/arm/ -e s/sa110/arm/ \

> +				  -e s/s390x/s390/ -e s/parisc64/parisc/ \

> +				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \

> +				  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \

> +				  -e s/riscv.*/riscv/)

> diff --git a/tools/testing/selftests/android/Makefile b/tools/testing/selftests/android/Makefile

> index 72c25a3cb658..d9a725478375 100644

> --- a/tools/testing/selftests/android/Makefile

> +++ b/tools/testing/selftests/android/Makefile

> @@ -6,7 +6,7 @@ TEST_PROGS := run.sh

>  

>  include ../lib.mk

>  

> -all:

> +all: khdr

>  	@for DIR in $(SUBDIRS); do		\

>  		BUILD_TARGET=$(OUTPUT)/$$DIR;	\

>  		mkdir $$BUILD_TARGET  -p;	\

> diff --git a/tools/testing/selftests/android/ion/Makefile b/tools/testing/selftests/android/ion/Makefile

> index e03695287f76..88cfe88e466f 100644

> --- a/tools/testing/selftests/android/ion/Makefile

> +++ b/tools/testing/selftests/android/ion/Makefile

> @@ -10,6 +10,8 @@ $(TEST_GEN_FILES): ipcsocket.c ionutils.c

>  

>  TEST_PROGS := ion_test.sh

>  

> +KSFT_KHDR_INSTALL := 1

> +top_srcdir = ../../../../..

>  include ../../lib.mk

>  

>  $(OUTPUT)/ionapp_export: ionapp_export.c ipcsocket.c ionutils.c

> diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile

> index ff8feca49746..ad1eeb14fda7 100644

> --- a/tools/testing/selftests/futex/functional/Makefile

> +++ b/tools/testing/selftests/futex/functional/Makefile

> @@ -18,6 +18,7 @@ TEST_GEN_FILES := \

>  

>  TEST_PROGS := run.sh

>  

> +top_srcdir = ../../../../..

>  include ../../lib.mk

>  

>  $(TEST_GEN_FILES): $(HEADERS)

> diff --git a/tools/testing/selftests/gpio/Makefile b/tools/testing/selftests/gpio/Makefile

> index 1bbb47565c55..4665cdbf1a8d 100644

> --- a/tools/testing/selftests/gpio/Makefile

> +++ b/tools/testing/selftests/gpio/Makefile

> @@ -21,11 +21,8 @@ endef

>  CFLAGS += -O2 -g -std=gnu99 -Wall -I../../../../usr/include/

>  LDLIBS += -lmount -I/usr/include/libmount

>  

> -$(BINARIES): ../../../gpio/gpio-utils.o ../../../../usr/include/linux/gpio.h

> +$(BINARIES):| khdr

> +$(BINARIES): ../../../gpio/gpio-utils.o

>  

>  ../../../gpio/gpio-utils.o:

>  	make ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C ../../../gpio

> -

> -../../../../usr/include/linux/gpio.h:

> -	make -C ../../../.. headers_install INSTALL_HDR_PATH=$(shell pwd)/../../../../usr/

> -

> diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile

> index 03b0f551bedf..87d1a8488af8 100644

> --- a/tools/testing/selftests/kvm/Makefile

> +++ b/tools/testing/selftests/kvm/Makefile

> @@ -37,9 +37,6 @@ $(LIBKVM_OBJ): $(OUTPUT)/%.o: %.c

>  $(OUTPUT)/libkvm.a: $(LIBKVM_OBJ)

>  	$(AR) crs $@ $^

>  

> -$(LINUX_HDR_PATH):

> -	make -C $(top_srcdir) headers_install

> -

> -all: $(STATIC_LIBS) $(LINUX_HDR_PATH)

> +all: $(STATIC_LIBS)

>  $(TEST_GEN_PROGS): $(STATIC_LIBS)

> -$(TEST_GEN_PROGS) $(LIBKVM_OBJ): | $(LINUX_HDR_PATH)

> +$(STATIC_LIBS):| khdr

> diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk

> index 17ab36605a8e..0a8e75886224 100644

> --- a/tools/testing/selftests/lib.mk

> +++ b/tools/testing/selftests/lib.mk

> @@ -16,8 +16,20 @@ TEST_GEN_PROGS := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS))

>  TEST_GEN_PROGS_EXTENDED := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS_EXTENDED))

>  TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES))

>  

> +top_srcdir ?= ../../../..

> +include $(top_srcdir)/scripts/subarch.include

> +ARCH		?= $(SUBARCH)

> +

>  all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)

>  

> +.PHONY: khdr

> +khdr:

> +	make ARCH=$(ARCH) -C $(top_srcdir) headers_install

> +

> +ifdef KSFT_KHDR_INSTALL

> +$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES):| khdr

> +endif

> +

>  .ONESHELL:

>  define RUN_TEST_PRINT_RESULT

>  	TEST_HDR_MSG="selftests: "`basename $$PWD`:" $$BASENAME_TEST";	\

> diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile

> index cccdb2295567..256d82d5fa87 100644

> --- a/tools/testing/selftests/net/Makefile

> +++ b/tools/testing/selftests/net/Makefile

> @@ -15,6 +15,7 @@ TEST_GEN_FILES += udpgso udpgso_bench_tx udpgso_bench_rx ip_defrag

>  TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa

>  TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict tls

>  

> +KSFT_KHDR_INSTALL := 1

>  include ../lib.mk

>  

>  $(OUTPUT)/reuseport_bpf_numa: LDFLAGS += -lnuma

> diff --git a/tools/testing/selftests/networking/timestamping/Makefile b/tools/testing/selftests/networking/timestamping/Makefile

> index a728040edbe1..14cfcf006936 100644

> --- a/tools/testing/selftests/networking/timestamping/Makefile

> +++ b/tools/testing/selftests/networking/timestamping/Makefile

> @@ -5,6 +5,7 @@ TEST_PROGS := hwtstamp_config rxtimestamp timestamping txtimestamp

>  

>  all: $(TEST_PROGS)

>  

> +top_srcdir = ../../../../..

>  include ../../lib.mk

>  

>  clean:

> diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile

> index 9881876d2aa0..e94b7b14bcb2 100644

> --- a/tools/testing/selftests/vm/Makefile

> +++ b/tools/testing/selftests/vm/Makefile

> @@ -26,10 +26,6 @@ TEST_PROGS := run_vmtests

>  

>  include ../lib.mk

>  

> -$(OUTPUT)/userfaultfd: ../../../../usr/include/linux/kernel.h

>  $(OUTPUT)/userfaultfd: LDLIBS += -lpthread

>  

>  $(OUTPUT)/mlock-random-test: LDLIBS += -lcap

> -

> -../../../../usr/include/linux/kernel.h:

> -	make -C ../../../.. headers_install

> 


I queued this up in linux-kselftest next to be included in my next
pull request.

thanks,
-- Shuah
Michael Ellerman Sept. 28, 2018, 4:52 a.m. UTC | #2 
[ + linuxppc-dev ]

Anders Roxell <anders.roxell@linaro.org> writes:
> If the kernel headers aren't installed we can't build all the tests.

> Add a new make target rule 'khdr' in the file lib.mk to generate the

> kernel headers and that gets include for every test-dir Makefile that

> includes lib.mk If the testdir in turn have its own sub-dirs the

> top_srcdir needs to be set to the linux-rootdir to be able to generate

> the kernel headers.

>

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> Reviewed-by: Fathi Boudra <fathi.boudra@linaro.org>

> ---

>

> I sent this (v5) a month ago and wondered if it got lost. Resending

> unchanged.

>

> Cheers,

> Anders

>

>  Makefile                                           | 14 +-------------

>  scripts/subarch.include                            | 13 +++++++++++++

>  tools/testing/selftests/android/Makefile           |  2 +-

>  tools/testing/selftests/android/ion/Makefile       |  2 ++

>  tools/testing/selftests/futex/functional/Makefile  |  1 +

>  tools/testing/selftests/gpio/Makefile              |  7 ++-----

>  tools/testing/selftests/kvm/Makefile               |  7 ++-----

>  tools/testing/selftests/lib.mk                     | 12 ++++++++++++

>  tools/testing/selftests/net/Makefile               |  1 +

>  .../selftests/networking/timestamping/Makefile     |  1 +

>  tools/testing/selftests/vm/Makefile                |  4 ----

>  11 files changed, 36 insertions(+), 28 deletions(-)

>  create mode 100644 scripts/subarch.include


This broke all the powerpc selftests :(

Why did it go in at rc5?

cheers
shuah Sept. 28, 2018, 1:52 p.m. UTC | #3 
On 09/27/2018 10:52 PM, Michael Ellerman wrote:
> [ + linuxppc-dev ]

> 

> Anders Roxell <anders.roxell@linaro.org> writes:

>> If the kernel headers aren't installed we can't build all the tests.

>> Add a new make target rule 'khdr' in the file lib.mk to generate the

>> kernel headers and that gets include for every test-dir Makefile that

>> includes lib.mk If the testdir in turn have its own sub-dirs the

>> top_srcdir needs to be set to the linux-rootdir to be able to generate

>> the kernel headers.

>>

>> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

>> Reviewed-by: Fathi Boudra <fathi.boudra@linaro.org>

>> ---

>>

>> I sent this (v5) a month ago and wondered if it got lost. Resending

>> unchanged.

>>

>> Cheers,

>> Anders

>>

>>  Makefile                                           | 14 +-------------

>>  scripts/subarch.include                            | 13 +++++++++++++

>>  tools/testing/selftests/android/Makefile           |  2 +-

>>  tools/testing/selftests/android/ion/Makefile       |  2 ++

>>  tools/testing/selftests/futex/functional/Makefile  |  1 +

>>  tools/testing/selftests/gpio/Makefile              |  7 ++-----

>>  tools/testing/selftests/kvm/Makefile               |  7 ++-----

>>  tools/testing/selftests/lib.mk                     | 12 ++++++++++++

>>  tools/testing/selftests/net/Makefile               |  1 +

>>  .../selftests/networking/timestamping/Makefile     |  1 +

>>  tools/testing/selftests/vm/Makefile                |  4 ----

>>  11 files changed, 36 insertions(+), 28 deletions(-)

>>  create mode 100644 scripts/subarch.include

> 

> This broke all the powerpc selftests :(


Sorry for thr breakage.

> 

> Why did it go in at rc5?

> 


This patch has been in linux-next for a sometime before I decided to send this.
My original intent was to send this for rc2, and my schedule was messed up with
traveling. Since I didn't hear any issues from linux-next soaking, I made a call
on sending this in for rc5.

On second thought I should have waited until 4.20. Sorry about that.

thanks,
-- Shuah
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 19948e556941..9c781e77fa24 100644
--- a/Makefile
+++ b/Makefile
@@ -299,19 +299,7 @@  KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
 KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
 export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
 
-# SUBARCH tells the usermode build what the underlying arch is.  That is set
-# first, and if a usermode build is happening, the "ARCH=um" on the command
-# line overrides the setting of ARCH below.  If a native build is happening,
-# then ARCH is assigned, getting whatever value it gets normally, and
-# SUBARCH is subsequently ignored.
-
-SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
-				  -e s/sun4u/sparc64/ \
-				  -e s/arm.*/arm/ -e s/sa110/arm/ \
-				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
-				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-				  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
-				  -e s/riscv.*/riscv/)
+include scripts/subarch.include
 
 # Cross compiling and selecting different set of gcc/bin-utils
 # ---------------------------------------------------------------------------
diff --git a/scripts/subarch.include b/scripts/subarch.include
new file mode 100644
index 000000000000..650682821126
--- /dev/null
+++ b/scripts/subarch.include
@@ -0,0 +1,13 @@ 
+# SUBARCH tells the usermode build what the underlying arch is.  That is set
+# first, and if a usermode build is happening, the "ARCH=um" on the command
+# line overrides the setting of ARCH below.  If a native build is happening,
+# then ARCH is assigned, getting whatever value it gets normally, and
+# SUBARCH is subsequently ignored.
+
+SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+				  -e s/sun4u/sparc64/ \
+				  -e s/arm.*/arm/ -e s/sa110/arm/ \
+				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
+				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
+				  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
+				  -e s/riscv.*/riscv/)
diff --git a/tools/testing/selftests/android/Makefile b/tools/testing/selftests/android/Makefile
index 72c25a3cb658..d9a725478375 100644
--- a/tools/testing/selftests/android/Makefile
+++ b/tools/testing/selftests/android/Makefile
@@ -6,7 +6,7 @@  TEST_PROGS := run.sh
 
 include ../lib.mk
 
-all:
+all: khdr
 	@for DIR in $(SUBDIRS); do		\
 		BUILD_TARGET=$(OUTPUT)/$$DIR;	\
 		mkdir $$BUILD_TARGET  -p;	\
diff --git a/tools/testing/selftests/android/ion/Makefile b/tools/testing/selftests/android/ion/Makefile
index e03695287f76..88cfe88e466f 100644
--- a/tools/testing/selftests/android/ion/Makefile
+++ b/tools/testing/selftests/android/ion/Makefile
@@ -10,6 +10,8 @@  $(TEST_GEN_FILES): ipcsocket.c ionutils.c
 
 TEST_PROGS := ion_test.sh
 
+KSFT_KHDR_INSTALL := 1
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(OUTPUT)/ionapp_export: ionapp_export.c ipcsocket.c ionutils.c
diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile
index ff8feca49746..ad1eeb14fda7 100644
--- a/tools/testing/selftests/futex/functional/Makefile
+++ b/tools/testing/selftests/futex/functional/Makefile
@@ -18,6 +18,7 @@  TEST_GEN_FILES := \
 
 TEST_PROGS := run.sh
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 $(TEST_GEN_FILES): $(HEADERS)
diff --git a/tools/testing/selftests/gpio/Makefile b/tools/testing/selftests/gpio/Makefile
index 1bbb47565c55..4665cdbf1a8d 100644
--- a/tools/testing/selftests/gpio/Makefile
+++ b/tools/testing/selftests/gpio/Makefile
@@ -21,11 +21,8 @@  endef
 CFLAGS += -O2 -g -std=gnu99 -Wall -I../../../../usr/include/
 LDLIBS += -lmount -I/usr/include/libmount
 
-$(BINARIES): ../../../gpio/gpio-utils.o ../../../../usr/include/linux/gpio.h
+$(BINARIES):| khdr
+$(BINARIES): ../../../gpio/gpio-utils.o
 
 ../../../gpio/gpio-utils.o:
 	make ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C ../../../gpio
-
-../../../../usr/include/linux/gpio.h:
-	make -C ../../../.. headers_install INSTALL_HDR_PATH=$(shell pwd)/../../../../usr/
-
diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
index 03b0f551bedf..87d1a8488af8 100644
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@ -37,9 +37,6 @@  $(LIBKVM_OBJ): $(OUTPUT)/%.o: %.c
 $(OUTPUT)/libkvm.a: $(LIBKVM_OBJ)
 	$(AR) crs $@ $^
 
-$(LINUX_HDR_PATH):
-	make -C $(top_srcdir) headers_install
-
-all: $(STATIC_LIBS) $(LINUX_HDR_PATH)
+all: $(STATIC_LIBS)
 $(TEST_GEN_PROGS): $(STATIC_LIBS)
-$(TEST_GEN_PROGS) $(LIBKVM_OBJ): | $(LINUX_HDR_PATH)
+$(STATIC_LIBS):| khdr
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
index 17ab36605a8e..0a8e75886224 100644
--- a/tools/testing/selftests/lib.mk
+++ b/tools/testing/selftests/lib.mk
@@ -16,8 +16,20 @@  TEST_GEN_PROGS := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS))
 TEST_GEN_PROGS_EXTENDED := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS_EXTENDED))
 TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES))
 
+top_srcdir ?= ../../../..
+include $(top_srcdir)/scripts/subarch.include
+ARCH		?= $(SUBARCH)
+
 all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
 
+.PHONY: khdr
+khdr:
+	make ARCH=$(ARCH) -C $(top_srcdir) headers_install
+
+ifdef KSFT_KHDR_INSTALL
+$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES):| khdr
+endif
+
 .ONESHELL:
 define RUN_TEST_PRINT_RESULT
 	TEST_HDR_MSG="selftests: "`basename $$PWD`:" $$BASENAME_TEST";	\
diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile
index cccdb2295567..256d82d5fa87 100644
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@ -15,6 +15,7 @@  TEST_GEN_FILES += udpgso udpgso_bench_tx udpgso_bench_rx ip_defrag
 TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa
 TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict tls
 
+KSFT_KHDR_INSTALL := 1
 include ../lib.mk
 
 $(OUTPUT)/reuseport_bpf_numa: LDFLAGS += -lnuma
diff --git a/tools/testing/selftests/networking/timestamping/Makefile b/tools/testing/selftests/networking/timestamping/Makefile
index a728040edbe1..14cfcf006936 100644
--- a/tools/testing/selftests/networking/timestamping/Makefile
+++ b/tools/testing/selftests/networking/timestamping/Makefile
@@ -5,6 +5,7 @@  TEST_PROGS := hwtstamp_config rxtimestamp timestamping txtimestamp
 
 all: $(TEST_PROGS)
 
+top_srcdir = ../../../../..
 include ../../lib.mk
 
 clean:
diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
index 9881876d2aa0..e94b7b14bcb2 100644
--- a/tools/testing/selftests/vm/Makefile
+++ b/tools/testing/selftests/vm/Makefile
@@ -26,10 +26,6 @@  TEST_PROGS := run_vmtests
 
 include ../lib.mk
 
-$(OUTPUT)/userfaultfd: ../../../../usr/include/linux/kernel.h
 $(OUTPUT)/userfaultfd: LDLIBS += -lpthread
 
 $(OUTPUT)/mlock-random-test: LDLIBS += -lcap
-
-../../../../usr/include/linux/kernel.h:
-	make -C ../../../.. headers_install