From patchwork Fri Sep 8 18:21:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1831705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ux3LApXi; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rj4FT3SQZz1yhG for ; Sat, 9 Sep 2023 04:21:49 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qeg6o-00086o-Qa; Fri, 08 Sep 2023 18:21:34 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qeg6m-00086d-KP for kernel-team@lists.ubuntu.com; Fri, 08 Sep 2023 18:21:32 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.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 C07213F10A for ; Fri, 8 Sep 2023 18:21:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1694197291; bh=Q6u4yWGg52me6th7sNFa/BgEUPhF7XY965XbgPpGfy0=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=ux3LApXiPyrXA1UbicxjfsG7DXUVCMaG+VDr+ZePPEK3nX6PQbgYp+is9qtBweO9y a1p/PKM7uDVM9piemOFZPlse8N7pFbAy1l0KzyxKLWZy+lc4M0VuvNkNrYAnZ+kdbd SVdib/VsDCP/HuMK9MHWXk9IlDJZ6NUF18mKuW8bwwIHm9Kc/4TlBpgfEw/SMYvDhN vGCpnlZ1acNpZL8Bb8juRWMczF7OQ/PoG/whzYboFmJUXEFvUDWk8Dys38rop3a2uS Dbp6X1ykfN3lB8/4jiI4QraNTirKXCZYR/KKr+3CVtwe1SViwrRAR+cYKZJJ9uKcBu GJDjFeAQRYFSQ== Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-401d8873904so18678955e9.0 for ; Fri, 08 Sep 2023 11:21:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694197291; x=1694802091; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Q6u4yWGg52me6th7sNFa/BgEUPhF7XY965XbgPpGfy0=; b=B3OvKZeaHhfQ42di75/Ij5+jZmQeXNmayuUnV95oQE4Rw9GILbbImLm7aH+UONwlCd GYRZ3M1csPRwhWwUFUO2KQ1i8Q+nyJIE/Wb4EwFAkVGfWT8K2xN8xxc+eF7mK9ytsHFv ejTlId03rUB9dO2r5F6gWEtE3OcYhvCh2SeeZiOcKdQ92CoypqDc7sRtTxhPDiDGsuQa MbXTNfj8u0Vreme4etu9KB616oTmN1L+IdVof7YyQHzhLfdMAhbkfAUKdeMdQU6tWmp0 YMzqE+ZVOPyTANZy/8LWbdQKeHKd/3T5M3UDsGfX/xYopTz+VgQYJmE1ES0g177R4Odz ii9A== X-Gm-Message-State: AOJu0Yy/bghh83+cWvMIT2mKMdlBk+GN0gA742kkmXieoA6hUziB29rQ XwUBQCBKp2vAr0k4z9ixLYdGe1tiyyavno0aoVcLfeNu/jIBW0ZW7m9T52IQMEbADCfn8JkmIUT psM7j+ms0M1XAxxaT9Mhj0apy+2HCyZFilDlE2mtZAHytw8inLQ== X-Received: by 2002:adf:ecc7:0:b0:31a:d8c0:cb8b with SMTP id s7-20020adfecc7000000b0031ad8c0cb8bmr2662590wro.25.1694197291128; Fri, 08 Sep 2023 11:21:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFmYmJoHRT0vCk3CA/1+DDLUBcw+D9vPwwPaaH8XLzE9fo8pkaGDHd1tEU2dOah5O7JBShztw== X-Received: by 2002:adf:ecc7:0:b0:31a:d8c0:cb8b with SMTP id s7-20020adfecc7000000b0031ad8c0cb8bmr2662574wro.25.1694197290681; Fri, 08 Sep 2023 11:21:30 -0700 (PDT) Received: from localhost ([137.220.91.195]) by smtp.gmail.com with ESMTPSA id 21-20020a05600c229500b00402d34ea099sm5811505wmf.29.2023.09.08.11.21.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 11:21:30 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [MANTIC][PATCH] UBUNTU: [Config]: Turn on CONFIG_EFI_ZBOOT on ARM64 Date: Fri, 8 Sep 2023 19:21:28 +0100 Message-Id: <20230908182128.1451215-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" On UEFI platforms, since v6.2 Linux, with new enough grub2 (2.12~rc1), EFI_ZBOOT can be used. This enables UEFI boot to use Linux EFI stub decompressors to supports Zstd compressed kernel image, like on other architectures. Other boot-types should continue to use compressed images for now (i.e. u-boot, piboot, abootimg) kernels. See comment in arm64.mk. BugLink: https://bugs.launchpad.net/bugs/2002226 Signed-off-by: Dimitri John Ledkov Acked-by: Tim Gardner --- debian.master/config/annotations | 28 +++++++++++++++------------- debian.master/rules.d/arm64.mk | 5 +++-- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 60be644b2e..6164cfe79c 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -174,6 +174,9 @@ CONFIG_EFIVAR_FS note<'needed for variable EFI up CONFIG_EFI_HANDOVER_PROTOCOL policy<{'amd64': 'y'}> CONFIG_EFI_HANDOVER_PROTOCOL note<'{GRUB may include some downstream patches that may rely on the handover protocol, so make sure this is enabled}'> +CONFIG_EFI_ZBOOT policy<{'arm64': 'y', 'riscv64': 'n'}> +CONFIG_EFI_ZBOOT note<'LP: #2002226'> + CONFIG_EVM policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_EVM note<'LP: #1643652'> @@ -321,7 +324,7 @@ CONFIG_IP_PNP note<'LP: #1259861'> CONFIG_ISM policy<{'s390x': 'm'}> CONFIG_ISM note<'LP: #1789934'> -CONFIG_KERNEL_ZSTD policy<{'amd64': 'y', 'arm64': '-', 'riscv64': '-', 's390x': 'y'}> +CONFIG_KERNEL_ZSTD policy<{'amd64': 'y', 'arm64': 'y', 'riscv64': '-', 's390x': 'y'}> CONFIG_KERNEL_ZSTD note<'LP: #1931725'> CONFIG_KEXEC_BZIMAGE_VERIFY_SIG policy<{'amd64': 'y'}> @@ -4522,7 +4525,6 @@ CONFIG_EFI_STUB policy<{'amd64': 'y', 'arm64': ' CONFIG_EFI_TEST policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'riscv64': 'm'}> CONFIG_EFI_VARS_PSTORE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'riscv64': 'm'}> CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'riscv64': 'n'}> -CONFIG_EFI_ZBOOT policy<{'arm64': 'n', 'riscv64': 'n'}> CONFIG_EFS_FS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}> CONFIG_EINT_MTK policy<{'arm64': 'y', 'armhf': 'y'}> CONFIG_EISA policy<{'amd64': 'y'}> @@ -5424,13 +5426,13 @@ CONFIG_HAVE_IRQ_TIME_ACCOUNTING policy<{'amd64': 'y', 'arm64': ' CONFIG_HAVE_JUMP_LABEL_HACK policy<{'amd64': 'y'}> CONFIG_HAVE_KCSAN_COMPILER policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_HAVE_KERNEL_BZIP2 policy<{'amd64': 'y', 's390x': 'y'}> -CONFIG_HAVE_KERNEL_GZIP policy<{'amd64': 'y', 'arm64': '-', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': '-', 's390x': 'y'}> -CONFIG_HAVE_KERNEL_LZ4 policy<{'amd64': 'y', 'arm64': '-', 'armhf': 'y', 'riscv64': '-', 's390x': 'y'}> -CONFIG_HAVE_KERNEL_LZMA policy<{'amd64': 'y', 'arm64': '-', 'armhf': 'y', 'riscv64': '-', 's390x': 'y'}> -CONFIG_HAVE_KERNEL_LZO policy<{'amd64': 'y', 'arm64': '-', 'armhf': 'y', 'riscv64': '-', 's390x': 'y'}> +CONFIG_HAVE_KERNEL_GZIP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': '-', 's390x': 'y'}> +CONFIG_HAVE_KERNEL_LZ4 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'riscv64': '-', 's390x': 'y'}> +CONFIG_HAVE_KERNEL_LZMA policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'riscv64': '-', 's390x': 'y'}> +CONFIG_HAVE_KERNEL_LZO policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'riscv64': '-', 's390x': 'y'}> CONFIG_HAVE_KERNEL_UNCOMPRESSED policy<{'s390x': 'y'}> -CONFIG_HAVE_KERNEL_XZ policy<{'amd64': 'y', 'arm64': '-', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': '-', 's390x': 'y'}> -CONFIG_HAVE_KERNEL_ZSTD policy<{'amd64': 'y', 'arm64': '-', 'riscv64': '-', 's390x': 'y'}> +CONFIG_HAVE_KERNEL_XZ policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': '-', 's390x': 'y'}> +CONFIG_HAVE_KERNEL_ZSTD policy<{'amd64': 'y', 'arm64': 'y', 'riscv64': '-', 's390x': 'y'}> CONFIG_HAVE_KPROBES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_HAVE_KPROBES_ON_FTRACE policy<{'amd64': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_HAVE_KRETPROBES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> @@ -6859,15 +6861,15 @@ CONFIG_KDB_KEYBOARD policy<{'amd64': 'y', 'arm64': ' CONFIG_KEEMBAY_WATCHDOG policy<{'arm64': 'm'}> CONFIG_KEMPLD_WDT policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_KERNEL_BZIP2 policy<{'amd64': 'n', 's390x': 'n'}> -CONFIG_KERNEL_GZIP policy<{'amd64': 'n', 'arm64': '-', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': '-', 's390x': 'n'}> -CONFIG_KERNEL_LZ4 policy<{'amd64': 'n', 'arm64': '-', 'armhf': 'n', 'riscv64': '-', 's390x': 'n'}> -CONFIG_KERNEL_LZMA policy<{'amd64': 'n', 'arm64': '-', 'armhf': 'n', 'riscv64': '-', 's390x': 'n'}> -CONFIG_KERNEL_LZO policy<{'amd64': 'n', 'arm64': '-', 'armhf': 'n', 'riscv64': '-', 's390x': 'n'}> +CONFIG_KERNEL_GZIP policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': '-', 's390x': 'n'}> +CONFIG_KERNEL_LZ4 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'riscv64': '-', 's390x': 'n'}> +CONFIG_KERNEL_LZMA policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'riscv64': '-', 's390x': 'n'}> +CONFIG_KERNEL_LZO policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'riscv64': '-', 's390x': 'n'}> CONFIG_KERNEL_MODE_NEON policy<{'arm64': 'y', 'armhf': 'y'}> CONFIG_KERNEL_NOBP policy<{'s390x': 'n'}> CONFIG_KERNEL_START policy<{'ppc64el': '0xc000000000000000'}> CONFIG_KERNEL_UNCOMPRESSED policy<{'s390x': 'n'}> -CONFIG_KERNEL_XZ policy<{'amd64': 'n', 'arm64': '-', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': '-', 's390x': 'n'}> +CONFIG_KERNEL_XZ policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': '-', 's390x': 'n'}> CONFIG_KERNFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_KEXEC policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_KEXEC_CORE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index 3306ccfce1..f47ba46252 100644 --- a/debian.master/rules.d/arm64.mk +++ b/debian.master/rules.d/arm64.mk @@ -2,8 +2,9 @@ human_arch = ARMv8 build_arch = arm64 defconfig = defconfig flavours = generic generic-64k -build_image = Image.gz -kernel_file = arch/$(build_arch)/boot/Image.gz +# Non-efi flavours likely want the old Image.gz here +build_image = vmlinuz.efi +kernel_file = arch/$(build_arch)/boot/vmlinuz.efi install_file = vmlinuz no_dumpfile = true uefi_signed = true