From: Kechen Lu <kechenl@nvidia.com>
To: <kvm@vger.kernel.org>, <pbonzini@redhat.com>, <seanjc@google.com>
Cc: <vkuznets@redhat.com>, <somduttar@nvidia.com>,
<kechenl@nvidia.com>, <linux-kernel@vger.kernel.org>
Subject: [RFC PATCH v3 1/7] KVM: x86: only allow exits disable before vCPUs created
Date: Tue, 14 Jun 2022 18:16:16 -0700 [thread overview]
Message-ID: <20220615011622.136646-2-kechenl@nvidia.com> (raw)
In-Reply-To: <20220615011622.136646-1-kechenl@nvidia.com>
From: Sean Christopherson <seanjc@google.com>
Since VMX and SVM both would never update the control bits if exits
are disable after vCPUs are created, only allow setting exits
disable flag before vCPU creation.
Fixes: 4d5422cea3b6 ("KVM: X86: Provide a capability to disable MWAIT
intercepts")
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Kechen Lu <kechenl@nvidia.com>
---
Documentation/virt/kvm/api.rst | 1 +
arch/x86/kvm/x86.c | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst
index 11e00a46c610..d0d8749591a8 100644
--- a/Documentation/virt/kvm/api.rst
+++ b/Documentation/virt/kvm/api.rst
@@ -6933,6 +6933,7 @@ branch to guests' 0x200 interrupt vector.
:Architectures: x86
:Parameters: args[0] defines which exits are disabled
:Returns: 0 on success, -EINVAL when args[0] contains invalid exits
+ or if any vCPU has already been created
Valid bits in args[0] are::
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 158b2e135efc..3ac6329e6d43 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6006,6 +6006,10 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm,
if (cap->args[0] & ~KVM_X86_DISABLE_VALID_EXITS)
break;
+ mutex_lock(&kvm->lock);
+ if (kvm->created_vcpus)
+ goto disable_exits_unlock;
+
if ((cap->args[0] & KVM_X86_DISABLE_EXITS_MWAIT) &&
kvm_can_mwait_in_guest())
kvm->arch.mwait_in_guest = true;
@@ -6016,6 +6020,8 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm,
if (cap->args[0] & KVM_X86_DISABLE_EXITS_CSTATE)
kvm->arch.cstate_in_guest = true;
r = 0;
+disable_exits_unlock:
+ mutex_unlock(&kvm->lock);
break;
case KVM_CAP_MSR_PLATFORM_INFO:
kvm->arch.guest_can_read_msr_platform_info = cap->args[0];
--
2.32.0
next prev parent reply other threads:[~2022-06-15 1:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-15 1:16 [RFC PATCH v3 0/7] KVM: x86: add per-vCPU exits disable capability Kechen Lu
2022-06-15 1:16 ` Kechen Lu [this message]
2022-07-20 17:12 ` [RFC PATCH v3 1/7] KVM: x86: only allow exits disable before vCPUs created Sean Christopherson
2022-07-20 17:49 ` Sean Christopherson
2022-07-20 18:38 ` Kechen Lu
2022-06-15 1:16 ` [RFC PATCH v3 2/7] KVM: x86: Move *_in_guest power management flags to vCPU scope Kechen Lu
2022-06-15 1:16 ` [RFC PATCH v3 3/7] KVM: x86: Reject disabling of MWAIT interception when not allowed Kechen Lu
2022-07-20 17:13 ` Sean Christopherson
2022-06-15 1:16 ` [RFC PATCH v3 4/7] KVM: x86: Let userspace re-enable previously disabled exits Kechen Lu
2022-06-15 2:51 ` Chao Gao
2022-07-20 17:18 ` Sean Christopherson
2022-06-15 1:16 ` [RFC PATCH v3 5/7] KVM: x86: add vCPU scoped toggling for " Kechen Lu
2022-06-15 2:43 ` Chao Gao
2022-06-16 3:04 ` Kechen Lu
2022-07-20 17:38 ` Sean Christopherson
2022-06-15 1:16 ` [RFC PATCH v3 6/7] KVM: x86: Add a new guest_debug flag forcing exit to userspace Kechen Lu
2022-06-15 1:16 ` [RFC PATCH v3 7/7] KVM: selftests: Add tests for VM and vCPU cap KVM_CAP_X86_DISABLE_EXITS Kechen Lu
2022-06-15 3:14 ` Chao Gao
2022-06-15 18:21 ` Kechen Lu
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=20220615011622.136646-2-kechenl@nvidia.com \
--to=kechenl@nvidia.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=somduttar@nvidia.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 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.