In order to implement postponing resamplefd event until an interrupt is unmasked, we need not only to track changes of the interrupt mask state (which is made possible by the previous patch "KVM: x86: Move kvm_(un)register_irq_mask_notifier() to generic KVM") but also to know its initial mask state at the time of registering a resamplefd listener. So implement kvm_irq_is_masked() for that. Actually, for now it's implemented for x86 only (see below). The implementation is trickier than I'd like it to be, for 2 reasons: 1. Interrupt (GSI) to irqchip pin mapping is not a 1:1 mapping: an IRQ may map to multiple pins on different irqchips. I guess the only reason for that is to support x86 interrupts 0-15 for which we don't know if the guest uses PIC or IOAPIC. For this reason kvm_set_irq() delivers interrupt to both, assuming the guest will ignore the unused one. For the same reason, in kvm_irq_is_masked() we should also take into account the mask state of both irqchips. We consider an interrupt unmasked if and only if it is unmasked in at least one of PIC or IOAPIC, assuming that in the unused one all the interrupts should be masked. 2. For now ->is_masked() implemented for x86 only, so need to handle the case when ->is_masked() is not provided by the irqchip. In such case kvm_irq_is_masked() returns failure, and its caller may fall back to an assumption that an interrupt is always unmasked. Link: https://lore.kernel.org/kvm/31420943-8c5f-125c-a5ee-d2fde2700083@xxxxxxxxxxxx/ Signed-off-by: Dmytro Maluka <dmy@xxxxxxxxxxxx> --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/i8259.c | 11 +++++++++++ arch/x86/kvm/ioapic.c | 11 +++++++++++ arch/x86/kvm/ioapic.h | 1 + arch/x86/kvm/irq_comm.c | 16 ++++++++++++++++ include/linux/kvm_host.h | 3 +++ virt/kvm/irqchip.c | 34 +++++++++++++++++++++++++++++++++ 7 files changed, 77 insertions(+) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 39a867d68721..64618b890700 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1840,6 +1840,7 @@ static inline int __kvm_irq_line_state(unsigned long *irq_state, int kvm_pic_set_irq(struct kvm_pic *pic, int irq, int irq_source_id, int level); void kvm_pic_clear_all(struct kvm_pic *pic, int irq_source_id); +bool kvm_pic_irq_is_masked(struct kvm_pic *pic, int irq); void kvm_inject_nmi(struct kvm_vcpu *vcpu); diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c index e1bb6218bb96..2d1ed3bc7cc5 100644 --- a/arch/x86/kvm/i8259.c +++ b/arch/x86/kvm/i8259.c @@ -211,6 +211,17 @@ void kvm_pic_clear_all(struct kvm_pic *s, int irq_source_id) pic_unlock(s); } +bool kvm_pic_irq_is_masked(struct kvm_pic *s, int irq) +{ + bool ret; + + pic_lock(s); + ret = !!(s->pics[irq >> 3].imr & (1 << irq)); + pic_unlock(s); + + return ret; +} + /* * acknowledge interrupt 'irq' */ diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c index 765943d7cfa5..874f68a65c87 100644 --- a/arch/x86/kvm/ioapic.c +++ b/arch/x86/kvm/ioapic.c @@ -478,6 +478,17 @@ void kvm_ioapic_clear_all(struct kvm_ioapic *ioapic, int irq_source_id) spin_unlock(&ioapic->lock); } +bool kvm_ioapic_irq_is_masked(struct kvm_ioapic *ioapic, int irq) +{ + bool ret; + + spin_lock(&ioapic->lock); + ret = !!ioapic->redirtbl[irq].fields.mask; + spin_unlock(&ioapic->lock); + + return ret; +} + static void kvm_ioapic_eoi_inject_work(struct work_struct *work) { int i; diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h index 539333ac4b38..fe1f51319992 100644 --- a/arch/x86/kvm/ioapic.h +++ b/arch/x86/kvm/ioapic.h @@ -114,6 +114,7 @@ void kvm_ioapic_destroy(struct kvm *kvm); int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int irq_source_id, int level, bool line_status); void kvm_ioapic_clear_all(struct kvm_ioapic *ioapic, int irq_source_id); +bool kvm_ioapic_irq_is_masked(struct kvm_ioapic *ioapic, int irq); void kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state); void kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state); void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c index 43e13892ed34..5bff6d6ac54f 100644 --- a/arch/x86/kvm/irq_comm.c +++ b/arch/x86/kvm/irq_comm.c @@ -34,6 +34,13 @@ static int kvm_set_pic_irq(struct kvm_kernel_irq_routing_entry *e, return kvm_pic_set_irq(pic, e->irqchip.pin, irq_source_id, level); } +static bool kvm_is_masked_pic_irq(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm) +{ + struct kvm_pic *pic = kvm->arch.vpic; + return kvm_pic_irq_is_masked(pic, e->irqchip.pin); +} + static int kvm_set_ioapic_irq(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm, int irq_source_id, int level, bool line_status) @@ -43,6 +50,13 @@ static int kvm_set_ioapic_irq(struct kvm_kernel_irq_routing_entry *e, line_status); } +static bool kvm_is_masked_ioapic_irq(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm) +{ + struct kvm_ioapic *ioapic = kvm->arch.vioapic; + return kvm_ioapic_irq_is_masked(ioapic, e->irqchip.pin); +} + int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, struct kvm_lapic_irq *irq, struct dest_map *dest_map) { @@ -275,11 +289,13 @@ int kvm_set_routing_entry(struct kvm *kvm, if (ue->u.irqchip.pin >= PIC_NUM_PINS / 2) return -EINVAL; e->set = kvm_set_pic_irq; + e->is_masked = kvm_is_masked_pic_irq; break; case KVM_IRQCHIP_IOAPIC: if (ue->u.irqchip.pin >= KVM_IOAPIC_NUM_PINS) return -EINVAL; e->set = kvm_set_ioapic_irq; + e->is_masked = kvm_is_masked_ioapic_irq; break; default: return -EINVAL; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 9e12ef503157..e8bfb3b0d4d1 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -625,6 +625,8 @@ struct kvm_kernel_irq_routing_entry { int (*set)(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm, int irq_source_id, int level, bool line_status); + bool (*is_masked)(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm); union { struct { unsigned irqchip; @@ -1598,6 +1600,7 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *irq_entry, struct kvm *kvm, int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm, int irq_source_id, int level, bool line_status); +int kvm_irq_is_masked(struct kvm *kvm, int irq, bool *masked); bool kvm_irq_has_notifier(struct kvm *kvm, unsigned irqchip, unsigned pin); void kvm_notify_acked_gsi(struct kvm *kvm, int gsi); void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin); diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index 58e4f88b2b9f..9252ebedba55 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -97,6 +97,40 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level, return ret; } +/* + * Return value: + * = 0 Interrupt mask state successfully written to `masked` + * < 0 Failed to read interrupt mask state + */ +int kvm_irq_is_masked(struct kvm *kvm, int irq, bool *masked) +{ + struct kvm_kernel_irq_routing_entry irq_set[KVM_NR_IRQCHIPS]; + int ret = -1, i, idx; + + /* Not possible to detect if the guest uses the PIC or the + * IOAPIC. So assume the interrupt to be unmasked iff it is + * unmasked in at least one of both. + */ + idx = srcu_read_lock(&kvm->irq_srcu); + i = kvm_irq_map_gsi(kvm, irq_set, irq); + srcu_read_unlock(&kvm->irq_srcu, idx); + + while (i--) { + if (!irq_set[i].is_masked) + continue; + + if (!irq_set[i].is_masked(&irq_set[i], kvm)) { + *masked = false; + return 0; + } + ret = 0; + } + if (!ret) + *masked = true; + + return ret; +} + static void free_irq_routing_table(struct kvm_irq_routing_table *rt) { int i; -- 2.37.0.170.g444d1eabd0-goog
