[v3] Add loongarch kvm accel support

[PATCH v3 8/9] target/loongarch: Implement set vcpu intr for kvm

Posted by Tianrui Zhao 2 years, 1 month ago

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           | 32 +++++++++++++++++++++++---------
 target/loongarch/kvm.c           | 15 +++++++++++++++
 target/loongarch/kvm_loongarch.h | 16 ++++++++++++++++
 target/loongarch/trace-events    |  1 +
 4 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 target/loongarch/kvm_loongarch.h

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index 83899c673f..caf82f9133 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -11,7 +11,6 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "sysemu/qtest.h"
-#include "exec/cpu_ldst.h"
 #include "exec/exec-all.h"
 #include "cpu.h"
 #include "internals.h"
@@ -20,8 +19,16 @@
 #ifndef CONFIG_USER_ONLY
 #include "sysemu/reset.h"
 #endif
-#include "tcg/tcg.h"
 #include "vec.h"
+#include "sysemu/kvm.h"
+#include "kvm_loongarch.h"
+#ifdef CONFIG_KVM
+#include <linux/kvm.h>
+#endif
+#ifdef CONFIG_TCG
+#include "exec/cpu_ldst.h"
+#include "tcg/tcg.h"
+#endif
 
 const char * const regnames[32] = {
     "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
@@ -110,12 +117,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);
+        }
     }
 }
 
@@ -140,7 +150,9 @@ static inline bool cpu_loongarch_hw_interrupts_pending(CPULoongArchState *env)
 
     return (pending & status) != 0;
 }
+#endif
 
+#ifdef CONFIG_TCG
 static void loongarch_cpu_do_interrupt(CPUState *cs)
 {
     LoongArchCPU *cpu = LOONGARCH_CPU(cs);
@@ -320,9 +332,7 @@ static bool loongarch_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
     }
     return false;
 }
-#endif
 
-#ifdef CONFIG_TCG
 static void loongarch_cpu_synchronize_from_tb(CPUState *cs,
                                               const TranslationBlock *tb)
 {
@@ -560,7 +570,9 @@ static void loongarch_cpu_reset_hold(Object *obj)
     }
 #endif
 
+#ifdef CONFIG_TCG
     restore_fp_status(env);
+#endif
     cs->exception_index = -1;
 }
 
@@ -802,7 +814,9 @@ static struct TCGCPUOps loongarch_tcg_ops = {
 #include "hw/core/sysemu-cpu-ops.h"
 
 static const struct SysemuCPUOps loongarch_sysemu_ops = {
+#ifdef CONFIG_TCG
     .get_phys_page_debug = loongarch_cpu_get_phys_page_debug,
+#endif
 };
 
 static int64_t loongarch_cpu_get_arch_id(CPUState *cs)
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..d945b6bb82
--- /dev/null
+++ b/target/loongarch/kvm_loongarch.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * QEMU LoongArch kvm interface
+ *
+ * Copyright (c) 2023 Loongson Technology Corporation Limited
+ */
+
+#include "cpu.h"
+
+#ifndef QEMU_KVM_LOONGARCH_H
+#define QEMU_KVM_LOONGARCH_H
+
+int  kvm_loongarch_set_interrupt(LoongArchCPU *cpu, int irq, int level);
+void kvm_arch_reset_vcpu(CPULoongArchState *env);
+
+#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"
-- 
2.39.1

Re: [PATCH v3 8/9] target/loongarch: Implement set vcpu intr for kvm

Posted by gaosong 2 years, 1 month ago

This patch also broken 'loongarch64-linux-user' build

在 2023/12/28 下午4:40, Tianrui Zhao 写道:
> 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           | 32 +++++++++++++++++++++++---------
>   target/loongarch/kvm.c           | 15 +++++++++++++++
>   target/loongarch/kvm_loongarch.h | 16 ++++++++++++++++
>   target/loongarch/trace-events    |  1 +
>   4 files changed, 55 insertions(+), 9 deletions(-)
>   create mode 100644 target/loongarch/kvm_loongarch.h
>
> diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
> index 83899c673f..caf82f9133 100644
> --- a/target/loongarch/cpu.c
> +++ b/target/loongarch/cpu.c
> @@ -11,7 +11,6 @@
>   #include "qapi/error.h"
>   #include "qemu/module.h"
>   #include "sysemu/qtest.h"
> -#include "exec/cpu_ldst.h"
>   #include "exec/exec-all.h"
>   #include "cpu.h"
>   #include "internals.h"
> @@ -20,8 +19,16 @@
>   #ifndef CONFIG_USER_ONLY
>   #include "sysemu/reset.h"
>   #endif
> -#include "tcg/tcg.h"
>   #include "vec.h"
> +#include "sysemu/kvm.h"
> +#include "kvm_loongarch.h"
> +#ifdef CONFIG_KVM
> +#include <linux/kvm.h>
> +#endif
> +#ifdef CONFIG_TCG
> +#include "exec/cpu_ldst.h"
> +#include "tcg/tcg.h"
> +#endif
>   
>   const char * const regnames[32] = {
>       "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
> @@ -110,12 +117,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);
> +        }
>       }
>   }
>   
> @@ -140,7 +150,9 @@ static inline bool cpu_loongarch_hw_interrupts_pending(CPULoongArchState *env)
>   
>       return (pending & status) != 0;
>   }
> +#endif
>   
> +#ifdef CONFIG_TCG
here
+#ifndef CONFIG_USER_ONLY
>   static void loongarch_cpu_do_interrupt(CPUState *cs)
>   {
>       LoongArchCPU *cpu = LOONGARCH_CPU(cs);
> @@ -320,9 +332,7 @@ static bool loongarch_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
>       }
>       return false;
>   }
> -#endif
>   
> -#ifdef CONFIG_TCG
here
+#endif

Otherwise
Reviewed-by: Song Gao <gaosong@loongson.cn>

Thanks.
Song Gao
>   static void loongarch_cpu_synchronize_from_tb(CPUState *cs,
>                                                 const TranslationBlock *tb)
>   {
> @@ -560,7 +570,9 @@ static void loongarch_cpu_reset_hold(Object *obj)
>       }
>   #endif
>   
> +#ifdef CONFIG_TCG
>       restore_fp_status(env);
> +#endif
>       cs->exception_index = -1;
>   }
>   
> @@ -802,7 +814,9 @@ static struct TCGCPUOps loongarch_tcg_ops = {
>   #include "hw/core/sysemu-cpu-ops.h"
>   
>   static const struct SysemuCPUOps loongarch_sysemu_ops = {
> +#ifdef CONFIG_TCG
>       .get_phys_page_debug = loongarch_cpu_get_phys_page_debug,
> +#endif
>   };
>   
>   static int64_t loongarch_cpu_get_arch_id(CPUState *cs)
> 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..d945b6bb82
> --- /dev/null
> +++ b/target/loongarch/kvm_loongarch.h
> @@ -0,0 +1,16 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * QEMU LoongArch kvm interface
> + *
> + * Copyright (c) 2023 Loongson Technology Corporation Limited
> + */
> +
> +#include "cpu.h"
> +
> +#ifndef QEMU_KVM_LOONGARCH_H
> +#define QEMU_KVM_LOONGARCH_H
> +
> +int  kvm_loongarch_set_interrupt(LoongArchCPU *cpu, int irq, int level);
> +void kvm_arch_reset_vcpu(CPULoongArchState *env);
> +
> +#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"