Commit a5a18ae7 authored by Boris Ostrovsky's avatar Boris Ostrovsky
Browse files

xen/pvh: Indicate XENFEAT_linux_rsdp_unrestricted to Xen 



Pre-4.17 kernels ignored start_info's rsdp_paddr pointer and instead
relied on finding RSDP in standard location in BIOS RO memory. This
has worked since that's where Xen used to place it.

However, with recent Xen change (commit 4a5733771e6f ("libxl: put RSDP
for PVH guest near 4GB")) it prefers to keep RSDP at a "non-standard"
address. Even though as of commit b17d9d1d ("x86/xen: Add pvh
specific rsdp address retrieval function") Linux is able to find RSDP,
for back-compatibility reasons we need to indicate to Xen that we can
handle this, an we do so by setting XENFEAT_linux_rsdp_unrestricted
flag in ELF notes.

(Also take this opportunity and sync features.h header file with Xen)

Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarWei Liu <wei.liu2@citrix.com>
parent c37a3c94

arch/x86/xen/xen-head.S

+3 −1
Original line number Diff line number Diff line
@@ -89,7 +89,9 @@ END(hypercall_page) 
	ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,

		.ascii "!writable_page_tables|pae_pgdir_above_4gb")

	ELFNOTE(Xen, XEN_ELFNOTE_SUPPORTED_FEATURES,

		.long (1 << XENFEAT_writable_page_tables) | (1 << XENFEAT_dom0))

		.long (1 << XENFEAT_writable_page_tables) |       \

		      (1 << XENFEAT_dom0) |                       \

		      (1 << XENFEAT_linux_rsdp_unrestricted))

	ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE,       .asciz "yes")

	ELFNOTE(Xen, XEN_ELFNOTE_LOADER,         .asciz "generic")

	ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID,

include/xen/interface/features.h

+23 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ 
/* x86: Does this Xen host support the MMU_PT_UPDATE_PRESERVE_AD hypercall? */

#define XENFEAT_mmu_pt_update_preserve_ad  5



/* x86: Does this Xen host support the MMU_{CLEAR,COPY}_PAGE hypercall? */

#define XENFEAT_highmem_assist             6



/*

 * If set, GNTTABOP_map_grant_ref honors flags to be placed into guest kernel

 * available pte bits.
@@ -60,6 +63,26 @@ 
/* operation as Dom0 is supported */

#define XENFEAT_dom0                      11



/* Xen also maps grant references at pfn = mfn.

 * This feature flag is deprecated and should not be used.

#define XENFEAT_grant_map_identity        12

 */



/* Guest can use XENMEMF_vnode to specify virtual node for memory op. */

#define XENFEAT_memory_op_vnode_supported 13



/* arm: Hypervisor supports ARM SMC calling convention. */

#define XENFEAT_ARM_SMCCC_supported       14



/*

 * x86/PVH: If set, ACPI RSDP can be placed at any address. Otherwise RSDP

 * must be located in lower 1MB, as required by ACPI Specification for IA-PC

 * systems.

 * This feature flag is only consulted if XEN_ELFNOTE_GUEST_OS contains

 * the "linux" string.

 */

#define XENFEAT_linux_rsdp_unrestricted   15



#define XENFEAT_NR_SUBMAPS 1



#endif /* __XEN_PUBLIC_FEATURES_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE