From patchwork Sat Aug 5 06:11:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 131443 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp302410vqr; Fri, 4 Aug 2023 23:44:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJPecnIykvN8anXmogXSXzZBTkZZTLUdJ13Prj7HGw6AZVzf8QUdqz/BYFyUxybp4t4dA0 X-Received: by 2002:a05:6402:345:b0:523:2847:fb5a with SMTP id r5-20020a056402034500b005232847fb5amr686225edw.40.1691217841169; Fri, 04 Aug 2023 23:44:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691217841; cv=none; d=google.com; s=arc-20160816; b=uzQm5OQ8gPKbCj0aHZs+B89OkN1GR3Kqms8JCVuabcUWjSvRtKl3f0o4h3nIk56roD ZobAuDGMrMIrAlwyJpL7GSK884YzcPg7NNwKfJhfSLYiEFjVWsX3OfiD3pMRURS60hYV dP+EdCV8F3qruYGXsjM5/Ei88qAOcRJ+gClhQv2wGjYFD30wPk05MlhzWtVH1behreuq W7SRWHeLOvSKSuAnEqvwxck3boEY5103nKxFgsbykcifxWK845rb7I71gZNKlRjiZaEj v5y85Vk1lEWigwr00je9CcBPB6U4TPR0b9eIHz4TVKecHmqxlse2CzzankofvhGHGS2q GGBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=khV3HmlPVwTSMSZYwfiwUTWj3n3RInZs0C41/p6Bypw=; fh=AzeD7YCzxWA+xrfgg0HiLIXeOkAAMHglNTjKdDLJwsU=; b=hJ1u02qaY3brtffdThVwxJagTKfy/0MHdJwwgAQRBcOD2IubNU/YvfPETEtp/B4Qv0 pF585Bon6Fv/qdduYGIcIQ/UTH1dTd2q9AMeccIXmVNo2FFCZcE+zgi2ge3lRSVFXm/y SSh630/1h7rFYpLKgNHCzemxWp+oQD2+jiSCg2HzlvnHrRRE7k2MSeWZPG23LNWz2Zgy IgSeQLZEB/BZReDkh0fGK3tGNwpD//HJta8X9EhVcHIqk9sCgQ6C1PlP0GXT2l1hekip NtvMAwJ2qrMUKYOuQB9m/iHqgFyhnjHfe2EjoOQlWe82RAqMKcnVuCZt/nVQbDeCdnYl aSrQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e21-20020a50fb95000000b0052328ffc610si550142edq.249.2023.08.04.23.43.35; Fri, 04 Aug 2023 23:44:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229686AbjHEGLU (ORCPT + 99 others); Sat, 5 Aug 2023 02:11:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjHEGLR (ORCPT ); Sat, 5 Aug 2023 02:11:17 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.65.254]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E5764ED0; Fri, 4 Aug 2023 23:11:14 -0700 (PDT) X-QQ-mid: bizesmtp64t1691215864tag61k2f Received: from linux-lab-host.localdomain ( [116.30.131.233]) by bizesmtp.qq.com (ESMTP) with id ; Sat, 05 Aug 2023 14:11:03 +0800 (CST) X-QQ-SSF: 01200000000000E0X000000A0000000 X-QQ-FEAT: 8bAiRczmfHQKjO9A1xPL3JmyacwtRyy73Jl2Cs1iUKjm25LcZFMQudKWkiaFZ IJp6L5sal0Hp/oWyQxR9EDHA7nZqiySF6iI+A1CEN2Mvq5wOX9HcrkPaPf3s3Y+lLO53rJB GoHB/YNUR4z3ZoZwFyb+DBA0qFedj960y2VB4wKFb8wxuumbnMNxx7HUQeCoZYSSOP37w6s 6dpqY28Jy+95HnUtTTsrUK7xI7eR6EBjUU5kkj1DFpVnUWb5AtGE3TLazK7nXJYLafcIUdU DQOGQ6mJamimV6zPoW6Fmi7LkGH5R291K6g9wInj2w+XHDyAD8lUMUK2QRk5GTMf+m0ypYj fhWumx98lefPMNh4s/GKxwRAHpp1UvJmvW5QlIeJofvXWHB+Z67I5SVJc8V7w== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 17493183823704717070 From: Zhangjin Wu To: thomas@t-8ch.de, w@1wt.eu Cc: falcon@tinylab.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Subject: [PATCH v2 1/3] selftests/nolibc: allow report with existing test log Date: Sat, 5 Aug 2023 14:11:02 +0800 Message-Id: <307eb92fa4c9b774d48732a1de34076d826d40eb.1691215074.git.falcon@tinylab.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-1 X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773370439206852645 X-GMAIL-MSGID: 1773370439206852645 After the tests finish, it is valuable to report and summarize with existing test log. This avoid rerun or run the tests again when not necessary. Reviewed-by: Thomas Weißschuh Signed-off-by: Zhangjin Wu --- tools/testing/selftests/nolibc/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index 16cc33db54e3..51fef5e6a152 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -225,6 +225,10 @@ rerun: $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(srctree)/$(IMAGE)" -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out" $(Q)$(REPORT) $(CURDIR)/run.out +# report with existing test log +report: + $(Q)$(REPORT) $(CURDIR)/run.out + clean: $(call QUIET_CLEAN, sysroot) $(Q)rm -rf sysroot From patchwork Sat Aug 5 06:12:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 131444 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp303333vqr; Fri, 4 Aug 2023 23:47:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6TJwJcb0AB2hTCC9ZeYN1nFV0Cu0A+CxwV2JPZu2gdHSBq+JUe6H9UJcKhtN7sA/fr9EU X-Received: by 2002:a17:906:308c:b0:99b:b398:53b6 with SMTP id 12-20020a170906308c00b0099bb39853b6mr2073763ejv.34.1691218022355; Fri, 04 Aug 2023 23:47:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691218022; cv=none; d=google.com; s=arc-20160816; b=eSB+hgwFupMwyYOz3IfcFZhdRMkwouR9+81SnQiw1EhVbkajIyeokuhJBXY5YeTPcc oImtjx3VEGl1ORfoaIW4VsvWinS3fvE+QEsu/+ORLErCZzRb5qEBc8743vJrCiY8ErLA svsYW7qALyRO0r9JsUUnCKrjzuRrM13klVxamuQLhIa/QHuSPmYGxqyPjqSzfY1+t43m XrqnwEbE62/x7rc9zNJdKCdlfwErHg4uFjoPt1jfxgFBWRvBws6ZYtXP805sfMmlgXtT JxsF8lAMsQLEvJ18mJc1oQq+my/76Pyg7B+6yw5uTrK7j5PXcm7uxSzSlEwiEE04dg38 kT+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=ahLGGUNcbw1aylRCL51PWNGpWHd7inokv1/JAfLlRw8=; fh=AzeD7YCzxWA+xrfgg0HiLIXeOkAAMHglNTjKdDLJwsU=; b=lzzrbin+XU2r3poMmHwtHxsbGbS13WbVcgQ4PJJ01xLPAMHhP7uqeNFVItOlvpblYU UCCZuq5NHceal+vqd8yDbmZNlzbozVPmyR99+MXfNW9EBFrr38MTkh6/k7Hgsbp1aGbA ywd+bAAtJPUxmB8DiAgHDaeSqTNCsomxBZk7ATbirbFAEEJioHegVPL+uyZvRPoCfRPT GVt9CDQYFOzBKc7+BuOaI4MgqtBiW9U9ujBqpLCHm6WXBzHcHI46PCemldN1f82iIIrn C90tPYtb8TBCwws0QlbRNOlnIyzd2FC1sEAWMReeDSPl1FW5KMy8z6qkMTrVe84uZG9u l9Ew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t8-20020a170906064800b0099845f657a8si2605072ejb.616.2023.08.04.23.46.38; Fri, 04 Aug 2023 23:47:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229717AbjHEGMW (ORCPT + 99 others); Sat, 5 Aug 2023 02:12:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjHEGMU (ORCPT ); Sat, 5 Aug 2023 02:12:20 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.65.254]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B35F64ED7; Fri, 4 Aug 2023 23:12:18 -0700 (PDT) X-QQ-mid: bizesmtp62t1691215929tog00vde Received: from linux-lab-host.localdomain ( [116.30.131.233]) by bizesmtp.qq.com (ESMTP) with id ; Sat, 05 Aug 2023 14:12:07 +0800 (CST) X-QQ-SSF: 01200000000000E0X000000A0000000 X-QQ-FEAT: SFhf6fKhx/8agEErdMFhc7b3CoQDfYYa64dUygiIKK6bfOZW6eaO50gmvgSkJ OB2wiuG3XUXSphcBxzDQxJ8KvWYDUBOCG/qoCQhBDcxqxE/86kdeVcccD8qpUqs15yjeJzZ exjvN/l5mh7xTgDXFe/PzeMYPSNntJp8E4l9XUXxt+6KIwfohSXa8LlMLWBQrQe5+YvQWr4 HKdVPxT5hcEAwPGdjf8HubUIfTFKdxHSfAGChvwOPFs0XUk7l/iBSC5psv5GkI9Z+cI1yxc 9Wu+MJ5k2GW5hkmk0Zvbxi2wgOK5CHoZV3Knytk3+cGpEbkXcYRgQG4eHY64SDUI0DyGccD nhNSMAqRrd0rn376xf0rcC+l9pWB7sFcEuTc3fjAbe+9u2CcbprXWHT0bGe4c62rPAherny X-QQ-GoodBg: 0 X-BIZMAIL-ID: 1579897849559597880 From: Zhangjin Wu To: thomas@t-8ch.de, w@1wt.eu Cc: falcon@tinylab.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Subject: [PATCH v2 2/3] tools/nolibc: stackprotector.h: make __stack_chk_init static Date: Sat, 5 Aug 2023 14:12:06 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-1 X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773370628954681367 X-GMAIL-MSGID: 1773370628954681367 This allows to generate smaller text/data/dec size. As the _start_c() function added by crt.h, __stack_chk_init() is called from _start_c() instead of the assembly _start. So, it is able to mark it with static now. Reviewed-by: Thomas Weißschuh Signed-off-by: Zhangjin Wu --- tools/include/nolibc/crt.h | 2 +- tools/include/nolibc/stackprotector.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/include/nolibc/crt.h b/tools/include/nolibc/crt.h index 32e128b0fb62..a5f33fef1672 100644 --- a/tools/include/nolibc/crt.h +++ b/tools/include/nolibc/crt.h @@ -10,7 +10,7 @@ char **environ __attribute__((weak)); const unsigned long *_auxv __attribute__((weak)); -void __stack_chk_init(void); +static void __stack_chk_init(void); static void exit(int); void _start_c(long *sp) diff --git a/tools/include/nolibc/stackprotector.h b/tools/include/nolibc/stackprotector.h index b620f2b9578d..13f1d0e60387 100644 --- a/tools/include/nolibc/stackprotector.h +++ b/tools/include/nolibc/stackprotector.h @@ -37,8 +37,7 @@ void __stack_chk_fail_local(void) __attribute__((weak,section(".data.nolibc_stack_chk"))) uintptr_t __stack_chk_guard; -__attribute__((weak,section(".text.nolibc_stack_chk"))) __no_stack_protector -void __stack_chk_init(void) +static __no_stack_protector void __stack_chk_init(void) { my_syscall3(__NR_getrandom, &__stack_chk_guard, sizeof(__stack_chk_guard), 0); /* a bit more randomness in case getrandom() fails, ensure the guard is never 0 */ @@ -46,7 +45,7 @@ void __stack_chk_init(void) __stack_chk_guard ^= (uintptr_t) &__stack_chk_guard; } #else /* !defined(_NOLIBC_STACKPROTECTOR) */ -__inline__ void __stack_chk_init(void) {} +static void __stack_chk_init(void) {} #endif /* defined(_NOLIBC_STACKPROTECTOR) */ #endif /* _NOLIBC_STACKPROTECTOR_H */ From patchwork Sat Aug 5 06:13:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 131463 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp353310vqr; Sat, 5 Aug 2023 02:15:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF8yJVOzb8qN0trQBAWfM0SOBHVI+q3wzqvoNTkriz6XMN0lFOrAO5cY/QuUFeSBL0RP9Ii X-Received: by 2002:a05:6a00:1ac7:b0:687:4323:ec31 with SMTP id f7-20020a056a001ac700b006874323ec31mr5318594pfv.13.1691226937748; Sat, 05 Aug 2023 02:15:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691226937; cv=none; d=google.com; s=arc-20160816; b=krgdgDPoip1oKbwwHTIT1AmvSGF1s2HCWN4ePLlK+XYQzJDIGvC70T4GQ0SMWlW/pA rEzfSE4oa/C28eda/2Nrv5Xz29ufVre6/qrK0+Gdt7JCxWRP1FYP4HbF79Ar69tIUNFf ngl4LYyPI/Bd/EtgPcxRWB7xNPQ+hKjTTd6VcvrPOotRuZxuShcA+RPt/EQeoq0IUcUa hv5mcsj1k30+xkKwaMBEPbjWBAmd2QV7Lyrk3/F2GprkOumN6JbUyqVHtvOC4MteYFiT gIWaT3D5szkTbWOl9G6NRMmvX+GNilM39V6OFMcNpQGd1UeNL3sRAKWKy9ta6pvruh11 daUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=gKmk7gRDlEU4hxxlMgLLdZkUI9+dV1QSym4F/u+ugl8=; fh=AzeD7YCzxWA+xrfgg0HiLIXeOkAAMHglNTjKdDLJwsU=; b=bMrqVYv8yfe7yYd0+1EwGCyOM8nZlDDJF4Qa0vX91BnRoLKU59Btwo/0EDQCuRBIBW 7O6x3bv4Lmmsrmqu58WB8wIxjkDNts4TPJN+WTa+gDCmF3YhQ45iRbnNtEoTqraRb8Xe Cs3Yig0ju/2/T6W5Sa6Qh7z8EcHf/tbDqKiN6Fo6gSQgvcHpFTuBRAtPfebXxhMdCpGR fVyVV3xV5Z3rybpyIZwuBjcmGGc63QnTNeH72Btfrxjqbyr9RxoiYJ8uLog9XtLc4/Re b+0s2FN6nvotLm0JS6sCxgfTfhq1uqmPPRnGUxx6tKnlOnaquHcP68pi+0wGIqUdxjU/ 9h8Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u14-20020a056a00124e00b0067c12c99c56si2973080pfi.117.2023.08.05.02.15.23; Sat, 05 Aug 2023 02:15:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229722AbjHEGN0 (ORCPT + 99 others); Sat, 5 Aug 2023 02:13:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjHEGNY (ORCPT ); Sat, 5 Aug 2023 02:13:24 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 288B64ED0; Fri, 4 Aug 2023 23:13:22 -0700 (PDT) X-QQ-mid: bizesmtp71t1691215993ty0dxrkb Received: from linux-lab-host.localdomain ( [116.30.131.233]) by bizesmtp.qq.com (ESMTP) with id ; Sat, 05 Aug 2023 14:13:12 +0800 (CST) X-QQ-SSF: 01200000000000E0X000000A0000000 X-QQ-FEAT: VudjVnMJxE6y0HQdOAnIPW2Xm5and1bBaT6pX9ZCs1jzBV+VotcyCU7xHF8c2 FJ8c1IS734nq3CP1BRwRLg4LfZfUimvLvF/xBDGhTUxe4pd1bybAdcSavoW54CMSSrHpsB2 mANBiu2rVvVdMcY7IJfVl5cYBAoG8Gq6cpaAnTWvk0cnl9r4JKMabJrlzxI/WvlLkuUr9Hs 6aM7b/2PH9u/TWGLbkDATDLliZpiME9l9NAccP4y+wcqoMokBowHc7k4HqwryQJ4Gg5ik6t ay4C4v5/10U4XvHXebFaLKXL3Vyf5F7Jryf18X3+YtN6z+6mgbkmJznf//wgfner21xQVko iKOYjLmMArC5jIDUZp0t3h5fekE5sH+9UqD6m2t6QmLjrpo3Ml8w+rF9JlPTcb6kqgFxxlt KaQ2z2e4dmM= X-QQ-GoodBg: 0 X-BIZMAIL-ID: 9091032993655144416 From: Zhangjin Wu To: thomas@t-8ch.de, w@1wt.eu Cc: falcon@tinylab.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Subject: [PATCH v2 3/3] selftests/nolibc: fix up O= option support Date: Sat, 5 Aug 2023 14:13:11 +0800 Message-Id: <06d96bd81fe812a9718098a383678ad3beba98b1.1691215074.git.falcon@tinylab.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-1 X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773379977215336151 X-GMAIL-MSGID: 1773379977215336151 To avoid pollute the source code tree and avoid mrproper for every architecture switch, the O= argument must be supported. Both IMAGE and .config are from the building directory, let's use objtree instead of srctree for them. If no O= option specified, means building kernel in source code tree, objtree should be srctree in such case. To support relative path, as suggested by Thomas, $(COMMAND_O) is used to pass the O=$(ABSOLUTE_O) to the $(MAKE) commands. Suggested-by: Willy Tarreau Link: https://lore.kernel.org/lkml/ZK0AB1OXH1s2xYsh@1wt.eu/ Suggested-by: Thomas Weißschuh Link: https://lore.kernel.org/lkml/058a264d-45bd-4f1f-8af3-56ed337b3251@t-8ch.de/ Link: https://lore.kernel.org/lkml/500504f6-fed1-45a4-a518-4631a6f3e463@t-8ch.de/ Signed-off-by: Zhangjin Wu --- tools/testing/selftests/nolibc/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index 51fef5e6a152..20797ba5d393 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -9,6 +9,9 @@ ifeq ($(srctree),) srctree := $(patsubst %/tools/testing/selftests/,%,$(dir $(CURDIR))) endif +# add objtree for O= option, required by IMAGE and .config +objtree ?= $(srctree) + ifeq ($(ARCH),) include $(srctree)/scripts/subarch.include ARCH = $(SUBARCH) @@ -52,7 +55,7 @@ IMAGE_ppc64le = arch/powerpc/boot/zImage IMAGE_riscv = arch/riscv/boot/Image IMAGE_s390 = arch/s390/boot/bzImage IMAGE_loongarch = arch/loongarch/boot/vmlinuz.efi -IMAGE = $(IMAGE_$(XARCH)) +IMAGE = $(objtree)/$(IMAGE_$(XARCH)) IMAGE_NAME = $(notdir $(IMAGE)) # CROSS_COMPILE: cross toolchain prefix by architecture @@ -173,7 +176,7 @@ sysroot: sysroot/$(ARCH)/include sysroot/$(ARCH)/include: $(Q)rm -rf sysroot/$(ARCH) sysroot/sysroot $(QUIET_MKDIR)mkdir -p sysroot - $(Q)$(MAKE) -C ../../../include/nolibc ARCH=$(ARCH) OUTPUT=$(CURDIR)/sysroot/ headers_standalone + $(Q)$(MAKE) -C ../../../include/nolibc $(COMMAND_O) ARCH=$(ARCH) OUTPUT=$(CURDIR)/sysroot/ headers_standalone $(Q)mv sysroot/sysroot sysroot/$(ARCH) ifneq ($(NOLIBC_SYSROOT),0) @@ -210,19 +213,19 @@ initramfs: nolibc-test $(Q)cp nolibc-test initramfs/init defconfig: - $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) mrproper $(DEFCONFIG) prepare + $(Q)$(MAKE) -C $(srctree) $(COMMAND_O) 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 + $(Q)$(MAKE) -C $(srctree) $(COMMAND_O) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) CONFIG_INITRAMFS_SOURCE=$(CURDIR)/initramfs # 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" + $(Q)qemu-system-$(QEMU_ARCH) -display none -no-reboot -kernel "$(IMAGE)" -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 "$(IMAGE)" -serial stdio $(QEMU_ARGS) > "$(CURDIR)/run.out" $(Q)$(REPORT) $(CURDIR)/run.out # report with existing test log