From: Peter Xu <peterx@redhat.com>
To: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: kvm@vger.kernel.org, Nitesh Narayan Lal <nitesh@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 5/5] KVM: X86: Fix callers of kvm_apic_match_dest() to use correct macros
Date: Tue, 3 Dec 2019 11:27:47 -0500 [thread overview]
Message-ID: <20191203162747.GD17275@xz-x1> (raw)
In-Reply-To: <87r21lbl0c.fsf@vitty.brq.redhat.com>
On Tue, Dec 03, 2019 at 02:23:47PM +0100, Vitaly Kuznetsov wrote:
> Peter Xu <peterx@redhat.com> writes:
>
> > Callers of kvm_apic_match_dest() should always pass in APIC_DEST_*
> > macros for either dest_mode and short_hand parameters. Fix up all the
> > callers of kvm_apic_match_dest() that are not following the rule.
> >
> > Reported-by: Sean Christopherson <sean.j.christopherson@intel.com>
> > Reported-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> > Signed-off-by: Peter Xu <peterx@redhat.com>
> > ---
> > arch/x86/kvm/ioapic.c | 11 +++++++----
> > arch/x86/kvm/irq_comm.c | 3 ++-
> > 2 files changed, 9 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c
> > index 901d85237d1c..1082ca8d11e5 100644
> > --- a/arch/x86/kvm/ioapic.c
> > +++ b/arch/x86/kvm/ioapic.c
> > @@ -108,8 +108,9 @@ static void __rtc_irq_eoi_tracking_restore_one(struct kvm_vcpu *vcpu)
> > union kvm_ioapic_redirect_entry *e;
> >
> > e = &ioapic->redirtbl[RTC_GSI];
> > - if (!kvm_apic_match_dest(vcpu, NULL, 0, e->fields.dest_id,
> > - e->fields.dest_mode))
> > + if (!kvm_apic_match_dest(vcpu, NULL, APIC_DEST_NOSHORT,
> > + e->fields.dest_id,
> > + kvm_lapic_irq_dest_mode(e->fields.dest_mode)))
> > return;
> >
> > new_val = kvm_apic_pending_eoi(vcpu, e->fields.vector);
> > @@ -237,6 +238,7 @@ void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, ulong *ioapic_handled_vectors)
> > struct dest_map *dest_map = &ioapic->rtc_status.dest_map;
> > union kvm_ioapic_redirect_entry *e;
> > int index;
> > + u16 dm;
> >
> > spin_lock(&ioapic->lock);
> >
> > @@ -250,8 +252,9 @@ void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, ulong *ioapic_handled_vectors)
> > if (e->fields.trig_mode == IOAPIC_LEVEL_TRIG ||
> > kvm_irq_has_notifier(ioapic->kvm, KVM_IRQCHIP_IOAPIC, index) ||
> > index == RTC_GSI) {
> > - if (kvm_apic_match_dest(vcpu, NULL, 0,
> > - e->fields.dest_id, e->fields.dest_mode) ||
> > + dm = kvm_lapic_irq_dest_mode(e->fields.dest_mode);
>
> Nit: you could've defined 'dm' right here in the block (after '{') but
> in any case I'd suggest to stick to 'dest_mode' and not shorten it to
> 'dm' for consistency.
>
> > + if (kvm_apic_match_dest(vcpu, NULL, APIC_DEST_NOSHORT,
> > + e->fields.dest_id, dm) ||
> > kvm_apic_pending_eoi(vcpu, e->fields.vector))
> > __set_bit(e->fields.vector,
> > ioapic_handled_vectors);
> > diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c
> > index 5f59e5ebdbed..e89c2160b39f 100644
> > --- a/arch/x86/kvm/irq_comm.c
> > +++ b/arch/x86/kvm/irq_comm.c
> > @@ -417,7 +417,8 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,
> >
> > kvm_set_msi_irq(vcpu->kvm, entry, &irq);
> >
> > - if (irq.level && kvm_apic_match_dest(vcpu, NULL, 0,
> > + if (irq.level &&
> > + kvm_apic_match_dest(vcpu, NULL, APIC_DEST_NOSHORT,
> > irq.dest_id, irq.dest_mode))
> > __set_bit(irq.vector, ioapic_handled_vectors);
> > }
>
> Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
I'll move the declaration in with your r-b. 'dm' is a silly trick of
mine to avoid the 80-char line limit. Thanks,
--
Peter Xu
next prev parent reply other threads:[~2019-12-03 16:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 20:13 [PATCH v3 0/5] KVM: X86: Cleanups on dest_mode and headers Peter Xu
2019-12-02 20:13 ` [PATCH v3 1/5] KVM: X86: Fix kvm_bitmap_or_dest_vcpus() to use irq shorthand Peter Xu
2019-12-03 9:25 ` Vitaly Kuznetsov
2019-12-02 20:13 ` [PATCH v3 2/5] KVM: X86: Move irrelevant declarations out of ioapic.h Peter Xu
2019-12-03 9:36 ` Vitaly Kuznetsov
2019-12-02 20:13 ` [PATCH v3 3/5] KVM: X86: Use APIC_DEST_* macros properly in kvm_lapic_irq.dest_mode Peter Xu
2019-12-03 13:16 ` Vitaly Kuznetsov
2019-12-03 16:16 ` Peter Xu
2019-12-02 20:13 ` [PATCH v3 4/5] KVM: X86: Drop KVM_APIC_SHORT_MASK and KVM_APIC_DEST_MASK Peter Xu
2019-12-03 13:19 ` Vitaly Kuznetsov
2019-12-03 16:21 ` Peter Xu
2019-12-02 20:13 ` [PATCH v3 5/5] KVM: X86: Fix callers of kvm_apic_match_dest() to use correct macros Peter Xu
2019-12-03 13:23 ` Vitaly Kuznetsov
2019-12-03 16:27 ` Peter Xu [this message]
2019-12-03 16:32 ` Sean Christopherson
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=20191203162747.GD17275@xz-x1 \
--to=peterx@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nitesh@redhat.com \
--cc=pbonzini@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=vkuznets@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