From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.221.71 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794313073; b=1OWmRJGslcsmnkcwjgGXy+WvKnR5uQp5iyyVypDe7YScGHaMnirhsPnZsaj88zWrf12I l/SL+DZI2T1H0LdPn8dhjNV7UdYW0xVuQTey8RRBFuHvAMAteMx5kMaUtVftkpYM0ndmo Q400KuDqFG8zHlx2hDkg1wNqlixw83uBgw5C7n2uUwe+A49RPhWA/bumRYrtCXLXdJe1M Q8D/funm2aZfVit/hsT5fvXDWDdC/N17hr7Gd1Lig+ZmmQPCIlXm9s5HRtA23k+khxVF9 GG8DChxk9qrGsDD7QTBzouA94DLi8DhvvS0tQGzBOC8k77eWBg4sFMbMTZRzim+ehJw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794313073; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Received:Date:In-Reply-To:Mime-Version: References:X-Mailer:Message-ID:Subject:From:To:Cc:Content-Type; bh=HdvBqOsbdSb+5XW1VvJy1N+JD/q5Zf64Jcn34ls18MA=; b=IyVBVrUegNSk4mduJ/5XQWEWfK8H3YyAX33jPxWKDeGuWSAeUHWN7beK4DCLBbj/C+NO 0aMiQmg7Yo0tiylZdkYq2+BavxTNc+Gm0yhMR6yu8ipIhAhW758roMaQJhm/vaW1op0R7 eU2T7c+HazxJMRhzbegcgBdsqkU97503WRAF6SJ/l4glCxZtWgeHT4zYpb9eDXPwONecj sd9MLiKKyo4kb8h6WkimMtFDc6ZDC7a1uMMqHFOIKIftwNNyZjm6bXj2CMUhrfCaSFcr3 HR+O6hwkzHbiao1BqdpXAHkpyl5Yejzl1lZZg7UaR1629e935VKapsDL+0ZMSekWq0w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=RDTUHAra; arc=none smtp.remote-ip=209.85.221.71 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 13EB8606A321 for ; Tue, 10 Nov 2026 12:17:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 13EB8606A321 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=RDTUHAra Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-48e0461e040so1563851f8f.0 for ; Tue, 10 Nov 2026 04:17:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794313071; x=1794917871; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=HdvBqOsbdSb+5XW1VvJy1N+JD/q5Zf64Jcn34ls18MA=; b=RDTUHAra0nxM9K7XDD9ouJhV316KQlnfA+8Hfwds36RFsQ1LpnfjM4i/87A9rKPppV wSjcM3TQY5/U6UuUNDbO3NO9IIud24WvzbPL7htM2J/Wr7G8z4yj3U3lb2tqcOy8hqbt FsFGruVvxfU1/IEZuTeV7gjNCWN5xvTAa8tS5z9FtdGBOQRQg1RGTO2IEB8BqmX3QnGL fC0g0kfZkKnbIfjFNDH9gEbWvNL0JHGaExFBnmLoWfMH0fSr1SDTpPT8RQN9fSogd/Vy tErofCqkMo0yggyLVUGujHzcpWuNQSbxEXJalXVWxQ5Y6yMQEHddT/7yIiwCkBxadvaO TFPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794313071; x=1794917871; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=HdvBqOsbdSb+5XW1VvJy1N+JD/q5Zf64Jcn34ls18MA=; b=MTvEKsyAMjKq9AmnwwromYBXRPxpzO2vQAmwgclfQoB+Vt0ulmd9t/zP+19o5zorPj 0uJ6aTEOWtEfHar1bf0SWovTFf8LI2wjJo0ZB2jCjE/34J8LuHPdBAWz3B7wHx0QyJDO fE1gmYJaAyWXcdvWSHbdPw4rw/yeNntYGuR9tRoYtvYbEmyyjY8BdyUnm5GkmlY1ATt1 zFB0aAH4pOYVsAAcnIMod2WG0+ZoXWjYBe4s3zj6NN9B9U8URoyxwQaUGwJrziVPe6Vf LItoi3JkHNSQH2L9F8Fj1xOi8MdidAA3kJdc0rkuaZ63BeDqc3Iy0uCz1uzg41W9u6gz woug== X-Gm-Message-State: APuU4Z8DeFZoABAStRQVxISAhfng9ixDor99I2e5m6Ey38ow62FJxfrF WCwxzvaAbrLVzedJjA5n+SNUjRpDGmjGDsU5kMm4IbItNGZpJ+OHtz6ZPMy1qE4gGU9Z0GKtt7U osTan8ANJeNVGxap26WeyV3U5L44I3BEYIRvb8FoTFcjlz2umxutpZf3eYYxeC6608hAOqzpm54 IvdTuUoxDLd0FeiTLvpaeIiiVrQK7lFg== X-Received: from wrso6.prod.google.com ([2002:a5d:4746:0:b0:497:913:6e4b]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:468b:b0:48f:e879:5890 with SMTP id ffacd0b85a97d-4982fc49566mr3226218f8f.32.1794313071241; Tue, 10 Nov 2026 04:17:51 -0800 (PST) Date: Tue, 10 Nov 2026 13:17:42 +0100 In-Reply-To: <20261110121731.2728824-12-ardb+git@google.com> X-Mailing-List: linux-efi@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261110121731.2728824-12-ardb+git@google.com> X-Mailer: git-send-email 2.56.0.542.g3ef89b7020-goog Message-ID: <20261110121731.2728824-22-ardb+git@google.com> Subject: [PATCH v2 10/10] efi/libstub: arm64: Drop zboot code_size hack From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Jason Gunthorpe , Paul Walmsley , Palmer Dabbelt , Albert Ou , Huacai Chen , loongarch@lists.linux.dev, linux-riscv@lists.infradead.org Content-Type: text/plain; charset="UTF-8" From: Ard Biesheuvel Now that the code size can be obtained via the generic image_info struct, there is no longer a need to inject it explicitly during the build. Signed-off-by: Ard Biesheuvel --- arch/arm64/boot/Makefile | 3 --- arch/arm64/kernel/image-vars.h | 4 ---- drivers/firmware/efi/libstub/arm64.c | 4 +--- drivers/firmware/efi/libstub/zboot.lds | 4 ---- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index d42d07667822..509b59518818 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -51,7 +51,4 @@ EFI_ZBOOT_BFD_TARGET := elf64-littleaarch64 EFI_ZBOOT_MACH_TYPE := ARM64 EFI_ZBOOT_FORWARD_CFI := $(CONFIG_ARM64_BTI_KERNEL) -EFI_ZBOOT_OBJCOPY_FLAGS = --add-symbol zboot_code_size=0x$$( \ - $(NM) vmlinux|grep _kernel_codesize|cut -d' ' -f1) - include $(srctree)/drivers/firmware/efi/libstub/Makefile.zboot diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index 9ab71d103f64..22b242a7a21b 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -144,10 +144,6 @@ KVM_NVHE_ALIAS(kvm_protected_mode_initialized); #endif /* CONFIG_KVM */ -#ifdef CONFIG_EFI_ZBOOT -_kernel_codesize = ABSOLUTE(__inittext_end - _text); -#endif - /* * LLD will occasionally error out with a '__init_end does not converge' error * if INIT_IDMAP_DIR_SIZE is defined in terms of _end, as this results in a diff --git a/drivers/firmware/efi/libstub/arm64.c b/drivers/firmware/efi/libstub/arm64.c index fdd48ba0f9f1..4399b23fa237 100644 --- a/drivers/firmware/efi/libstub/arm64.c +++ b/drivers/firmware/efi/libstub/arm64.c @@ -88,8 +88,6 @@ efi_status_t check_platform_features(void) #define DCTYPE "cvau" #endif -u32 __weak code_size; - void efi_cache_sync_image(unsigned long image_base, unsigned long alloc_size) { @@ -100,7 +98,7 @@ void efi_cache_sync_image(unsigned long image_base, /* only perform the cache maintenance if needed for I/D coherency */ if (!(ctr & BIT(CTR_EL0_IDC_SHIFT))) { unsigned long base = image_base; - unsigned long size = code_size; + unsigned long size = alloc_size; do { asm("dc " DCTYPE ", %0" :: "r"(base)); diff --git a/drivers/firmware/efi/libstub/zboot.lds b/drivers/firmware/efi/libstub/zboot.lds index e1365907f805..e0f0bf005854 100644 --- a/drivers/firmware/efi/libstub/zboot.lds +++ b/drivers/firmware/efi/libstub/zboot.lds @@ -2,8 +2,6 @@ ENTRY(__efistub_efi_zboot_header); -PROVIDE(zboot_code_size = ABSOLUTE(0)); - SECTIONS { .head : ALIGN(4096) { @@ -22,8 +20,6 @@ SECTIONS *(.rodata* .init.rodata* .srodata*) . = ALIGN(4); - __efistub_code_size = .; - LONG(zboot_code_size); __efistub_efistub_image_info_offset = .; LONG(efistub_image_info_offset); -- 2.56.0.542.g3ef89b7020-goog