x86: xen cpuid() cleanup
Subsystems (4)
Juergen Gross
maintainerv2 cover x86: xen cpuid() cleanup
Reduce special casing of xen_cpuid() by using cpu capabilities instead of faked cpuid nodes.
This cleanup enables us remove the hypervisor specific set_cpu_features callback as the same effect can be reached via setup_[clear|force]_cpu_cap().
Removing the rest faked nodes from xen_cpuid() requires some more work as the remaining cases (mwait leafs and extended topology info) have to be handled at the consumer sides of this information.
Changes in V2:
- added several features to this scheme
- removed hypervisor specific set_cpu_features() callbacks
Juergen Gross (11):
xen: set cpu capabilities from xen_start_kernel() x86/xen: don't indicate DCA support in pv domains x86/xen: use capabilities instead of fake cpuid values for aperf x86/xen: use capabilities instead of fake cpuid values for mtrr x86/xen: use capabilities instead of fake cpuid values for acc x86/xen: use capabilities instead of fake cpuid values for acpi x86/xen: use capabilities instead of fake cpuid values for mwait x86/xen: use capabilities instead of fake cpuid values for x2apic x86/xen: use capabilities instead of fake cpuid values for xsave
vmware: set cpu capabilities during platform initialization x86/cpu: remove hypervisor specific set_cpu_features
arch/x86/include/asm/hypervisor.h | 5 --- arch/x86/kernel/cpu/common.c | 1 - arch/x86/kernel/cpu/hypervisor.c | 8 ---- arch/x86/kernel/cpu/vmware.c | 39 ++++++++++--------- arch/x86/xen/enlighten_pv.c | 81 +++++++++++++++------------------------ 5 files changed, 50 insertions(+), 84 deletions(-)
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Juergen Gross
maintainerPATCH v2 1/11 xen: set cpu capabilities from xen_start_kernel()
There is no need to set the same capabilities for each cpu individually. This can easily be done for all cpus when starting the kernel.
--- arch/x86/xen/enlighten_pv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/x86/xen/enlighten_pv.c +7 -7
@@ -327,6 +327,12 @@ static void __init xen_init_cpuid_mask(void) cpuid_leaf1_ecx_set_mask = (1 << (X86_FEATURE_MWAIT %32 )); } +static void __init xen_init_capabilities (void ) +{ +setup_clear_cpu_cap (X86_BUG_SYSRET_SS_ATTRS ); +setup_force_cpu_cap (X86_FEATURE_XENPV ); +} +static void xen_set_debugreg (int reg,unsigned long val) {HYPERVISOR_set_debugreg (reg, val);
@@ -1318,6 +1324,7 @@ asmlinkage __visible void __init xen_start_kernel(void)xen_init_irq_ops ();xen_init_cpuid_mask (); +xen_init_capabilities ();#ifdef CONFIG_X86_LOCAL_APIC /*
@@ -1506,16 +1513,9 @@ static uint32_t __init xen_platform_pv(void)return 0 ; } -static void xen_set_cpu_features (struct cpuinfo_x86 *c) -{ -clear_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS ); -set_cpu_cap (c,X86_FEATURE_XENPV ); -} -const struct hypervisor_x86 x86_hyper_xen_pv = { .name ="Xen PV" , .detect = xen_platform_pv, - .set_cpu_features = xen_set_cpu_features, .pin_vcpu = xen_pin_vcpu, };EXPORT_SYMBOL (x86_hyper_xen_pv);
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Juergen Gross
maintainerPATCH v2 1/11 xen: set cpu capabilities from xen_start_kernel()
In reply to Juergen GrossThere is no need to set the same capabilities for each cpu individually. This can easily be done for all cpus when starting the kernel.
--- arch/x86/xen/enlighten_pv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/x86/xen/enlighten_pv.c +7 -7
@@ -327,6 +327,12 @@ static void __init xen_init_cpuid_mask(void) cpuid_leaf1_ecx_set_mask = (1 << (X86_FEATURE_MWAIT %32 )); } +static void __init xen_init_capabilities (void ) +{ +setup_clear_cpu_cap (X86_BUG_SYSRET_SS_ATTRS ); +setup_force_cpu_cap (X86_FEATURE_XENPV ); +} +static void xen_set_debugreg (int reg,unsigned long val) {HYPERVISOR_set_debugreg (reg, val);
@@ -1318,6 +1324,7 @@ asmlinkage __visible void __init xen_start_kernel(void)xen_init_irq_ops ();xen_init_cpuid_mask (); +xen_init_capabilities ();#ifdef CONFIG_X86_LOCAL_APIC /*
@@ -1506,16 +1513,9 @@ static uint32_t __init xen_platform_pv(void)return 0 ; } -static void xen_set_cpu_features (struct cpuinfo_x86 *c) -{ -clear_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS ); -set_cpu_cap (c,X86_FEATURE_XENPV ); -} -const struct hypervisor_x86 x86_hyper_xen_pv = { .name ="Xen PV" , .detect = xen_platform_pv, - .set_cpu_features = xen_set_cpu_features, .pin_vcpu = xen_pin_vcpu, };EXPORT_SYMBOL (x86_hyper_xen_pv);
Signature · 1 line
2.12.0
Juergen Gross
maintainerPATCH v2 2/11 x86/xen: don't indicate DCA support in pv domains
In reply to Juergen GrossXen doesn't support DCA (direct cache access) for pv domains. Clear the corresponding capability indicator.
--- arch/x86/xen/enlighten_pv.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/xen/enlighten_pv.c +1 -0
@@ -331,6 +331,7 @@ static void __init xen_init_capabilities(void) {setup_clear_cpu_cap (X86_BUG_SYSRET_SS_ATTRS );setup_force_cpu_cap (X86_FEATURE_XENPV ); +setup_clear_cpu_cap (X86_FEATURE_DCA ); }static void xen_set_debugreg (int reg,unsigned long val)
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Juergen Gross
maintainerPATCH v2 3/11 x86/xen: use capabilities instead of fake cpuid values for aperf
In reply to Juergen GrossWhen running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the aperf/mperf feature is indicated as not being present by special casing the related cpuid leaf.
Instead of delivering fake cpuid values clear the cpu capability bit for aperf/mperf instead.
--- arch/x86/xen/enlighten_pv.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
arch/x86/xen/enlighten_pv.c +1 -8
@@ -165,9 +165,6 @@ xen_running_on_version_or_later(unsigned int major, unsigned int minor)return false; } -#define CPUID_THERM_POWER_LEAF 6 -#define APERFMPERF_PRESENT 0 -static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0 ;static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0 ;
@@ -201,11 +198,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, *dx = cpuid_leaf5_edx_val;return ; -case CPUID_THERM_POWER_LEAF : -/* Disabling APERFMPERF for kernel usage */ - maskecx = ~(1 <<APERFMPERF_PRESENT ); -break ; -case 0xb :/* Suppress extended topology stuff */ maskebx =0 ;
@@ -332,6 +324,7 @@ static void __init xen_init_capabilities(void)setup_clear_cpu_cap (X86_BUG_SYSRET_SS_ATTRS );setup_force_cpu_cap (X86_FEATURE_XENPV );setup_clear_cpu_cap (X86_FEATURE_DCA ); +setup_clear_cpu_cap (X86_FEATURE_APERFMPERF ); }static void xen_set_debugreg (int reg,unsigned long val)
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Juergen Gross
maintainerPATCH v2 4/11 x86/xen: use capabilities instead of fake cpuid values for mtrr
In reply to Juergen GrossWhen running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the mtrr feature is indicated as not being present by special casing the related cpuid leaf.
Instead of delivering fake cpuid values clear the cpu capability bit for mtrr instead.
--- arch/x86/xen/enlighten_pv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/xen/enlighten_pv.c +2 -2
@@ -295,8 +295,7 @@ static void __init xen_init_cpuid_mask(void)unsigned int xsave_mask; cpuid_leaf1_edx_mask = - ~((1 <<X86_FEATURE_MTRR ) |/* disable MTRR */ - (1 <<X86_FEATURE_ACC ));/* thermal monitoring */ + ~(1 <<X86_FEATURE_ACC );/* thermal monitoring */ if (!xen_initial_domain ()) cpuid_leaf1_edx_mask &=
@@ -325,6 +324,7 @@ static void __init xen_init_capabilities(void)setup_force_cpu_cap (X86_FEATURE_XENPV );setup_clear_cpu_cap (X86_FEATURE_DCA );setup_clear_cpu_cap (X86_FEATURE_APERFMPERF ); +setup_clear_cpu_cap (X86_FEATURE_MTRR ); }static void xen_set_debugreg (int reg,unsigned long val)
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Juergen Gross
maintainerPATCH v2 4/11 x86/xen: use capabilities instead of fake cpuid values for mtrr
In reply to Juergen GrossWhen running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the mtrr feature is indicated as not being present by special casing the related cpuid leaf.
Instead of delivering fake cpuid values clear the cpu capability bit for mtrr instead.
--- arch/x86/xen/enlighten_pv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/xen/enlighten_pv.c +2 -2
@@ -295,8 +295,7 @@ static void __init xen_init_cpuid_mask(void)unsigned int xsave_mask; cpuid_leaf1_edx_mask = - ~((1 <<X86_FEATURE_MTRR ) |/* disable MTRR */ - (1 <<X86_FEATURE_ACC ));/* thermal monitoring */ + ~(1 <<X86_FEATURE_ACC );/* thermal monitoring */ if (!xen_initial_domain ()) cpuid_leaf1_edx_mask &=
@@ -325,6 +324,7 @@ static void __init xen_init_capabilities(void)setup_force_cpu_cap (X86_FEATURE_XENPV );setup_clear_cpu_cap (X86_FEATURE_DCA );setup_clear_cpu_cap (X86_FEATURE_APERFMPERF ); +setup_clear_cpu_cap (X86_FEATURE_MTRR ); }static void xen_set_debugreg (int reg,unsigned long val)
Signature · 1 line
2.12.0
Juergen Gross
maintainerPATCH v2 5/11 x86/xen: use capabilities instead of fake cpuid values for acc
In reply to Juergen GrossWhen running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the acc feature (thermal monitoring) is indicated as not being present by special casing the related cpuid leaf.
Instead of delivering fake cpuid values clear the cpu capability bit for acc instead.
--- arch/x86/xen/enlighten_pv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/x86/xen/enlighten_pv.c +1 -3
@@ -294,9 +294,6 @@ static void __init xen_init_cpuid_mask(void)unsigned int ax, bx, cx, dx;unsigned int xsave_mask; - cpuid_leaf1_edx_mask = - ~(1 <<X86_FEATURE_ACC );/* thermal monitoring */ -if (!xen_initial_domain ()) cpuid_leaf1_edx_mask &= ~((1 <<X86_FEATURE_ACPI ));/* disable ACPI */
@@ -325,6 +322,7 @@ static void __init xen_init_capabilities(void)setup_clear_cpu_cap (X86_FEATURE_DCA );setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );setup_clear_cpu_cap (X86_FEATURE_MTRR ); +setup_clear_cpu_cap (X86_FEATURE_ACC ); }static void xen_set_debugreg (int reg,unsigned long val)
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Juergen Gross
maintainerPATCH v2 5/11 x86/xen: use capabilities instead of fake cpuid values for acc
In reply to Juergen GrossWhen running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the acc feature (thermal monitoring) is indicated as not being present by special casing the related cpuid leaf.
Instead of delivering fake cpuid values clear the cpu capability bit for acc instead.
--- arch/x86/xen/enlighten_pv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/x86/xen/enlighten_pv.c +1 -3
@@ -294,9 +294,6 @@ static void __init xen_init_cpuid_mask(void)unsigned int ax, bx, cx, dx;unsigned int xsave_mask; - cpuid_leaf1_edx_mask = - ~(1 <<X86_FEATURE_ACC );/* thermal monitoring */ -if (!xen_initial_domain ()) cpuid_leaf1_edx_mask &= ~((1 <<X86_FEATURE_ACPI ));/* disable ACPI */
@@ -325,6 +322,7 @@ static void __init xen_init_capabilities(void)setup_clear_cpu_cap (X86_FEATURE_DCA );setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );setup_clear_cpu_cap (X86_FEATURE_MTRR ); +setup_clear_cpu_cap (X86_FEATURE_ACC ); }static void xen_set_debugreg (int reg,unsigned long val)
Signature · 1 line
2.12.0
Juergen Gross
maintainerPATCH v2 6/11 x86/xen: use capabilities instead of fake cpuid values for acpi
In reply to Juergen GrossWhen running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the acpi feature is indicated as not being present by special casing the related cpuid leaf in case we are not the initial domain.
Instead of delivering fake cpuid values clear the cpu capability bit for acpi instead.
--- arch/x86/xen/enlighten_pv.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
arch/x86/xen/enlighten_pv.c +3 -8
@@ -165,7 +165,6 @@ xen_running_on_version_or_later(unsigned int major, unsigned int minor)return false; } -static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0 ;static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0 ;static __read_mostly unsigned int cpuid_leaf1_ecx_set_mask;
@@ -177,7 +176,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, {unsigned maskebx = ~0 ;unsigned maskecx = ~0 ; -unsigned maskedx = ~0 ;unsigned setecx =0 ;/* * Mask out inconvenient features, to try and disable as many
@@ -187,7 +185,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,case 1 : maskecx = cpuid_leaf1_ecx_mask; setecx = cpuid_leaf1_ecx_set_mask; - maskedx = cpuid_leaf1_edx_mask;break ;case CPUID_MWAIT_LEAF :
@@ -214,7 +211,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, *bx &= maskebx; *cx &= maskecx; *cx |= setecx; - *dx &= maskedx; }STACK_FRAME_NON_STANDARD (xen_cpuid);/* XEN_EMULATE_PREFIX */
@@ -294,10 +290,6 @@ static void __init xen_init_cpuid_mask(void)unsigned int ax, bx, cx, dx;unsigned int xsave_mask; -if (!xen_initial_domain ()) - cpuid_leaf1_edx_mask &= - ~((1 <<X86_FEATURE_ACPI ));/* disable ACPI */ - cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_X2APIC %32 )); ax =1 ;
@@ -323,6 +315,9 @@ static void __init xen_init_capabilities(void)setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );setup_clear_cpu_cap (X86_FEATURE_MTRR );setup_clear_cpu_cap (X86_FEATURE_ACC ); + +if (!xen_initial_domain ()) +setup_clear_cpu_cap (X86_FEATURE_ACPI ); }static void xen_set_debugreg (int reg,unsigned long val)
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Juergen Gross
maintainerPATCH v2 6/11 x86/xen: use capabilities instead of fake cpuid values for acpi
In reply to Juergen GrossWhen running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the acpi feature is indicated as not being present by special casing the related cpuid leaf in case we are not the initial domain.
Instead of delivering fake cpuid values clear the cpu capability bit for acpi instead.
--- arch/x86/xen/enlighten_pv.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
arch/x86/xen/enlighten_pv.c +3 -8
@@ -165,7 +165,6 @@ xen_running_on_version_or_later(unsigned int major, unsigned int minor)return false; } -static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0 ;static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0 ;static __read_mostly unsigned int cpuid_leaf1_ecx_set_mask;
@@ -177,7 +176,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, {unsigned maskebx = ~0 ;unsigned maskecx = ~0 ; -unsigned maskedx = ~0 ;unsigned setecx =0 ;/* * Mask out inconvenient features, to try and disable as many
@@ -187,7 +185,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,case 1 : maskecx = cpuid_leaf1_ecx_mask; setecx = cpuid_leaf1_ecx_set_mask; - maskedx = cpuid_leaf1_edx_mask;break ;case CPUID_MWAIT_LEAF :
@@ -214,7 +211,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, *bx &= maskebx; *cx &= maskecx; *cx |= setecx; - *dx &= maskedx; }STACK_FRAME_NON_STANDARD (xen_cpuid);/* XEN_EMULATE_PREFIX */
@@ -294,10 +290,6 @@ static void __init xen_init_cpuid_mask(void)unsigned int ax, bx, cx, dx;unsigned int xsave_mask; -if (!xen_initial_domain ()) - cpuid_leaf1_edx_mask &= - ~((1 <<X86_FEATURE_ACPI ));/* disable ACPI */ - cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_X2APIC %32 )); ax =1 ;
@@ -323,6 +315,9 @@ static void __init xen_init_capabilities(void)setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );setup_clear_cpu_cap (X86_FEATURE_MTRR );setup_clear_cpu_cap (X86_FEATURE_ACC ); + +if (!xen_initial_domain ()) +setup_clear_cpu_cap (X86_FEATURE_ACPI ); }static void xen_set_debugreg (int reg,unsigned long val)
Signature · 1 line
2.12.0
Juergen Gross
maintainerPATCH v2 7/11 x86/xen: use capabilities instead of fake cpuid values for mwait
In reply to Juergen GrossWhen running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the mwait feature is indicated to be present or not by special casing the related cpuid leaf.
Instead of delivering fake cpuid values use the cpu capability bit for mwait instead.
--- arch/x86/xen/enlighten_pv.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
arch/x86/xen/enlighten_pv.c +5 -6
@@ -167,7 +167,6 @@ xen_running_on_version_or_later(unsigned int major, unsigned int minor)static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0 ; -static __read_mostly unsigned int cpuid_leaf1_ecx_set_mask;static __read_mostly unsigned int cpuid_leaf5_ecx_val;static __read_mostly unsigned int cpuid_leaf5_edx_val;
@@ -176,7 +175,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, {unsigned maskebx = ~0 ;unsigned maskecx = ~0 ; -unsigned setecx =0 ;/* * Mask out inconvenient features, to try and disable as many * unsupported kernel subsystems as possible.
@@ -184,7 +182,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,switch (*ax) {case 1 : maskecx = cpuid_leaf1_ecx_mask; - setecx = cpuid_leaf1_ecx_set_mask;break ;case CPUID_MWAIT_LEAF :
@@ -210,7 +207,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, *bx &= maskebx; *cx &= maskecx; - *cx |= setecx; }STACK_FRAME_NON_STANDARD (xen_cpuid);/* XEN_EMULATE_PREFIX */
@@ -303,8 +299,6 @@ static void __init xen_init_cpuid_mask(void)/* Xen will set CR4.OSXSAVE if supported and not disabled by force */ if ((cx & xsave_mask) != xsave_mask) cpuid_leaf1_ecx_mask &= ~xsave_mask;/* disable XSAVE & OSXSAVE */ -if (xen_check_mwait ()) - cpuid_leaf1_ecx_set_mask = (1 << (X86_FEATURE_MWAIT %32 )); }static void __init xen_init_capabilities (void )
@@ -318,6 +312,11 @@ static void __init xen_init_capabilities(void)if (!xen_initial_domain ())setup_clear_cpu_cap (X86_FEATURE_ACPI ); + +if (xen_check_mwait ()) +setup_force_cpu_cap (X86_FEATURE_MWAIT ); +else +setup_clear_cpu_cap (X86_FEATURE_MWAIT ); }static void xen_set_debugreg (int reg,unsigned long val)
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Juergen Gross
maintainerPATCH v2 8/11 x86/xen: use capabilities instead of fake cpuid values for x2apic
In reply to Juergen GrossWhen running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the x2apic feature is indicated as not being present by special casing the related cpuid leaf.
Instead of delivering fake cpuid values clear the cpu capability bit for x2apic instead.
--- arch/x86/xen/enlighten_pv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/xen/enlighten_pv.c +1 -2
@@ -286,8 +286,6 @@ static void __init xen_init_cpuid_mask(void)unsigned int ax, bx, cx, dx;unsigned int xsave_mask; - cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_X2APIC %32 )); - ax =1 ; cx =0 ;cpuid (1 , &ax, &bx, &cx, &dx);
@@ -309,6 +307,7 @@ static void __init xen_init_capabilities(void)setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );setup_clear_cpu_cap (X86_FEATURE_MTRR );setup_clear_cpu_cap (X86_FEATURE_ACC ); +setup_clear_cpu_cap (X86_FEATURE_X2APIC );if (!xen_initial_domain ())setup_clear_cpu_cap (X86_FEATURE_ACPI );
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Juergen Gross
maintainerPATCH v2 8/11 x86/xen: use capabilities instead of fake cpuid values for x2apic
In reply to Juergen GrossWhen running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the x2apic feature is indicated as not being present by special casing the related cpuid leaf.
Instead of delivering fake cpuid values clear the cpu capability bit for x2apic instead.
--- arch/x86/xen/enlighten_pv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/xen/enlighten_pv.c +1 -2
@@ -286,8 +286,6 @@ static void __init xen_init_cpuid_mask(void)unsigned int ax, bx, cx, dx;unsigned int xsave_mask; - cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_X2APIC %32 )); - ax =1 ; cx =0 ;cpuid (1 , &ax, &bx, &cx, &dx);
@@ -309,6 +307,7 @@ static void __init xen_init_capabilities(void)setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );setup_clear_cpu_cap (X86_FEATURE_MTRR );setup_clear_cpu_cap (X86_FEATURE_ACC ); +setup_clear_cpu_cap (X86_FEATURE_X2APIC );if (!xen_initial_domain ())setup_clear_cpu_cap (X86_FEATURE_ACPI );
Signature · 1 line
2.12.0
Juergen Gross
maintainerPATCH v2 9/11 x86/xen: use capabilities instead of fake cpuid values for xsave
In reply to Juergen GrossWhen running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the xsave feature availability is indicated by special casing the related cpuid leaf.
Instead of delivering fake cpuid values set or clear the cpu capability bits for xsave instead.
--- arch/x86/xen/enlighten_pv.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-)
arch/x86/xen/enlighten_pv.c +11 -17
@@ -165,8 +165,6 @@ xen_running_on_version_or_later(unsigned int major, unsigned int minor)return false; } -static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0 ; -static __read_mostly unsigned int cpuid_leaf5_ecx_val;static __read_mostly unsigned int cpuid_leaf5_edx_val;
@@ -174,16 +172,12 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, unsigned int *cx, unsigned int *dx) { unsigned maskebx = ~0; -unsigned maskecx = ~0 ; +/* * Mask out inconvenient features, to try and disable as many * unsupported kernel subsystems as possible. */ switch (*ax) { -case 1 : - maskecx = cpuid_leaf1_ecx_mask; -break ; -case CPUID_MWAIT_LEAF :/* Synthesize the values.. */ *ax =0 ;
@@ -206,7 +200,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, : "0" (*ax), "2" (*cx)); *bx &= maskebx; - *cx &= maskecx; }STACK_FRAME_NON_STANDARD (xen_cpuid);/* XEN_EMULATE_PREFIX */
@@ -281,22 +274,19 @@ static bool __init xen_check_mwait(void)return false;#endif } -static void __init xen_init_cpuid_mask (void ) + +static bool __init xen_check_xsave (void ) { -unsigned int ax, bx, cx, dx; -unsigned int xsave_mask; +unsigned int cx, xsave_mask; - ax =1 ; - cx =0 ; -cpuid (1 , &ax, &bx, &cx, &dx); + cx =cpuid_ecx (1 ); xsave_mask = (1 << (X86_FEATURE_XSAVE %32 )) | (1 << (X86_FEATURE_OSXSAVE %32 ));/* Xen will set CR4.OSXSAVE if supported and not disabled by force */ -if ((cx & xsave_mask) != xsave_mask) - cpuid_leaf1_ecx_mask &= ~xsave_mask;/* disable XSAVE & OSXSAVE */ +return (cx & xsave_mask) == xsave_mask; }static void __init xen_init_capabilities (void )
@@ -316,6 +306,11 @@ static void __init xen_init_capabilities(void)setup_force_cpu_cap (X86_FEATURE_MWAIT ); elsesetup_clear_cpu_cap (X86_FEATURE_MWAIT ); + +if (!xen_check_xsave ()) { +setup_clear_cpu_cap (X86_FEATURE_XSAVE ); +setup_clear_cpu_cap (X86_FEATURE_OSXSAVE ); + } }static void xen_set_debugreg (int reg,unsigned long val)
@@ -1308,7 +1303,6 @@ asmlinkage __visible void __init xen_start_kernel(void)xen_setup_gdt (0 );xen_init_irq_ops (); -xen_init_cpuid_mask ();xen_init_capabilities ();#ifdef CONFIG_X86_LOCAL_APIC
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Re: [PATCH v2 09/11] x86/xen: use capabilities instead of fake cpuid values for xsave
Quoted 15 lines · Juergen Gross
arch/x86/xen/enlighten_pv.c +3
-6@@ -281,22 +274,19 @@ static bool __init xen_check_mwait(void)return false;#endif } -static void __init xen_init_cpuid_mask (void ) + +static bool __init xen_check_xsave (void ) { -unsigned int ax, bx, cx, dx; -unsigned int xsave_mask; +unsigned int cx, xsave_mask; - ax =1 ; - cx =0 ; -cpuid (1 , &ax, &bx, &cx, &dx);
arch/x86/xen/enlighten_pv.c static bool __init xen_check_mwait(void) · line 289
Quoted 10 lines
arch/x86/xen/enlighten_pv.c +2
-2+ cx =cpuid_ecx (1 ); xsave_mask = (1 << (X86_FEATURE_XSAVE %32 )) | (1 << (X86_FEATURE_OSXSAVE %32 ));/* Xen will set CR4.OSXSAVE if supported and not disabled by force */ -if ((cx & xsave_mask) != xsave_mask) - cpuid_leaf1_ecx_mask &= ~xsave_mask;/* disable XSAVE & OSXSAVE */ +return (cx & xsave_mask) == xsave_mask;
As you are taking the time to change this logic, could we see about making it work in a way which doesn't require maintaining non-architectural hackary in the hypervisor?
(For anyone reading this who isn't familiar with the history,
http://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=xen/arch/x86/cpuid.c;h=d359e090f33bb5793524186dc5f1c8bb620f17b3;hb=17cd6621688bce9972d9242611114fd7aba44c31#l726
ought to cover it)
In the presence of the bugs which caused this issue in the first place, the best way to probe whether xsave is actually available is to try and execute an xgetbv instruction, and use #UD as a signal that support isn't actually available.
This also avoids Linux participating in the non-architectural behaviour of forcing OXSAVE to be something other than a reflection of CR4.
~Andrew
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH v2 09/11] x86/xen: use capabilities instead of fake cpuid values for xsave
In reply to Juergen GrossQuoted 15 lines · Juergen Gross
arch/x86/xen/enlighten_pv.c +3
-6@@ -281,22 +274,19 @@ static bool __init xen_check_mwait(void)return false;#endif } -static void __init xen_init_cpuid_mask (void ) + +static bool __init xen_check_xsave (void ) { -unsigned int ax, bx, cx, dx; -unsigned int xsave_mask; +unsigned int cx, xsave_mask; - ax =1 ; - cx =0 ; -cpuid (1 , &ax, &bx, &cx, &dx);
arch/x86/xen/enlighten_pv.c static bool __init xen_check_mwait(void) · line 289
Quoted 10 lines
arch/x86/xen/enlighten_pv.c +2
-2+ cx =cpuid_ecx (1 ); xsave_mask = (1 << (X86_FEATURE_XSAVE %32 )) | (1 << (X86_FEATURE_OSXSAVE %32 ));/* Xen will set CR4.OSXSAVE if supported and not disabled by force */ -if ((cx & xsave_mask) != xsave_mask) - cpuid_leaf1_ecx_mask &= ~xsave_mask;/* disable XSAVE & OSXSAVE */ +return (cx & xsave_mask) == xsave_mask;
As you are taking the time to change this logic, could we see about making it work in a way which doesn't require maintaining non-architectural hackary in the hypervisor?
(For anyone reading this who isn't familiar with the history,
http://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=xen/arch/x86/cpuid.c;h=d359e090f33bb5793524186dc5f1c8bb620f17b3;hb=17cd6621688bce9972d9242611114fd7aba44c31#l726
ought to cover it)
In the presence of the bugs which caused this issue in the first place, the best way to probe whether xsave is actually available is to try and execute an xgetbv instruction, and use #UD as a signal that support isn't actually available.
This also avoids Linux participating in the non-architectural behaviour of forcing OXSAVE to be something other than a reflection of CR4.
~Andrew
Juergen Gross
maintainerPATCH v2 10/11 vmware: set cpu capabilities during platform initialization
In reply to Juergen GrossThere is no need to set the same capabilities for each cpu individually. This can be done for all cpus in platform initialization.
--- arch/x86/kernel/cpu/vmware.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-)
arch/x86/kernel/cpu/vmware.c +20 -19
@@ -113,6 +113,24 @@ static void __init vmware_paravirt_ops_setup(void)#define vmware_paravirt_ops_setup () do {} while (0)#endif +/* +* VMware hypervisor takes care of exporting a reliable TSC to the guest. +* Still, due to timing difference when running on virtual cpus, the TSC can +* be marked as unstable in some cases. For example, the TSC sync check at +* bootup can fail due to a marginal offset between vcpus' TSCs (though the +* TSCs do not drift from each other). Also, the ACPI PM timer clocksource +* is not suitable as a watchdog when running on a hypervisor because the +* kernel may miss a wrap of the counter if the vcpu is descheduled for a +* long time. To skip these checks at runtime we set these capability bits, +* so that the kernel could just trust the hypervisor with providing a +* reliable virtual TSC that is suitable for timekeeping. +*/ +static void __init vmware_set_capabilities (void ) +{ +setup_force_cpu_cap (X86_FEATURE_CONSTANT_TSC ); +setup_force_cpu_cap (X86_FEATURE_TSC_RELIABLE ); +} +static void __init vmware_platform_setup (void ) {uint32_t eax, ebx, ecx, edx;
@@ -152,6 +170,8 @@ static void __init vmware_platform_setup(void)#ifdef CONFIG_X86_IO_APIC no_timer_check =1 ;#endif + +vmware_set_capabilities (); }/*
@@ -176,24 +196,6 @@ static uint32_t __init vmware_platform(void)return 0 ; } -/* -* VMware hypervisor takes care of exporting a reliable TSC to the guest. -* Still, due to timing difference when running on virtual cpus, the TSC can -* be marked as unstable in some cases. For example, the TSC sync check at -* bootup can fail due to a marginal offset between vcpus' TSCs (though the -* TSCs do not drift from each other). Also, the ACPI PM timer clocksource -* is not suitable as a watchdog when running on a hypervisor because the -* kernel may miss a wrap of the counter if the vcpu is descheduled for a -* long time. To skip these checks at runtime we set these capability bits, -* so that the kernel could just trust the hypervisor with providing a -* reliable virtual TSC that is suitable for timekeeping. -*/ -static void vmware_set_cpu_features (struct cpuinfo_x86 *c) -{ -set_cpu_cap (c,X86_FEATURE_CONSTANT_TSC ); -set_cpu_cap (c,X86_FEATURE_TSC_RELIABLE ); -} -/* Checks if hypervisor supports x2apic without VT-D interrupt remapping. */ static bool __init vmware_legacy_x2apic_available (void ) {
@@ -206,7 +208,6 @@ static bool __init vmware_legacy_x2apic_available(void)const __refconst struct hypervisor_x86 x86_hyper_vmware = { .name ="VMware" , .detect = vmware_platform, - .set_cpu_features = vmware_set_cpu_features, .init_platform = vmware_platform_setup, .x2apic_available = vmware_legacy_x2apic_available, };
Signature · 1 line
2.12.0
Juergen Gross
maintainerPATCH v2 10/11 vmware: set cpu capabilities during platform initialization
In reply to Juergen GrossThere is no need to set the same capabilities for each cpu individually. This can be done for all cpus in platform initialization.
--- arch/x86/kernel/cpu/vmware.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-)
arch/x86/kernel/cpu/vmware.c +20 -19
@@ -113,6 +113,24 @@ static void __init vmware_paravirt_ops_setup(void)#define vmware_paravirt_ops_setup () do {} while (0)#endif +/* +* VMware hypervisor takes care of exporting a reliable TSC to the guest. +* Still, due to timing difference when running on virtual cpus, the TSC can +* be marked as unstable in some cases. For example, the TSC sync check at +* bootup can fail due to a marginal offset between vcpus' TSCs (though the +* TSCs do not drift from each other). Also, the ACPI PM timer clocksource +* is not suitable as a watchdog when running on a hypervisor because the +* kernel may miss a wrap of the counter if the vcpu is descheduled for a +* long time. To skip these checks at runtime we set these capability bits, +* so that the kernel could just trust the hypervisor with providing a +* reliable virtual TSC that is suitable for timekeeping. +*/ +static void __init vmware_set_capabilities (void ) +{ +setup_force_cpu_cap (X86_FEATURE_CONSTANT_TSC ); +setup_force_cpu_cap (X86_FEATURE_TSC_RELIABLE ); +} +static void __init vmware_platform_setup (void ) {uint32_t eax, ebx, ecx, edx;
@@ -152,6 +170,8 @@ static void __init vmware_platform_setup(void)#ifdef CONFIG_X86_IO_APIC no_timer_check =1 ;#endif + +vmware_set_capabilities (); }/*
@@ -176,24 +196,6 @@ static uint32_t __init vmware_platform(void)return 0 ; } -/* -* VMware hypervisor takes care of exporting a reliable TSC to the guest. -* Still, due to timing difference when running on virtual cpus, the TSC can -* be marked as unstable in some cases. For example, the TSC sync check at -* bootup can fail due to a marginal offset between vcpus' TSCs (though the -* TSCs do not drift from each other). Also, the ACPI PM timer clocksource -* is not suitable as a watchdog when running on a hypervisor because the -* kernel may miss a wrap of the counter if the vcpu is descheduled for a -* long time. To skip these checks at runtime we set these capability bits, -* so that the kernel could just trust the hypervisor with providing a -* reliable virtual TSC that is suitable for timekeeping. -*/ -static void vmware_set_cpu_features (struct cpuinfo_x86 *c) -{ -set_cpu_cap (c,X86_FEATURE_CONSTANT_TSC ); -set_cpu_cap (c,X86_FEATURE_TSC_RELIABLE ); -} -/* Checks if hypervisor supports x2apic without VT-D interrupt remapping. */ static bool __init vmware_legacy_x2apic_available (void ) {
@@ -206,7 +208,6 @@ static bool __init vmware_legacy_x2apic_available(void)const __refconst struct hypervisor_x86 x86_hyper_vmware = { .name ="VMware" , .detect = vmware_platform, - .set_cpu_features = vmware_set_cpu_features, .init_platform = vmware_platform_setup, .x2apic_available = vmware_legacy_x2apic_available, };
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Re: [PATCH v2 10/11] vmware: set cpu capabilities during platform initialization
Quoted 2 lines · Juergen Gross
There is no need to set the same capabilities for each cpu individually. This can be done for all cpus in platform initialization.
Looks reasonable to me.
Thanks,
Alok
Quoted 83 lines
Cc Alok Kataria <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Signed-off-by Juergen Gross <[email protected]>--- arch/x86/kernel/cpu/vmware.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-)arch/x86/kernel/cpu/vmware.c +20
-19@@ -113,6 +113,24 @@ static void __init vmware_paravirt_ops_setup(void)#define vmware_paravirt_ops_setup () do {} while (0)#endif +/* +* VMware hypervisor takes care of exporting a reliable TSC to the guest. +* Still, due to timing difference when running on virtual cpus, the TSC can +* be marked as unstable in some cases. For example, the TSC sync check at +* bootup can fail due to a marginal offset between vcpus' TSCs (though the +* TSCs do not drift from each other). Also, the ACPI PM timer clocksource +* is not suitable as a watchdog when running on a hypervisor because the +* kernel may miss a wrap of the counter if the vcpu is descheduled for a +* long time. To skip these checks at runtime we set these capability bits, +* so that the kernel could just trust the hypervisor with providing a +* reliable virtual TSC that is suitable for timekeeping. +*/ +static void __init vmware_set_capabilities (void ) +{ +setup_force_cpu_cap (X86_FEATURE_CONSTANT_TSC ); +setup_force_cpu_cap (X86_FEATURE_TSC_RELIABLE ); +} +static void __init vmware_platform_setup (void ) {uint32_t eax, ebx, ecx, edx;@@ -152,6 +170,8 @@ static void __init vmware_platform_setup(void)#ifdef CONFIG_X86_IO_APIC no_timer_check =1 ;#endif + +vmware_set_capabilities (); }/* @@ -176,24 +196,6 @@ static uint32_t __init vmware_platform(void)return 0 ; } -/* -* VMware hypervisor takes care of exporting a reliable TSC to the guest. -* Still, due to timing difference when running on virtual cpus, the TSC can -* be marked as unstable in some cases. For example, the TSC sync check at -* bootup can fail due to a marginal offset between vcpus' TSCs (though the -* TSCs do not drift from each other). Also, the ACPI PM timer clocksource -* is not suitable as a watchdog when running on a hypervisor because the -* kernel may miss a wrap of the counter if the vcpu is descheduled for a -* long time. To skip these checks at runtime we set these capability bits, -* so that the kernel could just trust the hypervisor with providing a -* reliable virtual TSC that is suitable for timekeeping. -*/ -static void vmware_set_cpu_features (struct cpuinfo_x86 *c) -{ -set_cpu_cap (c,X86_FEATURE_CONSTANT_TSC ); -set_cpu_cap (c,X86_FEATURE_TSC_RELIABLE ); -} -/* Checks if hypervisor supports x2apic without VT-D interrupt remapping. */ static bool __init vmware_legacy_x2apic_available (void ) {@@ -206,7 +208,6 @@ static bool __init vmware_legacy_x2apic_available(void)const __refconst struct hypervisor_x86 x86_hyper_vmware = { .name ="VMware" , .detect = vmware_platform, - .set_cpu_features = vmware_set_cpu_features, .init_platform = vmware_platform_setup, .x2apic_available = vmware_legacy_x2apic_available, };
Re: [PATCH v2 10/11] vmware: set cpu capabilities during platform initialization
In reply to Juergen GrossQuoted 2 lines · Juergen Gross
There is no need to set the same capabilities for each cpu individually. This can be done for all cpus in platform initialization.
Looks reasonable to me.
Thanks,
Alok
Quoted 76 lines
Cc Alok Kataria <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Signed-off-by Juergen Gross <[email protected]>--- arch/x86/kernel/cpu/vmware.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-)arch/x86/kernel/cpu/vmware.c +20
-18@@ -113,6 +113,24 @@ static void __init vmware_paravirt_ops_setup(void)#define vmware_paravirt_ops_setup () do {} while (0)#endif +/* +* VMware hypervisor takes care of exporting a reliable TSC to the guest. +* Still, due to timing difference when running on virtual cpus, the TSC can +* be marked as unstable in some cases. For example, the TSC sync check at +* bootup can fail due to a marginal offset between vcpus' TSCs (though the +* TSCs do not drift from each other). Also, the ACPI PM timer clocksource +* is not suitable as a watchdog when running on a hypervisor because the +* kernel may miss a wrap of the counter if the vcpu is descheduled for a +* long time. To skip these checks at runtime we set these capability bits, +* so that the kernel could just trust the hypervisor with providing a +* reliable virtual TSC that is suitable for timekeeping. +*/ +static void __init vmware_set_capabilities (void ) +{ +setup_force_cpu_cap (X86_FEATURE_CONSTANT_TSC ); +setup_force_cpu_cap (X86_FEATURE_TSC_RELIABLE ); +} +static void __init vmware_platform_setup (void ) {uint32_t eax, ebx, ecx, edx;@@ -152,6 +170,8 @@ static void __init vmware_platform_setup(void)#ifdef CONFIG_X86_IO_APIC no_timer_check =1 ;#endif + +vmware_set_capabilities (); }/* @@ -176,24 +196,6 @@ static uint32_t __init vmware_platform(void)return 0 ; } -/* -* VMware hypervisor takes care of exporting a reliable TSC to the guest. -* Still, due to timing difference when running on virtual cpus, the TSC can -* be marked as unstable in some cases. For example, the TSC sync check at -* bootup can fail due to a marginal offset between vcpus' TSCs (though the -* TSCs do not drift from each other). Also, the ACPI PM timer clocksource -* is not suitable as a watchdog when running on a hypervisor because the -* kernel may miss a wrap of the counter if the vcpu is descheduled for a -* long time. To skip these checks at runtime we set these capability bits, -* so that the kernel could just trust the hypervisor with providing a -* reliable virtual TSC that is suitable for timekeeping. -*/ -static void vmware_set_cpu_features (struct cpuinfo_x86 *c) -{ -set_cpu_cap (c,X86_FEATURE_CONSTANT_TSC ); -set_cpu_cap (c,X86_FEATURE_TSC_RELIABLE ); -} -/* Checks if hypervisor supports x2apic without VT-D interrupt remapping. */ static bool __init vmware_legacy_x2apic_available (void ) {
arch/x86/kernel/cpu/vmware.c static bool __init vmware_legacy_x2apic_available(void) · line 213
Quoted 7 lines
arch/x86/kernel/cpu/vmware.c +0
-1@@ -206,7 +208,6 @@ static bool __init vmware_legacy_x2apic_available(void)const __refconst struct hypervisor_x86 x86_hyper_vmware = { .name ="VMware" , .detect = vmware_platform, - .set_cpu_features = vmware_set_cpu_features, .init_platform = vmware_platform_setup, .x2apic_available = vmware_legacy_x2apic_available, };
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
Juergen Gross
maintainerPATCH v2 11/11 x86/cpu: remove hypervisor specific set_cpu_features
In reply to Juergen GrossThere is no user of x86_hyper->set_cpu_features() any more. Remove it.
--- arch/x86/include/asm/hypervisor.h | 5 ----- arch/x86/kernel/cpu/common.c | 1 - arch/x86/kernel/cpu/hypervisor.c | 8 -------- 3 files changed, 14 deletions(-)
arch/x86/include/asm/hypervisor.h +0 -5
@@ -35,9 +35,6 @@ struct hypervisor_x86 {/* Detection routine */ uint32_t (*detect)(void ); -/* Adjust CPU feature bits (run once per CPU) */ -void (*set_cpu_features)(struct cpuinfo_x86 *); -/* Platform setup (run once per boot) */ void (*init_platform)(void );
@@ -57,12 +54,10 @@ extern const struct hypervisor_x86 x86_hyper_xen_pv;extern const struct hypervisor_x86 x86_hyper_xen_hvm;extern const struct hypervisor_x86 x86_hyper_kvm; -extern void init_hypervisor (struct cpuinfo_x86 *c);extern void init_hypervisor_platform (void );extern bool hypervisor_x2apic_available (void );extern void hypervisor_pin_vcpu (int cpu);#else -static inline void init_hypervisor (struct cpuinfo_x86 *c) { }static inline void init_hypervisor_platform (void ) { }static inline bool hypervisor_x2apic_available (void ) {return false; }#endif /* CONFIG_HYPERVISOR_GUEST */
arch/x86/kernel/cpu/common.c +0 -1
@@ -1149,7 +1149,6 @@ static void identify_cpu(struct cpuinfo_x86 *c)detect_ht (c);#endif -init_hypervisor (c);x86_init_rdrand (c);x86_init_cache_qos (c);setup_pku (c);
arch/x86/kernel/cpu/hypervisor.c +0 -8
@@ -63,12 +63,6 @@ detect_hypervisor_vendor(void)pr_info ("Hypervisor detected: %s\n" , x86_hyper->name); } -void init_hypervisor (struct cpuinfo_x86 *c) -{ -if (x86_hyper && x86_hyper->set_cpu_features) - x86_hyper->set_cpu_features (c); -} -void __init init_hypervisor_platform (void ) {
@@ -77,8 +71,6 @@ void __init init_hypervisor_platform(void)if (!x86_hyper)return ; -init_hypervisor (&boot_cpu_data); -if (x86_hyper->init_platform) x86_hyper->init_platform (); }
Signature · 7 lines
2.12.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xen.org/xen-devel
Quoted 10 lines · Juergen Gross
Reduce special casing of
xen_cpuid()by using cpu capabilities instead of faked cpuid nodes.This cleanup enables us remove the hypervisor specific
set_cpu_featurescallback as the same effect can be reached via setup_[clear|force]_cpu_cap().Removing the rest faked nodes from
xen_cpuid()requires some more work as the remaining cases (mwait leafs and extended topology info) have to be handled at the consumer sides of this information.
-boris
Quoted 10 lines · Juergen Gross
Reduce special casing of
xen_cpuid()by using cpu capabilities instead of faked cpuid nodes.This cleanup enables us remove the hypervisor specific
set_cpu_featurescallback as the same effect can be reached via setup_[clear|force]_cpu_cap().Removing the rest faked nodes from
xen_cpuid()requires some more work as the remaining cases (mwait leafs and extended topology info) have to be handled at the consumer sides of this information.
-boris
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel