All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jim Mattson <jmattson@google.com>
To: kvm@vger.kernel.org, Wincy Van <fanwenyi0529@gmail.com>
Cc: Jim Mattson <jmattson@google.com>
Subject: [PATCH 2/2] KVM: nVMX: Check host support for MSR bitmaps
Date: Thu, 25 May 2017 11:01:14 -0700	[thread overview]
Message-ID: <20170525180114.131500-2-jmattson@google.com> (raw)
In-Reply-To: <20170525180114.131500-1-jmattson@google.com>

If the host doesn't support MSR bitmaps, but the L2 guest is
configured to use MSR bitmaps, fail the emulated VM-entry.

Fixes: 3af18d9c5fe95 ("KVM: nVMX: Prepare for using hardware MSR bitmap")
Signed-off-by: Jim Mattson <jmattson@google.com>
---
 arch/x86/kvm/vmx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index ae641c8d4284..639188037744 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -9590,7 +9590,7 @@ static int nested_vmx_check_msr_bitmap_controls(struct kvm_vcpu *vcpu,
 	if (!nested_cpu_has(vmcs12, CPU_BASED_USE_MSR_BITMAPS))
 		return 0;
 
-	if (vmcs12_read_any(vcpu, MSR_BITMAP, &addr)) {
+	if (!cpu_has_vmx_msr_bitmap()) {
 		WARN_ON(1);
 		return -EINVAL;
 	}
-- 
2.13.0.219.gdb65acc882-goog

  reply	other threads:[~2017-05-25 18:01 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-25 18:01 [PATCH 1/2] KVM: nVMX: Fix nested_vmx_check_msr_bitmap_controls Jim Mattson
2017-05-25 18:01 ` Jim Mattson [this message]
2017-05-26  0:04   ` [PATCH v2 2/2] KVM: nVMX: Check host support for MSR bitmaps Jim Mattson
2017-06-07 14:21     ` Radim Krčmář
2017-06-19 22:23       ` [PATCH v2] KVM: nVMX: Fix nested_vmx_check_msr_bitmap_controls Jim Mattson
2017-05-25 20:41 ` [PATCH 1/2] " kbuild test robot
2017-05-26  0:02 ` [PATCH v2 " Jim Mattson

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=20170525180114.131500-2-jmattson@google.com \
    --to=jmattson@google.com \
    --cc=fanwenyi0529@gmail.com \
    --cc=kvm@vger.kernel.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.