* [PATCH v2 1/2] x86/purgatory: hard-code obj-y in Makefile
@ 2022-07-25 2:08 Masahiro Yamada
2022-07-25 2:08 ` [PATCH v2 2/2] x86/purgatory: Omit use of bin2c Masahiro Yamada
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Masahiro Yamada @ 2022-07-25 2:08 UTC (permalink / raw)
To: x86, Thomas Gleixner, Ingo Molnar, Borislav Petkov
Cc: H . Peter Anvin, Masahiro Yamada, Dave Hansen, Nick Desaulniers,
linux-kernel
arch/x86/Kbuild guards the entire purgatory/ directory, and
CONFIG_KEXEC_FILE is bool type.
$(CONFIG_KEXEC_FILE) is always 'y' when this directory is being built.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
(no changes since v1)
arch/x86/purgatory/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile
index ae53d54d7959..248b009c4061 100644
--- a/arch/x86/purgatory/Makefile
+++ b/arch/x86/purgatory/Makefile
@@ -81,4 +81,4 @@ quiet_cmd_bin2c = BIN2C $@
$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE
$(call if_changed,bin2c)
-obj-$(CONFIG_KEXEC_FILE) += kexec-purgatory.o
+obj-y += kexec-purgatory.o
--
2.34.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2 2/2] x86/purgatory: Omit use of bin2c
2022-07-25 2:08 [PATCH v2 1/2] x86/purgatory: hard-code obj-y in Makefile Masahiro Yamada
@ 2022-07-25 2:08 ` Masahiro Yamada
2022-07-25 12:08 ` [tip: x86/build] " tip-bot2 for Masahiro Yamada
2022-07-25 12:08 ` [tip: x86/build] x86/purgatory: Hard-code obj-y in Makefile tip-bot2 for Masahiro Yamada
2022-07-25 17:02 ` [PATCH v2 1/2] x86/purgatory: hard-code " Nick Desaulniers
2 siblings, 1 reply; 5+ messages in thread
From: Masahiro Yamada @ 2022-07-25 2:08 UTC (permalink / raw)
To: x86, Thomas Gleixner, Ingo Molnar, Borislav Petkov
Cc: H . Peter Anvin, Masahiro Yamada, Dave Hansen, Helge Deller,
Nick Desaulniers, Russell King (Oracle),
Thomas Bogendoerfer, linux-kernel
The .incbin assembler directive is much faster than bin2c + $(CC).
Do similar refactoring as in commit 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 <masahiroy@kernel.org>
---
Changes in v2:
- Fix a typo (kexec_purgatroy_end -> kexec_purgatory_end)
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 677111acbaa3..f2e1d6c347fb 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 be0b95e51df6..2c1d37cd479f 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=y
depends on CRYPTO_SHA256=y
diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile
index 248b009c4061..31c634a22818 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)
-targets += kexec-purgatory.c
-
-quiet_cmd_bin2c = BIN2C $@
- cmd_bin2c = $(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
obj-y += kexec-purgatory.o
diff --git a/arch/x86/purgatory/kexec-purgatory.S b/arch/x86/purgatory/kexec-purgatory.S
new file mode 100644
index 000000000000..8530fe93b718
--- /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 7adab4618035..379e86c71bed 100755
--- a/scripts/remove-stale-files
+++ b/scripts/remove-stale-files
@@ -41,3 +41,5 @@ if [ -n "${building_out_of_srctree}" ]; then
fi
rm -f scripts/extract-cert
+
+rm -f arch/x86/purgatory/kexec-purgatory.c
--
2.34.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [tip: x86/build] x86/purgatory: Omit use of bin2c
2022-07-25 2:08 ` [PATCH v2 2/2] x86/purgatory: Omit use of bin2c Masahiro Yamada
@ 2022-07-25 12:08 ` tip-bot2 for Masahiro Yamada
0 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Masahiro Yamada @ 2022-07-25 12:08 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Masahiro Yamada, Borislav Petkov, x86, linux-kernel
The following commit has been merged into the x86/build branch of tip:
Commit-ID: 2d17bd24b0169d3fdbf003dfd55af600e9a30553
Gitweb: https://git.kernel.org/tip/2d17bd24b0169d3fdbf003dfd55af600e9a30553
Author: Masahiro Yamada <masahiroy@kernel.org>
AuthorDate: Mon, 25 Jul 2022 11:08:12 +09:00
Committer: Borislav Petkov <bp@suse.de>
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 <masahiroy@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
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=y
depends on CRYPTO_SHA256=y
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)
-targets += kexec-purgatory.c
-
-quiet_cmd_bin2c = BIN2C $@
- cmd_bin2c = $(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
obj-y += kexec-purgatory.o
diff --git a/arch/x86/purgatory/kexec-purgatory.S b/arch/x86/purgatory/kexec-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
rm -f scripts/extract-cert
+
+rm -f arch/x86/purgatory/kexec-purgatory.c
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip: x86/build] x86/purgatory: Hard-code obj-y in Makefile
2022-07-25 2:08 [PATCH v2 1/2] x86/purgatory: hard-code obj-y in Makefile Masahiro Yamada
2022-07-25 2:08 ` [PATCH v2 2/2] x86/purgatory: Omit use of bin2c Masahiro Yamada
@ 2022-07-25 12:08 ` tip-bot2 for Masahiro Yamada
2022-07-25 17:02 ` [PATCH v2 1/2] x86/purgatory: hard-code " Nick Desaulniers
2 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Masahiro Yamada @ 2022-07-25 12:08 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Masahiro Yamada, Borislav Petkov, x86, linux-kernel
The following commit has been merged into the x86/build branch of tip:
Commit-ID: 61922d3fa686733e08387a8a4e11b02b4af6d43c
Gitweb: https://git.kernel.org/tip/61922d3fa686733e08387a8a4e11b02b4af6d43c
Author: Masahiro Yamada <masahiroy@kernel.org>
AuthorDate: Mon, 25 Jul 2022 11:08:11 +09:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 25 Jul 2022 10:26:49 +02:00
x86/purgatory: Hard-code obj-y in Makefile
arch/x86/Kbuild guards the entire purgatory/ directory, and
CONFIG_KEXEC_FILE is bool type.
$(CONFIG_KEXEC_FILE) is always 'y' when this directory is being built.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20220725020812.622255-1-masahiroy@kernel.org
---
arch/x86/purgatory/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile
index ae53d54..248b009 100644
--- a/arch/x86/purgatory/Makefile
+++ b/arch/x86/purgatory/Makefile
@@ -81,4 +81,4 @@ quiet_cmd_bin2c = BIN2C $@
$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE
$(call if_changed,bin2c)
-obj-$(CONFIG_KEXEC_FILE) += kexec-purgatory.o
+obj-y += kexec-purgatory.o
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] x86/purgatory: hard-code obj-y in Makefile
2022-07-25 2:08 [PATCH v2 1/2] x86/purgatory: hard-code obj-y in Makefile Masahiro Yamada
2022-07-25 2:08 ` [PATCH v2 2/2] x86/purgatory: Omit use of bin2c Masahiro Yamada
2022-07-25 12:08 ` [tip: x86/build] x86/purgatory: Hard-code obj-y in Makefile tip-bot2 for Masahiro Yamada
@ 2022-07-25 17:02 ` Nick Desaulniers
2 siblings, 0 replies; 5+ messages in thread
From: Nick Desaulniers @ 2022-07-25 17:02 UTC (permalink / raw)
To: Masahiro Yamada
Cc: x86, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
H . Peter Anvin, Dave Hansen, linux-kernel
On Sun, Jul 24, 2022 at 7:10 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> arch/x86/Kbuild guards the entire purgatory/ directory, and
> CONFIG_KEXEC_FILE is bool type.
>
> $(CONFIG_KEXEC_FILE) is always 'y' when this directory is being built.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Thanks for the patch!
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> ---
>
> (no changes since v1)
>
> arch/x86/purgatory/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile
> index ae53d54d7959..248b009c4061 100644
> --- a/arch/x86/purgatory/Makefile
> +++ b/arch/x86/purgatory/Makefile
> @@ -81,4 +81,4 @@ quiet_cmd_bin2c = BIN2C $@
> $(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE
> $(call if_changed,bin2c)
>
> -obj-$(CONFIG_KEXEC_FILE) += kexec-purgatory.o
> +obj-y += kexec-purgatory.o
> --
> 2.34.1
>
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-25 17:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-25 2:08 [PATCH v2 1/2] x86/purgatory: hard-code obj-y in Makefile Masahiro Yamada
2022-07-25 2:08 ` [PATCH v2 2/2] x86/purgatory: Omit use of bin2c Masahiro Yamada
2022-07-25 12:08 ` [tip: x86/build] " tip-bot2 for Masahiro Yamada
2022-07-25 12:08 ` [tip: x86/build] x86/purgatory: Hard-code obj-y in Makefile tip-bot2 for Masahiro Yamada
2022-07-25 17:02 ` [PATCH v2 1/2] x86/purgatory: hard-code " Nick Desaulniers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®