From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F8D0C2BA16 for ; Wed, 8 Apr 2020 21:56:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 160AF20730 for ; Wed, 8 Apr 2020 21:56:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PpeIq0Jf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726884AbgDHV4M (ORCPT ); Wed, 8 Apr 2020 17:56:12 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:33636 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726799AbgDHV4K (ORCPT ); Wed, 8 Apr 2020 17:56:10 -0400 Received: by mail-pl1-f194.google.com with SMTP id ay1so3052856plb.0; Wed, 08 Apr 2020 14:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x/7kW0cmEuUJVUvzc/KSfN5Zbm5nXQUqMb4FSyTtXWw=; b=PpeIq0JfDPS2kP9J/CGwtDCFqo9DEuuffcu0RP+XEoAjBtkqJCLffSD8nc5AJANqLK drY33xPk1gLtyRlCzv/o6Z50moAMU4m/em0J4VA3kX7CHHSiSvYFkxRU+v8nGXhKVmJL AROoUNAm7rrakoLy8Lmz5wR+lRWrsjWX5I+GBWNCYsHVVPiuFckMFpbk9Wgn30BpuWp1 B5mgcH1kBXcpLtL8DdZlR2ZpV7d+j+tNvfmF+j0jGjeHu1aMGwhz6iaul7eg3MxOJrwm uCFPPiip02oJPrTgCAjzbjXD19PwqP1FNtwo0bBaj/JkCsAJKO38B8EIAoJlm+zaQMoU f/YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x/7kW0cmEuUJVUvzc/KSfN5Zbm5nXQUqMb4FSyTtXWw=; b=j2A0Ggh5tIKgiFRncZTxcpwks3erz2YRNjpCP2OqKbGzhp47Ku9ffLceSRkKyUrlXa I3ZrkVPDIz93oRTGAU+UhaddjR30KnTgw1RVJRRNc+XqBa7jiE6FqPFYgfODshTdo998 KW2APl5f82XqLSP/FqKZelQbr6owBRqhvx04EAmydFWrQUij+G4Rbv+WEzR9rDUh41ZW 0+4wj3SUDyF4bsV0MSMQSW8ylyVzvH1tzzWwr06YRBk8MVxa61DqhxMhzTGInXQKEpk9 bv2aglWTvENsV/o1gE4GRi2bPV/ZDk6qIjxppA1LisQIGdKypoNYc6zdOqeGpyKqxmL2 8sYg== X-Gm-Message-State: AGi0PuZ2TogJ9dZ3/c4C1VhYxUzqcuDaz2M0LIP0+jvb7gk7hAdkXpXA FoyOn2JSie+F3ytwUddQgxc= X-Google-Smtp-Source: APiQypJrdbbCrJjd+Tae32wwTtNG8LDNM14wWyvTI9nNl166ioZfC8hfSttQuIYr6SC0o65bWuFc+g== X-Received: by 2002:a17:902:7b82:: with SMTP id w2mr9349367pll.132.1586382968479; Wed, 08 Apr 2020 14:56:08 -0700 (PDT) Received: from nickserv.localdomain (c-73-222-55-223.hsd1.ca.comcast.net. [73.222.55.223]) by smtp.gmail.com with ESMTPSA id ci13sm459604pjb.16.2020.04.08.14.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 14:56:07 -0700 (PDT) From: Nick Terrell To: Nick Terrell Cc: linux-kernel@vger.kernel.org, Chris Mason , linux-kbuild@vger.kernel.org, x86@kernel.org, gregkh@linuxfoundation.org, Petr Malat , Kees Cook , Kernel Team , Nick Terrell , Adam Borowski , Patrick Williams , rmikey@fb.com, mingo@kernel.org, Patrick Williams , Sedat Dilek Subject: [PATCH v5 4/8] init: add support for zstd compressed kernel Date: Wed, 8 Apr 2020 14:57:07 -0700 Message-Id: <20200408215711.137639-5-nickrterrell@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200408215711.137639-1-nickrterrell@gmail.com> References: <20200408215711.137639-1-nickrterrell@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nick Terrell * Adds the zstd cmd to scripts/Makefile.lib * Adds the HAVE_KERNEL_ZSTD and KERNEL_ZSTD options Architecture specific support is still needed for decompression. Reviewed-by: Kees Cook Tested-by: Sedat Dilek Signed-off-by: Nick Terrell --- init/Kconfig | 15 ++++++++++++++- scripts/Makefile.lib | 15 +++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/init/Kconfig b/init/Kconfig index 492bb7000aa4..806874fdd663 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -176,13 +176,16 @@ config HAVE_KERNEL_LZO config HAVE_KERNEL_LZ4 bool +config HAVE_KERNEL_ZSTD + bool + config HAVE_KERNEL_UNCOMPRESSED bool choice prompt "Kernel compression mode" default KERNEL_GZIP - depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_XZ || HAVE_KERNEL_LZO || HAVE_KERNEL_LZ4 || HAVE_KERNEL_UNCOMPRESSED + depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_XZ || HAVE_KERNEL_LZO || HAVE_KERNEL_LZ4 || HAVE_KERNEL_ZSTD || HAVE_KERNEL_UNCOMPRESSED help The linux kernel is a kind of self-extracting executable. Several compression algorithms are available, which differ @@ -261,6 +264,16 @@ config KERNEL_LZ4 is about 8% bigger than LZO. But the decompression speed is faster than LZO. +config KERNEL_ZSTD + bool "ZSTD" + depends on HAVE_KERNEL_ZSTD + help + ZSTD is a compression algorithm targeting intermediate compression + with fast decompression speed. It will compress better than GZIP and + decompress around the same speed as LZO, but slower than LZ4. You + will need at least 192 KB RAM or more for booting. The zstd command + line tools is required for compression. + config KERNEL_UNCOMPRESSED bool "None" depends on HAVE_KERNEL_UNCOMPRESSED diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index b12dd5ba4896..efe69b78d455 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -405,6 +405,21 @@ quiet_cmd_xzkern = XZKERN $@ quiet_cmd_xzmisc = XZMISC $@ cmd_xzmisc = cat $(real-prereqs) | xz --check=crc32 --lzma2=dict=1MiB > $@ +# ZSTD +# --------------------------------------------------------------------------- +# Appends the uncompressed size of the data using size_append. The .zst +# format has the size information available at the beginning of the file too, +# but it's in a more complex format and it's good to avoid changing the part +# of the boot code that reads the uncompressed size. +# Note that the bytes added by size_append will make the zstd tool think that +# the file is corrupt. This is expected. + +quiet_cmd_zstd = ZSTD $@ +cmd_zstd = (cat $(filter-out FORCE,$^) | \ + zstd -19 && \ + $(call size_append, $(filter-out FORCE,$^))) > $@ || \ + (rm -f $@ ; false) + # ASM offsets # --------------------------------------------------------------------------- -- 2.26.0