s390/boot: add zstd support
Enable ztsd support in s390/boot, to enable booting with zstd compressed kernel when configured with CONFIG_KERNEL_ZSTD=y. BOOT_HEAP_SIZE is defined to 0x30000 in this case. Actual decompressor memory usage with allyesconfig is currently 0x26150. BugLink: https://bugs.launchpad.net/bugs/1931725 Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> cc: Heiko Carstens <hca@linux.ibm.com> cc: Vasily Gorbik <gor@linux.ibm.com> cc: Christian Borntraeger <borntraeger@de.ibm.com> cc: linux-s390@vger.kernel.org Link: https://lore.kernel.org/r/20210615114150.325080-1-dimitri.ledkov@canonical.com [gor: added BOOT_HEAP_SIZE for zstd] Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
This commit is contained in:
Родитель
54f4521452
Коммит
7b034d9c1b
|
@ -173,6 +173,7 @@ config S390
|
||||||
select HAVE_KERNEL_LZO
|
select HAVE_KERNEL_LZO
|
||||||
select HAVE_KERNEL_UNCOMPRESSED
|
select HAVE_KERNEL_UNCOMPRESSED
|
||||||
select HAVE_KERNEL_XZ
|
select HAVE_KERNEL_XZ
|
||||||
|
select HAVE_KERNEL_ZSTD
|
||||||
select HAVE_KPROBES
|
select HAVE_KPROBES
|
||||||
select HAVE_KPROBES_ON_FTRACE
|
select HAVE_KPROBES_ON_FTRACE
|
||||||
select HAVE_KRETPROBES
|
select HAVE_KRETPROBES
|
||||||
|
|
|
@ -14,6 +14,7 @@ obj-y := $(if $(CONFIG_KERNEL_UNCOMPRESSED),,decompressor.o) info.o
|
||||||
obj-all := $(obj-y) piggy.o syms.o
|
obj-all := $(obj-y) piggy.o syms.o
|
||||||
targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2
|
targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2
|
||||||
targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4
|
targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4
|
||||||
|
targets += vmlinux.bin.zst
|
||||||
targets += info.bin syms.bin vmlinux.syms $(obj-all)
|
targets += info.bin syms.bin vmlinux.syms $(obj-all)
|
||||||
|
|
||||||
KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR)
|
KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR)
|
||||||
|
@ -63,6 +64,7 @@ suffix-$(CONFIG_KERNEL_LZ4) := .lz4
|
||||||
suffix-$(CONFIG_KERNEL_LZMA) := .lzma
|
suffix-$(CONFIG_KERNEL_LZMA) := .lzma
|
||||||
suffix-$(CONFIG_KERNEL_LZO) := .lzo
|
suffix-$(CONFIG_KERNEL_LZO) := .lzo
|
||||||
suffix-$(CONFIG_KERNEL_XZ) := .xz
|
suffix-$(CONFIG_KERNEL_XZ) := .xz
|
||||||
|
suffix-$(CONFIG_KERNEL_ZSTD) := .zst
|
||||||
|
|
||||||
$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
|
$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
|
||||||
$(call if_changed,gzip)
|
$(call if_changed,gzip)
|
||||||
|
@ -76,6 +78,8 @@ $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
|
||||||
$(call if_changed,lzo)
|
$(call if_changed,lzo)
|
||||||
$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
|
$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
|
||||||
$(call if_changed,xzkern)
|
$(call if_changed,xzkern)
|
||||||
|
$(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE
|
||||||
|
$(call if_changed,zstd22)
|
||||||
|
|
||||||
OBJCOPYFLAGS_piggy.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.bin.compressed
|
OBJCOPYFLAGS_piggy.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.bin.compressed
|
||||||
$(obj)/piggy.o: $(obj)/vmlinux.bin$(suffix-y) FORCE
|
$(obj)/piggy.o: $(obj)/vmlinux.bin$(suffix-y) FORCE
|
||||||
|
|
|
@ -30,6 +30,8 @@ extern unsigned char _compressed_end[];
|
||||||
|
|
||||||
#ifdef CONFIG_KERNEL_BZIP2
|
#ifdef CONFIG_KERNEL_BZIP2
|
||||||
#define BOOT_HEAP_SIZE 0x400000
|
#define BOOT_HEAP_SIZE 0x400000
|
||||||
|
#elif CONFIG_KERNEL_ZSTD
|
||||||
|
#define BOOT_HEAP_SIZE 0x30000
|
||||||
#else
|
#else
|
||||||
#define BOOT_HEAP_SIZE 0x10000
|
#define BOOT_HEAP_SIZE 0x10000
|
||||||
#endif
|
#endif
|
||||||
|
@ -61,6 +63,10 @@ static unsigned long free_mem_end_ptr = (unsigned long) _end + BOOT_HEAP_SIZE;
|
||||||
#include "../../../../lib/decompress_unxz.c"
|
#include "../../../../lib/decompress_unxz.c"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_KERNEL_ZSTD
|
||||||
|
#include "../../../../lib/decompress_unzstd.c"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define decompress_offset ALIGN((unsigned long)_end + BOOT_HEAP_SIZE, PAGE_SIZE)
|
#define decompress_offset ALIGN((unsigned long)_end + BOOT_HEAP_SIZE, PAGE_SIZE)
|
||||||
|
|
||||||
unsigned long mem_safe_offset(void)
|
unsigned long mem_safe_offset(void)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче