From: Vitaly Kuznetsov <vkuznets@redhat.com> To: "Suthikulpanit\, Suravee" <Suravee.Suthikulpanit@amd.com> Cc: "pbonzini\@redhat.com" <pbonzini@redhat.com>, "rkrcmar\@redhat.com" <rkrcmar@redhat.com>, "joro\@8bytes.org" <joro@8bytes.org>, "graf\@amazon.com" <graf@amazon.com>, "jschoenh\@amazon.de" <jschoenh@amazon.de>, "karahmed\@amazon.de" <karahmed@amazon.de>, "rimasluk\@amazon.com" <rimasluk@amazon.com>, "Grimm\, Jon" <Jon.Grimm@amd.com>, "Suthikulpanit\, Suravee" <Suravee.Suthikulpanit@amd.com>, "linux-kernel\@vger.kernel.org" <linux-kernel@vger.kernel.org>, "kvm\@vger.kernel.org" <kvm@vger.kernel.org> Subject: Re: [PATCH v2 05/15] kvm: lapic: Introduce APICv update helper function Date: Tue, 27 Aug 2019 09:22:50 +0200 Message-ID: <87a7bvm5rp.fsf@vitty.brq.redhat.com> (raw) In-Reply-To: <1565886293-115836-6-git-send-email-suravee.suthikulpanit@amd.com> "Suthikulpanit, Suravee" <Suravee.Suthikulpanit@amd.com> writes: > Re-factor code into a helper function for setting lapic parameters when > activate/deactivate APICv, and export the function for subsequent usage. > > Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> > --- > arch/x86/kvm/lapic.c | 22 +++++++++++++++++----- > arch/x86/kvm/lapic.h | 1 + > 2 files changed, 18 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index 4dabc31..90f79ca 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -2153,6 +2153,21 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) > > } > > +void kvm_apic_update_apicv(struct kvm_vcpu *vcpu) > +{ > + struct kvm_lapic *apic = vcpu->arch.apic; > + > + if (vcpu->arch.apicv_active) { > + /* irr_pending is always true when apicv is activated. */ > + apic->irr_pending = true; > + apic->isr_count = 1; > + } else { > + apic->irr_pending = (apic_search_irr(apic) != -1); > + apic->isr_count = count_vectors(apic->regs + APIC_ISR); > + } > +} > +EXPORT_SYMBOL(kvm_apic_update_apicv); EXPORT_SYMBOL_GPL please. > + > void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) > { > struct kvm_lapic *apic = vcpu->arch.apic; > @@ -2197,8 +2212,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) > kvm_lapic_set_reg(apic, APIC_ISR + 0x10 * i, 0); > kvm_lapic_set_reg(apic, APIC_TMR + 0x10 * i, 0); > } > - apic->irr_pending = vcpu->arch.apicv_active; > - apic->isr_count = vcpu->arch.apicv_active ? 1 : 0; > + kvm_apic_update_apicv(vcpu); > apic->highest_isr_cache = -1; > update_divide_count(apic); > atomic_set(&apic->lapic_timer.pending, 0); > @@ -2468,9 +2482,7 @@ int kvm_apic_set_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s) > apic_manage_nmi_watchdog(apic, kvm_lapic_get_reg(apic, APIC_LVT0)); > update_divide_count(apic); > start_apic_timer(apic); > - apic->irr_pending = true; > - apic->isr_count = vcpu->arch.apicv_active ? > - 1 : count_vectors(apic->regs + APIC_ISR); > + kvm_apic_update_apicv(vcpu); > apic->highest_isr_cache = -1; > if (vcpu->arch.apicv_active) { > kvm_x86_ops->apicv_post_state_restore(vcpu); > diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h > index d6d049b..3892d50 100644 > --- a/arch/x86/kvm/lapic.h > +++ b/arch/x86/kvm/lapic.h > @@ -90,6 +90,7 @@ bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source, > int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq, > struct dest_map *dest_map); > int kvm_apic_local_deliver(struct kvm_lapic *apic, int lvt_type); > +void kvm_apic_update_apicv(struct kvm_vcpu *vcpu); > > bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src, > struct kvm_lapic_irq *irq, int *r, struct dest_map *dest_map); -- Vitaly
next prev parent reply index Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-15 16:25 [PATCH v2 00/15] kvm: x86: Support AMD SVM AVIC w/ in-kernel irqchip mode Suthikulpanit, Suravee 2019-08-15 16:25 ` [PATCH v2 01/15] kvm: x86: Modify kvm_x86_ops.get_enable_apicv() to use struct kvm parameter Suthikulpanit, Suravee 2019-08-27 7:15 ` Vitaly Kuznetsov 2019-08-15 16:25 ` [PATCH v2 02/15] kvm: x86: Introduce KVM APICv state Suthikulpanit, Suravee 2019-08-19 9:49 ` Alexander Graf 2019-08-26 19:06 ` Suthikulpanit, Suravee 2019-08-15 16:25 ` [PATCH v2 03/15] kvm: Add arch-specific per-VM debugfs support Suthikulpanit, Suravee 2019-08-15 16:25 ` [PATCH v2 04/15] kvm: x86: Add per-VM APICv state debugfs Suthikulpanit, Suravee 2019-08-19 9:57 ` Alexander Graf 2019-08-26 19:41 ` Suthikulpanit, Suravee 2019-08-27 8:20 ` Alexander Graf 2019-08-28 18:39 ` Suthikulpanit, Suravee 2019-08-28 19:36 ` Graf (AWS), Alexander 2019-08-15 16:25 ` [PATCH v2 05/15] kvm: lapic: Introduce APICv update helper function Suthikulpanit, Suravee 2019-08-27 7:22 ` Vitaly Kuznetsov [this message] 2019-08-15 16:25 ` [PATCH v2 06/15] kvm: x86: Add support for activate/de-activate APICv at runtime Suthikulpanit, Suravee 2019-08-27 7:29 ` Vitaly Kuznetsov 2019-08-27 8:05 ` Alexander Graf 2019-08-15 16:25 ` [PATCH v2 07/15] kvm: x86: svm: Add support to activate/deactivate posted interrupts Suthikulpanit, Suravee 2019-08-15 16:25 ` [PATCH v2 08/15] svm: Add support for setup/destroy virutal APIC backing page for AVIC Suthikulpanit, Suravee 2019-08-15 16:25 ` [PATCH v2 09/15] svm: Add support for activate/deactivate AVIC at runtime Suthikulpanit, Suravee 2019-08-19 10:28 ` Alexander Graf 2019-08-15 16:25 ` [PATCH v2 10/15] kvm: x86: hyperv: Use APICv deactivate request interface Suthikulpanit, Suravee 2019-08-19 10:31 ` Alexander Graf 2019-08-15 16:25 ` [PATCH v2 11/15] svm: Temporary deactivate AVIC during ExtINT handling Suthikulpanit, Suravee 2019-08-19 10:35 ` Alexander Graf 2019-08-28 15:17 ` Suthikulpanit, Suravee 2019-08-28 19:37 ` Graf (AWS), Alexander 2019-09-10 15:46 ` Suthikulpanit, Suravee 2019-08-15 16:25 ` [PATCH v2 12/15] kvm: i8254: Check LAPIC EOI pending when injecting irq on SVM AVIC Suthikulpanit, Suravee 2019-08-19 10:42 ` Alexander Graf 2019-08-26 20:46 ` Suthikulpanit, Suravee 2019-08-27 9:10 ` Alexander Graf 2019-09-13 14:50 ` Suthikulpanit, Suravee 2019-08-15 16:25 ` [PATCH v2 13/15] kvm: lapic: Clean up APIC predefined macros Suthikulpanit, Suravee 2019-08-15 16:25 ` [PATCH v2 14/15] kvm: ioapic: Delay update IOAPIC EOI for RTC Suthikulpanit, Suravee 2019-08-19 11:00 ` Alexander Graf 2019-09-04 2:06 ` Suthikulpanit, Suravee 2019-08-15 16:25 ` [PATCH v2 15/15] svm: Allow AVIC with in-kernel irqchip mode Suthikulpanit, Suravee
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=87a7bvm5rp.fsf@vitty.brq.redhat.com \ --to=vkuznets@redhat.com \ --cc=Jon.Grimm@amd.com \ --cc=Suravee.Suthikulpanit@amd.com \ --cc=graf@amazon.com \ --cc=joro@8bytes.org \ --cc=jschoenh@amazon.de \ --cc=karahmed@amazon.de \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=pbonzini@redhat.com \ --cc=rimasluk@amazon.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
KVM Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/kvm/0 kvm/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 kvm kvm/ https://lore.kernel.org/kvm \ kvm@vger.kernel.org public-inbox-index kvm Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.kvm AGPL code for this site: git clone https://public-inbox.org/public-inbox.git