xen: HVM X2APIC support
Subsystems (2)
PATCH v2 1/1 xen: HVM X2APIC support
This patch is similiar to Gleb Natapov's patch for KVM, which enable the hypervisor to emulate x2apic feature for the guest. By this way, the emulation of lapic would be simpler with x2apic interface(MSR), and faster.
--- arch/x86/include/asm/xen/hypervisor.h | 35 +++++++++++++++++++++++++++++++++ arch/x86/kernel/apic/apic.c | 4 ++- arch/x86/xen/enlighten.c | 30 ++++++++++----------------- 3 files changed, 49 insertions(+), 20 deletions(-)
arch/x86/include/asm/xen/hypervisor.h +35 -0
@@ -37,4 +37,39 @@extern struct shared_info *HYPERVISOR_shared_info;extern struct start_info *xen_start_info; +#include <asm/processor.h> + +static inline uint32_t xen_cpuid_base (void ) +{ +uint32_t base, eax, ebx, ecx, edx; +char signature[13 ]; + +for (base =0x40000000 ; base <0x40010000 ; base +=0x100 ) { +cpuid (base, &eax, &ebx, &ecx, &edx); + *(uint32_t *)(signature +0 ) = ebx; + *(uint32_t *)(signature +4 ) = ecx; + *(uint32_t *)(signature +8 ) = edx; + signature[12 ] =0 ; + +if (!strcmp ("XenVMMXenVMM" , signature) && ((eax - base) >=2 )) +return base; + } + +return 0 ; +} + +#ifdef CONFIG_XEN +extern bool xen_hvm_need_lapic (void ); + +static inline bool xen_para_available (void ) +{ +return xen_hvm_need_lapic (); +} +#else +static inline bool xen_para_available (void ) +{ +return (xen_cpuid_base () !=0 ); +} +#endif +#endif /* _ASM_X86_XEN_HYPERVISOR_H */
arch/x86/kernel/apic/apic.c +3 -1
@@ -52,6 +52,7 @@#include <asm/mce.h> #include <asm/kvm_para.h> #include <asm/tsc.h> +#include <asm/xen/hypervisor.h> unsigned int num_processors;
@@ -1476,7 +1477,8 @@ void __init enable_IR_x2apic(void)/* IR is required if there is APIC ID > 255 even when running * under KVM */ -if (max_physical_apicid >255 || !kvm_para_available ()) +if (max_physical_apicid >255 || + (!kvm_para_available () && !xen_para_available ())) goto nox2apic;/* * without IR all CPUs can be addressed by IOAPIC/MSI
arch/x86/xen/enlighten.c +11 -19
@@ -1245,25 +1245,6 @@ asmlinkage void __init xen_start_kernel(void)#endif } -static uint32_t xen_cpuid_base (void ) -{ -uint32_t base, eax, ebx, ecx, edx; -char signature[13 ]; - -for (base =0x40000000 ; base <0x40010000 ; base +=0x100 ) { -cpuid (base, &eax, &ebx, &ecx, &edx); - *(uint32_t *)(signature +0 ) = ebx; - *(uint32_t *)(signature +4 ) = ecx; - *(uint32_t *)(signature +8 ) = edx; - signature[12 ] =0 ; - -if (!strcmp ("XenVMMXenVMM" , signature) && ((eax - base) >=2 )) -return base; - } - -return 0 ; -} -static int init_hvm_pv_info (int *major,int *minor) {uint32_t eax, ebx, ecx, edx, pages, msr, base;
@@ -1373,6 +1354,17 @@ static bool __init xen_hvm_platform(void)return true; } +bool xen_hvm_need_lapic (void ) +{ +if (xen_pv_domain ()) +return false; +if (xen_hvm_domain () && + (xen_feature (XENFEAT_hvm_pirqs) || xen_have_vector_callback)) +return false; +return (xen_cpuid_base () !=0 ); +} +EXPORT_SYMBOL_GPL (xen_hvm_need_lapic); +const __refconst struct hypervisor_x86 x86_hyper_xen_hvm = { .name ="Xen HVM" , .detect = xen_hvm_platform,
Signature · 1 line
1.7.0.1
Quoted 43 lines · Sheng Yang
This patch is similiar to Gleb Natapov's patch for KVM, which enable the hypervisor to emulate x2apic feature for the guest. By this way, the emulation of lapic would be simpler with x2apic interface(MSR), and faster.
Signed-off-by Sheng Yang <[email protected]>--- arch/x86/include/asm/xen/hypervisor.h | 35 +++++++++++++++++++++++++++++++++ arch/x86/kernel/apic/apic.c | 4 ++- arch/x86/xen/enlighten.c | 30 ++++++++++----------------- 3 files changed, 49 insertions(+), 20 deletions(-)arch/x86/include/asm/xen/hypervisor.h +24
-0@@ -37,4 +37,39 @@extern struct shared_info *HYPERVISOR_shared_info;extern struct start_info *xen_start_info; +#include <asm/processor.h> + +static inline uint32_t xen_cpuid_base (void ) +{ +uint32_t base, eax, ebx, ecx, edx; +char signature[13 ]; + +for (base =0x40000000 ; base <0x40010000 ; base +=0x100 ) { +cpuid (base, &eax, &ebx, &ecx, &edx); + *(uint32_t *)(signature +0 ) = ebx; + *(uint32_t *)(signature +4 ) = ecx; + *(uint32_t *)(signature +8 ) = edx; + signature[12 ] =0 ; + +if (!strcmp ("XenVMMXenVMM" , signature) && ((eax - base) >=2 )) +return base; + } + +return 0 ; +} + +#ifdef CONFIG_XEN +extern bool xen_hvm_need_lapic (void ); +
arch/x86/include/asm/xen/hypervisor.h line 73
Quoted 10 lines
arch/x86/include/asm/xen/hypervisor.h +10
-0+static inline bool xen_para_available (void ) +{ +return xen_hvm_need_lapic (); +} +#else +static inline bool xen_para_available (void ) +{ +return (xen_cpuid_base () !=0 ); +} +#endif
Surely this should be using the asm/hypervisor.h interface?
Quoted 15 lines
arch/x86/include/asm/xen/hypervisor.h +1
-0+#endif /* _ASM_X86_XEN_HYPERVISOR_H */ arch/x86/kernel/apic/apic.c +1
-0@@ -52,6 +52,7 @@#include <asm/mce.h> #include <asm/kvm_para.h> #include <asm/tsc.h> +#include <asm/xen/hypervisor.h> unsigned int num_processors;
arch/x86/kernel/apic/apic.c void __init enable_IR_x2apic(void) · line 1482
Quoted 7 lines
arch/x86/kernel/apic/apic.c +2
-1@@ -1476,7 +1477,8 @@ void __init enable_IR_x2apic(void)/* IR is required if there is APIC ID > 255 even when running * under KVM */ -if (max_physical_apicid >255 || !kvm_para_available ()) +if (max_physical_apicid >255 || + (!kvm_para_available () && !xen_para_available ())) goto nox2apic;
What are the downsides of just using x2apic unconditionally?
Assuming there is some downside to using it all the time, what about adding a pseudo-cpu feature flag meaning "use x2apic unconditionally" rather than adding a bunch of ad-hoc tests here?
Quoted 33 lines
arch/x86/kernel/apic/apic.c +0
-0/* * without IR all CPUs can be addressed by IOAPIC/MSI arch/x86/xen/enlighten.c +0
-19@@ -1245,25 +1245,6 @@ asmlinkage void __init xen_start_kernel(void)#endif } -static uint32_t xen_cpuid_base (void ) -{ -uint32_t base, eax, ebx, ecx, edx; -char signature[13 ]; - -for (base =0x40000000 ; base <0x40010000 ; base +=0x100 ) { -cpuid (base, &eax, &ebx, &ecx, &edx); - *(uint32_t *)(signature +0 ) = ebx; - *(uint32_t *)(signature +4 ) = ecx; - *(uint32_t *)(signature +8 ) = edx; - signature[12 ] =0 ; - -if (!strcmp ("XenVMMXenVMM" , signature) && ((eax - base) >=2 )) -return base; - } - -return 0 ; -} -static int init_hvm_pv_info (int *major,int *minor) {uint32_t eax, ebx, ecx, edx, pages, msr, base;
arch/x86/xen/enlighten.c static bool __init xen_hvm_platform(void) · line 1357
Quoted 4 lines
arch/x86/xen/enlighten.c +1
-0@@ -1373,6 +1354,17 @@ static bool __init xen_hvm_platform(void)return true; } +bool xen_hvm_need_lapic (void )
Where does this get used?
arch/x86/xen/enlighten.c static bool __init xen_hvm_platform(void) · line 1370
Quoted 13 lines
arch/x86/xen/enlighten.c +10
-0+{ +if (xen_pv_domain ()) +return false; +if (xen_hvm_domain () && + (xen_feature (XENFEAT_hvm_pirqs) || xen_have_vector_callback)) +return false; +return (xen_cpuid_base () !=0 ); +} +EXPORT_SYMBOL_GPL (xen_hvm_need_lapic); +const __refconst struct hypervisor_x86 x86_hyper_xen_hvm = { .name ="Xen HVM" , .detect = xen_hvm_platform,
J
Quoted 52 lines · On Tuesday 07 December 2010 02:07:23 Jeremy Fitzhardinge wrote:
Quoted 51 lines · Sheng Yang
This patch is similiar to Gleb Natapov's patch for KVM, which enable the hypervisor to emulate x2apic feature for the guest. By this way, the emulation of lapic would be simpler with x2apic interface(MSR), and faster.
Signed-off-by Sheng Yang <[email protected]>---
arch/x86/include/asm/xen/hypervisor.h | 35 +++++++++++++++++++++++++++++++++ arch/x86/kernel/apic/apic.c | 4 ++- arch/x86/xen/enlighten.c | 30 ++++++++++----------------- 3 files changed, 49 insertions(+), 20 deletions(-)(quoted diff) +0
-0
b/arch/x86/include/asm/xen/hypervisor.hindex 396ff4c..bc5b804 100644arch/x86/include/asm/xen/hypervisor.h +28
-0@@ -37,4 +37,39 @@extern struct shared_info *HYPERVISOR_shared_info;extern struct start_info *xen_start_info; +#include <asm/processor.h> + +static inline uint32_t xen_cpuid_base (void ) +{ +uint32_t base, eax, ebx, ecx, edx; +char signature[13 ]; + +for (base =0x40000000 ; base <0x40010000 ; base +=0x100 ) { +cpuid (base, &eax, &ebx, &ecx, &edx); + *(uint32_t *)(signature +0 ) = ebx; + *(uint32_t *)(signature +4 ) = ecx; + *(uint32_t *)(signature +8 ) = edx; + signature[12 ] =0 ; + +if (!strcmp ("XenVMMXenVMM" , signature) && ((eax - base) >=2 )) +return base; + } + +return 0 ; +} + +#ifdef CONFIG_XEN +extern bool xen_hvm_need_lapic (void ); + +static inline bool xen_para_available (void ) +{ +return xen_hvm_need_lapic (); +}
Quoted 8 lines
arch/x86/include/asm/xen/hypervisor.h line 73
Quoted 6 lines
arch/x86/include/asm/xen/hypervisor.h +6
-0+#else +static inline bool xen_para_available (void ) +{ +return (xen_cpuid_base () !=0 ); +} +#endif Surely this should be using the
asm/hypervisor.hinterface?
I think it's the proper place. Or any suggestion?
Quoted 30 lines
Quoted 30 lines
arch/x86/include/asm/xen/hypervisor.h +1
-0+#endif /*
_ASM_X86_XEN_HYPERVISOR_H*/arch/x86/kernel/apic/apic.c +1
-0@@ -52,6 +52,7 @@#include <asm/mce.h> #include <asm/kvm_para.h> #include <asm/tsc.h> +#include <asm/xen/hypervisor.h> unsigned int
num_processors;arch/x86/kernel/apic/apic.c +2
-1@@ -1476,7 +1477,8 @@ void __init enable_IR_x2apic(void)/* IR is required if there is APIC ID > 255 even when running * under KVM */ -if (max_physical_apicid >255 || !kvm_para_available ()) +if (max_physical_apicid >255 || + (!kvm_para_available () && !xen_para_available ()))
Quoted 7 lines
Quoted 1 line
goto nox2apic;
What are the downsides of just using x2apic unconditionally?
Assuming there is some downside to using it all the time, what about adding a pseudo-cpu feature flag meaning "use x2apic unconditionally" rather than adding a bunch of ad-hoc tests here?
Because for native, x2apic should be used with interrupt-remapping, otherwise it didn't make much sense for native(the main reason to x2apic for bare-metal is support big machine with more than 255 APIC-ID, and without interrupt remapping it can't do so). But for hypervisor, we want to emulate the accessing faster through MSR, so we want them.
Quoted 41 lines
Quoted 41 lines
arch/x86/kernel/apic/apic.c +0
-0/* * without IR all CPUs can be addressed by IOAPIC/MSI arch/x86/xen/enlighten.c +0
-19@@ -1245,25 +1245,6 @@ asmlinkage void __init xen_start_kernel(void)#endif } -static uint32_t xen_cpuid_base (void ) -{ -uint32_t base, eax, ebx, ecx, edx; -char signature[13 ]; - -for (base =0x40000000 ; base <0x40010000 ; base +=0x100 ) { -cpuid (base, &eax, &ebx, &ecx, &edx); - *(uint32_t *)(signature +0 ) = ebx; - *(uint32_t *)(signature +4 ) = ecx; - *(uint32_t *)(signature +8 ) = edx; - signature[12 ] =0 ; - -if (!strcmp ("XenVMMXenVMM" , signature) && ((eax - base) >=2 )) -return base; - } - -return 0 ; -} -static int init_hvm_pv_info (int *major,int *minor){
arch/x86/xen/enlighten.c +0
-0uint32_t eax, ebx, ecx, edx, pages, msr, base;@@ -1373,6 +1354,17 @@ static bool __init xen_hvm_platform(void)
Quoted 7 lines
arch/x86/xen/enlighten.c static bool __init xen_hvm_platform(void) · line 1357
Quoted 5 lines
arch/x86/xen/enlighten.c +1
-0return true; } +bool xen_hvm_need_lapic (void )Where does this get used?
?... xen_para_available() above...
--
regards
Yang, Sheng
Quoted 18 lines
Quoted 14 lines
arch/x86/xen/enlighten.c +10
-0+{ +if (xen_pv_domain ()) +return false; +if (xen_hvm_domain () && + (xen_feature (XENFEAT_hvm_pirqs) || xen_have_vector_callback)) +return false; +return (xen_cpuid_base () !=0 ); +} +EXPORT_SYMBOL_GPL (xen_hvm_need_lapic); +const
__refconststructhypervisor_x86x86_hyper_xen_hvm= {arch/x86/xen/enlighten.c static bool __init xen_hvm_platform(void) · line 1370
Quoted 2 lines
arch/x86/xen/enlighten.c +0
-0.name = "Xen HVM", .detect = xen_hvm_platform,J
Quoted 65 lines · On Tuesday 07 December 2010 10:01:48 Sheng Yang wrote:
Quoted 55 lines · On Tuesday 07 December 2010 02:07:23 Jeremy Fitzhardinge wrote:
Quoted 54 lines · Sheng Yang
This patch is similiar to Gleb Natapov's patch for KVM, which enable the hypervisor to emulate x2apic feature for the guest. By this way, the emulation of lapic would be simpler with x2apic interface(MSR), and faster.
Signed-off-by Sheng Yang <[email protected]>---
arch/x86/include/asm/xen/hypervisor.h | 35+++++++++++++++++++++++++++++++++
arch/x86/kernel/apic/apic.c| 4 ++-
arch/x86/xen/enlighten.c | 30++++++++++----------------- 3 files changed, 49 insertions(+), 20 deletions(-)
(quoted diff) +0
-0
b/arch/x86/include/asm/xen/hypervisor.hindex 396ff4c..bc5b804 100644arch/x86/include/asm/xen/hypervisor.h +28
-0@@ -37,4 +37,39 @@extern struct shared_info *HYPERVISOR_shared_info;extern struct start_info *xen_start_info; +#include <asm/processor.h> + +static inline uint32_t xen_cpuid_base (void ) +{ +uint32_t base, eax, ebx, ecx, edx; +char signature[13 ]; + +for (base =0x40000000 ; base <0x40010000 ; base +=0x100 ) { +cpuid (base, &eax, &ebx, &ecx, &edx); + *(uint32_t *)(signature +0 ) = ebx; + *(uint32_t *)(signature +4 ) = ecx; + *(uint32_t *)(signature +8 ) = edx; + signature[12 ] =0 ; + +if (!strcmp ("XenVMMXenVMM" , signature) && ((eax - base) >=2 )) +return base; + } + +return 0 ; +} + +#ifdef CONFIG_XEN +extern bool xen_hvm_need_lapic (void ); + +static inline bool xen_para_available (void ) +{ +return xen_hvm_need_lapic (); +}Quoted 8 lines
arch/x86/include/asm/xen/hypervisor.h line 73
Quoted 6 lines
arch/x86/include/asm/xen/hypervisor.h +6
-0+#else +static inline bool xen_para_available (void ) +{ +return (xen_cpuid_base () !=0 ); +} +#endif Surely this should be using the
asm/hypervisor.hinterface?
Quoted 1 line
I think it's the proper place. Or any suggestion?
Oh, misread the comment. Seems put all detection there is a good idea.
--
regards
Yang, Sheng
Quoted 120 lines
Quoted 30 lines
Quoted 30 lines
arch/x86/include/asm/xen/hypervisor.h +1
-0+#endif /*
_ASM_X86_XEN_HYPERVISOR_H*/arch/x86/kernel/apic/apic.c +1
-0@@ -52,6 +52,7 @@#include <asm/mce.h> #include <asm/kvm_para.h> #include <asm/tsc.h> +#include <asm/xen/hypervisor.h> unsigned int
num_processors;arch/x86/kernel/apic/apic.c +2
-1@@ -1476,7 +1477,8 @@ void __init enable_IR_x2apic(void)/* IR is required if there is APIC ID > 255 even when running * under KVM */ -if (max_physical_apicid >255 || !kvm_para_available ()) +if (max_physical_apicid >255 || + (!kvm_para_available () && !xen_para_available ()))Quoted 7 lines
Quoted 1 line
goto nox2apic;
What are the downsides of just using x2apic unconditionally?
Assuming there is some downside to using it all the time, what about adding a pseudo-cpu feature flag meaning "use x2apic unconditionally" rather than adding a bunch of ad-hoc tests here?
Because for native, x2apic should be used with interrupt-remapping, otherwise it didn't make much sense for native(the main reason to x2apic for bare-metal is support big machine with more than 255 APIC-ID, and without interrupt remapping it can't do so). But for hypervisor, we want to emulate the accessing faster through MSR, so we want them.
Quoted 40 lines
Quoted 40 lines
arch/x86/kernel/apic/apic.c +0
-0/* * without IR all CPUs can be addressed by IOAPIC/MSI arch/x86/xen/enlighten.c +0
-19@@ -1245,25 +1245,6 @@ asmlinkage void __init xen_start_kernel(void)#endif } -static uint32_t xen_cpuid_base (void ) -{ -uint32_t base, eax, ebx, ecx, edx; -char signature[13 ]; - -for (base =0x40000000 ; base <0x40010000 ; base +=0x100 ) { -cpuid (base, &eax, &ebx, &ecx, &edx); - *(uint32_t *)(signature +0 ) = ebx; - *(uint32_t *)(signature +4 ) = ecx; - *(uint32_t *)(signature +8 ) = edx; - signature[12 ] =0 ; - -if (!strcmp ("XenVMMXenVMM" , signature) && ((eax - base) >=2 )) -return base; - } - -return 0 ; -} -static int init_hvm_pv_info (int *major,int *minor){
arch/x86/xen/enlighten.c +0
-0uint32_t eax, ebx, ecx, edx, pages, msr, base;@@ -1373,6 +1354,17 @@ static bool __init xen_hvm_platform(void)Quoted 7 lines
arch/x86/xen/enlighten.c static bool __init xen_hvm_platform(void) · line 1357
Quoted 5 lines
arch/x86/xen/enlighten.c +1
-0return true; } +bool xen_hvm_need_lapic (void )Where does this get used?
?...
xen_para_available()above...--
regards
Yang, ShengQuoted 11 lines
Quoted 11 lines
arch/x86/xen/enlighten.c +10
-0+{ +if (xen_pv_domain ()) +return false; +if (xen_hvm_domain () && + (xen_feature (XENFEAT_hvm_pirqs) || xen_have_vector_callback)) +return false; +return (xen_cpuid_base () !=0 ); +} +EXPORT_SYMBOL_GPL (xen_hvm_need_lapic); +Quoted 6 lines
arch/x86/xen/enlighten.c static bool __init xen_hvm_platform(void) · line 1370
Quoted 5 lines
const
__refconststructhypervisor_x86x86_hyper_xen_hvm= {arch/x86/xen/enlighten.c +0
-0.name = "Xen HVM", .detect = xen_hvm_platform,J
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 20 lines
arch/x86/include/asm/xen/hypervisor.h +20
-0+static inline uint32_t xen_cpuid_base (void ) +{ +uint32_t base, eax, ebx, ecx, edx; +char signature[13 ]; + +for (base =0x40000000 ; base <0x40010000 ; base +=0x100 ) { +cpuid (base, &eax, &ebx, &ecx, &edx); + *(uint32_t *)(signature +0 ) = ebx; + *(uint32_t *)(signature +4 ) = ecx; + *(uint32_t *)(signature +8 ) = edx; + signature[12 ] =0 ; + +if (!strcmp ("XenVMMXenVMM" , signature) && ((eax - base) >=2 )) +return base; + } + +return 0 ; +} + +#ifdef CONFIG_XEN
arch/x86/include/asm/xen/hypervisor.h line 71
Quoted 10 lines
arch/x86/include/asm/xen/hypervisor.h +10
-0+extern bool xen_hvm_need_lapic (void ); + +static inline bool xen_para_available (void ) +{ +return xen_hvm_need_lapic (); +} +#else +static inline bool xen_para_available (void ) +{ +return (xen_cpuid_base () !=0 );
Would it make sense to collapse the kvm_para_available and the xen_cpuid_base together (and maybe even the HyperV detection code) together in one and just return "x2_apic_para_capable" ?
Quoted 26 lines · On Tuesday 07 December 2010 04:40:54 Konrad Rzeszutek Wilk wrote:
Quoted 26 lines
arch/x86/include/asm/xen/hypervisor.h +26
-0+static inline uint32_t xen_cpuid_base (void ) +{ +uint32_t base, eax, ebx, ecx, edx; +char signature[13 ]; + +for (base =0x40000000 ; base <0x40010000 ; base +=0x100 ) { +cpuid (base, &eax, &ebx, &ecx, &edx); + *(uint32_t *)(signature +0 ) = ebx; + *(uint32_t *)(signature +4 ) = ecx; + *(uint32_t *)(signature +8 ) = edx; + signature[12 ] =0 ; + +if (!strcmp ("XenVMMXenVMM" , signature) && ((eax - base) >=2 )) +return base; + } + +return 0 ; +} + +#ifdef CONFIG_XEN +extern bool xen_hvm_need_lapic (void ); + +static inline bool xen_para_available (void ) +{ +return xen_hvm_need_lapic (); +}
Quoted 8 lines
arch/x86/include/asm/xen/hypervisor.h line 71
Quoted 4 lines
arch/x86/include/asm/xen/hypervisor.h +4
-0+#else +static inline bool xen_para_available (void ) +{ +return (xen_cpuid_base () !=0 );Would it make sense to collapse the
kvm_para_availableand thexen_cpuid_basetogether (and maybe even the HyperV detection code) together in one and just return "x2_apic_para_capable" ?
Well, no hyper-v now. But put them together is a good idea.
--
regards
Yang, Sheng