From patchwork Sat Sep 16 07:13:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13388140 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6186CD37BA for ; Sat, 16 Sep 2023 07:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238817AbjIPHO0 (ORCPT ); Sat, 16 Sep 2023 03:14:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231906AbjIPHN5 (ORCPT ); Sat, 16 Sep 2023 03:13:57 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6C73CD8; Sat, 16 Sep 2023 00:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1694848422; bh=N0u5CeBhd0jeZ72RH1KvQRJvme7lnR8v86eiHR768eA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=augLYVjbQcljGggD5qeSqYYRU5WC7gfXQEiSnnCrypztUS3jhu2zLHTz/2dS/JyYE o+RlvUUAomea51gY787k3m90sbwPo2kWvivjFSoxH6IinQSKPN2KnGqiN3p6z/pijy 6ntMLymfLzmK329uMjt861kPaOq0RPPQM3U89xgQ= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 16 Sep 2023 09:13:27 +0200 Subject: [PATCH RFC 1/3] kbuild: add toplevel target for usr/gen_init_cpio MIME-Version: 1.0 Message-Id: <20230916-nolibc-initramfs-v1-1-4416ecedca6d@weissschuh.net> References: <20230916-nolibc-initramfs-v1-0-4416ecedca6d@weissschuh.net> In-Reply-To: <20230916-nolibc-initramfs-v1-0-4416ecedca6d@weissschuh.net> To: Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Willy Tarreau , Shuah Khan Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694848421; l=887; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=N0u5CeBhd0jeZ72RH1KvQRJvme7lnR8v86eiHR768eA=; b=D/hhNRXl2GztEC1PQG3thapDENVP/CxmF97SvrXxLGAzYCCHDXpFLXQBLdh/P/leibxfDH+yN 5qLcNhqpDb9BB9AnpCG8CBg082F5DayoQ4Wwasi2WdoTwtDoM3J8a0W X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The nolibc testsuite wants to generate an initrams without linking it into the kernel for which it needs access to gen_init_cpio. Add a new toplevel target for it so it can be built standalone. Signed-off-by: Thomas Weißschuh --- Kbuild maintainers: If there is a way that does not require modification of the toplevel Makefile that would be nice, too. I followed the example of the "scripts_unifdef" target. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index ceb23eed4dce..1caa4429eceb 100644 --- a/Makefile +++ b/Makefile @@ -1812,6 +1812,10 @@ endif endif # KBUILD_EXTMOD +PHONY += usr_gen_init_cpio +usr_gen_init_cpio: + $(Q)$(MAKE) $(build)=usr usr/gen_init_cpio + # --------------------------------------------------------------------------- # Modules From patchwork Sat Sep 16 07:13:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13388138 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC4C6CD37B2 for ; Sat, 16 Sep 2023 07:14:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233150AbjIPHNy (ORCPT ); Sat, 16 Sep 2023 03:13:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231906AbjIPHNx (ORCPT ); Sat, 16 Sep 2023 03:13:53 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 733BE1BC1; Sat, 16 Sep 2023 00:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1694848422; bh=oT2kEBwaKoAUkh23wcKkuHSU9d9+GU/5x2kZCPlHweE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pRYZHs+qpYrm9CcQ5FkPCvwNcw3FXdvsFGAw9uemY81Sgn3gRFE+uJjuGC9wwp4L4 Wozq1/skugTsnBZUUaqFSn+kZJabFOJr7FT47hReAgP4oZ9S36ePafUac13zYnSRgV En1iK0HuJ68yXar6v7LeQsjD1Yl/8WQpAmzzT3fU= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 16 Sep 2023 09:13:28 +0200 Subject: [PATCH RFC 2/3] selftests/nolibc: don't embed initramfs into kernel image MIME-Version: 1.0 Message-Id: <20230916-nolibc-initramfs-v1-2-4416ecedca6d@weissschuh.net> References: <20230916-nolibc-initramfs-v1-0-4416ecedca6d@weissschuh.net> In-Reply-To: <20230916-nolibc-initramfs-v1-0-4416ecedca6d@weissschuh.net> To: Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Willy Tarreau , Shuah Khan Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694848421; l=5060; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=oT2kEBwaKoAUkh23wcKkuHSU9d9+GU/5x2kZCPlHweE=; b=0cIkidM3/ODX5NsYC7xYaNIapE4GXcLskp6UvWs2gvVArc+XdkjfHgdwZVnB53PbOezmmMmFK soCuDFi/PiXAofxD7BouOWI7DpvEzFrYllaf47o57cAnLjWxd9gCEAM X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org When the initramfs is embedded into the kernel each rebuild of it will trigger a full kernel relink and all the expensive postprocessing steps. Currently nolibc-test and therefore the initramfs are always rebuild, even without source changes, leading to lots of slow kernel relinks. Instead of linking the initramfs into the kernel assemble it manually and pass it explicitly to qemu. This avoids all of the kernel relinks. Signed-off-by: Thomas Weißschuh --- tools/testing/selftests/nolibc/Makefile | 47 +++++++++++++++++---------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index 689658f81a19..c62efc62a060 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -131,18 +131,18 @@ REPORT ?= awk '/\[OK\][\r]*$$/{p++} /\[FAIL\][\r]*$$/{if (!f) printf("\n"); f++ help: @echo "Supported targets under selftests/nolibc:" - @echo " all call the \"run\" target below" - @echo " help this help" - @echo " sysroot create the nolibc sysroot here (uses \$$ARCH)" - @echo " nolibc-test build the executable (uses \$$CC and \$$CROSS_COMPILE)" - @echo " libc-test build an executable using the compiler's default libc instead" - @echo " run-user runs the executable under QEMU (uses \$$XARCH, \$$TEST)" - @echo " initramfs prepare the initramfs with nolibc-test" - @echo " defconfig create a fresh new default config (uses \$$XARCH)" - @echo " kernel (re)build the kernel with the initramfs (uses \$$XARCH)" - @echo " run runs the kernel in QEMU after building it (uses \$$XARCH, \$$TEST)" - @echo " rerun runs a previously prebuilt kernel in QEMU (uses \$$XARCH, \$$TEST)" - @echo " clean clean the sysroot, initramfs, build and output files" + @echo " all call the \"run\" target below" + @echo " help this help" + @echo " sysroot create the nolibc sysroot here (uses \$$ARCH)" + @echo " nolibc-test build the executable (uses \$$CC and \$$CROSS_COMPILE)" + @echo " libc-test build an executable using the compiler's default libc instead" + @echo " run-user runs the executable under QEMU (uses \$$XARCH, \$$TEST)" + @echo " initramfs.cpio prepare the initramfs with nolibc-test" + @echo " defconfig create a fresh new default config (uses \$$XARCH)" + @echo " kernel (re)build the kernel with the initramfs (uses \$$XARCH)" + @echo " run runs the kernel in QEMU after building it (uses \$$XARCH, \$$TEST)" + @echo " rerun runs a previously prebuilt kernel in QEMU (uses \$$XARCH, \$$TEST)" + @echo " clean clean the sysroot, initramfs, build and output files" @echo "" @echo "The output file is \"run.out\". Test ranges may be passed using \$$TEST." @echo "" @@ -195,25 +195,26 @@ run-user: nolibc-test $(Q)qemu-$(QEMU_ARCH) ./nolibc-test > "$(CURDIR)/run.out" || : $(Q)$(REPORT) $(CURDIR)/run.out -initramfs: nolibc-test - $(QUIET_MKDIR)mkdir -p initramfs - $(call QUIET_INSTALL, initramfs/init) - $(Q)cp nolibc-test initramfs/init +$(srctree)/usr/gen_init_cpio: + $(Q)$(MAKE) -C $(srctree) usr_gen_init_cpio + +initramfs.cpio: $(srctree)/usr/gen_init_cpio nolibc-test + $(QUIET_GEN)echo 'file /init nolibc-test 755 0 0' | $(srctree)/usr/gen_init_cpio - > initramfs.cpio defconfig: $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) mrproper $(DEFCONFIG) prepare -kernel: initramfs - $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) CONFIG_INITRAMFS_SOURCE=$(CURDIR)/initramfs +kernel: + $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) # run the tests after building the kernel -run: kernel - $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(srctree)/$(IMAGE)" -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out" +run: kernel initramfs.cpio + qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(srctree)/$(IMAGE)" -initrd initramfs.cpio -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out" $(Q)$(REPORT) $(CURDIR)/run.out # re-run the tests from an existing kernel rerun: - $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(srctree)/$(IMAGE)" -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out" + $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(srctree)/$(IMAGE)" -initrd initramfs.cpio -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out" $(Q)$(REPORT) $(CURDIR)/run.out # report with existing test log @@ -227,8 +228,8 @@ clean: $(Q)rm -f nolibc-test $(call QUIET_CLEAN, libc-test) $(Q)rm -f libc-test - $(call QUIET_CLEAN, initramfs) - $(Q)rm -rf initramfs + $(call QUIET_CLEAN, initramfs.cpio) + $(Q)rm -rf initramfs.cpio $(call QUIET_CLEAN, run.out) $(Q)rm -rf run.out From patchwork Sat Sep 16 07:13:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13388141 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C735CCD37BD for ; Sat, 16 Sep 2023 07:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233357AbjIPHO0 (ORCPT ); Sat, 16 Sep 2023 03:14:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231889AbjIPHN4 (ORCPT ); Sat, 16 Sep 2023 03:13:56 -0400 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A03C11BC7; Sat, 16 Sep 2023 00:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1694848422; bh=HuKIsAyLFmZmHBEu40qJ+1hV5Zu0Xnhs4WVhae5Lnlk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=UABtFaabbXO8SbirT/kI4iR1QM2pkgAqQ+w7eIW7IdbX8h4v0YYjd5C9FR47ixMgq 8Kzva2sxm5JkNOJ2ft+cmFL3JPtvXDmtCzdqVmKCgkGP221/hobrIwbveyQS28yf81 XxZkf7lfJ+dAFW25za7OuQNQZzNqVZ7z4Xh6U3Bw= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 16 Sep 2023 09:13:29 +0200 Subject: [PATCH RFC 3/3] selftests/nolibc: drop target "rerun" MIME-Version: 1.0 Message-Id: <20230916-nolibc-initramfs-v1-3-4416ecedca6d@weissschuh.net> References: <20230916-nolibc-initramfs-v1-0-4416ecedca6d@weissschuh.net> In-Reply-To: <20230916-nolibc-initramfs-v1-0-4416ecedca6d@weissschuh.net> To: Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Willy Tarreau , Shuah Khan Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694848421; l=1248; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=HuKIsAyLFmZmHBEu40qJ+1hV5Zu0Xnhs4WVhae5Lnlk=; b=2btfW1pmngj98gPHBzBmyfY828dC96EUdzPmE3JwmSsRA3/LEXZl1R4xP7vuHIPHZVC/7bGem bxgIFHXU/cNAIXaWKHvMpdY13KvWcL/mvFbqUHq9zCmC+53X4Ji0T1f X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Now that the target "run" does not relink the kernel all the time anymore it is much faster and we don't need "rerun" anymore. Signed-off-by: Thomas Weißschuh --- Willy: This is an optional commit, "rerun" is still a bit faster than "run". Also maybe it should be squashed into the previous commit. --- tools/testing/selftests/nolibc/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index c62efc62a060..ca9ec9c6f2f4 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -212,11 +212,6 @@ run: kernel initramfs.cpio qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(srctree)/$(IMAGE)" -initrd initramfs.cpio -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out" $(Q)$(REPORT) $(CURDIR)/run.out -# re-run the tests from an existing kernel -rerun: - $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(srctree)/$(IMAGE)" -initrd initramfs.cpio -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out" - $(Q)$(REPORT) $(CURDIR)/run.out - # report with existing test log report: $(Q)$(REPORT) $(CURDIR)/run.out