From: "Radim Krčmář" <rkrcmar@redhat.com>
To: Jim Mattson <jmattson@google.com>
Cc: kvm@vger.kernel.org
Subject: Re: [PATCH] kvm: nVMX: VMCLEAR should not cause the vCPU to shut down
Date: Fri, 3 Mar 2017 17:12:25 +0100 [thread overview]
Message-ID: <20170303161224.GD23831@potion> (raw)
In-Reply-To: <20170302204148.12015-1-jmattson@google.com>
2017-03-02 12:41-0800, Jim Mattson:
> VMCLEAR should silently ignore a failure to clear the launch state of
> the VMCS referenced by the operand.
>
> Signed-off-by: Jim Mattson <jmattson@google.com>
> ---
> arch/x86/kvm/vmx.c | 22 ++++------------------
> 1 file changed, 4 insertions(+), 18 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index ef4ba71dbb66..bca497a92541 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -7259,9 +7259,8 @@ static int handle_vmoff(struct kvm_vcpu *vcpu)
> static int handle_vmclear(struct kvm_vcpu *vcpu)
> {
> struct vcpu_vmx *vmx = to_vmx(vcpu);
> + u32 zero = 0;
> gpa_t vmptr;
> - struct vmcs12 *vmcs12;
> - struct page *page;
>
> if (!nested_vmx_check_permission(vcpu))
> return 1;
> @@ -7272,22 +7271,9 @@ static int handle_vmclear(struct kvm_vcpu *vcpu)
> if (vmptr == vmx->nested.current_vmptr)
> nested_release_vmcs12(vmx);
>
> - page = nested_get_page(vcpu, vmptr);
> - if (page == NULL) {
> - /*
> - * For accurate processor emulation, VMCLEAR beyond available
> - * physical memory should do nothing at all. However, it is
> - * possible that a nested vmx bug, not a guest hypervisor bug,
> - * resulted in this case, so let's shut down before doing any
> - * more damage:
> - */
(Consciously introducing bugs in order to somewhat mitigate possible
bugs is not desirable.)
> - kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
> - return 1;
> - }
> - vmcs12 = kmap(page);
> - vmcs12->launch_state = 0;
> - kunmap(page);
> - nested_release_page(page);
> + kvm_write_guest(vcpu->kvm,
I have changed this line to
kvm_vcpu_write_guest(vcpu
and applied to kvm/queue (planning to merge in 4.11-rc2).
The change makes a difference if the guest is using VMX inside SMM and I
don't see a reason to avoid the SMM address space in that case.
Let me know what you think,
thanks.
> + vmptr + offsetof(struct vmcs12, launch_state),
> + &zero, sizeof(zero));
(Could have also been kvm_vcpu_write_guest_page(), but that is only
performance gain.)
>
> nested_free_vmcs02(vmx, vmptr);
>
> --
> 2.12.0.rc1.440.g5b76565f74-goog
>
next prev parent reply other threads:[~2017-03-03 16:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-02 20:41 [PATCH] kvm: nVMX: VMCLEAR should not cause the vCPU to shut down Jim Mattson
2017-03-03 16:12 ` Radim Krčmář [this message]
2017-03-03 16:46 ` Jim Mattson
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=20170303161224.GD23831@potion \
--to=rkrcmar@redhat.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
/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.