From: Paolo Bonzini <pbonzini@redhat.com>
To: Jan Kiszka <jan.kiszka@siemens.com>,
Wanpeng Li <wanpeng.li@linux.intel.com>
Cc: kvm <kvm@vger.kernel.org>, Bandan Das <bsd@redhat.com>
Subject: Re: nVMX: Shadowing of CPU_BASED_VM_EXEC_CONTROL broken
Date: Wed, 08 Oct 2014 17:44:25 +0200 [thread overview]
Message-ID: <54355BD9.3010201@redhat.com> (raw)
In-Reply-To: <54355344.5050301@siemens.com>
Il 08/10/2014 17:07, Jan Kiszka ha scritto:
> As usual, this was a nasty race that involved some concurrent VCPUs and
> proper host load, so hard to write unit tests...
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 04fa1b8..d6bcaca 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -6417,6 +6417,8 @@ static void copy_shadow_to_vmcs12(struct vcpu_vmx *vmx)
> const unsigned long *fields = shadow_read_write_fields;
> const int num_fields = max_shadow_read_write_fields;
>
> + preempt_disable();
> +
> vmcs_load(shadow_vmcs);
>
> for (i = 0; i < num_fields; i++) {
> @@ -6440,6 +6442,8 @@ static void copy_shadow_to_vmcs12(struct vcpu_vmx *vmx)
>
> vmcs_clear(shadow_vmcs);
> vmcs_load(vmx->loaded_vmcs->vmcs);
> +
> + preempt_enable();
> }
>
> static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx)
> @@ -6457,6 +6461,8 @@ static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx)
> u64 field_value = 0;
> struct vmcs *shadow_vmcs = vmx->nested.current_shadow_vmcs;
>
> + preempt_disable();
> +
> vmcs_load(shadow_vmcs);
>
> for (q = 0; q < ARRAY_SIZE(fields); q++) {
> @@ -6483,6 +6489,8 @@ static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx)
>
> vmcs_clear(shadow_vmcs);
> vmcs_load(vmx->loaded_vmcs->vmcs);
> +
> + preempt_enable();
> }
>
> No proper patch yet because there might be a smarter approach without
> using the preempt_disable() hammer.
copy_vmcs12_to_shadow already runs with preemption disabled; for stable@
it's not that bad to do the same in copy_shadow_to_vmcs12.
For 3.18 it could be nice of course to use loaded_vmcs properly, but it
would also incur some overhead.
Paolo
> But the point is that we temporarily
> load a vmcs without updating loaded_vmcs->vmcs. Now, if some other VCPU
> is scheduling in right in the middle of this, the wrong vmcs will be
> flushed and then reloaded - e.g. a non-shadow vmcs with that interrupt
> window flag set...
>
> Patch is currently under heavy load testing here, but it looks very good
> as the bug was quickly reproducible before I applied it.
next prev parent reply other threads:[~2014-10-08 15:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-08 8:29 nVMX: Shadowing of CPU_BASED_VM_EXEC_CONTROL broken Jan Kiszka
2014-10-08 8:47 ` Paolo Bonzini
2014-10-08 8:54 ` Jan Kiszka
2014-10-08 9:25 ` Wanpeng Li
2014-10-08 9:51 ` Jan Kiszka
2014-10-08 10:20 ` Paolo Bonzini
2014-10-08 10:29 ` Jan Kiszka
2014-10-08 10:34 ` Paolo Bonzini
2014-10-08 15:07 ` Jan Kiszka
2014-10-08 15:44 ` Paolo Bonzini [this message]
2014-10-08 16:07 ` Jan Kiszka
2014-10-08 23:34 ` Wanpeng Li
2014-10-08 23:58 ` Wanpeng Li
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=54355BD9.3010201@redhat.com \
--to=pbonzini@redhat.com \
--cc=bsd@redhat.com \
--cc=jan.kiszka@siemens.com \
--cc=kvm@vger.kernel.org \
--cc=wanpeng.li@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;
as well as URLs for NNTP newsgroup(s).