mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Wanpeng Li <kernellwp@gmail.com>,
	linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: "Radim Krčmář" <rkrcmar@redhat.com>,
	"Wanpeng Li" <wanpeng.li@hotmail.com>
Subject: Re: [PATCH v2] KVM: LAPIC: Fix cancel preemption timer repeatedly due to preemption
Date: Mon, 24 Jul 2017 16:45:56 +0200	[thread overview]
Message-ID: <2131b7f1-8999-3536-4d3a-b9b635ec56cb@redhat.com> (raw)
In-Reply-To: <1500886678-5417-1-git-send-email-wanpeng.li@hotmail.com>

On 24/07/2017 10:57, Wanpeng Li wrote:
> From: Wanpeng Li <wanpeng.li@hotmail.com>
> 
> Preemption can occur in the preemption timer expiration handler:
> 
>           CPU0                    CPU1
> 
>   preemption timer vmexit
>   handle_preemption_timer(vCPU0)
>     kvm_lapic_expired_hv_timer
>       hv_timer_is_use == true
>   sched_out
>                            sched_in
>                            kvm_arch_vcpu_load
>                              kvm_lapic_restart_hv_timer
>                                restart_apic_timer
>                                  start_hv_timer
>                                    already-expired timer or sw timer triggerd in the window
>                                  start_sw_timer
>                                    cancel_hv_timer

At this point, the timer interrupt is injected, right?

If this is correct, kvm_lapic_expired_hv_timer can just do nothing if
the timer is not in use, with a comment explaining that the preemption
notifier has run start_sw_timer and thus injected the timer interrupt.

>                            /* back in kvm_lapic_expired_hv_timer */
>                            cancel_hv_timer
>                              WARN_ON(!apic->lapic_timer.hv_timer_in_use);  ==> Oops
> 
> This can be reproduced if CONFIG_PREEMPT is enabled.
> 
> This patch fixes it by don't cancel preemption timer repeatedly if 
> the preemption timer has already been cancelled due to preemption 
> since already-expired timer or sw timer triggered in the window.
> 
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Radim Krčmář <rkrcmar@redhat.com>
> Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
> ---
>  arch/x86/kvm/lapic.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index 2819d4c..8341b40 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -1560,9 +1560,13 @@ void kvm_lapic_expired_hv_timer(struct kvm_vcpu *vcpu)
>  {
>  	struct kvm_lapic *apic = vcpu->arch.apic;
>  
> -	WARN_ON(!apic->lapic_timer.hv_timer_in_use);
> -	WARN_ON(swait_active(&vcpu->wq));
> -	cancel_hv_timer(apic);
> +	preempt_disable();
> +	if (!(!apic_lvtt_period(apic) && atomic_read(&apic->lapic_timer.pending))) {

Why is the "if" necessary?

Maybe all of kvm_lapic_expired_hv_timer and start_sw_timer should be in
preemption-disabled regions, which trivially avoids any reentrancy issue
with the preempt notifier.  Then, cancel_hv_timer can assert that it's
called with preemption disabled.

Paolo

> +		WARN_ON(!apic->lapic_timer.hv_timer_in_use);
> +		WARN_ON(swait_active(&vcpu->wq));
> +		cancel_hv_timer(apic);
> +	}
> +	preempt_enable();
>  	apic_timer_expired(apic);
>  
>  	if (apic_lvtt_period(apic) && apic->lapic_timer.period) {
> 

  reply	other threads:[~2017-07-24 14:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-24  8:57 Wanpeng Li
2017-07-24 14:45 ` Paolo Bonzini [this message]
2017-07-24 15:08   ` Wanpeng Li
2017-07-24 15:38     ` 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=2131b7f1-8999-3536-4d3a-b9b635ec56cb@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=kernellwp@gmail.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rkrcmar@redhat.com \
    --cc=wanpeng.li@hotmail.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®