From patchwork Sat May 4 19:34:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 13654107 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4F3183CCA for ; Sat, 4 May 2024 19:34:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714851296; cv=none; b=UOVsbnql2dEN1w7gEIw3GKcCubL4fHsPZTK0lsjnXtoIIJT2E9ke1tzvqugaNjZMDSDHp08L73ZRpLb98QMyEhp+WLQ+bcpMUEnUC2bCl/Q5tKaaYZ4rsMSq2m7E68P198uuL1LgjXO5bFFVPdkYbZyOj92ThudLcN6rmDxkA+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714851296; c=relaxed/simple; bh=dRGAKcxr2q5NSUlclEu4yws4rka1HJIpJd2sl/fEVEo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rwjty6nexD2eMs6MIYD4IxYjUT4T+GVcSlpnSXafRgZIrF/phNnbrmXcsicqvPSFDa2UkhV09gMPrHG/pueKULWnvwtdtMdOxCGrEMIZe8YJlidOYPoollzPviwSBxly36vLmb5N0AAMCHgce2AB0SKZn6jyMZ2xGzGHFmGVDrc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=qul2u+eU; arc=none smtp.client-ip=185.125.188.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="qul2u+eU" Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id C01983FE50 for ; Sat, 4 May 2024 19:34:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1714851290; bh=XYcyH30Tdg0L1XT/KhSL5KHFpF2lXtDsTt+QyOMRfmk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qul2u+eU9WchgadwQaM5BqT3lD4UWi5hcPIgb56Wgyle0AV/DEaOvCG4Xyv0T+wCF BT7VxDcbg20i5XE5gNR33TLCgksARSe2npsHQCZBvF4014Pw4Cdq5PQKsYUUdRO+EA xVvKOKluFiR2vBwJsZfLq5qZ0zS2pPFaAWIpAnjtDzutzDq6is/jmzat5Qi/8UJRXr 74pk+LdHZ4fH3EqL7AN5nCxxKgZnm+Yyw+I05Yu41ghFHjPrwKplhiolPfmsPnx0sy qX1mpfAOEoqnUKSF/peQcieziqmKPcwo0uZ+fgwzqFp0h3msmHjY7Z22/GeCnGdmJj mcijQbn9XciJQ== Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-56e645a8762so505951a12.3 for ; Sat, 04 May 2024 12:34:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714851290; x=1715456090; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XYcyH30Tdg0L1XT/KhSL5KHFpF2lXtDsTt+QyOMRfmk=; b=fQ95Os8jHbEzLlyRs5lyNSs9xGGVtuxXbM/e1C4WU25Qz3uAGjfbVUbKspVMrtVfd/ VUrxomB8/iedG6yoojbGMCbTlIWe5J2srDfy0JsCGS2XLJqZFUMArmCvFIUHOWwy5Jlw 8N/80gDIWxPXVghWU6O5+RH8rD/4IK6KtVlectzfgWO/7TpzI1FjULCouH9XuVonuwCD S0DPmC6eswnhGGYELC1fIRxprAWaIo3YzJNi7DqOZBRl+sT24wxrZn0lSiICLDXAaVQN NXhNj6IkPdIN0Ttf1j9/DxXvIJYWXCAgc1PkXiuAP/od0ULZimbiQERiVerjTtR3sh8F /sTQ== X-Forwarded-Encrypted: i=1; AJvYcCXk70UMvnCxVPwlIn51fFmWGUfmDBPNddZUaJtqCEPXEnmWWvnWNGec6Q/TrDBKvaJ90S0fBMhaGnO6Co/qoOt0LVKudrogg0vmm2p+ X-Gm-Message-State: AOJu0YzXOJLaN3B0Yj9cDNwVUCv1kpCUnkpLbSbfbOFg7fwU56HAE1JO cnbWTnhrLbjw+dLPPp3AwwUOpZnHRv2BICwkcTjgRyTRoCACLTHptV53SAGVJAvVPjXA7xRV9O6 sjXbPE2+rmJAicyzkULNvSk0AGpdx45Lc0Ftx1x1e5GcfzT1C2nLJIzCghoYgTdww/N4MDAfTs7 eqrg== X-Received: by 2002:a50:d5d8:0:b0:572:4fc3:3a28 with SMTP id g24-20020a50d5d8000000b005724fc33a28mr3895883edj.23.1714851290385; Sat, 04 May 2024 12:34:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGnRJR1GyEL9wACd0QWSYElWiR8PckNNzcjss6a2GKF18p7Qs7LRVI0kBoEyI6PAN3xCIefKQ== X-Received: by 2002:a50:d5d8:0:b0:572:4fc3:3a28 with SMTP id g24-20020a50d5d8000000b005724fc33a28mr3895868edj.23.1714851290043; Sat, 04 May 2024 12:34:50 -0700 (PDT) Received: from stitch.. ([80.71.142.166]) by smtp.gmail.com with ESMTPSA id et4-20020a056402378400b00572d255e342sm2227021edb.10.2024.05.04.12.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 May 2024 12:34:49 -0700 (PDT) From: Emil Renner Berthing To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Nick Terrell , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= Subject: [PATCH v2 1/2] riscv: make image compression configurable Date: Sat, 4 May 2024 21:34:38 +0200 Message-ID: <20240504193446.196886-2-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240504193446.196886-1-emil.renner.berthing@canonical.com> References: <20240504193446.196886-1-emil.renner.berthing@canonical.com> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Previously the build process would always set KBUILD_IMAGE to the uncompressed Image file (unless XIP_KERNEL or EFI_ZBOOT was enabled) and unconditionally compress it into Image.gz. However there are already build targets for Image.bz2, Image.lz4, Image.lzma, Image.lzo and Image.zstd, so let's make use of those, make the compression method configurable and set KBUILD_IMAGE accordingly so that targets like 'make install' and 'make bindeb-pkg' will use the chosen image. Tested-by: Björn Töpel Signed-off-by: Emil Renner Berthing Reviewed-by: Nicolas Schier Reviewed-by: Masahiro Yamada --- Changes in v2: - Rebase on riscv/for-next - Use boot-image-$(CONFIG_..) := assignments rather than ifeq train --- arch/riscv/Kconfig | 7 +++++++ arch/riscv/Makefile | 38 ++++++++++++++++++-------------------- arch/riscv/boot/install.sh | 9 ++++++--- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 6bec1bce6586..79e558397f41 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -140,6 +140,13 @@ config RISCV select HAVE_GCC_PLUGINS select HAVE_GENERIC_VDSO if MMU && 64BIT select HAVE_IRQ_TIME_ACCOUNTING + select HAVE_KERNEL_BZIP2 if !XIP_KERNEL && !EFI_ZBOOT + select HAVE_KERNEL_GZIP if !XIP_KERNEL && !EFI_ZBOOT + select HAVE_KERNEL_LZ4 if !XIP_KERNEL && !EFI_ZBOOT + select HAVE_KERNEL_LZMA if !XIP_KERNEL && !EFI_ZBOOT + select HAVE_KERNEL_LZO if !XIP_KERNEL && !EFI_ZBOOT + select HAVE_KERNEL_UNCOMPRESSED if !XIP_KERNEL && !EFI_ZBOOT + select HAVE_KERNEL_ZSTD if !XIP_KERNEL && !EFI_ZBOOT select HAVE_KPROBES if !XIP_KERNEL select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL select HAVE_KRETPROBES if !XIP_KERNEL diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 8b2ae27f1d98..07ff2f34f0dc 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -136,20 +136,20 @@ endif CHECKFLAGS += -D__riscv -D__riscv_xlen=$(BITS) # Default target when executing plain make -boot := arch/riscv/boot -ifeq ($(CONFIG_XIP_KERNEL),y) -KBUILD_IMAGE := $(boot)/xipImage -else -ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy) -KBUILD_IMAGE := $(boot)/loader.bin -else -ifeq ($(CONFIG_EFI_ZBOOT),) -KBUILD_IMAGE := $(boot)/Image.gz -else -KBUILD_IMAGE := $(boot)/vmlinuz.efi -endif -endif +boot := arch/riscv/boot +boot-image-y := Image +boot-image-$(CONFIG_KERNEL_BZIP2) := Image.bz2 +boot-image-$(CONFIG_KERNEL_GZIP) := Image.gz +boot-image-$(CONFIG_KERNEL_LZ4) := Image.lz4 +boot-image-$(CONFIG_KERNEL_LZMA) := Image.lzma +boot-image-$(CONFIG_KERNEL_LZO) := Image.lzo +boot-image-$(CONFIG_KERNEL_ZSTD) := Image.zst +ifdef CONFIG_RISCV_M_MODE +boot-image-$(CONFIG_ARCH_CANAAN) := loader.bin endif +boot-image-$(CONFIG_EFI_ZBOOT) := vmlinuz.efi +boot-image-$(CONFIG_XIP_KERNEL) := xipImage +KBUILD_IMAGE := $(boot)/$(boot-image-y) libs-y += arch/riscv/lib/ libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a @@ -168,21 +168,19 @@ endif vdso-install-y += arch/riscv/kernel/vdso/vdso.so.dbg vdso-install-$(CONFIG_COMPAT) += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg -BOOT_TARGETS := Image Image.gz loader loader.bin xipImage vmlinuz.efi +BOOT_TARGETS := Image Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst loader loader.bin xipImage vmlinuz.efi all: $(notdir $(KBUILD_IMAGE)) loader.bin: loader -Image.gz loader vmlinuz.efi: Image +Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst loader xipImage vmlinuz.efi: Image + $(BOOT_TARGETS): vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ @$(kecho) ' Kernel: $(boot)/$@ is ready' -Image.%: Image - $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ - -install: KBUILD_IMAGE := $(boot)/Image -zinstall: KBUILD_IMAGE := $(boot)/Image.gz +# the install target always installs KBUILD_IMAGE (which may be compressed) +# but keep the zinstall target for compatibility with older releases install zinstall: $(call cmd,install) diff --git a/arch/riscv/boot/install.sh b/arch/riscv/boot/install.sh index 4c63f3f0643d..a8df7591513a 100755 --- a/arch/riscv/boot/install.sh +++ b/arch/riscv/boot/install.sh @@ -17,15 +17,18 @@ # $3 - kernel map file # $4 - default install path (blank if root directory) -if [ "$(basename $2)" = "Image.gz" ]; then +case "${2##*/}" in # Compressed install +Image.*|vmlinuz.efi) echo "Installing compressed kernel" base=vmlinuz -else + ;; # Normal install +*) echo "Installing normal kernel" base=vmlinux -fi + ;; +esac if [ -f $4/$base-$1 ]; then mv $4/$base-$1 $4/$base-$1.old