On Fri, Oct 06, 2017 at 04:33:52PM +0100, Marc Zyngier wrote: > When the VLPI gets mapped, it must inherit the configuration of > the LPI configured at the vITS level. For that purpose, let's make > update_lpi_config globally available and call it just after > having performed the VLPI map operation. > > Acked-by: Christoffer Dall <[email protected]> > Signed-off-by: Marc Zyngier <[email protected]> > --- > virt/kvm/arm/vgic/vgic-its.c | 6 ++---- > virt/kvm/arm/vgic/vgic-v4.c | 2 ++ > virt/kvm/arm/vgic/vgic.h | 2 ++ > 3 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c > index eb72eb027060..f434748439ee 100644 > --- a/virt/kvm/arm/vgic/vgic-its.c > +++ b/virt/kvm/arm/vgic/vgic-its.c > @@ -37,8 +37,6 @@ > static int vgic_its_save_tables_v0(struct vgic_its *its); > static int vgic_its_restore_tables_v0(struct vgic_its *its); > static int vgic_its_commit_v0(struct vgic_its *its); > -static int update_lpi_config(struct kvm *kvm, struct vgic_irq *irq, > - struct kvm_vcpu *filter_vcpu, bool needs_inv); > > /* > * Creates a new (reference to a) struct vgic_irq for a given LPI. > @@ -272,8 +270,8 @@ static struct its_collection *find_collection(struct > vgic_its *its, int coll_id) > * If filter_vcpu is not NULL, applies only if the IRQ is targeting this > * VCPU. Unconditionally applies if filter_vcpu is NULL. > */ > -static int update_lpi_config(struct kvm *kvm, struct vgic_irq *irq, > - struct kvm_vcpu *filter_vcpu, bool needs_inv) > +int update_lpi_config(struct kvm *kvm, struct vgic_irq *irq, > + struct kvm_vcpu *filter_vcpu, bool needs_inv) > { > u64 propbase = GICR_PROPBASER_ADDRESS(kvm->arch.vgic.propbaser); > u8 prop; > diff --git a/virt/kvm/arm/vgic/vgic-v4.c b/virt/kvm/arm/vgic/vgic-v4.c > index ba1dd3162eba..b79a0450bb1c 100644 > --- a/virt/kvm/arm/vgic/vgic-v4.c > +++ b/virt/kvm/arm/vgic/vgic-v4.c > @@ -147,6 +147,8 @@ int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int virq, > irq->hw = true; > irq->host_irq = virq; > > + /* Force the property update and invalidate */ > + update_lpi_config(kvm, irq, NULL, true);
Actually, when re-reading this patch, this looks weird to me. I think this needs to either be done as part of the map, or before the map, to prevent for example a disabled interrupt from the guest'ss PoV to fire when it doesn't expect it. Thanks, -Christoffer > out: > mutex_unlock(&its->its_lock); > return ret; > diff --git a/virt/kvm/arm/vgic/vgic.h b/virt/kvm/arm/vgic/vgic.h > index c4105f613f57..1bd2e28ac097 100644 > --- a/virt/kvm/arm/vgic/vgic.h > +++ b/virt/kvm/arm/vgic/vgic.h > @@ -239,6 +239,8 @@ static inline int vgic_v3_max_apr_idx(struct kvm_vcpu > *vcpu) > int vgic_its_resolve_lpi(struct kvm *kvm, struct vgic_its *its, > u32 devid, u32 eventid, struct vgic_irq **irq); > struct vgic_its *vgic_msi_to_its(struct kvm *kvm, struct kvm_msi *msi); > +int update_lpi_config(struct kvm *kvm, struct vgic_irq *irq, > + struct kvm_vcpu *filter_vcpu, bool needs_inv); > > bool vgic_supports_direct_msis(struct kvm *kvm); > int vgic_v4_init(struct kvm *kvm); > -- > 2.14.1 > > _______________________________________________ > kvmarm mailing list > [email protected] > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
