From: Frediano Ziglio <frediano.ziglio@cloud.com>
To: xen-devel@lists.xenproject.org
Cc: "Frediano Ziglio" <frediano.ziglio@cloud.com>,
"Jan Beulich" <jbeulich@suse.com>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH v4 1/3] x86: Put trampoline in separate .init.trampoline section
Date: Thu, 19 Sep 2024 09:00:19 +0100 [thread overview]
Message-ID: <20240919080021.20155-2-frediano.ziglio@cloud.com> (raw)
In-Reply-To: <20240919080021.20155-1-frediano.ziglio@cloud.com>
This change put the trampoline in a separate, not executable section.
The trampoline contains a mix of code and data (data which
is modified from C code during early start so must be writable).
This is in preparation for W^X patch in order to satisfy UEFI CA
memory mitigation requirements.
At the moment .init.text and .init.data in EFI mode are put together
so they will be in the same final section as before this patch.
Putting in a separate section (even in final executables) allows
to easily disassembly that section. As we need to have a writable
section and as we can't have code and data together to satisfy W^X
requirement we need to have a data section. However tools like objdump
by default do not disassemble data sections. Forcing disassembly of
data sections would result in a very large output and possibly crash
of tools. Putting in a separate section allows to selectively
disassemble that part of code using a command like
objdump -m i386 -j .init.trampoline -d xen-syms
Signed-off-by: Frediano Ziglio <frediano.ziglio@cloud.com>
---
Changes since last version:
- use completely separate section even on final executables
(suggested by Jan Beulich).
Changes since v1:
- remove useless align.
Changes since v2:
- remove change to alignment;
- improved commit message.
Changes since v3:
- split commit, add more requirements.
---
xen/arch/x86/boot/head.S | 5 +++--
xen/arch/x86/xen.lds.S | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S
index 12bbb97f33..493286a9fb 100644
--- a/xen/arch/x86/boot/head.S
+++ b/xen/arch/x86/boot/head.S
@@ -882,8 +882,9 @@ cmdline_parse_early:
reloc:
.incbin "reloc.bin"
+#include "x86_64.S"
+
+ .section .init.trampoline, "aw", @progbits
ENTRY(trampoline_start)
#include "trampoline.S"
ENTRY(trampoline_end)
-
-#include "x86_64.S"
diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S
index d48de67cfd..22fb7d8458 100644
--- a/xen/arch/x86/xen.lds.S
+++ b/xen/arch/x86/xen.lds.S
@@ -269,6 +269,10 @@ SECTIONS
__ctors_end = .;
} PHDR(text)
+ DECL_SECTION(.init.trampoline) {
+ *(.init.trampoline)
+ } PHDR(text)
+
#ifndef EFI
/*
* With --orphan-sections=warn (or =error) we need to handle certain linker
--
2.34.1
next prev parent reply other threads:[~2024-09-19 8:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-19 8:00 [PATCH v4 0/3] x86: Satisfy requirements for UEFI CA memory mitigation requirements Frediano Ziglio
2024-09-19 8:00 ` Frediano Ziglio [this message]
2024-09-23 15:17 ` [PATCH v4 1/3] x86: Put trampoline in separate .init.trampoline section Jan Beulich
2024-09-23 15:31 ` Frediano Ziglio
2024-09-23 15:42 ` Jan Beulich
2024-09-19 8:00 ` [PATCH v4 2/3] x86: Split output sections for UEFI CA memory mitigation requirements Frediano Ziglio
2024-09-23 15:45 ` Jan Beulich
2024-09-19 8:00 ` [PATCH v4 3/3] x86: Align " Frediano Ziglio
2024-09-23 15:54 ` Jan Beulich
2024-09-23 16:06 ` Frediano Ziglio
2024-09-24 8:14 ` Jan Beulich
2024-09-24 10:22 ` Frediano Ziglio
2024-09-24 11:09 ` Jan Beulich
2024-09-24 12:17 ` Jan Beulich
2024-09-24 12:22 ` Frediano Ziglio
2024-09-24 13:27 ` Jan Beulich
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=20240919080021.20155-2-frediano.ziglio@cloud.com \
--to=frediano.ziglio@cloud.com \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=roger.pau@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.