From: Chenyi Qiang <chenyi.qiang@intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
Xiaoyao Li <xiaoyao.li@intel.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/5] KVM: nVMX: Verify the VMX controls MSRs with the global capability when setting VMX MSRs
Date: Fri, 28 Aug 2020 16:56:19 +0800 [thread overview]
Message-ID: <20200828085622.8365-3-chenyi.qiang@intel.com> (raw)
In-Reply-To: <20200828085622.8365-1-chenyi.qiang@intel.com>
When setting the nested VMX MSRs, verify it with the values in
vmcs_config.nested_vmx_msrs, which reflects the global capability of
VMX controls MSRs.
Signed-off-by: Chenyi Qiang <chenyi.qiang@intel.com>
---
arch/x86/kvm/vmx/nested.c | 71 ++++++++++++++++++++++++++++-----------
1 file changed, 51 insertions(+), 20 deletions(-)
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index 6e0e71f4d45f..47bee53e235a 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -1234,7 +1234,7 @@ static int vmx_restore_vmx_basic(struct vcpu_vmx *vmx, u64 data)
BIT_ULL(49) | BIT_ULL(54) | BIT_ULL(55) |
/* reserved */
BIT_ULL(31) | GENMASK_ULL(47, 45) | GENMASK_ULL(63, 56);
- u64 vmx_basic = vmx->nested.msrs.basic;
+ u64 vmx_basic = vmcs_config.nested.basic;
if (!is_bitwise_subset(vmx_basic, data, feature_and_reserved))
return -EINVAL;
@@ -1265,24 +1265,24 @@ vmx_restore_control_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data)
switch (msr_index) {
case MSR_IA32_VMX_TRUE_PINBASED_CTLS:
- lowp = &vmx->nested.msrs.pinbased_ctls_low;
- highp = &vmx->nested.msrs.pinbased_ctls_high;
+ lowp = &vmcs_config.nested.pinbased_ctls_low;
+ highp = &vmcs_config.nested.pinbased_ctls_high;
break;
case MSR_IA32_VMX_TRUE_PROCBASED_CTLS:
- lowp = &vmx->nested.msrs.procbased_ctls_low;
- highp = &vmx->nested.msrs.procbased_ctls_high;
+ lowp = &vmcs_config.nested.procbased_ctls_low;
+ highp = &vmcs_config.nested.procbased_ctls_high;
break;
case MSR_IA32_VMX_TRUE_EXIT_CTLS:
- lowp = &vmx->nested.msrs.exit_ctls_low;
- highp = &vmx->nested.msrs.exit_ctls_high;
+ lowp = &vmcs_config.nested.exit_ctls_low;
+ highp = &vmcs_config.nested.exit_ctls_high;
break;
case MSR_IA32_VMX_TRUE_ENTRY_CTLS:
- lowp = &vmx->nested.msrs.entry_ctls_low;
- highp = &vmx->nested.msrs.entry_ctls_high;
+ lowp = &vmcs_config.nested.entry_ctls_low;
+ highp = &vmcs_config.nested.entry_ctls_high;
break;
case MSR_IA32_VMX_PROCBASED_CTLS2:
- lowp = &vmx->nested.msrs.secondary_ctls_low;
- highp = &vmx->nested.msrs.secondary_ctls_high;
+ lowp = &vmcs_config.nested.secondary_ctls_low;
+ highp = &vmcs_config.nested.secondary_ctls_high;
break;
default:
BUG();
@@ -1298,8 +1298,30 @@ vmx_restore_control_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data)
if (!is_bitwise_subset(supported, data, GENMASK_ULL(63, 32)))
return -EINVAL;
- *lowp = data;
- *highp = data >> 32;
+ switch (msr_index) {
+ case MSR_IA32_VMX_TRUE_PINBASED_CTLS:
+ vmx->nested.msrs.pinbased_ctls_low = data;
+ vmx->nested.msrs.pinbased_ctls_high = data >> 32;
+ break;
+ case MSR_IA32_VMX_TRUE_PROCBASED_CTLS:
+ vmx->nested.msrs.procbased_ctls_low = data;
+ vmx->nested.msrs.procbased_ctls_high = data >> 32;
+ break;
+ case MSR_IA32_VMX_TRUE_EXIT_CTLS:
+ vmx->nested.msrs.exit_ctls_low = data;
+ vmx->nested.msrs.exit_ctls_high = data >> 32;
+ break;
+ case MSR_IA32_VMX_TRUE_ENTRY_CTLS:
+ vmx->nested.msrs.entry_ctls_low = data;
+ vmx->nested.msrs.entry_ctls_high = data >> 32;
+ break;
+ case MSR_IA32_VMX_PROCBASED_CTLS2:
+ vmx->nested.msrs.secondary_ctls_low = data;
+ vmx->nested.msrs.secondary_ctls_high = data >> 32;
+ break;
+ default:
+ BUG();
+ }
return 0;
}
@@ -1313,8 +1335,8 @@ static int vmx_restore_vmx_misc(struct vcpu_vmx *vmx, u64 data)
GENMASK_ULL(13, 9) | BIT_ULL(31);
u64 vmx_misc;
- vmx_misc = vmx_control_msr(vmx->nested.msrs.misc_low,
- vmx->nested.msrs.misc_high);
+ vmx_misc = vmx_control_msr(vmcs_config.nested.misc_low,
+ vmcs_config.nested.misc_high);
if (!is_bitwise_subset(vmx_misc, data, feature_and_reserved_bits))
return -EINVAL;
@@ -1344,8 +1366,8 @@ static int vmx_restore_vmx_ept_vpid_cap(struct vcpu_vmx *vmx, u64 data)
{
u64 vmx_ept_vpid_cap;
- vmx_ept_vpid_cap = vmx_control_msr(vmx->nested.msrs.ept_caps,
- vmx->nested.msrs.vpid_caps);
+ vmx_ept_vpid_cap = vmx_control_msr(vmcs_config.nested.ept_caps,
+ vmcs_config.nested.vpid_caps);
/* Every bit is either reserved or a feature bit. */
if (!is_bitwise_subset(vmx_ept_vpid_cap, data, -1ULL))
@@ -1362,10 +1384,10 @@ static int vmx_restore_fixed0_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data)
switch (msr_index) {
case MSR_IA32_VMX_CR0_FIXED0:
- msr = &vmx->nested.msrs.cr0_fixed0;
+ msr = &vmcs_config.nested.cr0_fixed0;
break;
case MSR_IA32_VMX_CR4_FIXED0:
- msr = &vmx->nested.msrs.cr4_fixed0;
+ msr = &vmcs_config.nested.cr4_fixed0;
break;
default:
BUG();
@@ -1378,7 +1400,16 @@ static int vmx_restore_fixed0_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data)
if (!is_bitwise_subset(data, *msr, -1ULL))
return -EINVAL;
- *msr = data;
+ switch (msr_index) {
+ case MSR_IA32_VMX_CR0_FIXED0:
+ vmx->nested.msrs.cr0_fixed0 = data;
+ break;
+ case MSR_IA32_VMX_CR4_FIXED0:
+ vmx->nested.msrs.cr4_fixed0 = data;
+ break;
+ default:
+ BUG();
+ }
return 0;
}
--
2.17.1
next prev parent reply other threads:[~2020-08-28 8:55 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-28 8:56 [PATCH 0/5] Fix nested VMX controls MSRs Chenyi Qiang
2020-08-28 8:56 ` [PATCH 1/5] KVM: nVMX: Fix VMX controls MSRs setup when nested VMX enabled Chenyi Qiang
2020-08-28 17:43 ` Jim Mattson
2020-08-29 1:49 ` Chenyi Qiang
2020-08-29 2:51 ` Xiaoyao Li
2020-08-31 17:36 ` Jim Mattson
2020-09-01 3:27 ` Xiaoyao Li
2020-08-28 8:56 ` Chenyi Qiang [this message]
2020-08-28 18:23 ` [PATCH 2/5] KVM: nVMX: Verify the VMX controls MSRs with the global capability when setting VMX MSRs Jim Mattson
2020-08-31 3:15 ` Chenyi Qiang
2020-08-28 8:56 ` [PATCH 3/5] KVM: nVMX: Update VMX controls MSR according to guest CPUID after " Chenyi Qiang
2020-08-28 20:39 ` Jim Mattson
2020-09-02 18:16 ` Sean Christopherson
2020-09-02 18:32 ` Jim Mattson
2020-09-11 17:09 ` Paolo Bonzini
2020-08-28 8:56 ` [PATCH 4/5] KVM: nVMX: Fix the update value of nested load IA32_PERF_GLOBAL_CTRL control Chenyi Qiang
2020-08-28 18:29 ` Jim Mattson
2020-08-28 8:56 ` [PATCH 5/5] KVM: nVMX: Simplify the initialization of nested_vmx_msrs Chenyi Qiang
2020-09-11 17:11 ` [PATCH 0/5] Fix nested VMX controls MSRs 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=20200828085622.8365-3-chenyi.qiang@intel.com \
--to=chenyi.qiang@intel.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=xiaoyao.li@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