Commit c0dfadfe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-boot-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 boot updates from Ingo Molnar:
 "The main change in this cycle was to add support for ZSTD-compressed
  kernel and initrd images.

  ZSTD has a very fast decompressor, yet it compresses better than gzip"

* tag 'x86-boot-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Documentation: dontdiff: Add zstd compressed files
  .gitignore: Add ZSTD-compressed files
  x86: Add support for ZSTD compressed kernel
  x86: Bump ZO_z_extra_bytes margin for zstd
  usr: Add support for zstd compressed initramfs
  init: Add support for zstd compressed kernel
  lib: Add zstd support to decompress
  lib: Prepare zstd for preboot environment, improve performance
parents ba77c568 1ac1efa5

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
*.tab.[ch]

*.tar

*.xz

*.zst

Module.symvers

modules.builtin

modules.order

Documentation/dontdiff

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
*.ver

*.xml

*.xz

*.zst

*_MODULES

*_vga16.c

*~

Documentation/x86/boot.rst

+3 −3
Original line number Diff line number Diff line
@@ -782,9 +782,9 @@ Protocol: 2.08+ 
  uncompressed data should be determined using the standard magic

  numbers.  The currently supported compression formats are gzip

  (magic numbers 1F 8B or 1F 9E), bzip2 (magic number 42 5A), LZMA

  (magic number 5D 00), XZ (magic number FD 37), and LZ4 (magic number

  02 21).  The uncompressed payload is currently always ELF (magic

  number 7F 45 4C 46).

  (magic number 5D 00), XZ (magic number FD 37), LZ4 (magic number

  02 21) and ZSTD (magic number 28 B5). The uncompressed payload is

  currently always ELF (magic number 7F 45 4C 46).



============	==============

Field name:	payload_length

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ KLZOP = lzop 
LZMA		= lzma

LZ4		= lz4c

XZ		= xz

ZSTD		= zstd



CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)
@@ -512,7 +513,7 @@ CLANG_FLAGS := 
export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC

export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE LEX YACC AWK INSTALLKERNEL

export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX

export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ

export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD

export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE



export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ config X86 
	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_XZ

	select HAVE_KERNEL_ZSTD

	select HAVE_KPROBES

	select HAVE_KPROBES_ON_FTRACE

	select HAVE_FUNCTION_ERROR_INJECTION

CRA Git | Maintained and supported by SUSTech CRA and CCSE