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>,
"Marcelo Tosatti" <mtosatti@redhat.com>
Subject: Re: [PATCH v5 4/4] KVM: LAPIC: Don't inject already-expired timer via posted interrupt
Date: Fri, 5 Jul 2019 14:40:27 +0200 [thread overview]
Message-ID: <67fad01b-8a77-5892-d963-77a3d321bb65@redhat.com> (raw)
In-Reply-To: <1561110002-4438-5-git-send-email-wanpengli@tencent.com>
On 21/06/19 11:40, Wanpeng Li wrote:
> From: Wanpeng Li <wanpengli@tencent.com>
>
> already-expired timer interrupt can be injected to guest when vCPU who
> arms the lapic timer re-vmentry, don't posted inject in this case.
>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Radim Krčmář <rkrcmar@redhat.com>
> Cc: Marcelo Tosatti <mtosatti@redhat.com>
> Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> ---
> arch/x86/kvm/lapic.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index ae575c0..7cd95ea 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -1452,7 +1452,7 @@ static void kvm_apic_inject_pending_timer_irqs(struct kvm_lapic *apic)
> }
> }
>
> -static void apic_timer_expired(struct kvm_lapic *apic)
> +static void apic_timer_expired(struct kvm_lapic *apic, bool can_pi_inject)
> {
> struct kvm_vcpu *vcpu = apic->vcpu;
> struct swait_queue_head *q = &vcpu->wq;
> @@ -1464,7 +1464,7 @@ static void apic_timer_expired(struct kvm_lapic *apic)
> if (apic_lvtt_tscdeadline(apic) || ktimer->hv_timer_in_use)
> ktimer->expired_tscdeadline = ktimer->tscdeadline;
>
> - if (posted_interrupt_inject_timer(apic->vcpu)) {
> + if (can_pi_inject && posted_interrupt_inject_timer(apic->vcpu)) {
Perhaps it should use a posted interrupt if kvm_arch_should_kick(vcpu),
i.e. just add kvm_arch_vcpu_should_kick(apic->vcpu) to
posted_interrupt_inject_timer?
Paolo
> if (apic->lapic_timer.timer_advance_ns)
> kvm_wait_lapic_expire(vcpu, true);
> kvm_apic_inject_pending_timer_irqs(apic);
> @@ -1607,7 +1607,7 @@ static void start_sw_tscdeadline(struct kvm_lapic *apic)
> expire = ktime_sub_ns(expire, ktimer->timer_advance_ns);
> hrtimer_start(&ktimer->timer, expire, HRTIMER_MODE_ABS);
> } else
> - apic_timer_expired(apic);
> + apic_timer_expired(apic, false);
>
> local_irq_restore(flags);
> }
> @@ -1697,7 +1697,7 @@ static void start_sw_period(struct kvm_lapic *apic)
>
> if (ktime_after(ktime_get(),
> apic->lapic_timer.target_expiration)) {
> - apic_timer_expired(apic);
> + apic_timer_expired(apic, false);
>
> if (apic_lvtt_oneshot(apic))
> return;
> @@ -1759,7 +1759,7 @@ static bool start_hv_timer(struct kvm_lapic *apic)
> if (atomic_read(&ktimer->pending)) {
> cancel_hv_timer(apic);
> } else if (expired) {
> - apic_timer_expired(apic);
> + apic_timer_expired(apic, false);
> cancel_hv_timer(apic);
> }
> }
> @@ -1809,7 +1809,7 @@ void kvm_lapic_expired_hv_timer(struct kvm_vcpu *vcpu)
> goto out;
> WARN_ON(swait_active(&vcpu->wq));
> cancel_hv_timer(apic);
> - apic_timer_expired(apic);
> + apic_timer_expired(apic, false);
>
> if (apic_lvtt_period(apic) && apic->lapic_timer.period) {
> advance_periodic_target_expiration(apic);
> @@ -2312,7 +2312,7 @@ static enum hrtimer_restart apic_timer_fn(struct hrtimer *data)
> struct kvm_timer *ktimer = container_of(data, struct kvm_timer, timer);
> struct kvm_lapic *apic = container_of(ktimer, struct kvm_lapic, lapic_timer);
>
> - apic_timer_expired(apic);
> + apic_timer_expired(apic, true);
>
> if (lapic_is_periodic(apic)) {
> advance_periodic_target_expiration(apic);
>
next prev parent reply other threads:[~2019-07-05 12:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-21 9:39 [PATCH v5 0/4] KVM: LAPIC: Implement Exitless Timer Wanpeng Li
2019-06-21 9:39 ` [PATCH v5 1/4] KVM: LAPIC: Make lapic timer unpinned Wanpeng Li
2019-06-21 9:40 ` [PATCH v5 2/4] KVM: LAPIC: Inject timer interrupt via posted interrupt Wanpeng Li
2019-07-05 12:37 ` Paolo Bonzini
[not found] ` <HK2PR02MB4145E122DC5AC2445137A10F80F50@HK2PR02MB4145.apcprd02.prod.outlook.com>
2019-07-05 13:00 ` Paolo Bonzini
[not found] ` <HK2PR02MB4145BBA5B72DD70AC622FD0E80F50@HK2PR02MB4145.apcprd02.prod.outlook.com>
2019-07-05 13:42 ` Paolo Bonzini
2019-06-21 9:40 ` [PATCH v5 3/4] KVM: LAPIC: Ignore timer migration when lapic timer is injected by pi Wanpeng Li
2019-06-21 9:40 ` [PATCH v5 4/4] KVM: LAPIC: Don't inject already-expired timer via posted interrupt Wanpeng Li
2019-07-05 12:40 ` Paolo Bonzini [this message]
[not found] ` <HK2PR02MB4145B13227997511174DBFA480F50@HK2PR02MB4145.apcprd02.prod.outlook.com>
2019-07-05 13:26 ` Paolo Bonzini
2019-07-02 16:38 ` [PATCH v5 0/4] KVM: LAPIC: Implement Exitless Timer Paolo Bonzini
2019-07-02 22:23 ` Marcelo Tosatti
2019-07-03 0:47 ` Wanpeng Li
2019-07-03 1:01 ` 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=67fad01b-8a77-5892-d963-77a3d321bb65@redhat.com \
--to=pbonzini@redhat.com \
--cc=kernellwp@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=rkrcmar@redhat.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).