From: Joerg Roedel <joerg.roedel@amd.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, stable@kernel.org
Subject: Re: [PATCH 02/11] KVM: SVM: Fix wrong interrupt injection in enable_irq_windows
Date: Mon, 22 Feb 2010 11:29:09 +0100 [thread overview]
Message-ID: <20100222102909.GB4210@amd.com> (raw)
In-Reply-To: <1266592990-8911-3-git-send-email-joerg.roedel@amd.com>
Hi Avi,
forgot this one? I did not find it in your tree.
Joerg
On Fri, Feb 19, 2010 at 04:23:01PM +0100, Joerg Roedel wrote:
> The nested_svm_intr() function does not execute the vmexit
> anymore. Therefore we may still be in the nested state after
> that function ran. This patch changes the nested_svm_intr()
> function to return wether the irq window could be enabled.
>
> Cc: stable@kernel.org
> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
> ---
> arch/x86/kvm/svm.c | 17 ++++++++---------
> 1 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index 63ecd4d..f87fc98 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -1389,16 +1389,17 @@ static int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr,
> return nested_svm_exit_handled(svm);
> }
>
> -static inline int nested_svm_intr(struct vcpu_svm *svm)
> +/* This function returns true if it is save to enable the irq window */
> +static inline bool nested_svm_intr(struct vcpu_svm *svm)
> {
> if (!is_nested(svm))
> - return 0;
> + return true;
>
> if (!(svm->vcpu.arch.hflags & HF_VINTR_MASK))
> - return 0;
> + return true;
>
> if (!(svm->vcpu.arch.hflags & HF_HIF_MASK))
> - return 0;
> + return false;
>
> svm->vmcb->control.exit_code = SVM_EXIT_INTR;
>
> @@ -1411,10 +1412,10 @@ static inline int nested_svm_intr(struct vcpu_svm *svm)
> */
> svm->nested.exit_required = true;
> trace_kvm_nested_intr_vmexit(svm->vmcb->save.rip);
> - return 1;
> + return false;
> }
>
> - return 0;
> + return true;
> }
>
> static void *nested_svm_map(struct vcpu_svm *svm, u64 gpa, struct page **_page)
> @@ -2563,13 +2564,11 @@ static void enable_irq_window(struct kvm_vcpu *vcpu)
> {
> struct vcpu_svm *svm = to_svm(vcpu);
>
> - nested_svm_intr(svm);
> -
> /* In case GIF=0 we can't rely on the CPU to tell us when
> * GIF becomes 1, because that's a separate STGI/VMRUN intercept.
> * The next time we get that intercept, this function will be
> * called again though and we'll get the vintr intercept. */
> - if (gif_set(svm)) {
> + if (gif_set(svm) && nested_svm_intr(svm)) {
> svm_set_vintr(svm);
> svm_inject_irq(svm, 0x0);
> }
> --
> 1.6.6
>
next prev parent reply other threads:[~2010-02-22 10:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-19 15:22 [PATCH 0/11] Nested SVM fixes v2 Joerg Roedel
2010-02-19 15:23 ` [PATCH 01/11] KVM: SVM: Don't use kmap_atomic in nested_svm_map Joerg Roedel
2010-02-19 15:23 ` [PATCH 02/11] KVM: SVM: Fix wrong interrupt injection in enable_irq_windows Joerg Roedel
2010-02-22 10:29 ` Joerg Roedel [this message]
2010-02-22 11:05 ` Avi Kivity
2010-02-19 15:23 ` [PATCH 03/11] KVM: SVM: Fix schedule-while-atomic on nested exception handling Joerg Roedel
2010-02-19 15:23 ` [PATCH 04/11] KVM: SVM: Sync all control registers on nested vmexit Joerg Roedel
2010-02-19 15:23 ` [PATCH 05/11] KVM: SVM: Annotate nested_svm_map with might_sleep() Joerg Roedel
2010-02-19 15:23 ` [PATCH 06/11] KVM: SVM: Fix nested msr intercept handling Joerg Roedel
2010-02-19 15:23 ` [PATCH 07/11] KVM: SVM: Don't sync nested cr8 to lapic and back Joerg Roedel
2010-02-19 15:23 ` [PATCH 08/11] KVM: SVM: Activate nested state only when guest state is complete Joerg Roedel
2010-02-19 15:23 ` [PATCH 09/11] KVM: SVM: Make lazy FPU switching work with nested svm Joerg Roedel
2010-02-19 15:23 ` [PATCH 10/11] KVM: SVM: Remove newlines from nested trace points Joerg Roedel
2010-02-19 15:23 ` [PATCH 11/11] KVM: SVM: Don't call instruction emulator for invd and wbinvd Joerg Roedel
2010-02-21 9:53 ` Avi Kivity
2010-02-21 11:37 ` Joerg Roedel
2010-02-21 12:00 ` Avi Kivity
2010-02-21 12:12 ` Joerg Roedel
2010-02-21 9:56 ` [PATCH 0/11] Nested SVM fixes v2 Avi Kivity
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=20100222102909.GB4210@amd.com \
--to=joerg.roedel@amd.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=stable@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