| Message ID | 20180607110911.12252-1-anders.roxell@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, 7 Jun 2018 at 13:09, Anders Roxell <anders.roxell@linaro.org> 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> > --- > 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 6b9aea95ae3a..8050072300fa 100644 > --- a/Makefile > +++ b/Makefile > @@ -286,19 +286,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 d9d00319b07c..bcb69380bbab 100644 > --- a/tools/testing/selftests/kvm/Makefile > +++ b/tools/testing/selftests/kvm/Makefile > @@ -32,9 +32,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 663e11e85727..d515dabc6b0d 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 > TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa > TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict > > +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 fdefa2295ddc..58759454b1d0 100644 > --- a/tools/testing/selftests/vm/Makefile > +++ b/tools/testing/selftests/vm/Makefile > @@ -25,10 +25,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 > -- > 2.17.1 > Ping. -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/23/2018 02:49 PM, Anders Roxell wrote: > On Thu, 7 Jun 2018 at 13:09, Anders Roxell <anders.roxell@linaro.org> 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> >> --- >> 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 6b9aea95ae3a..8050072300fa 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -286,19 +286,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 What is the reason for this SUBARCH block move to to scripts/subarch.include? Is this necessary for adding headers install dependency to lib.mk? >> >> # 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/) thanks, -- Shuah -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 24 Jul 2018 at 19:11, Shuah Khan <shuah@kernel.org> wrote: > > On 07/23/2018 02:49 PM, Anders Roxell wrote: > > On Thu, 7 Jun 2018 at 13:09, Anders Roxell <anders.roxell@linaro.org> 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> > >> --- > >> 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 6b9aea95ae3a..8050072300fa 100644 > >> --- a/Makefile > >> +++ b/Makefile > >> @@ -286,19 +286,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 > > What is the reason for this SUBARCH block move to to scripts/subarch.include? > Is this necessary for adding headers install dependency to lib.mk? This is needed to create headers for cross build. Cheers, Anders -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Anders, On 07/25/2018 10:08 AM, Anders Roxell wrote: > On Tue, 24 Jul 2018 at 19:11, Shuah Khan <shuah@kernel.org> wrote: >> >> On 07/23/2018 02:49 PM, Anders Roxell wrote: >>> On Thu, 7 Jun 2018 at 13:09, Anders Roxell <anders.roxell@linaro.org> 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> >>>> --- >>>> 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 6b9aea95ae3a..8050072300fa 100644 >>>> --- a/Makefile >>>> +++ b/Makefile >>>> @@ -286,19 +286,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 >> >> What is the reason for this SUBARCH block move to to scripts/subarch.include? >> Is this necessary for adding headers install dependency to lib.mk? > > This is needed to create headers for cross build. > I am sorry for the delay on this patch. I am going to get this into 4.19. If anybody has objections, please let me. Anders! Will be able to rebase the patch and send me the latest. I think I have Acks from kvm, android, and vm so far. thanks, -- Shuah -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2018-08-07 2:03 GMT+09:00 Shuah Khan <shuah@kernel.org>: > Hi Anders, > > On 07/25/2018 10:08 AM, Anders Roxell wrote: >> On Tue, 24 Jul 2018 at 19:11, Shuah Khan <shuah@kernel.org> wrote: >>> >>> On 07/23/2018 02:49 PM, Anders Roxell wrote: >>>> On Thu, 7 Jun 2018 at 13:09, Anders Roxell <anders.roxell@linaro.org> 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> >>>>> --- >>>>> 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 6b9aea95ae3a..8050072300fa 100644 >>>>> --- a/Makefile >>>>> +++ b/Makefile >>>>> @@ -286,19 +286,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 >>> >>> What is the reason for this SUBARCH block move to to scripts/subarch.include? >>> Is this necessary for adding headers install dependency to lib.mk? >> >> This is needed to create headers for cross build. >> > > I am sorry for the delay on this patch. I am going to get this into 4.19. > If anybody has objections, please let me. > > Anders! Will be able to rebase the patch and send me the latest. I think > I have Acks from kvm, android, and vm so far. > I may be missing something about the tools/ directory, but why isn't it like this? kselftest: headers_install $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests
On Tue, 7 Aug 2018 at 04:33, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > 2018-08-07 2:03 GMT+09:00 Shuah Khan <shuah@kernel.org>: > > Hi Anders, > > > > On 07/25/2018 10:08 AM, Anders Roxell wrote: > >> On Tue, 24 Jul 2018 at 19:11, Shuah Khan <shuah@kernel.org> wrote: > >>> > >>> On 07/23/2018 02:49 PM, Anders Roxell wrote: > >>>> On Thu, 7 Jun 2018 at 13:09, Anders Roxell <anders.roxell@linaro.org> 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> > >>>>> --- > >>>>> 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 6b9aea95ae3a..8050072300fa 100644 > >>>>> --- a/Makefile > >>>>> +++ b/Makefile > >>>>> @@ -286,19 +286,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 > >>> > >>> What is the reason for this SUBARCH block move to to scripts/subarch.include? > >>> Is this necessary for adding headers install dependency to lib.mk? > >> > >> This is needed to create headers for cross build. > >> > > > > I am sorry for the delay on this patch. I am going to get this into 4.19. > > If anybody has objections, please let me. > > > > Anders! Will be able to rebase the patch and send me the latest. I think > > I have Acks from kvm, android, and vm so far. > > > > > I may be missing something about the tools/ directory, > but why isn't it like this? > > > kselftest: headers_install > $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests That wont work if you cross compile, since you wont run the tests where you build them. Then you can argue that we should break it up in a build and run rule. However, my understanding how people just build and run the the tests for that particular subsystem that they develop for, like: make -C tools/testing/selftests/<subsystem>/ Cheers, Anders -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Anders, On Wed, Aug 8, 2018 at 12:46 PM Anders Roxell <anders.roxell@linaro.org> wrote: > On Tue, 7 Aug 2018 at 04:33, Masahiro Yamada > <yamada.masahiro@socionext.com> wrote: > > 2018-08-07 2:03 GMT+09:00 Shuah Khan <shuah@kernel.org>: > > > On 07/25/2018 10:08 AM, Anders Roxell wrote: > > >> On Tue, 24 Jul 2018 at 19:11, Shuah Khan <shuah@kernel.org> wrote: > > >>> On 07/23/2018 02:49 PM, Anders Roxell wrote: > > >>>> On Thu, 7 Jun 2018 at 13:09, Anders Roxell <anders.roxell@linaro.org> 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> > > >>>>> --- > > >>>>> 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 6b9aea95ae3a..8050072300fa 100644 > > >>>>> --- a/Makefile > > >>>>> +++ b/Makefile > > >>>>> @@ -286,19 +286,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 > > >>> > > >>> What is the reason for this SUBARCH block move to to scripts/subarch.include? > > >>> Is this necessary for adding headers install dependency to lib.mk? > > >> > > >> This is needed to create headers for cross build. > > > > > > I am sorry for the delay on this patch. I am going to get this into 4.19. > > > If anybody has objections, please let me. > > > > > > Anders! Will be able to rebase the patch and send me the latest. I think > > > I have Acks from kvm, android, and vm so far. > > > > I may be missing something about the tools/ directory, > > but why isn't it like this? > > > > > > kselftest: headers_install > > $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests > > That wont work if you cross compile, since you wont run the tests > where you build them. So why does a similar dependency work for samples in the main Makefile (even listed twice!)? Documentation/ samples/: headers_install samples: headers_install Or perhaps this also doesn't work? > Then you can argue that we should break it up in a build and run rule. > However, my understanding how people just build and run the the tests > for that particular subsystem that they develop for, like: > make -C tools/testing/selftests/<subsystem>/ I'm still a bit puzzled: how can you "build and run" the tests when cross-compiling, as you don't run the tests where you build them? Thanks! Gr{oetje,eeting}s, Geert
diff --git a/Makefile b/Makefile index 6b9aea95ae3a..8050072300fa 100644 --- a/Makefile +++ b/Makefile @@ -286,19 +286,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 d9d00319b07c..bcb69380bbab 100644 --- a/tools/testing/selftests/kvm/Makefile +++ b/tools/testing/selftests/kvm/Makefile @@ -32,9 +32,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 663e11e85727..d515dabc6b0d 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 TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict +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 fdefa2295ddc..58759454b1d0 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -25,10 +25,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