mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
xen/ppc: Ensure ELF sections' physical load addresses start at 0x0
Some boot mechanisms, including the new linux file_load kexec systemcall used by system firmware v2.10 on RaptorCS systems will try to honor the physical address field of the ELF LOAD section header, which will fail when the address is based off of XEN_VIRT_START (0xc000000000000000). To ensure that the physical address of the LOAD section header starts at 0x0, move x86's DECL_SECTION macro to xen.lds.h and use it to declare all sections. Signed-off-by: Shawn Anastasio <sanastasio@raptorengineering.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
This commit is contained in:
Shawn Anastasio authored and 
Jan Beulich committed
1 parent
10e8d824b7
commit
97b90f9bf2
3 files changed
+26
-17
No files matched your search
+15
-12
@@ -4,6 +4,9 @@
|
||||
OUTPUT_ARCH(powerpc:common64)
|
||||
ENTRY(start)
|
||||
|
||||
/* Used by the DECL_SECTION() macro to calculate physical load addresses */
|
||||
#define __XEN_VIRT_START XEN_VIRT_START
|
||||
|
||||
PHDRS
|
||||
{
|
||||
text PT_LOAD ;
|
||||
@@ -17,7 +20,7 @@ SECTIONS
|
||||
. = XEN_VIRT_START;
|
||||
_start = .;
|
||||
|
||||
.text : {
|
||||
DECL_SECTION(.text) {
|
||||
_stext = .; /* Text section */
|
||||
*(.text.header)
|
||||
|
||||
@@ -40,7 +43,7 @@ SECTIONS
|
||||
} :text
|
||||
|
||||
. = ALIGN(PAGE_SIZE);
|
||||
.rodata : {
|
||||
DECL_SECTION(.rodata) {
|
||||
_srodata = .; /* Read-only data */
|
||||
/* Bug frames table */
|
||||
__start_bug_frames = .;
|
||||
@@ -64,7 +67,7 @@ SECTIONS
|
||||
|
||||
#if defined(BUILD_ID)
|
||||
. = ALIGN(4);
|
||||
.note.gnu.build-id : {
|
||||
DECL_SECTION(.note.gnu.build-id) {
|
||||
__note_gnu_build_id_start = .;
|
||||
*(.note.gnu.build-id)
|
||||
__note_gnu_build_id_end = .;
|
||||
@@ -73,19 +76,19 @@ SECTIONS
|
||||
_erodata = .; /* End of read-only data */
|
||||
|
||||
. = ALIGN(PAGE_SIZE);
|
||||
.data.ro_after_init : {
|
||||
DECL_SECTION(.data.ro_after_init) {
|
||||
__ro_after_init_start = .;
|
||||
*(.data.ro_after_init)
|
||||
. = ALIGN(PAGE_SIZE);
|
||||
__ro_after_init_end = .;
|
||||
} :text
|
||||
|
||||
.data.read_mostly : {
|
||||
DECL_SECTION(.data.read_mostly) {
|
||||
*(.data.read_mostly)
|
||||
} :text
|
||||
|
||||
. = ALIGN(PAGE_SIZE);
|
||||
.data : { /* Data */
|
||||
DECL_SECTION(.data) { /* Data */
|
||||
*(.data.page_aligned)
|
||||
. = ALIGN(8);
|
||||
__start_schedulers_array = .;
|
||||
@@ -100,7 +103,7 @@ SECTIONS
|
||||
|
||||
. = ALIGN(PAGE_SIZE); /* Init code and data */
|
||||
__init_begin = .;
|
||||
.init.text : {
|
||||
DECL_SECTION(.init.text) {
|
||||
_sinittext = .;
|
||||
*(.init.text)
|
||||
_einittext = .;
|
||||
@@ -108,7 +111,7 @@ SECTIONS
|
||||
} :text
|
||||
|
||||
. = ALIGN(PAGE_SIZE);
|
||||
.init.data : {
|
||||
DECL_SECTION(init.data) {
|
||||
*(.init.rodata)
|
||||
*(.init.rodata.*)
|
||||
|
||||
@@ -137,18 +140,18 @@ SECTIONS
|
||||
__ctors_end = .;
|
||||
} :text
|
||||
|
||||
.got : {
|
||||
DECL_SECTION(.got) {
|
||||
*(.got .toc)
|
||||
} :text
|
||||
|
||||
.got.plt : {
|
||||
DECL_SECTION(.got.plt) {
|
||||
*(.got.plt)
|
||||
} :text
|
||||
|
||||
. = ALIGN(POINTER_ALIGN);
|
||||
__init_end = .;
|
||||
|
||||
.bss : { /* BSS */
|
||||
DECL_SECTION(.bss) { /* BSS */
|
||||
__bss_start = .;
|
||||
*(.bss.stack_aligned)
|
||||
*(.bss.page_aligned)
|
||||
@@ -168,7 +171,7 @@ SECTIONS
|
||||
_end = . ;
|
||||
|
||||
/* Section for the device tree blob (if any). */
|
||||
.dtb : { *(.dtb) } :text
|
||||
DECL_SECTION(.dtb) { *(.dtb) } :text
|
||||
|
||||
DWARF2_DEBUG_SECTIONS
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
#define FORMAT "pei-x86-64"
|
||||
#undef __XEN_VIRT_START
|
||||
#undef DECL_SECTION
|
||||
#define __XEN_VIRT_START __image_base__
|
||||
#define DECL_SECTION(x) x :
|
||||
|
||||
@@ -20,11 +21,6 @@ ENTRY(efi_start)
|
||||
#else /* !EFI */
|
||||
|
||||
#define FORMAT "elf64-x86-64"
|
||||
#ifdef CONFIG_LD_IS_GNU
|
||||
# define DECL_SECTION(x) x : AT(ADDR(#x) - __XEN_VIRT_START)
|
||||
#else
|
||||
# define DECL_SECTION(x) x : AT(ADDR(x) - __XEN_VIRT_START)
|
||||
#endif
|
||||
|
||||
ENTRY(start_pa)
|
||||
|
||||
|
||||
@@ -5,6 +5,16 @@
|
||||
* Common macros to be used in architecture specific linker scripts.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Declare a section whose load address is based at PA 0 rather than
|
||||
* Xen's virtual base address.
|
||||
*/
|
||||
#ifdef CONFIG_LD_IS_GNU
|
||||
# define DECL_SECTION(x) x : AT(ADDR(#x) - __XEN_VIRT_START)
|
||||
#else
|
||||
# define DECL_SECTION(x) x : AT(ADDR(x) - __XEN_VIRT_START)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* To avoid any confusion, please note that the EFI macro does not correspond
|
||||
* to EFI support and is used when linking a native EFI (i.e. PE/COFF) binary,
|
||||
|
||||