[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 49/60] ioapic: support "info irq"
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 49/60] ioapic: support "info irq" |
Date: |
Thu, 28 Jun 2018 22:04:59 +0200 |
From: Peter Xu <address@hidden>
This include both userspace and in-kernel ioapic. Note that the numbers
can be inaccurate for kvm-ioapic. One reason is the same with
kvm-i8259, that when irqfd is used, irqs can be delivered all inside
kernel without our notice. Meanwhile, kvm-ioapic is specially treated
when irq numbers <ISA_NUM_IRQS, those irqs will be delivered in kernel
too via kvm-i8259 (please refer to kvm_pc_gsi_handler).
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/i386/kvm/ioapic.c | 2 ++
hw/intc/ioapic.c | 1 +
hw/intc/ioapic_common.c | 23 +++++++++++++++++++++++
include/hw/i386/ioapic_internal.h | 3 +++
4 files changed, 29 insertions(+)
diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index 646f624..5274dc7 100644
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -132,8 +132,10 @@ static void kvm_ioapic_reset(DeviceState *dev)
static void kvm_ioapic_set_irq(void *opaque, int irq, int level)
{
KVMIOAPICState *s = opaque;
+ IOAPICCommonState *common = IOAPIC_COMMON(s);
int delivered;
+ ioapic_stat_update_irq(common, irq, level);
delivered = kvm_set_irq(kvm_state, s->kvm_gsi_base + irq, level);
apic_report_irq_delivered(delivered);
}
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index c45f073..222f3f7 100644
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -148,6 +148,7 @@ static void ioapic_set_irq(void *opaque, int vector, int
level)
* the cleanest way of doing it but it should work. */
trace_ioapic_set_irq(vector, level);
+ ioapic_stat_update_irq(s, vector, level);
if (vector == 0) {
vector = 2;
}
diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
index a02c135..692dc37 100644
--- a/hw/intc/ioapic_common.c
+++ b/hw/intc/ioapic_common.c
@@ -35,6 +35,28 @@
*/
int ioapic_no;
+void ioapic_stat_update_irq(IOAPICCommonState *s, int irq, int level)
+{
+ if (level != s->irq_level[irq]) {
+ s->irq_level[irq] = level;
+ if (level == 1) {
+ s->irq_count[irq]++;
+ }
+ }
+}
+
+static bool ioapic_get_statistics(InterruptStatsProvider *obj,
+ uint64_t **irq_counts,
+ unsigned int *nb_irqs)
+{
+ IOAPICCommonState *s = IOAPIC_COMMON(obj);
+
+ *irq_counts = s->irq_count;
+ *nb_irqs = IOAPIC_NUM_PINS;
+
+ return true;
+}
+
static void ioapic_irr_dump(Monitor *mon, const char *name, uint32_t bitmap)
{
int i;
@@ -176,6 +198,7 @@ static void ioapic_common_class_init(ObjectClass *klass,
void *data)
dc->realize = ioapic_common_realize;
dc->vmsd = &vmstate_ioapic_common;
ic->print_info = ioapic_print_info;
+ ic->get_statistics = ioapic_get_statistics;
}
static const TypeInfo ioapic_common_type = {
diff --git a/include/hw/i386/ioapic_internal.h
b/include/hw/i386/ioapic_internal.h
index a11d86d..9848f39 100644
--- a/include/hw/i386/ioapic_internal.h
+++ b/include/hw/i386/ioapic_internal.h
@@ -109,10 +109,13 @@ struct IOAPICCommonState {
uint64_t ioredtbl[IOAPIC_NUM_PINS];
Notifier machine_done;
uint8_t version;
+ uint64_t irq_count[IOAPIC_NUM_PINS];
+ int irq_level[IOAPIC_NUM_PINS];
};
void ioapic_reset_common(DeviceState *dev);
void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s);
+void ioapic_stat_update_irq(IOAPICCommonState *s, int irq, int level);
#endif /* QEMU_IOAPIC_INTERNAL_H */
--
1.8.3.1
- [Qemu-devel] [PULL 38/60] hw/mips/jazz: create ESP device directly via qdev, (continued)
- [Qemu-devel] [PULL 38/60] hw/mips/jazz: create ESP device directly via qdev, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 37/60] pr-manager-helper: report event on connection/disconnection, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 41/60] WHPX: register for unrecognized MSR exits, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 43/60] target-i386: Add NMI interception to SVM, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 42/60] memory/hmp: Print owners/parents in "info mtree", Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 48/60] ioapic: some proper indents when dump info, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 46/60] doc: another fix to "info pic", Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 44/60] target-i386: Allow interrupt injection after STGI, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 45/60] target-i386: Mark cpu_vmexit noreturn, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 47/60] ioapic: support "info pic", Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 49/60] ioapic: support "info irq",
Paolo Bonzini <=
- [Qemu-devel] [PULL 51/60] kvm: support -overcommit cpu-pm=on|off, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 52/60] i386/cpu: make -cpu host support monitor/mwait, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 54/60] dump: use system context in Windows dump, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 56/60] dump: add Windows live system dump, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 53/60] dump: add Windows dump format to dump-guest-memory, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 55/60] dump: add fallback KDBG using in Windows dump, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 50/60] hmp: obsolete "info ioapic", Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 58/60] hw/scsi: centralize SG_IO calls into single function, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 60/60] tests/boot-serial: Do not delete the output file in case of errors, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 59/60] hw/scsi: add VPD Block Limits emulation, Paolo Bonzini, 2018/06/28