| Message ID | 20231108014141.2590657-9-lixianglai@loongson.cn |
|---|---|
| State | New |
| Headers | show |
| Series | Add loongarch kvm accel support | expand |
On 8/11/23 02:41, xianglai li wrote: > From: Tianrui Zhao <zhaotianrui@loongson.cn> > > Implement loongarch kvm set vcpu interrupt interface, > when a irq is set in vcpu, we use the KVM_INTERRUPT > ioctl to set intr into kvm. > > Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn> > Signed-off-by: xianglai li <lixianglai@loongson.cn> > --- > target/loongarch/cpu.c | 18 +++++++++++++----- > target/loongarch/kvm-stub.c | 13 +++++++++++++ > target/loongarch/kvm.c | 15 +++++++++++++++ > target/loongarch/kvm_loongarch.h | 13 +++++++++++++ > target/loongarch/trace-events | 1 + > 5 files changed, 55 insertions(+), 5 deletions(-) > create mode 100644 target/loongarch/kvm-stub.c > create mode 100644 target/loongarch/kvm_loongarch.h > > diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c > index 0a4d1a9778..3073f1548d 100644 > --- a/target/loongarch/cpu.c > +++ b/target/loongarch/cpu.c > @@ -20,6 +20,11 @@ > #include "sysemu/reset.h" > #include "tcg/tcg.h" > #include "vec.h" > +#include "sysemu/kvm.h" > +#include "kvm_loongarch.h" > +#ifdef CONFIG_KVM > +#include <linux/kvm.h> > +#endif > > const char * const regnames[32] = { > "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", > @@ -108,12 +113,15 @@ void loongarch_cpu_set_irq(void *opaque, int irq, int level) > return; > } > > - env->CSR_ESTAT = deposit64(env->CSR_ESTAT, irq, 1, level != 0); > - > - if (FIELD_EX64(env->CSR_ESTAT, CSR_ESTAT, IS)) { > - cpu_interrupt(cs, CPU_INTERRUPT_HARD); > + if (kvm_enabled()) { > + kvm_loongarch_set_interrupt(cpu, irq, level); Since you guard this call with kvm_enabled(), ... > } else { > - cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); > + env->CSR_ESTAT = deposit64(env->CSR_ESTAT, irq, 1, level != 0); > + if (FIELD_EX64(env->CSR_ESTAT, CSR_ESTAT, IS)) { > + cpu_interrupt(cs, CPU_INTERRUPT_HARD); > + } else { > + cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); > + } > } > } > > diff --git a/target/loongarch/kvm-stub.c b/target/loongarch/kvm-stub.c > new file mode 100644 > index 0000000000..d38c30ec78 > --- /dev/null > +++ b/target/loongarch/kvm-stub.c > @@ -0,0 +1,13 @@ > +/* > + * QEMU KVM LoongArch specific function stubs > + * > + * Copyright (c) 2023 Loongson Technology Corporation Limited > + */ > +#include "qemu/osdep.h" > +#include "cpu.h" > +#include "kvm_loongarch.h" > + > +int kvm_loongarch_set_interrupt(LoongArchCPU *cpu, int irq, int level) > +{ > + g_assert_not_reached(); ... this stub shouldn't be required. Have you tested a TCG-only build? Then a KVM-only one? > +} > diff --git a/target/loongarch/kvm_loongarch.h b/target/loongarch/kvm_loongarch.h > new file mode 100644 > index 0000000000..cdef980eec > --- /dev/null > +++ b/target/loongarch/kvm_loongarch.h > @@ -0,0 +1,13 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > +/* > + * QEMU LoongArch kvm interface > + * > + * Copyright (c) 2023 Loongson Technology Corporation Limited > + */ > + > +#ifndef QEMU_KVM_LOONGARCH_H > +#define QEMU_KVM_LOONGARCH_H > + Missing: #include "cpu.h" to get the LoongArchCPU type declaration. > +int kvm_loongarch_set_interrupt(LoongArchCPU *cpu, int irq, int level); > + > +#endif Regards, Phil.
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index 0a4d1a9778..3073f1548d 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -20,6 +20,11 @@ #include "sysemu/reset.h" #include "tcg/tcg.h" #include "vec.h" +#include "sysemu/kvm.h" +#include "kvm_loongarch.h" +#ifdef CONFIG_KVM +#include <linux/kvm.h> +#endif const char * const regnames[32] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", @@ -108,12 +113,15 @@ void loongarch_cpu_set_irq(void *opaque, int irq, int level) return; } - env->CSR_ESTAT = deposit64(env->CSR_ESTAT, irq, 1, level != 0); - - if (FIELD_EX64(env->CSR_ESTAT, CSR_ESTAT, IS)) { - cpu_interrupt(cs, CPU_INTERRUPT_HARD); + if (kvm_enabled()) { + kvm_loongarch_set_interrupt(cpu, irq, level); } else { - cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); + env->CSR_ESTAT = deposit64(env->CSR_ESTAT, irq, 1, level != 0); + if (FIELD_EX64(env->CSR_ESTAT, CSR_ESTAT, IS)) { + cpu_interrupt(cs, CPU_INTERRUPT_HARD); + } else { + cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); + } } } diff --git a/target/loongarch/kvm-stub.c b/target/loongarch/kvm-stub.c new file mode 100644 index 0000000000..d38c30ec78 --- /dev/null +++ b/target/loongarch/kvm-stub.c @@ -0,0 +1,13 @@ +/* + * QEMU KVM LoongArch specific function stubs + * + * Copyright (c) 2023 Loongson Technology Corporation Limited + */ +#include "qemu/osdep.h" +#include "cpu.h" +#include "kvm_loongarch.h" + +int kvm_loongarch_set_interrupt(LoongArchCPU *cpu, int irq, int level) +{ + g_assert_not_reached(); +} diff --git a/target/loongarch/kvm.c b/target/loongarch/kvm.c index d2dab3fef4..bd33ec2114 100644 --- a/target/loongarch/kvm.c +++ b/target/loongarch/kvm.c @@ -748,6 +748,21 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) return ret; } +int kvm_loongarch_set_interrupt(LoongArchCPU *cpu, int irq, int level) +{ + struct kvm_interrupt intr; + CPUState *cs = CPU(cpu); + + if (level) { + intr.irq = irq; + } else { + intr.irq = -irq; + } + + trace_kvm_set_intr(irq, level); + return kvm_vcpu_ioctl(cs, KVM_INTERRUPT, &intr); +} + void kvm_arch_accel_class_init(ObjectClass *oc) { } diff --git a/target/loongarch/kvm_loongarch.h b/target/loongarch/kvm_loongarch.h new file mode 100644 index 0000000000..cdef980eec --- /dev/null +++ b/target/loongarch/kvm_loongarch.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * QEMU LoongArch kvm interface + * + * Copyright (c) 2023 Loongson Technology Corporation Limited + */ + +#ifndef QEMU_KVM_LOONGARCH_H +#define QEMU_KVM_LOONGARCH_H + +int kvm_loongarch_set_interrupt(LoongArchCPU *cpu, int irq, int level); + +#endif diff --git a/target/loongarch/trace-events b/target/loongarch/trace-events index 021839880e..dea11edc0f 100644 --- a/target/loongarch/trace-events +++ b/target/loongarch/trace-events @@ -12,3 +12,4 @@ kvm_failed_put_counter(const char *msg) "Failed to put counter into KVM: %s" kvm_failed_get_cpucfg(const char *msg) "Failed to get cpucfg from KVM: %s" kvm_failed_put_cpucfg(const char *msg) "Failed to put cpucfg into KVM: %s" kvm_arch_handle_exit(int num) "kvm arch handle exit, the reason number: %d" +kvm_set_intr(int irq, int level) "kvm set interrupt, irq num: %d, level: %d"