From: Wei Liu <wl@xen.org>
To: Xen Development List <xen-devel@lists.xenproject.org>
Cc: "Wei Liu" <liuwe@microsoft.com>, "Wei Liu" <wl@xen.org>,
"Paul Durrant" <paul@xen.org>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"Michael Kelley" <mikelley@microsoft.com>,
"Jan Beulich" <jbeulich@suse.com>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [Xen-devel] [PATCH v2 2/8] x86/hyperv: detect absolutely necessary MSRs
Date: Fri, 3 Jan 2020 16:08:19 +0000 [thread overview]
Message-ID: <20200103160825.19377-3-liuwe@microsoft.com> (raw)
In-Reply-To: <20200103160825.19377-1-liuwe@microsoft.com>
If they are not available, disable Hyper-V related features.
Signed-off-by: Wei Liu <liuwe@microsoft.com>
---
v2:
1. Fix comment style
---
xen/arch/x86/guest/hyperv/hyperv.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c
index 2e70b4aa82..8d38313d7a 100644
--- a/xen/arch/x86/guest/hyperv/hyperv.c
+++ b/xen/arch/x86/guest/hyperv/hyperv.c
@@ -32,6 +32,8 @@ static const struct hypervisor_ops ops = {
const struct hypervisor_ops *__init hyperv_probe(void)
{
uint32_t eax, ebx, ecx, edx;
+ uint64_t required_msrs = HV_X64_MSR_HYPERCALL_AVAILABLE |
+ HV_X64_MSR_VP_INDEX_AVAILABLE;
cpuid(0x40000000, &eax, &ebx, &ecx, &edx);
if ( !((ebx == 0x7263694d) && /* "Micr" */
@@ -57,6 +59,16 @@ const struct hypervisor_ops *__init hyperv_probe(void)
ms_hyperv.max_vp_index = eax;
ms_hyperv.max_lp_index = ebx;
+ if ( (ms_hyperv.features & required_msrs) != required_msrs )
+ {
+ /*
+ * Oops, required MSRs are not available. Treat this as
+ * "Hyper-V is not available".
+ */
+ memset(&ms_hyperv, 0, sizeof(ms_hyperv));
+ return NULL;
+ }
+
return &ops;
}
--
2.20.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2020-01-03 16:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-03 16:08 [Xen-devel] [PATCH v2 0/8] More Hyper-V infrastructure Wei Liu
2020-01-03 16:08 ` [Xen-devel] [PATCH v2 1/8] x86: include xen/lib.h in guest/pvh-boot.h Wei Liu
2020-01-03 16:08 ` Wei Liu [this message]
2020-01-03 16:08 ` [Xen-devel] [PATCH v2 3/8] x86: rename guest/hypercall.h to guest/xen-hypercall.h Wei Liu
2020-01-03 16:08 ` [Xen-devel] [PATCH v2 4/8] x86/hyperv: setup hypercall page Wei Liu
2020-01-03 16:08 ` [Xen-devel] [PATCH v2 5/8] x86/hyperv: provide Hyper-V hypercall functions Wei Liu
2020-01-03 16:08 ` [Xen-devel] [PATCH v2 6/8] x86/hyperv: provide percpu hypercall input page Wei Liu
2020-01-03 16:30 ` Andrew Cooper
2020-01-03 16:55 ` Wei Liu
2020-01-03 16:57 ` Andrew Cooper
2020-01-03 17:02 ` Wei Liu
2020-01-03 16:08 ` [Xen-devel] [PATCH v2 7/8] x86/hyperv: retrieve vp_index from Hyper-V Wei Liu
2020-01-03 16:08 ` [Xen-devel] [PATCH v2 8/8] x86/hyperv: setup VP assist page Wei Liu
2020-01-05 16:41 ` Wei Liu
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=20200103160825.19377-3-liuwe@microsoft.com \
--to=wl@xen.org \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=liuwe@microsoft.com \
--cc=mikelley@microsoft.com \
--cc=paul@xen.org \
--cc=roger.pau@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.