[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 07/12] arm/sdei: override qemu_irq handler when binding inter
From: |
Heyi Guo |
Subject: |
[RFC PATCH 07/12] arm/sdei: override qemu_irq handler when binding interrupt |
Date: |
Tue, 24 Sep 2019 23:21:46 +0800 |
Override qemu_irq handler to support trigger SDEI event transparently
after guest binds interrupt to SDEI event. We don't have good way to
get GIC device and to guarantee SDEI device is initialized after GIC,
so we search GIC in system bus when the first SDEI request happens or
in VMSTATE post_load().
Signed-off-by: Heyi Guo <address@hidden>
Cc: Peter Maydell <address@hidden>
Cc: Dave Martin <address@hidden>
Cc: Marc Zyngier <address@hidden>
Cc: Mark Rutland <address@hidden>
Cc: James Morse <address@hidden>
---
target/arm/sdei.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++--
target/arm/sdei_int.h | 3 ++
2 files changed, 137 insertions(+), 3 deletions(-)
diff --git a/target/arm/sdei.c b/target/arm/sdei.c
index 088ed76..9ceb131 100644
--- a/target/arm/sdei.c
+++ b/target/arm/sdei.c
@@ -85,6 +85,24 @@ static void qemu_sde_cpu_init(QemuSDEState *s)
}
}
+static int gic_int_to_irq(int num_irq, int intid, int cpu)
+{
+ if (intid >= GIC_INTERNAL) {
+ return intid - GIC_INTERNAL;
+ }
+ return num_irq - GIC_INTERNAL + cpu * GIC_INTERNAL + intid;
+}
+
+static int irq_to_gic_int(int num_irq, int irq, int *cpu)
+{
+ if (irq < num_irq - GIC_INTERNAL) {
+ return irq + GIC_INTERNAL;
+ }
+ irq -= num_irq - GIC_INTERNAL;
+ *cpu = irq / GIC_INTERNAL;
+ return irq % GIC_INTERNAL;
+}
+
static inline QemuSDECpu *get_sde_cpu(QemuSDEState *s, CPUState *cs)
{
assert(cs->cpu_index < s->sdei_max_cpus);
@@ -381,6 +399,76 @@ static void dispatch_cpu(QemuSDEState *s, CPUState *cs,
bool is_critical)
}
}
+static void qemu_sdei_irq_handler(void *opaque, int irq, int level)
+{
+ int cpu = 0;
+ irq = irq_to_gic_int(sde_state->num_irq, irq, &cpu);
+ trigger_sdei_by_irq(cpu, irq);
+}
+
+static void override_qemu_irq(QemuSDEState *s, int32_t event, uint32_t intid)
+{
+ qemu_irq irq;
+ QemuSDE *sde;
+ CPUState *cs;
+ int cpu;
+
+ /* SPI */
+ if (intid >= GIC_INTERNAL) {
+ cs = arm_get_cpu_by_id(0);
+ irq = qdev_get_gpio_in(s->gic_dev,
+ gic_int_to_irq(s->num_irq, intid, 0));
+ if (irq) {
+ qemu_irq_intercept_in(&irq, qemu_sdei_irq_handler, 1);
+ }
+ sde = get_sde_no_check(s, event, cs);
+ sde->irq = irq;
+ put_sde(sde, cs);
+ return;
+ }
+ /* PPI */
+ for (cpu = 0; cpu < s->sdei_max_cpus; cpu++) {
+ cs = arm_get_cpu_by_id(cpu);
+ irq = qdev_get_gpio_in(s->gic_dev,
+ gic_int_to_irq(s->num_irq, intid, cpu));
+ if (irq) {
+ qemu_irq_intercept_in(&irq, qemu_sdei_irq_handler, 1);
+ }
+ sde = get_sde_no_check(s, event, cs);
+ sde->irq = irq;
+ put_sde(sde, cs);
+ }
+}
+
+static void restore_qemu_irq(QemuSDEState *s, int32_t event, uint32_t intid)
+{
+ QemuSDE *sde;
+ CPUState *cs;
+ int cpu;
+
+ /* SPI */
+ if (intid >= GIC_INTERNAL) {
+ cs = arm_get_cpu_by_id(0);
+ sde = get_sde_no_check(s, event, cs);
+ if (sde->irq) {
+ qemu_irq_remove_intercept(&sde->irq, 1);
+ sde->irq = NULL;
+ }
+ put_sde(sde, cs);
+ return;
+ }
+ /* PPI */
+ for (cpu = 0; cpu < s->sdei_max_cpus; cpu++) {
+ cs = arm_get_cpu_by_id(cpu);
+ sde = get_sde_no_check(s, event, cs);
+ if (sde->irq) {
+ qemu_irq_remove_intercept(&sde->irq, 1);
+ sde->irq = NULL;
+ }
+ put_sde(sde, cs);
+ }
+}
+
static int32_t sdei_alloc_event_num(QemuSDEState *s, bool is_critical,
bool is_shared, int intid)
{
@@ -414,6 +502,7 @@ static int32_t sdei_alloc_event_num(QemuSDEState *s, bool
is_critical,
sde_props[index].interrupt = intid;
sde_props[index].is_shared = is_shared;
sde_props[index].is_critical = is_critical;
+ override_qemu_irq(s, event, intid);
s->irq_map[intid] = event;
qemu_mutex_unlock(&sde_props[index].lock);
qemu_mutex_unlock(&s->sdei_interrupt_bind_lock);
@@ -433,6 +522,7 @@ static int32_t sdei_free_event_num_locked(QemuSDEState *s,
QemuSDEProp *prop)
goto unlock_return;
}
+ restore_qemu_irq(s, prop->event_id, prop->interrupt);
s->irq_map[prop->interrupt] = SDEI_INVALID_EVENT_ID;
prop->event_id = SDEI_INVALID_EVENT_ID;
prop->interrupt = SDEI_INVALID_INTERRUPT;
@@ -929,13 +1019,33 @@ static int64_t sdei_event_pe_unmask(QemuSDEState *s,
CPUState *cs,
return SDEI_SUCCESS;
}
+static int dev_walkerfn(DeviceState *dev, void *opaque)
+{
+ QemuSDEState *s = opaque;
+
+ if (object_dynamic_cast(OBJECT(dev), TYPE_ARM_GICV3_COMMON)) {
+ GICv3State *gic = ARM_GICV3_COMMON(dev);
+ s->num_irq = gic->num_irq;
+ s->gic_dev = dev;
+ return -1;
+ }
+
+ if (object_dynamic_cast(OBJECT(dev), TYPE_ARM_GIC_COMMON)) {
+ GICState *gic = ARM_GIC_COMMON(dev);
+ s->num_irq = gic->num_irq;
+ s->gic_dev = dev;
+ return -1;
+ }
+ return 0;
+}
+
static int64_t sdei_event_interrupt_bind(QemuSDEState *s, CPUState *cs,
struct kvm_run *run)
{
uint64_t *args = (uint64_t *)(run->hypercall.args);
uint32_t intid = args[1];
- if (intid < GIC_NR_SGIS || intid >= GIC_MAXIRQ) {
+ if (intid < GIC_NR_SGIS || intid >= s->num_irq) {
return SDEI_INVALID_PARAMETERS;
}
return sdei_alloc_event_num(s, false, intid >= 32, intid);
@@ -1042,6 +1152,17 @@ void sdei_handle_request(CPUState *cs, struct kvm_run
*run)
return;
}
+ if (!sde_state->gic_dev) {
+ /* Search for ARM GIC device */
+ qbus_walk_children(sysbus_get_default(), dev_walkerfn,
+ NULL, NULL, NULL, sde_state);
+ if (!sde_state->gic_dev) {
+ error_report("Cannot find ARM GIC device!");
+ run->hypercall.args[0] = SDEI_NOT_SUPPORTED;
+ return;
+ }
+ }
+
if (func_id < SDEI_1_0_FN_BASE || func_id > SDEI_MAX_REQ) {
error_report("Invalid SDEI function ID: 0x%x", func_id);
run->hypercall.args[0] = SDEI_INVALID_PARAMETERS;
@@ -1198,9 +1319,19 @@ static int qemu_sdei_post_load(void *opaque, int
version_id)
}
}
+ /* Search for ARM GIC device */
+ qbus_walk_children(sysbus_get_default(), dev_walkerfn,
+ NULL, NULL, NULL, s);
+ if (!s->gic_dev) {
+ error_report("Cannot find ARM GIC device!");
+ return 0;
+ }
+
for (i = 0; i < PRIVATE_SLOT_COUNT + SHARED_SLOT_COUNT; i++) {
- if (sde_props[i].interrupt != SDEI_INVALID_INTERRUPT) {
- s->irq_map[sde_props[i].interrupt] = sde_props[i].event_id;
+ int intid = sde_props[i].interrupt;
+ if (intid != SDEI_INVALID_INTERRUPT) {
+ s->irq_map[intid] = sde_props[i].event_id;
+ override_qemu_irq(s, sde_props[i].event_id, intid);
}
}
diff --git a/target/arm/sdei_int.h b/target/arm/sdei_int.h
index 7f69507..3930591 100644
--- a/target/arm/sdei_int.h
+++ b/target/arm/sdei_int.h
@@ -63,6 +63,7 @@ typedef struct QemuSDEProp {
typedef struct QemuSDE {
QemuSDEProp *prop;
CPUState *target_cpu;
+ qemu_irq irq;
QemuMutex lock;
bool enabled;
bool running;
@@ -95,9 +96,11 @@ typedef struct QemuSDECpu {
typedef struct QemuSDEState {
DeviceState parent_obj;
+ DeviceState *gic_dev;
QemuSDEProp sde_props_state[PRIVATE_SLOT_COUNT + SHARED_SLOT_COUNT];
QemuSDECpu *sde_cpus;
int sdei_max_cpus;
+ int num_irq;
QemuSDE *shared_sde_array[SHARED_SLOT_COUNT];
int32_t irq_map[GIC_MAXIRQ];
QemuMutex sdei_interrupt_bind_lock;
--
1.8.3.1
- [RFC PATCH 00/12] Add SDEI support for arm64, Heyi Guo, 2019/09/24
- [RFC PATCH 01/12] linux-headers: import arm_sdei.h, Heyi Guo, 2019/09/24
- [RFC PATCH 10/12] arm/sdei: check KVM cap and enable SDEI, Heyi Guo, 2019/09/24
- [RFC PATCH 04/12] arm/sdei: add system reset callback, Heyi Guo, 2019/09/24
- [RFC PATCH 06/12] core/irq: add qemu_irq_remove_intercept interface, Heyi Guo, 2019/09/24
- [RFC PATCH 02/12] arm/sdei: add virtual device framework, Heyi Guo, 2019/09/24
- [RFC PATCH 07/12] arm/sdei: override qemu_irq handler when binding interrupt,
Heyi Guo <=
- [RFC PATCH 03/12] arm/sdei: add support to handle SDEI requests from guest, Heyi Guo, 2019/09/24
- [RFC PATCH 05/12] arm/sdei: add support to trigger event by GIC interrupt ID, Heyi Guo, 2019/09/24
- [RFC PATCH 09/12] linux-headers/kvm.h: add capability to forward hypercall, Heyi Guo, 2019/09/24
- [RFC PATCH 08/12] arm/sdei: add support to register interrupt bind notifier, Heyi Guo, 2019/09/24
- [RFC PATCH 11/12] arm/kvm: handle guest exit of hypercall, Heyi Guo, 2019/09/24
- [RFC PATCH 12/12] virt/acpi: add SDEI table if SDEI is enabled, Heyi Guo, 2019/09/24
- Re: [RFC PATCH 00/12] Add SDEI support for arm64, no-reply, 2019/09/25
- Re: [RFC PATCH 00/12] Add SDEI support for arm64, no-reply, 2019/09/25
- Re: [RFC PATCH 00/12] Add SDEI support for arm64, Peter Maydell, 2019/09/30