From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 711D3C4CEC9 for ; Tue, 17 Sep 2019 15:17:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 466052171F for ; Tue, 17 Sep 2019 15:17:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729329AbfIQPRE (ORCPT ); Tue, 17 Sep 2019 11:17:04 -0400 Received: from foss.arm.com ([217.140.110.172]:57356 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729310AbfIQPRD (ORCPT ); Tue, 17 Sep 2019 11:17:03 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0FD0E15A2; Tue, 17 Sep 2019 08:17:03 -0700 (PDT) Received: from [10.1.197.50] (e120937-lin.cambridge.arm.com [10.1.197.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2088B3F575; Tue, 17 Sep 2019 08:17:02 -0700 (PDT) Subject: Re: [PATCH v6 01/11] kselftest: arm64: extend toplevel skeleton Makefile To: Anders Roxell Cc: linux-kselftest@vger.kernel.org, linux-arm-kernel@lists.infradead.org, shuah@kernel.org, andreyknvl@google.com, dave.martin@arm.com, amit.kachhap@arm.com References: <20190910123111.33478-1-cristian.marussi@arm.com> <20190910123111.33478-2-cristian.marussi@arm.com> <20190917134223.GA2695@localhost.localdomain> From: Cristian Marussi Message-ID: <38863e6e-4d6f-b7a6-2add-937fff9e5ef2@arm.com> Date: Tue, 17 Sep 2019 16:17:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190917134223.GA2695@localhost.localdomain> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Hi Anders thanks for the review. On 17/09/2019 14:42, Anders Roxell wrote: > On 2019-09-10 13:31, Cristian Marussi wrote: >> Modify KSFT arm64 toplevel Makefile to maintain arm64 kselftests organized >> by subsystem, keeping them into distinct subdirectories under arm64 custom >> KSFT directory: tools/testing/selftests/arm64/ >> >> Add to such toplevel Makefile a mechanism to guess the effective location >> of Kernel headers as installed by KSFT framework. >> >> Fit existing arm64 tags kselftest into this new schema moving them into >> their own subdirectory (arm64/tags). >> >> Signed-off-by: Cristian Marussi >> --- >> Based on: >> commit 9ce1263033cd ("selftests, arm64: add a selftest for passing >> tagged pointers to kernel") >> --- >> v5 --> v6 >> - using realpath to avoid passing down relative paths >> - fix commit msg & Copyright >> - removed unneded Makefile export >> - added SUBTARGETS specification, to allow building specific only some >> arm64 test subsystems >> v4 --> v5 >> - rebased on arm64/for-next/core >> - merged this patch with KSFT arm64 tags patch, while moving the latter >> into its own subdir >> - moved kernel header includes search mechanism from KSFT arm64 >> SIGNAL Makefile >> - export proper top_srcdir ENV for lib.mk >> v3 --> v4 >> - comment reword >> - simplified documentation in README >> - dropped README about standalone >> --- >> tools/testing/selftests/Makefile | 1 + >> tools/testing/selftests/arm64/Makefile | 63 +++++++++++++++++-- >> tools/testing/selftests/arm64/README | 25 ++++++++ >> tools/testing/selftests/arm64/tags/Makefile | 6 ++ >> .../arm64/{ => tags}/run_tags_test.sh | 0 >> .../selftests/arm64/{ => tags}/tags_test.c | 0 >> 6 files changed, 91 insertions(+), 4 deletions(-) >> create mode 100644 tools/testing/selftests/arm64/README >> create mode 100644 tools/testing/selftests/arm64/tags/Makefile >> rename tools/testing/selftests/arm64/{ => tags}/run_tags_test.sh (100%) >> rename tools/testing/selftests/arm64/{ => tags}/tags_test.c (100%) >> >> diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile >> index 25b43a8c2b15..1722dae9381a 100644 >> --- a/tools/testing/selftests/Makefile >> +++ b/tools/testing/selftests/Makefile >> @@ -1,5 +1,6 @@ >> # SPDX-License-Identifier: GPL-2.0 >> TARGETS = android >> +TARGETS += arm64 >> TARGETS += bpf >> TARGETS += breakpoints >> TARGETS += capabilities >> diff --git a/tools/testing/selftests/arm64/Makefile b/tools/testing/selftests/arm64/Makefile >> index a61b2e743e99..cbb2a5a9e3fc 100644 >> --- a/tools/testing/selftests/arm64/Makefile >> +++ b/tools/testing/selftests/arm64/Makefile >> @@ -1,11 +1,66 @@ >> # SPDX-License-Identifier: GPL-2.0 >> >> -# ARCH can be overridden by the user for cross compiling >> +# When ARCH not overridden for crosscompiling, lookup machine >> ARCH ?= $(shell uname -m 2>/dev/null || echo not) >> >> ifneq (,$(filter $(ARCH),aarch64 arm64)) >> -TEST_GEN_PROGS := tags_test >> -TEST_PROGS := run_tags_test.sh >> +SUBTARGETS ?= tags >> +else >> +SUBTARGETS := >> endif >> >> -include ../lib.mk >> +CFLAGS := -Wall -O2 -g >> + >> +# A proper top_srcdir is needed by KSFT(lib.mk) >> +top_srcdir = $(realpath ../../../../) >> + >> +# Additional include paths needed by kselftest.h and local headers >> +CFLAGS += -I$(top_srcdir)/tools/testing/selftests/ >> + >> +# Guessing where the Kernel headers could have been installed >> +# depending on ENV config >> +ifeq ($(KBUILD_OUTPUT),) >> +khdr_dir = $(top_srcdir)/usr/include >> +else >> +# the KSFT preferred location when KBUILD_OUTPUT is set >> +khdr_dir = $(KBUILD_OUTPUT)/kselftest/usr/include >> +endif >> + >> +CFLAGS += -I$(khdr_dir) >> + >> +export CFLAGS >> +export top_srcdir >> + >> +all: >> + @for DIR in $(SUBTARGETS); do \ >> + BUILD_TARGET=$(OUTPUT)/$$DIR; \ >> + mkdir -p $$BUILD_TARGET; \ >> + make OUTPUT=$$BUILD_TARGET -C $$DIR $@; \ >> + done >> + >> +install: all >> + @for DIR in $(SUBTARGETS); do \ >> + BUILD_TARGET=$(OUTPUT)/$$DIR; \ >> + make OUTPUT=$$BUILD_TARGET -C $$DIR $@; \ >> + done >> + >> +run_tests: all >> + @for DIR in $(SUBTARGETS); do \ >> + BUILD_TARGET=$(OUTPUT)/$$DIR; \ >> + make OUTPUT=$$BUILD_TARGET -C $$DIR $@; \ >> + done >> + >> +# Avoid any output on non arm64 on emit_tests >> +emit_tests: all >> + @for DIR in $(SUBTARGETS); do \ >> + BUILD_TARGET=$(OUTPUT)/$$DIR; \ >> + make OUTPUT=$$BUILD_TARGET -C $$DIR $@; \ >> + done >> + >> +clean: >> + @for DIR in $(SUBTARGETS); do \ >> + BUILD_TARGET=$(OUTPUT)/$$DIR; \ >> + make OUTPUT=$$BUILD_TARGET -C $$DIR $@; \ >> + done >> + >> +.PHONY: all clean install run_tests emit_tests >> diff --git a/tools/testing/selftests/arm64/README b/tools/testing/selftests/arm64/README >> new file mode 100644 >> index 000000000000..cc1e51796fee >> --- /dev/null >> +++ b/tools/testing/selftests/arm64/README >> @@ -0,0 +1,25 @@ >> +KSelfTest ARM64 >> +=============== >> + >> +- These tests are arm64 specific and so not built or run but just skipped >> + completely when env-variable ARCH is found to be different than 'arm64' >> + and `uname -m` reports other than 'aarch64'. >> + >> +- Holding true the above, ARM64 KSFT tests can be run within the KSelfTest >> + framework using standard Linux top-level-makefile targets: >> + >> + $ make TARGETS=arm64 kselftest-clean >> + $ make TARGETS=arm64 kselftest >> + >> + or >> + >> + $ make -C tools/testing/selftests TARGETS=arm64 \ >> + INSTALL_PATH= install >> + >> + or, alternatively, only specific arm64/ subtargets can be picked: >> + >> + $ make -C tools/testing/selftests TARGETS=arm64 SUBTARGETS="tags signal" \ >> + INSTALL_PATH= install >> + >> + Further details on building and running KFST can be found in: >> + Documentation/dev-tools/kselftest.rst >> diff --git a/tools/testing/selftests/arm64/tags/Makefile b/tools/testing/selftests/arm64/tags/Makefile >> new file mode 100644 >> index 000000000000..dcc8b0467b68 >> --- /dev/null >> +++ b/tools/testing/selftests/arm64/tags/Makefile >> @@ -0,0 +1,6 @@ >> +# SPDX-License-Identifier: GPL-2.0 >> + >> +TEST_GEN_PROGS := tags_test > > This should be TEST_GEN_FILES, since its used by run_tags_test.sh. > If its TEST_GEN_PROGS it will be added to the script run_kselftest.sh, > and I don't think thats the intent, even though it looked like that > before. > In fact I saw the tags tests running twice (via ./tags_test and via ./run_tags_test.sh) when called via run_kselftest.sh....but since it was already like that in the original patch so I did not want to fix it in the context of this series (where tags tests are simply relocated into their own directory) I could add a separate fix on top of this series if it could make sense. Cheers Cristian > Cheers, > Anders >