Skip to contentSkip to conversation

Various patches to improve Secure Boot support

PATCH Superseded Frediano Ziglio 3 participants 11 messages Jun 11 – Jun 12

v2 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

v2 cover Various patches to improve Secure Boot support

These patches improve support for Secure boot.
UEFI CA memory mitigation requires memory pages to be not executable and writable at the same time. So changing permissions and splitting some section is required.
Remove multiboot pieces from EFI executable.

Changes since v1:
- improved some comments;
- merged 2 pacthes removing multiboot support in x86 PE;
- removed a patch dealing with SBAT;
- other minor changes (see single patches).

Frediano Ziglio (2):
Align some sections to 4KB
x86: Split .init section to satisfy UEFI CA memory mitigation

Roger Pau Monné (2):
x86/efi: discard multiboot support for PE binary x86/efi: avoid a relocation in efi_arch_post_exit_boot()

 docs/hypervisor-guide/x86/how-xen-boots.rst |  6 ------
 xen/arch/x86/boot/head.S                    |  3 ++-
 xen/arch/x86/efi/efi-boot.h                 |  7 +++++--
 xen/arch/x86/xen.lds.S                      | 22 +++++++++++----------
 4 files changed, 19 insertions(+), 19 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

PATCH v2 1/4 Align some sections to 4KB

Required by UEFI CA memory mitigation.

It is a requirement for NX_COMPAT so the PE can be loaded with W^X perms in the pagetables.

NX_COMPAT is a requirement from shim-review,
https://github.com/rhboot/shim-review#do-you-have-the-nx-bit-set-in-your-shim-if-so-is-your-entire-boot-stack-nx-compatible-and-what-testing-have-you-done-to-ensure-such-compatibility

--
Changes since v2:
- Change subject.

---
 xen/arch/x86/xen.lds.S | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
xen/arch/x86/xen.lds.S +3 -2
index b9e888e596..f758940674 100644
@@ -162,8 +162,8 @@ SECTIONS
        __note_gnu_build_id_end = .;
   } PHDR(note) PHDR(text)
 #elif defined(BUILD_ID_EFI)
