Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9df56f19 authored by Jason Wang's avatar Jason Wang Committed by H. Peter Anvin
Browse files

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() return 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.

Acked-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Doug Covelli <dcovelli@vmware.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Dan Hecht <dhecht@vmware.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Link: http://lkml.kernel.org/r/1374742475-2485-4-git-send-email-jasowang@redhat.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 1085ba7f

arch/x86/include/asm/hypervisor.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *);

arch/x86/kernel/cpu/hypervisor.c

+7 −8
Original line number Diff line number Diff line
@@ -25,11 +25,6 @@ 
#include <asm/processor.h>

#include <asm/hypervisor.h>



/*

 * 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)

arch/x86/kernel/cpu/mshyperv.c

+8 −5
Original line number Diff line number Diff line
@@ -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 &&

	if (eax >= HYPERV_CPUID_MIN &&

	    eax <= HYPERV_CPUID_MAX &&

		!memcmp("Microsoft Hv", hyp_signature, 12);

	    !memcmp("Microsoft Hv", hyp_signature, 12))

		return HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS;



	return 0;

}



static cycle_t read_hv_clock(struct clocksource *arg)

arch/x86/kernel/cpu/vmware.c

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static void __init vmware_platform_setup(void) 
 * serial key should be enough, as this will always have a VMware

 * specific string when running under VMware hypervisor.

 */

static bool __init vmware_platform(void)

static uint32_t __init vmware_platform(void)

{

	if (cpu_has_hypervisor) {

		unsigned int eax;
@@ -102,12 +102,12 @@ static bool __init vmware_platform(void) 
		cpuid(CPUID_VMWARE_INFO_LEAF, &eax, &hyper_vendor_id[0],

		      &hyper_vendor_id[1], &hyper_vendor_id[2]);

		if (!memcmp(hyper_vendor_id, "VMwareVMware", 12))

			return true;

			return CPUID_VMWARE_INFO_LEAF;

	} else if (dmi_available && dmi_name_in_serial("VMware") &&

		   __vmware_platform())

		return true;

		return 1;



	return false;

	return 0;

}



/*

arch/x86/kernel/kvm.c

+2 −4
Original line number Diff line number Diff line
@@ -498,11 +498,9 @@ void __init kvm_guest_init(void) 
#endif

}



static bool __init kvm_detect(void)

static uint32_t __init kvm_detect(void)

{

	if (!kvm_para_available())

		return false;

	return true;

	return kvm_cpuid_base();

}



const struct hypervisor_x86 x86_hyper_kvm __refconst = {