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;
MIME-Version: 1.0
References: <20220725083904.56552-1-huangjie.albert@bytedance.com> <20220725083904.56552-4-huangjie.albert@bytedance.com>
In-Reply-To: <20220725083904.56552-4-huangjie.albert@bytedance.com>
From:   =?UTF-8?B?6buE5p2w?= <huangjie.albert@bytedance.com>
Date:   Mon, 25 Jul 2022 20:55:18 +0800
Message-ID: <CABKxMyM89vRT3wbKSPcoH+zZ7Lx+rpTaxfTi98xakGRhsYBv0g@mail.gmail.com>
Subject: Fwd: [PATCH 3/4] x86: Support the uncompressed kernel to speed up booting
To:     linux-kernel <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

---------- Forwarded message ---------
=E5=8F=91=E4=BB=B6=E4=BA=BA=EF=BC=9A Albert Huang <huangjie.albert@bytedanc=
e.com>
Date: 2022=E5=B9=B47=E6=9C=8825=E6=97=A5=E5=91=A8=E4=B8=80 16:40
Subject: [PATCH 3/4] x86: Support the uncompressed kernel to speed up booti=
ng
To:
Cc: huangjie.albert <huangjie.albert@bytedance.com>, Thomas Gleixner
<tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov
<bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>,
<x86@kernel.org>, H. Peter Anvin <hpa@zytor.com>, Eric Biederman
<ebiederm@xmission.com>, Masahiro Yamada <masahiroy@kernel.org>,
Michal Marek <michal.lkml@markovi.net>, Nick Desaulniers
<ndesaulniers@google.com>, Kirill A. Shutemov
<kirill.shutemov@linux.intel.com>, Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>, Tony Luck
<tony.luck@intel.com>, Michael Roth <michael.roth@amd.com>, Nathan
Chancellor <nathan@kernel.org>, Ard Biesheuvel <ardb@kernel.org>, Mark
Rutland <mark.rutland@arm.com>, Joerg Roedel <jroedel@suse.de>, Sean
Christopherson <seanjc@google.com>, Peter Zijlstra
<peterz@infradead.org>, Kees Cook <keescook@chromium.org>,
<linux-kernel@vger.kernel.org>, <kexec@lists.infradead.org>,
<linux-kbuild@vger.kernel.org>


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

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     :=3D y
 KCOV_INSTRUMENT                :=3D n

 targets :=3D 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 i=
n
 # case of cross compiling, as it has the '--target=3D' flag, which is need=
ed 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)   :=3D gz
 suffix-$(CONFIG_KERNEL_BZIP2)  :=3D bz2
@@ -147,6 +149,7 @@ suffix-$(CONFIG_KERNEL_XZ)  :=3D xz
 suffix-$(CONFIG_KERNEL_LZO)    :=3D lzo
 suffix-$(CONFIG_KERNEL_LZ4)    :=3D lz4
 suffix-$(CONFIG_KERNEL_ZSTD)   :=3D zst
+suffix-$(CONFIG_KERNEL_UNCOMPRESSED)   :=3D none

 quiet_cmd_mkpiggy =3D MKPIGGY $@
       cmd_mkpiggy =3D $(obj)/mkpiggy $< > $@
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/mis=
c.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 =3D LZ4     $@
 quiet_cmd_lz4_with_size =3D LZ4     $@
       cmd_lz4_with_size =3D { cat $(real-prereqs) | $(LZ4) -l -c1 stdin st=
dout; \
                   $(size_append); } > $@
+# none
+quiet_cmd_none =3D NONE     $@
+      cmd_none =3D (cat $(filter-out FORCE,$^) && \
+      $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+      (rm -f $@ ; false)

 # U-Boot mkimage
 # ------------------------------------------------------------------------=
---
--
2.31.1