Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xen/pvh: Support ParaVirtualized Hardware extensions (v3).

PVH allows PV linux guest to utilize hardware extended capabilities,
such as running MMU updates in a HVM container.

The Xen side defines PVH as (from docs/misc/pvh-readme.txt,
with modifications):

"* the guest uses auto translate:
- p2m is managed by Xen
- pagetables are owned by the guest
- mmu_update hypercall not available
* it uses event callback and not vlapic emulation,
* IDT is native, so set_trap_table hcall is also N/A for a PVH guest.

For a full list of hcalls supported for PVH, see pvh_hypercall64_table
in arch/x86/hvm/hvm.c in xen. From the ABI prespective, it's mostly a
PV guest with auto translate, although it does use hvm_op for setting
callback vector."

Use .ascii and .asciz to define xen feature string. Note, the PVH
string must be in a single line (not multiple lines with \) to keep the
assembler from putting null char after each string before \.
This patch allows it to be configured and enabled.

We also use introduce the 'XEN_ELFNOTE_SUPPORTED_FEATURES' ELF note to
tell the hypervisor that 'hvm_callback_vector' is what the kernel
needs. We can not put it in 'XEN_ELFNOTE_FEATURES' as older hypervisor
parse fields they don't understand as errors and refuse to load
the kernel. This work-around fixes the problem.

Signed-off-by: Mukesh Rathor <mukesh.rathor@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

authored by

Mukesh Rathor and committed by
Konrad Rzeszutek Wilk
4e903a20 be3e9cf3

+38 -2
+1 -1
arch/x86/xen/Kconfig
··· 53 53 54 54 config XEN_PVH 55 55 bool "Support for running as a PVH guest" 56 - depends on X86_64 && XEN && BROKEN 56 + depends on X86_64 && XEN 57 57 select XEN_PVHVM 58 58 def_bool n
+24 -1
arch/x86/xen/xen-head.S
··· 11 11 #include <asm/page_types.h> 12 12 13 13 #include <xen/interface/elfnote.h> 14 + #include <xen/interface/features.h> 14 15 #include <asm/xen/interface.h> 16 + 17 + #ifdef CONFIG_XEN_PVH 18 + #define PVH_FEATURES_STR "|writable_descriptor_tables|auto_translated_physmap|supervisor_mode_kernel" 19 + /* Note the lack of 'hvm_callback_vector'. Older hypervisor will 20 + * balk at this being part of XEN_ELFNOTE_FEATURES, so we put it in 21 + * XEN_ELFNOTE_SUPPORTED_FEATURES which older hypervisors will ignore. 22 + */ 23 + #define PVH_FEATURES ((1 << XENFEAT_writable_page_tables) | \ 24 + (1 << XENFEAT_auto_translated_physmap) | \ 25 + (1 << XENFEAT_supervisor_mode_kernel) | \ 26 + (1 << XENFEAT_hvm_callback_vector)) 27 + /* The XENFEAT_writable_page_tables is not stricly neccessary as we set that 28 + * up regardless whether this CONFIG option is enabled or not, but it 29 + * clarifies what the right flags need to be. 30 + */ 31 + #else 32 + #define PVH_FEATURES_STR "" 33 + #define PVH_FEATURES (0) 34 + #endif 15 35 16 36 __INIT 17 37 ENTRY(startup_xen) ··· 115 95 #endif 116 96 ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, _ASM_PTR startup_xen) 117 97 ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page) 118 - ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb") 98 + ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .ascii "!writable_page_tables|pae_pgdir_above_4gb"; .asciz PVH_FEATURES_STR) 99 + ELFNOTE(Xen, XEN_ELFNOTE_SUPPORTED_FEATURES, .long (PVH_FEATURES) | 100 + (1 << XENFEAT_writable_page_tables) | 101 + (1 << XENFEAT_dom0)) 119 102 ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") 120 103 ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic") 121 104 ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID,
+13
include/xen/interface/elfnote.h
··· 140 140 */ 141 141 #define XEN_ELFNOTE_SUSPEND_CANCEL 14 142 142 143 + /* 144 + * The features supported by this kernel (numeric). 145 + * 146 + * Other than XEN_ELFNOTE_FEATURES on pre-4.2 Xen, this note allows a 147 + * kernel to specify support for features that older hypervisors don't 148 + * know about. The set of features 4.2 and newer hypervisors will 149 + * consider supported by the kernel is the combination of the sets 150 + * specified through this and the string note. 151 + * 152 + * LEGACY: FEATURES 153 + */ 154 + #define XEN_ELFNOTE_SUPPORTED_FEATURES 17 155 + 143 156 #endif /* __XEN_PUBLIC_ELFNOTE_H__ */ 144 157 145 158 /*