From nobody Wed Apr 15 05:43:14 2026 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 CCBA2C433EF for ; Mon, 25 Jul 2022 12:08:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234766AbiGYMI3 (ORCPT ); Mon, 25 Jul 2022 08:08:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232413AbiGYMI1 (ORCPT ); Mon, 25 Jul 2022 08:08:27 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74A95DF61; Mon, 25 Jul 2022 05:08:24 -0700 (PDT) Date: Mon, 25 Jul 2022 12:08:20 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1658750902; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7oMdJNO8Q18/poUtr1F/51rn98EPl62mt6vQplKcYNc=; b=3RXlDyDtnV8NAaN7O69ictD0qukaCxX3pfwivsy/u3Qf/ANTqfPJw28fyA/WaGmWySSMDM cpTculevD7z8sj/rH5TVlKqHGVBnagIhE5IN5DF+Ipq71CTf9sBWf63+/4w7/Qp6DpZzFI rvKAyPAOBtb1REvypRxe1dpb9v8Sx2pjVVN57zVcZC08rf0VwGmxp4V+DiVmqDOQ13H63H LIQYrvIN9NkBxPNRTKCED4ijB8Rs1SlmeQwf+2yMsKX5QhgxLKMc5MMHJsCZFK74V4t45i 705GQA2Cr+5WTjbRKcAnkL4dybpHZYsHlaChzKJmNoD837p2L5Rqq1qBZ6FwEg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1658750902; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7oMdJNO8Q18/poUtr1F/51rn98EPl62mt6vQplKcYNc=; b=ibxmdoLpL7AqOBmSdTS4Eo0CYO49WoPDpBUvkKXrWY/FkajgZ/1U9/s/M//Fbz2r7uL15y oBKGnlAb0hjiVJDQ== From: "tip-bot2 for Masahiro Yamada" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/build] x86/purgatory: Omit use of bin2c Cc: Masahiro Yamada , Borislav Petkov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220725020812.622255-2-masahiroy@kernel.org> References: <20220725020812.622255-2-masahiroy@kernel.org> MIME-Version: 1.0 Message-ID: <165875090068.15455.6422328179935086784.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/build branch of tip: Commit-ID: 2d17bd24b0169d3fdbf003dfd55af600e9a30553 Gitweb: https://git.kernel.org/tip/2d17bd24b0169d3fdbf003dfd55af600e= 9a30553 Author: Masahiro Yamada AuthorDate: Mon, 25 Jul 2022 11:08:12 +09:00 Committer: Borislav Petkov CommitterDate: Mon, 25 Jul 2022 10:32:32 +02:00 x86/purgatory: Omit use of bin2c The .incbin assembler directive is much faster than bin2c + $(CC). Do similar refactoring as in 4c0f032d4963 ("s390/purgatory: Omit use of bin2c"). Please note the .quad directive matches to size_t in C (both 8 byte) because the purgatory is compiled only for the 64-bit kernel. (KEXEC_FILE depends on X86_64). Signed-off-by: Masahiro Yamada Signed-off-by: Borislav Petkov Link: https://lore.kernel.org/r/20220725020812.622255-2-masahiroy@kernel.org --- arch/x86/.gitignore | 2 -- arch/x86/Kconfig | 1 - arch/x86/purgatory/Makefile | 8 +------- arch/x86/purgatory/kexec-purgatory.S | 14 ++++++++++++++ scripts/remove-stale-files | 2 ++ 5 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 arch/x86/purgatory/kexec-purgatory.S diff --git a/arch/x86/.gitignore b/arch/x86/.gitignore index 677111a..f2e1d6c 100644 --- a/arch/x86/.gitignore +++ b/arch/x86/.gitignore @@ -3,6 +3,4 @@ boot/compressed/vmlinux tools/test_get_len tools/insn_sanity tools/insn_decoder_test -purgatory/kexec-purgatory.c purgatory/purgatory.ro - diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 076adde..901cb59 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2032,7 +2032,6 @@ config KEXEC config KEXEC_FILE bool "kexec file based system call" select KEXEC_CORE - select BUILD_BIN2C depends on X86_64 depends on CRYPTO=3Dy depends on CRYPTO_SHA256=3Dy diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index 248b009..31c634a 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@ -73,12 +73,6 @@ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE $(obj)/purgatory.chk: $(obj)/purgatory.ro FORCE $(call if_changed,ld) =20 -targets +=3D kexec-purgatory.c - -quiet_cmd_bin2c =3D BIN2C $@ - cmd_bin2c =3D $(objtree)/scripts/bin2c kexec_purgatory < $< > $@ - -$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE - $(call if_changed,bin2c) +$(obj)/kexec-purgatory.o: $(obj)/purgatory.ro $(obj)/purgatory.chk =20 obj-y +=3D kexec-purgatory.o diff --git a/arch/x86/purgatory/kexec-purgatory.S b/arch/x86/purgatory/kexe= c-purgatory.S new file mode 100644 index 0000000..8530fe9 --- /dev/null +++ b/arch/x86/purgatory/kexec-purgatory.S @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + + .section .rodata, "a" + + .align 8 +kexec_purgatory: + .globl kexec_purgatory + .incbin "arch/x86/purgatory/purgatory.ro" +.Lkexec_purgatory_end: + + .align 8 +kexec_purgatory_size: + .globl kexec_purgatory_size + .quad .Lkexec_purgatory_end - kexec_purgatory diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files index 7adab46..379e86c 100755 --- a/scripts/remove-stale-files +++ b/scripts/remove-stale-files @@ -41,3 +41,5 @@ if [ -n "${building_out_of_srctree}" ]; then fi =20 rm -f scripts/extract-cert + +rm -f arch/x86/purgatory/kexec-purgatory.c