From: Jan Kiszka <jan.kiszka@siemens.com>
To: Gleb Natapov <gleb@kernel.org>, Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm <kvm@vger.kernel.org>
Subject: [RFC][PATCH] KVM: nVMX: Leave VMX mode on apparent CPU reset
Date: Mon, 16 Dec 2013 10:32:34 +0100 [thread overview]
Message-ID: <52AEC8B2.7010602@siemens.com> (raw)
As long as we do not expose all the VMX related states to user space,
there is no way to properly reset a VCPU when VMX is enabled. Emulate
this for now by catching host-side clearings of the feature control MSR.
This allows to reboot a VM while it is running some hypervisor code.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Better ideas? Or continue to leave it as it is?
arch/x86/kvm/vmx.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index f90320b..da04247 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2455,6 +2455,8 @@ static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
return 1;
}
+static void vmx_reset_nested(struct kvm_vcpu *vcpu);
+
static int vmx_set_vmx_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
{
u32 msr_index = msr_info->index;
@@ -2470,6 +2472,12 @@ static int vmx_set_vmx_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
& FEATURE_CONTROL_LOCKED)
return 0;
to_vmx(vcpu)->nested.msr_ia32_feature_control = data;
+ /*
+ * Detect reset and allow to leave VMX mode this way until we
+ * expose all related states to user space.
+ */
+ if (host_initialized && data == 0)
+ vmx_reset_nested(vcpu);
return 1;
}
@@ -8487,6 +8495,33 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu)
vmx->nested.sync_shadow_vmcs = true;
}
+static void vmx_reset_nested(struct kvm_vcpu *vcpu)
+{
+ struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
+ struct vcpu_vmx *vmx = to_vmx(vcpu);
+
+ if (!vmx->nested.vmxon)
+ return;
+
+ if (is_guest_mode(vcpu)) {
+ vmcs12->host_cr0 = X86_CR0_NW | X86_CR0_CD | X86_CR0_ET;
+ vmcs12->host_cr3 = 0;
+ vmcs12->host_cr4 = 0;
+ vmcs12->host_rsp = 0;
+ vmcs12->vm_exit_controls = 0;
+ nested_vmx_vmexit(vcpu);
+ }
+
+ free_nested(vmx);
+
+ /*
+ * If we were in guest mode, the reset state user space wrote so far
+ * is now inconsistent. If we were in host mode, some state update may
+ * have been rejected. So simply repeat the reset her.
+ */
+ vmx_vcpu_reset(vcpu);
+}
+
/*
* L1's failure to enter L2 is a subset of a normal exit, as explained in
* 23.7 "VM-entry failures during or after loading guest state" (this also
--
1.8.1.1.298.ge7eed54
next reply other threads:[~2013-12-16 9:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-16 9:32 Jan Kiszka [this message]
2013-12-17 13:25 ` [RFC][PATCH] KVM: nVMX: Leave VMX mode on apparent CPU reset Paolo Bonzini
2013-12-17 14:40 ` Jan Kiszka
2013-12-17 14:43 ` Paolo Bonzini
2013-12-30 20:02 ` Marcelo Tosatti
2013-12-30 20:05 ` Marcelo Tosatti
2013-12-30 20:02 ` Marcelo Tosatti
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=52AEC8B2.7010602@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=gleb@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
/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.