-  /* Workaround bug in binutils < 2.36 */
-  . = ALIGN(32);
+  /* Align to satisfy UEFI CA memory mitigation. */
+  . = ALIGN(PAGE_SIZE);
   DECL_SECTION(.buildid) {
        __note_gnu_build_id_start = .;
        *(.buildid)
@@ -330,6 +330,7 @@ SECTIONS
   __2M_rwdata_end = ALIGN(SECTION_ALIGN);
 
 #ifdef EFI
+  . = ALIGN(PAGE_SIZE);
   .reloc ALIGN(4) : {
     __base_relocs_start = .;
     *(.reloc)
Signature · 1 line
2.43.0
#2 lore raw

Re: [PATCH v2 1/4] Align some sections to 4KB

Quoted 5 lines · Frediano Ziglio

Required by UEFI CA memory mitigation.

It is a requirement for NX_COMPAT so the PE can be loaded with W^X perms in the pagetables.

Quoted 7 lines

NX_COMPAT is a requirement from shim-review,
https://github.com/rhboot/shim-review#do-you-have-the-nx-bit-set-in-your-shim-if-so-is-your-entire-boot-stack-nx-compatible-and-what-testing-have-you-done-to-ensure-such-compatibility

--
Changes since v2:
- Change subject.

Did you? The description also doesn't look to have had any detail added.

Jan

#3 lore raw

Re: [PATCH v2 1/4] Align some sections to 4KB

Quoted 9 lines · Jan Beulich
Quoted 8 lines · Frediano Ziglio

Required by UEFI CA memory mitigation.

It is a requirement for NX_COMPAT so the PE can be loaded with W^X perms in the pagetables.

NX_COMPAT is a requirement from shim-review,
https://github.com/rhboot/shim-review#do-you-have-the-nx-bit-set-in-your-shim-if-so-is-your-entire-boot-stack-nx-compatible-and-what-testing-have-you-done-to-ensure-such-compatibility

Quoted 6 lines
Quoted 4 lines

--
Changes since v2:
- Change subject.

Did you? The description also doesn't look to have had any detail added.

Or wait - the subject tag also says v2. Did you (re-)post the wrong version?

Jan

#4 lore raw

Re: [PATCH v2 1/4] Align some sections to 4KB

Quoted 16 lines · Jan Beulich
Quoted 14 lines · Jan Beulich
Quoted 12 lines · Frediano Ziglio

Required by UEFI CA memory mitigation.

It is a requirement for NX_COMPAT so the PE can be loaded with W^X perms in the pagetables.

NX_COMPAT is a requirement from shim-review,
https://github.com/rhboot/shim-review#do-you-have-the-nx-bit-set-in-your-shim-if-so-is-your-entire-boot-stack-nx-compatible-and-what-testing-have-you-done-to-ensure-such-compatibility

--
Changes since v2:
- Change subject.

Quoted 5 lines
Quoted 1 line

Did you? The description also doesn't look to have had any detail added.

Or wait - the subject tag also says v2. Did you (re-)post the wrong version?

Jan

No, the series is v2, but in the comments should be "Changes since v1:" (as the majority of emails are).

Frediano

#5 lore raw

PATCH v2 2/4 x86/efi: discard multiboot support for PE binary

In reply to Frediano Ziglio

From: Roger Pau Monné <[email protected]>

The multiboot headers (.text.header section) are not consumed in the PE binary, hence discard them in the linker script when doing a PE build.

The multiboot and PVH entry points are not used in the PE binary, hence discard them in the linker script when doing a PE build.

That removes some relocations that otherwise appear due to the usage of the start and __efi64_mb2_start symbols in the multiboot2 header.

Section discarding is not done updating DISCARD_SECTIONS definition as the change is specific for x86.

No functional change intended.

--
Changes since v1:
- improve commit message;
- change section orders to avoid changing code order in final executable;
- merge 2 commits;
- removed deprecated documentation section.

---
 docs/hypervisor-guide/x86/how-xen-boots.rst | 6 ------
 xen/arch/x86/boot/head.S                    | 3 ++-
 xen/arch/x86/xen.lds.S                      | 5 +++++
 3 files changed, 7 insertions(+), 7 deletions(-)
docs/hypervisor-guide/x86/how-xen-boots.rst +0 -6
index 8b3229005c..b6d852050a 100644
@@ -82,12 +82,6 @@ When a PEI-capable toolchain is found, the objects are linked together and a
 PE32+ binary is created.  It can be run directly from the EFI shell, and has
 ``efi_start`` as its entry symbol.
 
-.. note::
-
-   xen.efi does contain all MB1/MB2/PVH tags included in the rest of the
-   build.  However, entry via anything other than the EFI64 protocol is
-   unsupported, and won't work.
-
 
 Boot
 ----
xen/arch/x86/boot/head.S +2 -1
index 77bb7a9e21..90faf411b9 100644
@@ -152,7 +152,7 @@ vga_text_buffer:
 efi_platform:
         .byte   0
 
-        .section .init.text, "ax", @progbits
+        .section .init.multiboot, "ax", @progbits
 
 early_error: /* Here to improve the disassembly. */
 
@@ -710,6 +710,7 @@ trampoline_setup:
         /* Jump into the relocated trampoline. */
         lret
 
+        .section .init.text, "ax", @progbits
 ENTRY(trampoline_start)
 #include "trampoline.S"
 ENTRY(trampoline_end)
xen/arch/x86/xen.lds.S +5 -0
index f758940674..749d9719cc 100644
@@ -57,6 +57,10 @@ SECTIONS
   __image_base__ = .;
 #else
   . = __image_base__;
+  /DISCARD/ : {
+    *(.text.header)
+    *(.init.multiboot)
+  }
 #endif
 
 #if 0
@@ -195,6 +199,7 @@ SECTIONS
   DECL_SECTION(.init.text) {
 #endif
        _sinittext = .;
+       *(.init.multiboot)
        *(.init.text)
        *(.text.startup)
        _einittext = .;
Signature · 1 line
2.43.0
#6 lore raw

Re: [PATCH v2 2/4] x86/efi: discard multiboot support for PE binary

Le 11/06/2026 à 17:33, Frediano Ziglio a écrit :

Quoted 8 lines

From: Roger Pau Monné <[email protected]>

The multiboot headers (.text.header section) are not consumed in the PE binary, hence discard them in the linker script when doing a PE build.

The multiboot and PVH entry points are not used in the PE binary, hence discard them in the linker script when doing a PE build.

nit: it looks like both paragraph state the same thing

Quoted 8 lines

That removes some relocations that otherwise appear due to the usage of the start and __efi64_mb2_start symbols in the multiboot2 header.

Section discarding is not done updating DISCARD_SECTIONS definition as the change is specific for x86.

No functional change intended.

Given that this now prevents booting using multiboot2 when using the PE build, this is a functional change, even though it's strongly discouraged (not officially supported).

I would add a changelog entry to actually state this change (eventually reminding that this was not actually supported anyway).

Quoted 68 lines

--
Changes since v1:
- improve commit message;
- change section orders to avoid changing code order in final executable;
- merge 2 commits;
- removed deprecated documentation section.

---
  docs/hypervisor-guide/x86/how-xen-boots.rst | 6 ------
  xen/arch/x86/boot/head.S                    | 3 ++-
  xen/arch/x86/xen.lds.S                      | 5 +++++
  3 files changed, 7 insertions(+), 7 deletions(-)
docs/hypervisor-guide/x86/how-xen-boots.rst +0 -6
index 8b3229005c..b6d852050a 100644
@@ -82,12 +82,6 @@ When a PEI-capable toolchain is found, the objects are linked together and a
  PE32+ binary is created.  It can be run directly from the EFI shell, and has
  ``efi_start`` as its entry symbol.
 
-.. note::
-
-   xen.efi does contain all MB1/MB2/PVH tags included in the rest of the
-   build.  However, entry via anything other than the EFI64 protocol is
-   unsupported, and won't work.
-
 
  Boot
  ----
xen/arch/x86/boot/head.S +2 -1
index 77bb7a9e21..90faf411b9 100644
@@ -152,7 +152,7 @@ vga_text_buffer:
  efi_platform:
          .byte   0
 
-        .section .init.text, "ax", @progbits
+        .section .init.multiboot, "ax", @progbits
 
  early_error: /* Here to improve the disassembly. */
 
@@ -710,6 +710,7 @@ trampoline_setup:
          /* Jump into the relocated trampoline. */
          lret
 
+        .section .init.text, "ax", @progbits
  ENTRY(trampoline_start)
  #include "trampoline.S"
  ENTRY(trampoline_end)
xen/arch/x86/xen.lds.S +4 -0
index f758940674..749d9719cc 100644
@@ -57,6 +57,10 @@ SECTIONS
    __image_base__ = .;
  #else
    . = __image_base__;
+  /DISCARD/ : {
+    *(.text.header)
+    *(.init.multiboot)
+  }
  #endif
 
  #if 0

xen/arch/x86/xen.lds.S SECTIONS · line 205

Quoted 7 lines
xen/arch/x86/xen.lds.S +1 -0
@@ -195,6 +199,7 @@ SECTIONS
    DECL_SECTION(.init.text) {
  #endif
         _sinittext = .;
+       *(.init.multiboot)
         *(.init.text)
         *(.text.startup)
         _einittext = .;

Teddy

#7 lore raw

Re: [PATCH v2 2/4] x86/efi: discard multiboot support for PE binary

Quoted 21 lines · Teddy Astie

Le 11/06/2026 à 17:33, Frediano Ziglio a écrit :

Quoted 8 lines

From: Roger Pau Monné <[email protected]>

The multiboot headers (.text.header section) are not consumed in the PE binary, hence discard them in the linker script when doing a PE build.

The multiboot and PVH entry points are not used in the PE binary, hence discard them in the linker script when doing a PE build.

nit: it looks like both paragraph state the same thing

Quoted 8 lines

That removes some relocations that otherwise appear due to the usage of the start and __efi64_mb2_start symbols in the multiboot2 header.

Section discarding is not done updating DISCARD_SECTIONS definition as the change is specific for x86.

No functional change intended.

Quoted 6 lines

Given that this now prevents booting using multiboot2 when using the PE build, this is a functional change, even though it's strongly discouraged (not officially supported).

I would add a changelog entry to actually state this change (eventually reminding that this was not actually supported anyway).

Did that actually work though? If not, I wouldn't see a need for a ChangeLog entry.

Jan

#8 lore raw

Re: [PATCH v2 2/4] x86/efi: discard multiboot support for PE binary

Quoted 8 lines · Jan Beulich
Quoted 6 lines · Teddy Astie
Quoted 5 lines · Frediano Ziglio

From: Roger Pau Monné <[email protected]>

The multiboot headers (.text.header section) are not consumed in the PE binary, hence discard them in the linker script when doing a PE build.

Quoted 6 lines
Quoted 6 lines
Quoted 3 lines

The multiboot and PVH entry points are not used in the PE binary, hence discard them in the linker script when doing a PE build.

nit: it looks like both paragraph state the same thing

This should be enough:

Multiboot and PVH booting are not supported for PE, hence discards them in the linker script when doing a PE build.

Quoted 13 lines
Quoted 13 lines
Quoted 8 lines

That removes some relocations that otherwise appear due to the usage of the start and __efi64_mb2_start symbols in the multiboot2 header.

Section discarding is not done updating DISCARD_SECTIONS definition as the change is specific for x86.

No functional change intended.

Given that this now prevents booting using multiboot2 when using the PE build, this is a functional change, even though it's strongly discouraged (not officially supported).

Quoted 7 lines
Quoted 2 lines

I would add a changelog entry to actually state this change (eventually reminding that this was not actually supported anyway).

Did that actually work though? If not, I wouldn't see a need for a ChangeLog entry.

Jan

No, multiboot for PE never worked. I agree it's not needed.

Some more long explanations are in place. Multiboot headers and code was always included in the PE file. Not as ever used but because the code was common with ELF. Multiboot specifications include support for a.out and ELF (and potentially some binary loading) and all boot loaders (as far as I know) followed those specifications. Here at XenServer we attempted to extend multiboot2 to support PE however at the end we ditched for another solution (extending xen_hypervisor/xen_module in grub) as more clean and simple. The multiboot2 code was never attempted to be upstream in grub (so it was only an internal PoC) while we intend to upstream the xen_hypervisor/xen_module solution.

Frediano

#9 lore raw

PATCH v2 3/4 x86/efi: avoid a relocation in efi_arch_post_exit_boot()

In reply to Frediano Ziglio

From: Roger Pau Monné <[email protected]>

Instead of using the absolute __start_xen address, calculate it as an offset from the current instruction pointer. The relocation would be problematic if the generated PE binary had .init.text as a standalone section with just read and execute permissions."

Removing this relocation is necessary to make it safe to split .init.

No functional change intended.

--
Changes since v2:
- Improve commit message.

---
 xen/arch/x86/efi/efi-boot.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
xen/arch/x86/efi/efi-boot.h +5 -2
index d738b839ee..b983f054b5 100644
@@ -270,7 +270,9 @@ static void __init noreturn efi_arch_post_exit_boot(void)
 
                    /* Jump to higher mappings. */
                    "mov    stack_start(%%rip), %%rsp\n\t"
-                   "movabs $__start_xen, %[rip]\n\t"
+                   "lea    __start_xen(%%rip), %[rip]\n\t"
+                   "add    %[offset], %[rip]\n\t"
+
                    "push   %[cs]\n\t"
                    "push   %[rip]\n\t"
                    "lretq"
@@ -278,7 +280,8 @@ static void __init noreturn efi_arch_post_exit_boot(void)
                      [cr4] "+&r" (cr4)
                    : [cr3] "r" (idle_pg_table),
                      [cs] "i" (__HYPERVISOR_CS),
-                     [ds] "r" (__HYPERVISOR_DS)
+                     [ds] "r" (__HYPERVISOR_DS),
+                     [offset] "r" (__XEN_VIRT_START - xen_phys_start)
                    : "memory" );
     unreachable();
 }
Signature · 1 line
2.43.0
#10 lore raw

PATCH v2 4/4 x86: Split .init section to satisfy UEFI CA memory mitigation

In reply to Frediano Ziglio

Currently .init section is both writeable and executable, split data and code to have 2 sections satisfying W^X rule.

It is a requirement for NX_COMPAT so the PE can be loaded with W^X perms in the pagetables.

NX_COMPAT is a requirement from shim-review,
https://github.com/rhboot/shim-review#do-you-have-the-nx-bit-set-in-your-shim-if-so-is-your-entire-boot-stack-nx-compatible-and-what-testing-have-you-done-to-ensure-such-compatibility

--
Change since v2:
- update comment style.

---
 xen/arch/x86/xen.lds.S | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
xen/arch/x86/xen.lds.S +4 -8
index 749d9719cc..8fefda1816 100644
@@ -193,11 +193,7 @@ SECTIONS
   __2M_init_start = .;         /* Start of 2M superpages, mapped RWX (boot only). */
   . = ALIGN(PAGE_SIZE);             /* Init code and data */
   __init_begin = .;
-#ifdef EFI /* EFI wants to merge all of .init.*  ELF doesn't. */
-  DECL_SECTION(.init) {
-#else
   DECL_SECTION(.init.text) {
-#endif
        _sinittext = .;
        *(.init.multiboot)
        *(.init.text)
@@ -210,12 +206,12 @@ SECTIONS
         */
        *(.altinstr_replacement)
 
-#ifdef EFI /* EFI wants to merge all of .init.*  ELF doesn't. */
-       . = ALIGN(SMP_CACHE_BYTES);
-#else
   } PHDR(text)
-  DECL_SECTION(.init.data) {
+#ifdef EFI
+  /* Align to satisfy UEFI CA memory mitigation. */
+  . = ALIGN(SECTION_ALIGN);
 #endif
+  DECL_SECTION(.init.data) {
        *(.init.bss.stack_aligned)
        *(.init.data.page_aligned)
 
Signature · 1 line
2.43.0