From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: kvm@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Jim Mattson <jmattson@google.com>,
linux-kernel@vger.kernel.org, Liran Alon <liran.alon@oracle.com>,
Roman Kagan <rkagan@virtuozzo.com>
Subject: [PATCH RFC 1/3] x86/kvm/hyper-v: remove stale evmcs_already_enabled check from nested_enable_evmcs()
Date: Wed, 15 Jan 2020 18:10:12 +0100 [thread overview]
Message-ID: <20200115171014.56405-2-vkuznets@redhat.com> (raw)
In-Reply-To: <20200115171014.56405-1-vkuznets@redhat.com>
In nested_enable_evmcs() evmcs_already_enabled check doesn't really do
anything: controls are already sanitized and we return '0' regardless.
Just drop the check.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
arch/x86/kvm/vmx/evmcs.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/x86/kvm/vmx/evmcs.c b/arch/x86/kvm/vmx/evmcs.c
index 72359709cdc1..89c3e0caf39f 100644
--- a/arch/x86/kvm/vmx/evmcs.c
+++ b/arch/x86/kvm/vmx/evmcs.c
@@ -350,17 +350,12 @@ int nested_enable_evmcs(struct kvm_vcpu *vcpu,
uint16_t *vmcs_version)
{
struct vcpu_vmx *vmx = to_vmx(vcpu);
- bool evmcs_already_enabled = vmx->nested.enlightened_vmcs_enabled;
vmx->nested.enlightened_vmcs_enabled = true;
if (vmcs_version)
*vmcs_version = nested_get_evmcs_version(vcpu);
- /* We don't support disabling the feature for simplicity. */
- if (evmcs_already_enabled)
- return 0;
-
vmx->nested.msrs.pinbased_ctls_high &= ~EVMCS1_UNSUPPORTED_PINCTRL;
vmx->nested.msrs.entry_ctls_high &= ~EVMCS1_UNSUPPORTED_VMENTRY_CTRL;
vmx->nested.msrs.exit_ctls_high &= ~EVMCS1_UNSUPPORTED_VMEXIT_CTRL;
--
2.24.1
next prev parent reply other threads:[~2020-01-15 17:10 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 17:10 [PATCH RFC 0/3] x86/kvm/hyper-v: fix enlightened VMCS & QEMU4.2 Vitaly Kuznetsov
2020-01-15 17:10 ` Vitaly Kuznetsov [this message]
2020-01-15 22:50 ` [PATCH RFC 1/3] x86/kvm/hyper-v: remove stale evmcs_already_enabled check from nested_enable_evmcs() Liran Alon
2020-01-15 17:10 ` [PATCH RFC 2/3] x86/kvm/hyper-v: move VMX controls sanitization out of nested_enable_evmcs() Vitaly Kuznetsov
2020-01-15 22:49 ` Liran Alon
2020-01-16 8:37 ` Vitaly Kuznetsov
2020-02-03 15:11 ` Vitaly Kuznetsov
2020-01-15 23:27 ` Sean Christopherson
2020-01-15 23:30 ` Liran Alon
2020-01-16 8:51 ` Vitaly Kuznetsov
2020-01-16 16:19 ` Sean Christopherson
2020-01-16 16:57 ` Vitaly Kuznetsov
2020-01-17 6:31 ` Sean Christopherson
2020-01-18 21:42 ` Paolo Bonzini
2020-01-19 8:54 ` Paolo Bonzini
2020-01-22 5:47 ` Sean Christopherson
2020-01-22 9:37 ` Vitaly Kuznetsov
2020-01-22 14:33 ` Paolo Bonzini
2020-01-22 15:08 ` Vitaly Kuznetsov
2020-01-22 15:51 ` Sean Christopherson
2020-01-22 16:29 ` Vitaly Kuznetsov
2020-01-22 16:40 ` Paolo Bonzini
2020-01-23 9:15 ` Vitaly Kuznetsov
2020-01-23 19:09 ` Vitaly Kuznetsov
2020-01-24 17:25 ` Sean Christopherson
2020-01-27 15:38 ` Vitaly Kuznetsov
2020-01-27 17:53 ` Paolo Bonzini
2020-01-27 21:52 ` Vitaly Kuznetsov
2020-01-27 18:17 ` Sean Christopherson
2020-01-15 17:10 ` [PATCH RFC 3/3] x86/kvm/hyper-v: don't allow to turn on unsupported VMX controls for nested guests Vitaly Kuznetsov
2020-01-15 22:59 ` Liran Alon
2020-01-16 8:55 ` Vitaly Kuznetsov
2020-01-16 16:21 ` Sean Christopherson
2020-01-19 8:57 ` 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=20200115171014.56405-2-vkuznets@redhat.com \
--to=vkuznets@redhat.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liran.alon@oracle.com \
--cc=pbonzini@redhat.com \
--cc=rkagan@virtuozzo.com \
--cc=sean.j.christopherson@intel.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).