[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC v2 8/9] target/loongarch: Implement set vcpu intr for kvm
From: |
Tianrui Zhao |
Subject: |
[PATCH RFC v2 8/9] target/loongarch: Implement set vcpu intr for kvm |
Date: |
Thu, 27 Apr 2023 15:26:44 +0800 |
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>
---
target/loongarch/cpu.c | 18 +++++++++++++-----
target/loongarch/kvm-stub.c | 11 +++++++++++
target/loongarch/kvm.c | 16 ++++++++++++++++
target/loongarch/kvm_loongarch.h | 13 +++++++++++++
target/loongarch/trace-events | 1 +
5 files changed, 54 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 600c00bbf2..d0b8f652a1 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -18,6 +18,11 @@
#include "cpu-csr.h"
#include "sysemu/reset.h"
#include "tcg/tcg.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",
@@ -104,12 +109,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..9965c1f119
--- /dev/null
+++ b/target/loongarch/kvm-stub.c
@@ -0,0 +1,11 @@
+/*
+ * QEMU KVM LoongArch specific function stubs
+ *
+ * Copyright (c) 2023 Loongson Technology Corporation Limited
+ */
+#include "cpu.h"
+
+void 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 bd994926d9..e80ca8b37f 100644
--- a/target/loongarch/kvm.c
+++ b/target/loongarch/kvm.c
@@ -519,6 +519,22 @@ 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_loongarch_interrupt intr;
+ CPUState *cs = CPU(cpu);
+
+ intr.cpu = cs->cpu_index;
+ 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 c79e01663a..2673e43bfd 100644
--- a/target/loongarch/trace-events
+++ b/target/loongarch/trace-events
@@ -12,3 +12,4 @@ kvm_failed_put_mpstate(const char *msg) "Failed to put
mp_state into KVM: %s"
kvm_failed_get_counter(const char *msg) "Failed to get counter from KVM: %s"
kvm_failed_put_counter(const char *msg) "Failed to put counter 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"
--
2.31.1
- [PATCH RFC v2 0/9] Add loongarch kvm accel support, Tianrui Zhao, 2023/04/27
- [PATCH RFC v2 5/9] target/loongarch: Implement kvm_arch_init function, Tianrui Zhao, 2023/04/27
- [PATCH RFC v2 9/9] target/loongarch: Add loongarch kvm into meson build, Tianrui Zhao, 2023/04/27
- [PATCH RFC v2 8/9] target/loongarch: Implement set vcpu intr for kvm,
Tianrui Zhao <=
- [PATCH RFC v2 7/9] target/loongarch: Implement kvm_arch_handle_exit, Tianrui Zhao, 2023/04/27
- [PATCH RFC v2 3/9] target/loongarch: Supplement vcpu env initial when vcpu reset, Tianrui Zhao, 2023/04/27
- [PATCH RFC v2 6/9] target/loongarch: Implement kvm_arch_init_vcpu, Tianrui Zhao, 2023/04/27
- [PATCH RFC v2 2/9] target/loongarch: Define some kvm_arch interfaces, Tianrui Zhao, 2023/04/27
- [PATCH RFC v2 1/9] linux-headers: Add KVM headers for loongarch, Tianrui Zhao, 2023/04/27
- [PATCH RFC v2 4/9] target/loongarch: Implement kvm get/set registers, Tianrui Zhao, 2023/04/27