From: Yuan Yao <yuan.yao@intel.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Jim Mattson <jmattson@google.com>,
Jon Cargille <jcargill@google.com>,
Peter Shier <pshier@google.com>, Oliver Upton <oupton@google.com>,
Yuan Yao <yuan.yao@linux.intel.com>
Subject: [PATCH 1/1] kvm: nVMX: Checks "VMCS shadowing" with VMCS link pointer for non-root mode VM{READ,WRITE}
Date: Fri, 12 Aug 2022 09:47:06 +0800 [thread overview]
Message-ID: <20220812014706.43409-1-yuan.yao@intel.com> (raw)
Add checking to VMCS12's "VMCS shadowing", make sure the checking of
VMCS12's vmcs_link_pointer for non-root mode VM{READ,WRITE} happens
only if VMCS12's "VMCS shadowing" is 1.
SDM says that for non-root mode the VMCS's "VMCS shadowing" must be 1
(and the corresponding bits in VMREAD/VMWRITE bitmap must be 0) when
condition checking of [B] is reached(please refer [A]), which means
checking to VMCS link pointer for non-root mode VM{READ,WRITE} should
happen only when "VMCS shadowing" = 1.
Description from SDM Vol3(April 2022) Chapter 30.3 VMREAD/VMWRITE:
IF (not in VMX operation)
or (CR0.PE = 0)
or (RFLAGS.VM = 1)
or (IA32_EFER.LMA = 1 and CS.L = 0)
THEN #UD;
ELSIF in VMX non-root operation
AND (“VMCS shadowing” is 0 OR
source operand sets bits in range 63:15 OR
VMREAD bit corresponding to bits 14:0 of source
operand is 1) <------[A]
THEN VMexit;
ELSIF CPL > 0
THEN #GP(0);
ELSIF (in VMX root operation AND current-VMCS pointer is not valid) OR
(in VMX non-root operation AND VMCS link pointer is not valid)
THEN VMfailInvalid; <------ [B]
...
Fixes: dd2d6042b7f4 ("kvm: nVMX: VMWRITE checks VMCS-link pointer before VMCS field")
Signed-off-by: Yuan Yao <yuan.yao@intel.com>
---
arch/x86/kvm/vmx/nested.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index ddd4367d4826..30685be54c5d 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -5123,6 +5123,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)
*/
if (vmx->nested.current_vmptr == INVALID_GPA ||
(is_guest_mode(vcpu) &&
+ nested_cpu_has_shadow_vmcs(vcpu) &&
get_vmcs12(vcpu)->vmcs_link_pointer == INVALID_GPA))
return nested_vmx_failInvalid(vcpu);
@@ -5233,6 +5234,7 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu)
*/
if (vmx->nested.current_vmptr == INVALID_GPA ||
(is_guest_mode(vcpu) &&
+ nested_cpu_has_shadow_vmcs(vcpu) &&
get_vmcs12(vcpu)->vmcs_link_pointer == INVALID_GPA))
return nested_vmx_failInvalid(vcpu);
--
2.27.0
next reply other threads:[~2022-08-12 1:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-12 1:47 Yuan Yao [this message]
2022-08-12 2:02 ` Yuan Yao
2022-08-12 19:27 ` Jim Mattson
2022-08-12 19:33 ` Jim Mattson
2022-08-12 23:07 ` Yao Yuan
2022-08-13 0:30 ` Jim Mattson
2022-08-14 11:06 ` Yao Yuan
2022-08-12 14:54 ` kernel test robot
2022-08-12 15:35 ` kernel test robot
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=20220812014706.43409-1-yuan.yao@intel.com \
--to=yuan.yao@intel.com \
--cc=jcargill@google.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oupton@google.com \
--cc=pbonzini@redhat.com \
--cc=pshier@google.com \
--cc=seanjc@google.com \
--cc=yuan.yao@linux.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
all inboxes | Powered by JetHome®