linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: KY Srinivasan <kys@microsoft.com>
To: Jason Wang <jasowang@redhat.com>,
	"devel@linuxdriverproject.org" <devel@linuxdriverproject.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"Greg KH (gregkh@linuxfoundation.org)"
	<gregkh@linuxfoundation.org>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Subject: RE: [PATCH] hv: vmbus_drv: detect hyperv through x86_hyper
Date: Fri, 31 Aug 2012 15:14:44 +0000	[thread overview]
Message-ID: <426367E2313C2449837CD2DE46E7EAF9309DDF86@SN2PRD0310MB382.namprd03.prod.outlook.com> (raw)
In-Reply-To: <1346391164-34001-1-git-send-email-jasowang@redhat.com>



> -----Original Message-----
> From: Jason Wang [mailto:jasowang@redhat.com]
> Sent: Friday, August 31, 2012 1:33 AM
> To: devel@linuxdriverproject.org; linux-kernel@vger.kernel.org
> Cc: Jason Wang; KY Srinivasan; Haiyang Zhang
> Subject: [PATCH] hv: vmbus_drv: detect hyperv through x86_hyper
> 
> There are two reasons we need to use x86_hyper instead of
> query_hypervisor_presence():
> 
> - Not only hyperv but also other hypervisors such as kvm would set
>   X86_FEATURE_HYTPERVISOR, so query_hypervisor_presence() will return true
> even
>   in kvm. This may cause extra delay of 5 seconds before failing the probing in
>   kvm guest.
> - The hypervisor has been detected in init_hypervisor(), so no need to do the
>   work again.
> 
> Cc: "K. Y. Srinivasan" <kys@microsoft.com>
> Cc: Haiyang Zhang <haiyangz@microsoft.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>

Thanks Jason.

Acked-by: K. Y. Srinivasan <kys@microsoft.com>

> ---
>  drivers/hv/vmbus_drv.c |   25 ++-----------------------
>  1 files changed, 2 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
> index f40dd57..8e1a9ec 100644
> --- a/drivers/hv/vmbus_drv.c
> +++ b/drivers/hv/vmbus_drv.c
> @@ -34,6 +34,7 @@
>  #include <linux/completion.h>
>  #include <linux/hyperv.h>
>  #include <asm/hyperv.h>
> +#include <asm/hypervisor.h>
>  #include "hyperv_vmbus.h"
> 
> 
> @@ -719,33 +720,11 @@ static struct acpi_driver vmbus_acpi_driver = {
>  	},
>  };
> 
> -/*
> - * query_hypervisor_presence
> - * - Query the cpuid for presence of windows hypervisor
> - */
> -static int query_hypervisor_presence(void)
> -{
> -	unsigned int eax;
> -	unsigned int ebx;
> -	unsigned int ecx;
> -	unsigned int edx;
> -	unsigned int op;
> -
> -	eax = 0;
> -	ebx = 0;
> -	ecx = 0;
> -	edx = 0;
> -	op = HVCPUID_VERSION_FEATURES;
> -	cpuid(op, &eax, &ebx, &ecx, &edx);
> -
> -	return ecx & HV_PRESENT_BIT;
> -}
> -
>  static int __init hv_acpi_init(void)
>  {
>  	int ret, t;
> 
> -	if (!query_hypervisor_presence())
> +	if (x86_hyper != &x86_hyper_ms_hyperv)
>  		return -ENODEV;
> 
>  	init_completion(&probe_event);
> --
> 1.7.1
> 
> 
> 




      reply	other threads:[~2012-08-31 15:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-31  5:32 Jason Wang
2012-08-31 15:14 ` KY Srinivasan [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=426367E2313C2449837CD2DE46E7EAF9309DDF86@SN2PRD0310MB382.namprd03.prod.outlook.com \
    --to=kys@microsoft.com \
    --cc=devel@linuxdriverproject.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=haiyangz@microsoft.com \
    --cc=jasowang@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --subject='RE: [PATCH] hv: vmbus_drv: detect hyperv through x86_hyper' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).