From: Paolo Bonzini <pbonzini@redhat.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: vkuznets@redhat.com, mlevitsk@redhat.com,
Sean Christopherson <sean.j.christopherson@intel.com>,
Jim Mattson <jmattson@google.com>
Subject: [PATCH 25/28] KVM: nSVM: leave guest mode when clearing EFER.SVME
Date: Tue, 26 May 2020 13:23:05 -0400 [thread overview]
Message-ID: <20200526172308.111575-26-pbonzini@redhat.com> (raw)
In-Reply-To: <20200526172308.111575-1-pbonzini@redhat.com>
According to the AMD manual, the effect of turning off EFER.SVME while a
guest is running is undefined. We make it leave guest mode immediately,
similar to the effect of clearing the VMX bit in MSR_IA32_FEAT_CTL.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch/x86/kvm/svm/nested.c | 16 ++++++++++++++++
arch/x86/kvm/svm/svm.c | 10 ++++++++--
arch/x86/kvm/svm/svm.h | 1 +
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
index a504963ef532..e63e62d12acd 100644
--- a/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
@@ -618,6 +618,22 @@ int nested_svm_vmexit(struct vcpu_svm *svm)
return 0;
}
+/*
+ * Forcibly leave nested mode in order to be able to reset the VCPU later on.
+ */
+void svm_leave_nested(struct vcpu_svm *svm)
+{
+ if (is_guest_mode(&svm->vcpu)) {
+ struct vmcb *hsave = svm->nested.hsave;
+ struct vmcb *vmcb = svm->vmcb;
+
+ svm->nested.nested_run_pending = 0;
+ leave_guest_mode(&svm->vcpu);
+ copy_vmcb_control_area(&vmcb->control, &hsave->control);
+ nested_svm_uninit_mmu_context(&svm->vcpu);
+ }
+}
+
static int nested_svm_exit_handled_msr(struct vcpu_svm *svm)
{
u32 offset, msr, value;
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index f0da6f0ebf1b..c1e746ccd7da 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -265,6 +265,7 @@ static int get_npt_level(struct kvm_vcpu *vcpu)
void svm_set_efer(struct kvm_vcpu *vcpu, u64 efer)
{
+ struct vcpu_svm *svm = to_svm(vcpu);
vcpu->arch.efer = efer;
if (!npt_enabled) {
@@ -275,8 +276,13 @@ void svm_set_efer(struct kvm_vcpu *vcpu, u64 efer)
efer &= ~EFER_LME;
}
- to_svm(vcpu)->vmcb->save.efer = efer | EFER_SVME;
- mark_dirty(to_svm(vcpu)->vmcb, VMCB_CR);
+ if (!(efer & EFER_SVME)) {
+ svm_leave_nested(svm);
+ svm_set_gif(svm, true);
+ }
+
+ svm->vmcb->save.efer = efer | EFER_SVME;
+ mark_dirty(svm->vmcb, VMCB_CR);
}
static int is_external_interrupt(u32 info)
diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
index be8e830f83fa..6ac4c00a5d82 100644
--- a/arch/x86/kvm/svm/svm.h
+++ b/arch/x86/kvm/svm/svm.h
@@ -389,6 +389,7 @@ static inline bool nested_exit_on_nmi(struct vcpu_svm *svm)
void enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb_gpa,
struct vmcb *nested_vmcb);
+void svm_leave_nested(struct vcpu_svm *svm);
int nested_svm_vmrun(struct vcpu_svm *svm);
void nested_svm_vmloadsave(struct vmcb *from_vmcb, struct vmcb *to_vmcb);
int nested_svm_vmexit(struct vcpu_svm *svm);
--
2.26.2
next prev parent reply other threads:[~2020-05-26 17:24 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 17:22 [PATCH v2 00/28] KVM: nSVM: event fixes and migration support Paolo Bonzini
2020-05-26 17:22 ` [PATCH 01/28] KVM: x86: track manually whether an event has been injected Paolo Bonzini
2020-05-26 17:22 ` [PATCH 02/28] KVM: x86: enable event window in inject_pending_event Paolo Bonzini
2020-05-29 2:16 ` Krish Sadhukhan
2020-05-29 8:47 ` Paolo Bonzini
2020-05-26 17:22 ` [PATCH 03/28] KVM: nSVM: inject exceptions via svm_check_nested_events Paolo Bonzini
2021-03-06 1:39 ` Sean Christopherson
2021-03-06 9:26 ` Paolo Bonzini
2021-03-08 16:44 ` Sean Christopherson
2021-03-08 17:28 ` Paolo Bonzini
2021-03-08 20:43 ` Sean Christopherson
2021-03-08 22:51 ` Paolo Bonzini
2020-05-26 17:22 ` [PATCH 04/28] KVM: nSVM: remove exit_required Paolo Bonzini
2020-05-26 17:22 ` [PATCH 05/28] KVM: nSVM: correctly inject INIT vmexits Paolo Bonzini
2020-05-29 6:46 ` Krish Sadhukhan
2020-05-29 8:47 ` Paolo Bonzini
2020-05-26 17:22 ` [PATCH 06/28] KVM: SVM: always update CR3 in VMCB Paolo Bonzini
2020-05-26 17:22 ` [PATCH 07/28] KVM: nVMX: always update CR3 in VMCS Paolo Bonzini
2020-05-26 17:22 ` [PATCH 08/28] KVM: nSVM: move map argument out of enter_svm_guest_mode Paolo Bonzini
2020-05-26 17:22 ` [PATCH 09/28] KVM: nSVM: extract load_nested_vmcb_control Paolo Bonzini
2020-05-26 17:22 ` [PATCH 10/28] KVM: nSVM: extract preparation of VMCB for nested run Paolo Bonzini
2020-05-26 17:22 ` [PATCH 11/28] KVM: nSVM: move MMU setup to nested_prepare_vmcb_control Paolo Bonzini
2020-05-26 17:22 ` [PATCH 12/28] KVM: nSVM: clean up tsc_offset update Paolo Bonzini
2020-05-26 17:22 ` [PATCH 13/28] KVM: nSVM: pass vmcb_control_area to copy_vmcb_control_area Paolo Bonzini
2020-05-26 17:22 ` [PATCH 14/28] KVM: nSVM: remove trailing padding for struct vmcb_control_area Paolo Bonzini
2020-05-26 17:22 ` [PATCH 15/28] KVM: nSVM: save all control fields in svm->nested Paolo Bonzini
2020-05-26 17:22 ` [PATCH 16/28] KVM: nSVM: restore clobbered INT_CTL fields after clearing VINTR Paolo Bonzini
2020-05-26 17:22 ` [PATCH 17/28] KVM: nSVM: synchronize VMCB controls updated by the processor on every vmexit Paolo Bonzini
2020-05-26 17:22 ` [PATCH 18/28] KVM: nSVM: remove unnecessary if Paolo Bonzini
2020-05-26 17:22 ` [PATCH 19/28] KVM: nSVM: extract svm_set_gif Paolo Bonzini
2020-05-26 17:23 ` [PATCH 20/28] KVM: SVM: preserve VGIF across VMCB switch Paolo Bonzini
2020-05-26 17:23 ` [PATCH 21/28] KVM: nSVM: synthesize correct EXITINTINFO on vmexit Paolo Bonzini
2020-05-26 17:23 ` [PATCH 22/28] KVM: nSVM: remove HF_VINTR_MASK Paolo Bonzini
2020-05-26 17:23 ` [PATCH 23/28] KVM: nSVM: remove HF_HIF_MASK Paolo Bonzini
2020-05-26 17:23 ` [PATCH 24/28] KVM: nSVM: split nested_vmcb_check_controls Paolo Bonzini
2020-05-26 17:23 ` Paolo Bonzini [this message]
2020-05-26 17:23 ` [PATCH 26/28] KVM: MMU: pass arbitrary CR0/CR4/EFER to kvm_init_shadow_mmu Paolo Bonzini
2020-05-26 17:23 ` [PATCH 27/28] selftests: kvm: add a SVM version of state-test Paolo Bonzini
2020-05-26 17:23 ` [PATCH 28/28] KVM: nSVM: implement KVM_GET_NESTED_STATE and KVM_SET_NESTED_STATE Paolo Bonzini
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=20200526172308.111575-26-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mlevitsk@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=vkuznets@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 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).