Re: [PATCH V2 4/4] x86: correctly detect hypervisor
On Mon, Aug 05, 2013 at 08:20:53AM -0700, H. Peter Anvin wrote: > On 08/05/2013 07:34 AM, Konrad Rzeszutek Wilk wrote: > > > > Could you provide me with a git branch so I can test it overnight please? > > > > Pull tip:x86/paravirt. It works for me. Thanks. > > -hpa > > -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 4/4] x86: correctly detect hypervisor
On 08/05/2013 07:34 AM, Konrad Rzeszutek Wilk wrote: > > Could you provide me with a git branch so I can test it overnight please? > Pull tip:x86/paravirt. -hpa -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V2 4/4] x86: correctly detect hypervisor
On Mon, Aug 05, 2013 at 11:38:14AM +0800, Jason Wang wrote:
> On 07/25/2013 04:54 PM, Jason Wang wrote:
> > We try to handle the hypervisor compatibility mode by detecting hypervisor
> > through a specific order. This is not robust, since hypervisors may
> > implement
> > each others features.
> >
> > This patch tries to handle this situation by always choosing the last one
> > in the
> > CPUID leaves. This is done by letting .detect() returns a priority instead
> > of
> > true/false and just re-using the CPUID leaf where the signature were found
> > as
> > the priority (or 1 if it was found by DMI). Then we can just pick
> > hypervisor who
> > has the highest priority. Other sophisticated detection method could also be
> > implemented on top.
> >
> > Suggested by H. Peter Anvin and Paolo Bonzini.
> >
> > Cc: Thomas Gleixner
> > Cc: Ingo Molnar
> > Cc: H. Peter Anvin
> > Cc: x...@kernel.org
> > Cc: K. Y. Srinivasan
> > Cc: Haiyang Zhang
> > Cc: Konrad Rzeszutek Wilk
> > Cc: Jeremy Fitzhardinge
> > Cc: Doug Covelli
> > Cc: Borislav Petkov
> > Cc: Dan Hecht
> > Cc: Paul Gortmaker
> > Cc: Marcelo Tosatti
> > Cc: Gleb Natapov
> > Cc: Paolo Bonzini
> > Cc: Frederic Weisbecker
> > Cc: linux-ker...@vger.kernel.org
> > Cc: de...@linuxdriverproject.org
> > Cc: kvm@vger.kernel.org
> > Cc: xen-de...@lists.xensource.com
> > Cc: virtualizat...@lists.linux-foundation.org
> > Signed-off-by: Jason Wang
> > ---
>
> Ping, any comments and acks for this series?
Could you provide me with a git branch so I can test it overnight please?
>
> Thanks
> > arch/x86/include/asm/hypervisor.h |2 +-
> > arch/x86/kernel/cpu/hypervisor.c | 15 +++
> > arch/x86/kernel/cpu/mshyperv.c| 13 -
> > arch/x86/kernel/cpu/vmware.c |8
> > arch/x86/kernel/kvm.c |6 ++
> > arch/x86/xen/enlighten.c |9 +++--
> > 6 files changed, 25 insertions(+), 28 deletions(-)
> >
> > diff --git a/arch/x86/include/asm/hypervisor.h
> > b/arch/x86/include/asm/hypervisor.h
> > index 2d4b5e6..e42f758 100644
> > --- a/arch/x86/include/asm/hypervisor.h
> > +++ b/arch/x86/include/asm/hypervisor.h
> > @@ -33,7 +33,7 @@ struct hypervisor_x86 {
> > const char *name;
> >
> > /* Detection routine */
> > - bool(*detect)(void);
> > + uint32_t(*detect)(void);
> >
> > /* Adjust CPU feature bits (run once per CPU) */
> > void(*set_cpu_features)(struct cpuinfo_x86 *);
> > diff --git a/arch/x86/kernel/cpu/hypervisor.c
> > b/arch/x86/kernel/cpu/hypervisor.c
> > index 8727921..36ce402 100644
> > --- a/arch/x86/kernel/cpu/hypervisor.c
> > +++ b/arch/x86/kernel/cpu/hypervisor.c
> > @@ -25,11 +25,6 @@
> > #include
> > #include
> >
> > -/*
> > - * Hypervisor detect order. This is specified explicitly here because
> > - * some hypervisors might implement compatibility modes for other
> > - * hypervisors and therefore need to be detected in specific sequence.
> > - */
> > static const __initconst struct hypervisor_x86 * const hypervisors[] =
> > {
> > #ifdef CONFIG_XEN_PVHVM
> > @@ -49,15 +44,19 @@ static inline void __init
> > detect_hypervisor_vendor(void)
> > {
> > const struct hypervisor_x86 *h, * const *p;
> > + uint32_t pri, max_pri = 0;
> >
> > for (p = hypervisors; p < hypervisors + ARRAY_SIZE(hypervisors); p++) {
> > h = *p;
> > - if (h->detect()) {
> > + pri = h->detect();
> > + if (pri != 0 && pri > max_pri) {
> > + max_pri = pri;
> > x86_hyper = h;
> > - printk(KERN_INFO "Hypervisor detected: %s\n", h->name);
> > - break;
> > }
> > }
> > +
> > + if (max_pri)
> > + printk(KERN_INFO "Hypervisor detected: %s\n", x86_hyper->name);
> > }
> >
> > void init_hypervisor(struct cpuinfo_x86 *c)
> > diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
> > index 8f4be53..71a39f3 100644
> > --- a/arch/x86/kernel/cpu/mshyperv.c
> > +++ b/arch/x86/kernel/cpu/mshyperv.c
> > @@ -27,20 +27,23 @@
> > struct ms_hyperv_info ms_hyperv;
> > EXPORT_SYMBOL_GPL(ms_hyperv);
> >
> > -static bool __init ms_hyperv_platform(void)
> > +static uint32_t __init ms_hyperv_platform(void)
> > {
> > u32 eax;
> > u32 hyp_signature[3];
> >
> > if (!boot_cpu_has(X86_FEATURE_HYPERVISOR))
> > - return false;
> > + return 0;
> >
> > cpuid(HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS,
> > &eax, &hyp_signature[0], &hyp_signature[1], &hyp_signature[2]);
> >
> > - return eax >= HYPERV_CPUID_MIN &&
> > - eax <= HYPERV_CPUID_MAX &&
> > - !memcmp("Microsoft Hv", hyp_signature, 12);
> > + if (eax >= HYPERV_CPUID_MIN &&
> > + eax <= HYPERV_CPUID_MAX &&
> > + !memcmp("Microsoft Hv", hyp_signature, 12))
> > + return HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS;
> > +
> > + re
Re: [PATCH V2 4/4] x86: correctly detect hypervisor
On 07/25/2013 04:54 PM, Jason Wang wrote:
> We try to handle the hypervisor compatibility mode by detecting hypervisor
> through a specific order. This is not robust, since hypervisors may implement
> each others features.
>
> This patch tries to handle this situation by always choosing the last one in
> the
> CPUID leaves. This is done by letting .detect() returns a priority instead of
> true/false and just re-using the CPUID leaf where the signature were found as
> the priority (or 1 if it was found by DMI). Then we can just pick hypervisor
> who
> has the highest priority. Other sophisticated detection method could also be
> implemented on top.
>
> Suggested by H. Peter Anvin and Paolo Bonzini.
>
> Cc: Thomas Gleixner
> Cc: Ingo Molnar
> Cc: H. Peter Anvin
> Cc: x...@kernel.org
> Cc: K. Y. Srinivasan
> Cc: Haiyang Zhang
> Cc: Konrad Rzeszutek Wilk
> Cc: Jeremy Fitzhardinge
> Cc: Doug Covelli
> Cc: Borislav Petkov
> Cc: Dan Hecht
> Cc: Paul Gortmaker
> Cc: Marcelo Tosatti
> Cc: Gleb Natapov
> Cc: Paolo Bonzini
> Cc: Frederic Weisbecker
> Cc: linux-ker...@vger.kernel.org
> Cc: de...@linuxdriverproject.org
> Cc: kvm@vger.kernel.org
> Cc: xen-de...@lists.xensource.com
> Cc: virtualizat...@lists.linux-foundation.org
> Signed-off-by: Jason Wang
> ---
Ping, any comments and acks for this series?
Thanks
> arch/x86/include/asm/hypervisor.h |2 +-
> arch/x86/kernel/cpu/hypervisor.c | 15 +++
> arch/x86/kernel/cpu/mshyperv.c| 13 -
> arch/x86/kernel/cpu/vmware.c |8
> arch/x86/kernel/kvm.c |6 ++
> arch/x86/xen/enlighten.c |9 +++--
> 6 files changed, 25 insertions(+), 28 deletions(-)
>
> diff --git a/arch/x86/include/asm/hypervisor.h
> b/arch/x86/include/asm/hypervisor.h
> index 2d4b5e6..e42f758 100644
> --- a/arch/x86/include/asm/hypervisor.h
> +++ b/arch/x86/include/asm/hypervisor.h
> @@ -33,7 +33,7 @@ struct hypervisor_x86 {
> const char *name;
>
> /* Detection routine */
> - bool(*detect)(void);
> + uint32_t(*detect)(void);
>
> /* Adjust CPU feature bits (run once per CPU) */
> void(*set_cpu_features)(struct cpuinfo_x86 *);
> diff --git a/arch/x86/kernel/cpu/hypervisor.c
> b/arch/x86/kernel/cpu/hypervisor.c
> index 8727921..36ce402 100644
> --- a/arch/x86/kernel/cpu/hypervisor.c
> +++ b/arch/x86/kernel/cpu/hypervisor.c
> @@ -25,11 +25,6 @@
> #include
> #include
>
> -/*
> - * Hypervisor detect order. This is specified explicitly here because
> - * some hypervisors might implement compatibility modes for other
> - * hypervisors and therefore need to be detected in specific sequence.
> - */
> static const __initconst struct hypervisor_x86 * const hypervisors[] =
> {
> #ifdef CONFIG_XEN_PVHVM
> @@ -49,15 +44,19 @@ static inline void __init
> detect_hypervisor_vendor(void)
> {
> const struct hypervisor_x86 *h, * const *p;
> + uint32_t pri, max_pri = 0;
>
> for (p = hypervisors; p < hypervisors + ARRAY_SIZE(hypervisors); p++) {
> h = *p;
> - if (h->detect()) {
> + pri = h->detect();
> + if (pri != 0 && pri > max_pri) {
> + max_pri = pri;
> x86_hyper = h;
> - printk(KERN_INFO "Hypervisor detected: %s\n", h->name);
> - break;
> }
> }
> +
> + if (max_pri)
> + printk(KERN_INFO "Hypervisor detected: %s\n", x86_hyper->name);
> }
>
> void init_hypervisor(struct cpuinfo_x86 *c)
> diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
> index 8f4be53..71a39f3 100644
> --- a/arch/x86/kernel/cpu/mshyperv.c
> +++ b/arch/x86/kernel/cpu/mshyperv.c
> @@ -27,20 +27,23 @@
> struct ms_hyperv_info ms_hyperv;
> EXPORT_SYMBOL_GPL(ms_hyperv);
>
> -static bool __init ms_hyperv_platform(void)
> +static uint32_t __init ms_hyperv_platform(void)
> {
> u32 eax;
> u32 hyp_signature[3];
>
> if (!boot_cpu_has(X86_FEATURE_HYPERVISOR))
> - return false;
> + return 0;
>
> cpuid(HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS,
> &eax, &hyp_signature[0], &hyp_signature[1], &hyp_signature[2]);
>
> - return eax >= HYPERV_CPUID_MIN &&
> - eax <= HYPERV_CPUID_MAX &&
> - !memcmp("Microsoft Hv", hyp_signature, 12);
> + if (eax >= HYPERV_CPUID_MIN &&
> + eax <= HYPERV_CPUID_MAX &&
> + !memcmp("Microsoft Hv", hyp_signature, 12))
> + return HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS;
> +
> + return 0;
> }
>
> static cycle_t read_hv_clock(struct clocksource *arg)
> diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
> index 7076878..628a059 100644
> --- a/arch/x86/kernel/cpu/vmware.c
> +++ b/arch/x86/kernel/cpu/vmware.c
> @@ -93,7 +93,7 @@ static void __init vmware_platform_setup(void)
> * serial key should be
RE: [PATCH V2 4/4] x86: correctly detect hypervisor
> -Original Message-
> From: Jason Wang [mailto:jasow...@redhat.com]
> Sent: Thursday, July 25, 2013 4:55 AM
> To: t...@linutronix.de; mi...@redhat.com; h...@zytor.com; x...@kernel.org;
> linux-ker...@vger.kernel.org; pbonz...@redhat.com
> Cc: kvm@vger.kernel.org; Jason Wang; KY Srinivasan; Haiyang Zhang; Konrad
> Rzeszutek Wilk; Jeremy Fitzhardinge; Doug Covelli; Borislav Petkov; Dan Hecht;
> Paul Gortmaker; Marcelo Tosatti; Gleb Natapov; Frederic Weisbecker;
> de...@linuxdriverproject.org; xen-de...@lists.xensource.com;
> virtualizat...@lists.linux-foundation.org
> Subject: [PATCH V2 4/4] x86: correctly detect hypervisor
>
> We try to handle the hypervisor compatibility mode by detecting hypervisor
> through a specific order. This is not robust, since hypervisors may implement
> each others features.
>
> This patch tries to handle this situation by always choosing the last one in
> the
> CPUID leaves. This is done by letting .detect() returns a priority instead of
> true/false and just re-using the CPUID leaf where the signature were found as
> the priority (or 1 if it was found by DMI). Then we can just pick hypervisor
> who
> has the highest priority. Other sophisticated detection method could also be
> implemented on top.
>
> Suggested by H. Peter Anvin and Paolo Bonzini.
>
> Cc: Thomas Gleixner
> Cc: Ingo Molnar
> Cc: H. Peter Anvin
> Cc: x...@kernel.org
> Cc: K. Y. Srinivasan
> Cc: Haiyang Zhang
> Cc: Konrad Rzeszutek Wilk
> Cc: Jeremy Fitzhardinge
> Cc: Doug Covelli
> Cc: Borislav Petkov
> Cc: Dan Hecht
> Cc: Paul Gortmaker
> Cc: Marcelo Tosatti
> Cc: Gleb Natapov
> Cc: Paolo Bonzini
> Cc: Frederic Weisbecker
> Cc: linux-ker...@vger.kernel.org
> Cc: de...@linuxdriverproject.org
> Cc: kvm@vger.kernel.org
> Cc: xen-de...@lists.xensource.com
> Cc: virtualizat...@lists.linux-foundation.org
> Signed-off-by: Jason Wang
Acked-by: K. Y. Srinivasan
> ---
> arch/x86/include/asm/hypervisor.h |2 +-
> arch/x86/kernel/cpu/hypervisor.c | 15 +++
> arch/x86/kernel/cpu/mshyperv.c| 13 -
> arch/x86/kernel/cpu/vmware.c |8
> arch/x86/kernel/kvm.c |6 ++
> arch/x86/xen/enlighten.c |9 +++--
> 6 files changed, 25 insertions(+), 28 deletions(-)
>
> diff --git a/arch/x86/include/asm/hypervisor.h
> b/arch/x86/include/asm/hypervisor.h
> index 2d4b5e6..e42f758 100644
> --- a/arch/x86/include/asm/hypervisor.h
> +++ b/arch/x86/include/asm/hypervisor.h
> @@ -33,7 +33,7 @@ struct hypervisor_x86 {
> const char *name;
>
> /* Detection routine */
> - bool(*detect)(void);
> + uint32_t(*detect)(void);
>
> /* Adjust CPU feature bits (run once per CPU) */
> void(*set_cpu_features)(struct cpuinfo_x86 *);
> diff --git a/arch/x86/kernel/cpu/hypervisor.c
> b/arch/x86/kernel/cpu/hypervisor.c
> index 8727921..36ce402 100644
> --- a/arch/x86/kernel/cpu/hypervisor.c
> +++ b/arch/x86/kernel/cpu/hypervisor.c
> @@ -25,11 +25,6 @@
> #include
> #include
>
> -/*
> - * Hypervisor detect order. This is specified explicitly here because
> - * some hypervisors might implement compatibility modes for other
> - * hypervisors and therefore need to be detected in specific sequence.
> - */
> static const __initconst struct hypervisor_x86 * const hypervisors[] =
> {
> #ifdef CONFIG_XEN_PVHVM
> @@ -49,15 +44,19 @@ static inline void __init
> detect_hypervisor_vendor(void)
> {
> const struct hypervisor_x86 *h, * const *p;
> + uint32_t pri, max_pri = 0;
>
> for (p = hypervisors; p < hypervisors + ARRAY_SIZE(hypervisors); p++) {
> h = *p;
> - if (h->detect()) {
> + pri = h->detect();
> + if (pri != 0 && pri > max_pri) {
> + max_pri = pri;
> x86_hyper = h;
> - printk(KERN_INFO "Hypervisor detected: %s\n", h-
> >name);
> - break;
> }
> }
> +
> + if (max_pri)
> + printk(KERN_INFO "Hypervisor detected: %s\n", x86_hyper-
> >name);
> }
>
> void init_hypervisor(struct cpuinfo_x86 *c)
> diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
> index 8f4be53..71a39f3 100644
> --- a/arch/x86/kernel/cpu/mshyperv.c
> +++ b/arch/x86/kernel/cpu/mshyperv.c
> @@ -27,20 +27,23 @@
> struct ms_hyperv_info ms_hyperv;
> EXPORT_SYMBOL_GPL(ms_hyperv);
>
> -static bool __init ms_hyperv_platform(void)
> +static uint32_t __init ms_hyperv_platform(void)
> {
> u32 eax;
> u32 hyp_signature[3];
>
> if (!boot_cpu_has(X86_FEATURE_HYPERVISOR))
> - return false;
> + return 0;
>
> cpuid(HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS,
> &eax, &hyp_signature[0], &hyp_signature[1], &hyp_signature[2]);
>
> - return eax >= HYPERV_CPUID_MIN &&
> - eax <= HYPERV_CPUID_MAX &&
> - !memcmp("Microsoft Hv", h
