| Message ID | 20220725083904.56552-4-huangjie.albert@bytedance.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | faster kexec reboot | expand |
Albert Huang <huangjie.albert@bytedance.com> writes: > From: "huangjie.albert" <huangjie.albert@bytedance.com> > > Although the compressed kernel can save the time of loading the > kernel into the memory and save the disk space for storing the kernel, > but in some time-sensitive scenarios, the time for decompressing the > kernel is intolerable. Therefore, it is necessary to support uncompressed > kernel images, so that the time of kernel decompression can be saved when > the kernel is started. > > This part of the time on my machine is approximately: > image type image size times > compressed(gzip) 8.5M 159ms > uncompressed 53M 8.5ms Why in the world are you using arch/x86/boot/compressed/... for an uncompressed kernel. Especially if you don't plan to process relocations. Even if it somehow makes sense why have you not followed the pattern used by the rest of the code and implemented a file that implements a no-op __decompress routine? Eric > Signed-off-by: huangjie.albert <huangjie.albert@bytedance.com> > --- > arch/x86/Kconfig | 1 + > arch/x86/boot/compressed/Makefile | 5 ++++- > arch/x86/boot/compressed/misc.c | 13 +++++++++++++ > scripts/Makefile.lib | 5 +++++ > 4 files changed, 23 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index adbd3a2bd60f..231187624c68 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -221,6 +221,7 @@ config X86 > select HAVE_KERNEL_LZO > select HAVE_KERNEL_XZ > select HAVE_KERNEL_ZSTD > + select HAVE_KERNEL_UNCOMPRESSED > select HAVE_KPROBES > select HAVE_KPROBES_ON_FTRACE > select HAVE_FUNCTION_ERROR_INJECTION > diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile > index 19e1905dcbf6..0c8417a2f792 100644 > --- a/arch/x86/boot/compressed/Makefile > +++ b/arch/x86/boot/compressed/Makefile > @@ -26,7 +26,7 @@ OBJECT_FILES_NON_STANDARD := y > KCOV_INSTRUMENT := n > > targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \ > - vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4 vmlinux.bin.zst > + vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4 vmlinux.bin.zst vmlinux.bin.none > > # CLANG_FLAGS must come before any cc-disable-warning or cc-option calls in > # case of cross compiling, as it has the '--target=' flag, which is needed to > @@ -139,6 +139,8 @@ $(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE > $(call if_changed,lz4_with_size) > $(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE > $(call if_changed,zstd22_with_size) > +$(obj)/vmlinux.bin.none: $(vmlinux.bin.all-y) FORCE > + $(call if_changed,none) > > suffix-$(CONFIG_KERNEL_GZIP) := gz > suffix-$(CONFIG_KERNEL_BZIP2) := bz2 > @@ -147,6 +149,7 @@ suffix-$(CONFIG_KERNEL_XZ) := xz > suffix-$(CONFIG_KERNEL_LZO) := lzo > suffix-$(CONFIG_KERNEL_LZ4) := lz4 > suffix-$(CONFIG_KERNEL_ZSTD) := zst > +suffix-$(CONFIG_KERNEL_UNCOMPRESSED) := none > > quiet_cmd_mkpiggy = MKPIGGY $@ > cmd_mkpiggy = $(obj)/mkpiggy $< > $@ > diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c > index cf690d8712f4..c23c0f525d93 100644 > --- a/arch/x86/boot/compressed/misc.c > +++ b/arch/x86/boot/compressed/misc.c > @@ -181,6 +181,19 @@ void __puthex(unsigned long value) > } > } > > +#ifdef CONFIG_KERNEL_UNCOMPRESSED > +#include <linux/decompress/mm.h> > +static int __decompress(unsigned char *buf, long len, > + long (*fill)(void*, unsigned long), > + long (*flush)(void*, unsigned long), > + unsigned char *outbuf, long olen, > + long *pos, void (*error)(char *x)) > +{ > + memcpy(outbuf, buf, olen); > + return 0; > +} > +#endif > + > #ifdef CONFIG_X86_NEED_RELOCS > static void handle_relocations(void *output, unsigned long output_len, > unsigned long virt_addr) > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index 3fb6a99e78c4..c89d5466c617 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -438,6 +438,11 @@ quiet_cmd_lz4 = LZ4 $@ > quiet_cmd_lz4_with_size = LZ4 $@ > cmd_lz4_with_size = { cat $(real-prereqs) | $(LZ4) -l -c1 stdin stdout; \ > $(size_append); } > $@ > +# none > +quiet_cmd_none = NONE $@ > + cmd_none = (cat $(filter-out FORCE,$^) && \ > + $(call size_append, $(filter-out FORCE,$^))) > $@ || \ > + (rm -f $@ ; false) > > # U-Boot mkimage > # ---------------------------------------------------------------------------
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index adbd3a2bd60f..231187624c68 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -221,6 +221,7 @@ config X86 select HAVE_KERNEL_LZO select HAVE_KERNEL_XZ select HAVE_KERNEL_ZSTD + select HAVE_KERNEL_UNCOMPRESSED select HAVE_KPROBES select HAVE_KPROBES_ON_FTRACE select HAVE_FUNCTION_ERROR_INJECTION diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 19e1905dcbf6..0c8417a2f792 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -26,7 +26,7 @@ OBJECT_FILES_NON_STANDARD := y KCOV_INSTRUMENT := n targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \ - vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4 vmlinux.bin.zst + vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4 vmlinux.bin.zst vmlinux.bin.none # CLANG_FLAGS must come before any cc-disable-warning or cc-option calls in # case of cross compiling, as it has the '--target=' flag, which is needed to @@ -139,6 +139,8 @@ $(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE $(call if_changed,lz4_with_size) $(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE $(call if_changed,zstd22_with_size) +$(obj)/vmlinux.bin.none: $(vmlinux.bin.all-y) FORCE + $(call if_changed,none) suffix-$(CONFIG_KERNEL_GZIP) := gz suffix-$(CONFIG_KERNEL_BZIP2) := bz2 @@ -147,6 +149,7 @@ suffix-$(CONFIG_KERNEL_XZ) := xz suffix-$(CONFIG_KERNEL_LZO) := lzo suffix-$(CONFIG_KERNEL_LZ4) := lz4 suffix-$(CONFIG_KERNEL_ZSTD) := zst +suffix-$(CONFIG_KERNEL_UNCOMPRESSED) := none quiet_cmd_mkpiggy = MKPIGGY $@ cmd_mkpiggy = $(obj)/mkpiggy $< > $@ diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index cf690d8712f4..c23c0f525d93 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -181,6 +181,19 @@ void __puthex(unsigned long value) } } +#ifdef CONFIG_KERNEL_UNCOMPRESSED +#include <linux/decompress/mm.h> +static int __decompress(unsigned char *buf, long len, + long (*fill)(void*, unsigned long), + long (*flush)(void*, unsigned long), + unsigned char *outbuf, long olen, + long *pos, void (*error)(char *x)) +{ + memcpy(outbuf, buf, olen); + return 0; +} +#endif + #ifdef CONFIG_X86_NEED_RELOCS static void handle_relocations(void *output, unsigned long output_len, unsigned long virt_addr) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 3fb6a99e78c4..c89d5466c617 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -438,6 +438,11 @@ quiet_cmd_lz4 = LZ4 $@ quiet_cmd_lz4_with_size = LZ4 $@ cmd_lz4_with_size = { cat $(real-prereqs) | $(LZ4) -l -c1 stdin stdout; \ $(size_append); } > $@ +# none +quiet_cmd_none = NONE $@ + cmd_none = (cat $(filter-out FORCE,$^) && \ + $(call size_append, $(filter-out FORCE,$^))) > $@ || \ + (rm -f $@ ; false) # U-Boot mkimage # ---------------------------------------------------------------------------