From: Marcelo Tosatti <mtosatti@redhat.com>
To: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
pbonzini@redhat.com, gleb@kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH] KVM: SVM: fix cr8 intercept window
Date: Tue, 11 Mar 2014 22:05:14 -0300 [thread overview]
Message-ID: <20140312010513.GA8131@amt.cnet> (raw)
In-Reply-To: <1394561478-8815-1-git-send-email-rkrcmar@redhat.com>
On Tue, Mar 11, 2014 at 07:11:18PM +0100, Radim Krčmář wrote:
> We always disable cr8 intercept in its handler, but only re-enable it
> if handling KVM_REQ_EVENT, so there can be a window where we do not
> intercept cr8 writes, which allows an interrupt to disrupt a higher
> priority task.
>
> Fix this by disabling intercepts in the same function that re-enables
> them when needed. This fixes BSOD in Windows 2008.
>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
> ---
> arch/x86/kvm/svm.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index 64d9bb9..f676c18 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -3003,10 +3003,8 @@ static int cr8_write_interception(struct vcpu_svm *svm)
> u8 cr8_prev = kvm_get_cr8(&svm->vcpu);
> /* instruction emulation calls kvm_set_cr8() */
> r = cr_interception(svm);
> - if (irqchip_in_kernel(svm->vcpu.kvm)) {
> - clr_cr_intercept(svm, INTERCEPT_CR8_WRITE);
> + if (irqchip_in_kernel(svm->vcpu.kvm))
> return r;
> - }
> if (cr8_prev <= kvm_get_cr8(&svm->vcpu))
> return r;
> kvm_run->exit_reason = KVM_EXIT_SET_TPR;
> @@ -3568,6 +3566,8 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu, int tpr, int irr)
> if (is_guest_mode(vcpu) && (vcpu->arch.hflags & HF_VINTR_MASK))
> return;
>
> + clr_cr_intercept(svm, INTERCEPT_CR8_WRITE);
> +
> if (irr == -1)
> return;
Shouldnt IRR be injected if TPR < IRR ? (via KVM_REQ_EVENT).
1) IRR has interrupt 10.
2) TPR now 9 due to CR8 write.
3) 10 should be injected.
Also not clearing the intercept can cause continuous CR8 writes to
exit until KVM_REQ_EVENT ?
next prev parent reply other threads:[~2014-03-12 1:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-11 18:11 [PATCH] KVM: SVM: fix cr8 intercept window Radim Krčmář
2014-03-12 1:05 ` Marcelo Tosatti [this message]
2014-03-12 10:40 ` Radim Krčmář
2014-03-12 14:54 ` Marcelo Tosatti
2014-03-12 17:20 ` Paolo Bonzini
2014-03-13 13:52 ` Gleb Natapov
2014-03-13 17:08 ` Radim Krčmář
2014-03-14 9:57 ` 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=20140312010513.GA8131@amt.cnet \
--to=mtosatti@redhat.com \
--cc=gleb@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=stable@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 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).