All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nick Terrell <nickrterrell@gmail.com>
To: Borislav Petkov <bp@alien8.de>, Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org, Chris Mason <clm@fb.com>,
	linux-kbuild@vger.kernel.org, x86@kernel.org,
	gregkh@linuxfoundation.org, Petr Malat <oss@malat.biz>,
	Kees Cook <keescook@chromium.org>,
	Kernel Team <Kernel-team@fb.com>,
	Nick Terrell <nickrterrell@gmail.com>,
	Adam Borowski <kilobyte@angband.pl>,
	Patrick Williams <patrickw3@fb.com>,
	rmikey@fb.com, mingo@kernel.org,
	Patrick Williams <patrick@stwcx.xyz>,
	Sedat Dilek <sedat.dilek@gmail.com>,
	Norbert Lange <nolange79@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Alex Xu <alex_y_xu@yahoo.ca>,
	Arvind Sankar <nivedita@alum.mit.edu>,
	Nick Terrell <terrelln@fb.com>
Subject: [PATCH v8 5/7] x86: bump ZO_z_extra_bytes margin for zstd
Date: Thu, 23 Jul 2020 12:27:59 -0700	[thread overview]
Message-ID: <20200723192801.351114-6-nickrterrell@gmail.com> (raw)
In-Reply-To: <20200723192801.351114-1-nickrterrell@gmail.com>

From: Nick Terrell <terrelln@fb.com>

Bump the ZO_z_extra_bytes margin for zstd.

Zstd needs 3 bytes per 128 KB, and has a 22 byte fixed overhead.
Zstd needs to maintain 128 KB of space at all times, since that is
the maximum block size. See the comments regarding in-place
decompression added in lib/decompress_unzstd.c for details.

The existing code is written so that all the compression algorithms use
the same ZO_z_extra_bytes. It is taken to be the maximum of the growth
rate plus the maximum fixed overhead. The comments just above this diff
state that:

Reviewed-by: Kees Cook <keescook@chromium.org>
Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Nick Terrell <terrelln@fb.com>
---
 arch/x86/boot/header.S | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 735ad7f21ab0..6dbd7e9f74c9 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -539,8 +539,14 @@ pref_address:		.quad LOAD_PHYSICAL_ADDR	# preferred load addr
 # the size-dependent part now grows so fast.
 #
 # extra_bytes = (uncompressed_size >> 8) + 65536
+#
+# ZSTD compressed data grows by at most 3 bytes per 128K, and only has a 22
+# byte fixed overhead but has a maximum block size of 128K, so it needs a
+# larger margin.
+#
+# extra_bytes = (uncompressed_size >> 8) + 131072
 
-#define ZO_z_extra_bytes	((ZO_z_output_len >> 8) + 65536)
+#define ZO_z_extra_bytes	((ZO_z_output_len >> 8) + 131072)
 #if ZO_z_output_len > ZO_z_input_len
 # define ZO_z_extract_offset	(ZO_z_output_len + ZO_z_extra_bytes - \
 				 ZO_z_input_len)
-- 
2.27.0


  parent reply	other threads:[~2020-07-23 19:30 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-23 19:27 [GIT PULL][PATCH v8 0/7] Add support for ZSTD-compressed kernel and initramfs Nick Terrell
2020-07-23 19:27 ` [PATCH v8 1/7] lib: prepare zstd for preboot environment Nick Terrell
2020-07-23 19:27 ` [PATCH v8 2/7] lib: add zstd support to decompress Nick Terrell
2020-07-24 12:12   ` Ingo Molnar
2020-07-23 19:27 ` [PATCH v8 3/7] init: add support for zstd compressed kernel Nick Terrell
2020-07-23 20:30   ` Randy Dunlap
2020-07-24 12:17     ` Ingo Molnar
2020-07-24 14:09       ` Randy Dunlap
2020-07-23 19:27 ` [PATCH v8 4/7] usr: add support for zstd compressed initramfs Nick Terrell
2020-07-23 19:27 ` Nick Terrell [this message]
2020-07-23 19:28 ` [PATCH v8 6/7] x86: Add support for ZSTD compressed kernel Nick Terrell
2020-07-24  0:50   ` Sedat Dilek
2020-07-24 14:30     ` Arvind Sankar
2020-07-24 14:48       ` Sedat Dilek
2020-07-24 17:38         ` Arvind Sankar
2020-07-27 22:44       ` Nick Terrell
2020-07-24 12:26   ` Ingo Molnar
2020-07-24 13:46     ` Adam Borowski
2020-07-27 22:43     ` Nick Terrell
2020-07-23 19:28 ` [PATCH v8 7/7] .gitignore: add ZSTD-compressed files Nick Terrell
2020-07-24  0:49 ` [GIT PULL][PATCH v8 0/7] Add support for ZSTD-compressed kernel and initramfs Sedat Dilek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200723192801.351114-6-nickrterrell@gmail.com \
    --to=nickrterrell@gmail.com \
    --cc=Kernel-team@fb.com \
    --cc=akpm@linux-foundation.org \
    --cc=alex_y_xu@yahoo.ca \
    --cc=bp@alien8.de \
    --cc=clm@fb.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=keescook@chromium.org \
    --cc=kilobyte@angband.pl \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=nivedita@alum.mit.edu \
    --cc=nolange79@gmail.com \
    --cc=oss@malat.biz \
    --cc=patrick@stwcx.xyz \
    --cc=patrickw3@fb.com \
    --cc=rmikey@fb.com \
    --cc=sedat.dilek@gmail.com \
    --cc=terrelln@fb.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.