mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Luiz Capitulino <luizcap@redhat.com>
To: Vitaly Kuznetsov <vkuznets@redhat.com>, Ard Biesheuvel <ardb@kernel.org>
Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] efi: Drop preprocessor directives from zboot.lds
Date: Fri, 6 Jun 2025 11:55:41 -0400	[thread overview]
Message-ID: <256ad7fc-c6d4-470d-a434-7b5556c3b8f6@redhat.com> (raw)
In-Reply-To: <20250606154112.311565-1-vkuznets@redhat.com>

On 2025-06-06 11:41, Vitaly Kuznetsov wrote:
> Older versions of `ld` don't seem to support preprocessor directives in
> linker scripts, e.g. on RHEL9's ld-2.35.2-63.el9 the build fails with:
> 
>   ld:./drivers/firmware/efi/libstub/zboot.lds:32: ignoring invalid character `#' in expression
>   ld:./drivers/firmware/efi/libstub/zboot.lds:33: syntax error
> 
> We don't seem to need these '#ifdef', no empty .sbat section is created
> when CONFIG_EFI_SBAT_FILE="":
> 
>   # objdump -h arch/arm64/boot/vmlinuz.efi
> 
>   arch/arm64/boot/vmlinuz.efi:     file format pei-aarch64-little
> 
>   Sections:
>   Idx Name          Size      VMA               LMA               File off  Algn
>     0 .text         00b94000  0000000000001000  0000000000001000  00001000  2**2
>                     CONTENTS, ALLOC, LOAD, READONLY, CODE
>     1 .data         00000200  0000000000b95000  0000000000b95000  00b95000  2**2
>                     CONTENTS, ALLOC, LOAD, DATA
> 
> Fixes: 0f9a1739dd0e ("efi: zboot specific mechanism for embedding SBAT section")
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>

Thanks for fixing Vitaly:

Tested-by: Luiz Capitulino <luizcap@redhat.com>

(this is for the build test, not SBAT testing).

> ---
> Note: not-yet-merged x86 version of 0f9a1739dd0e does not seem to be affected
> as vmlinux.lds script is a pre-processed version of vmlinux.lds.S.
> ---
>   drivers/firmware/efi/libstub/zboot.lds | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/firmware/efi/libstub/zboot.lds b/drivers/firmware/efi/libstub/zboot.lds
> index c3a166675450..4b8d5cd3dfa2 100644
> --- a/drivers/firmware/efi/libstub/zboot.lds
> +++ b/drivers/firmware/efi/libstub/zboot.lds
> @@ -29,14 +29,12 @@ SECTIONS
>   		. = _etext;
>   	}
>   
> -#ifdef CONFIG_EFI_SBAT
>           .sbat : ALIGN(4096) {
>   		_sbat = .;
>   		*(.sbat)
>   		_esbat = ALIGN(4096);
>   		. = _esbat;
>   	}
> -#endif
>   
>   	.data : ALIGN(4096) {
>   		_data = .;


  parent reply	other threads:[~2025-06-06 15:55 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-06 15:41 Vitaly Kuznetsov
2025-06-06 15:53 ` Ard Biesheuvel
2025-06-06 15:55 ` Luiz Capitulino [this message]
2025-07-07 21:36   ` Luiz Capitulino
2025-07-07 23:51     ` Ard Biesheuvel
2025-07-08  0:46       ` Luiz Capitulino

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=256ad7fc-c6d4-470d-a434-7b5556c3b8f6@redhat.com \
    --to=luizcap@redhat.com \
    --cc=ardb@kernel.org \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=vkuznets@redhat.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®