Add riscv kvm accel support
Subsystems (5)
v4 cover Add riscv kvm accel support
This series adds both riscv32 and riscv64 kvm support, and implements migration based on riscv. It is based on temporarily unaccepted kvm:
https://github.com/kvm-riscv/linux (lastest version v15).
This series depends on above pending changes which haven't yet been accepted, so this QEMU patch series is treated as RFC patches until that dependency has been dealt with.
Compared to RFC v3, the time scaling is supported in this series. The new feature also requires the following patches:
[1] Bugfix in kvm v15
https://lkml.org/lkml/2020/11/30/245
[2] kvm patches:
[PATCH RFC 0/3] Implement guest time scaling in RISC-V KVM
Several steps to use this:
1. Build emulation
$ ./configure --target-list=riscv64-softmmu $ make -j$(nproc)
2. Build kernel
https://github.com/kvm-riscv/linux
3. Build QEMU VM
Cross built in riscv toolchain.
$ PKG_CONFIG_LIBDIR=<toolchain pkgconfig path> $ export PKG_CONFIG_SYSROOT_DIR=<toolchain sysroot path> $ ./configure --target-list=riscv64-softmmu --enable-kvm \ --cross-prefix=riscv64-linux-gnu- --disable-libiscsi --disable-glusterfs \ --disable-libusb --disable-usb-redir --audio-drv-list= --disable-opengl \ --disable-libxml2 $ make -j$(nproc)
4. Start emulation
$ ./qemu-system-riscv64 -M virt -m 4096M -cpu rv64,x-h=true -nographic \
-name guest=riscv-hyp,debug-threads=on \
-smp 4 \
-bios ./fw_jump.bin \
-kernel ./Image \
-drive file=./hyp.img,format=raw,id=hd0 \
-device virtio-blk-device,drive=hd0 \
-append "root=/dev/vda rw console=ttyS0 earlycon=sbi"5. Start kvm-acceled QEMU VM in emulation
$ ./qemu-system-riscv64 -M virt,accel=kvm -m 1024M -cpu host -nographic \
-name guest=riscv-guset \
-smp 2 \
-bios none \
-kernel ./Image \
-drive file=./guest.img,format=raw,id=hd0 \
-device virtio-blk-device,drive=hd0 \
-append "root=/dev/vda rw console=ttyS0 earlycon=sbi"Changes since RFC v3
- Rebase on QEMU v5.2.0-rc2 and kvm-riscv linux v15.
- Add time scaling support(New patches 13, 14 and 15).
- Fix the bug that guest vm can't reboot.
Changes since RFC v2
- Fix checkpatch error at target/riscv/sbi_ecall_interface.h.
- Add riscv migration support.
Changes since RFC v1
- Add separate SBI ecall interface header.
- Add riscv32 kvm accel support.
Yifei Jiang (15):
linux-header: Update linux/kvm.h
target/riscv: Add target/riscv/kvm.c to place the public kvm interface target/riscv: Implement function kvm_arch_init_vcpu target/riscv: Implement kvm_arch_get_registers target/riscv: Implement kvm_arch_put_registers target/riscv: Support start kernel directly by KVM hw/riscv: PLIC update external interrupt by KVM when kvm enabled target/riscv: Handle KVM_EXIT_RISCV_SBI exit
target/riscv: Add host cpu type
target/riscv: Add kvm_riscv_get/put_regs_timer target/riscv: Implement virtual time adjusting with vm state changing target/riscv: Support virtual time context synchronization target/riscv: Introduce dynamic time frequency for virt machine target/riscv: Synchronize vcpu's frequency with KVM target/riscv: Add time frequency migration support
hw/intc/sifive_plic.c | 31 +- hw/riscv/virt.c | 26 +- linux-headers/linux/kvm.h | 8 + meson.build | 2 + target/riscv/cpu.c | 13 + target/riscv/cpu.h | 12 + target/riscv/kvm.c | 617 +++++++++++++++++++++++++++++ target/riscv/kvm_riscv.h | 25 ++ target/riscv/machine.c | 23 ++ target/riscv/meson.build | 1 + target/riscv/sbi_ecall_interface.h | 72 ++++ 11 files changed, 817 insertions(+), 13 deletions(-) create mode 100644 target/riscv/kvm.c create mode 100644 target/riscv/kvm_riscv.h create mode 100644 target/riscv/sbi_ecall_interface.h
Signature · 1 line
2.19.1
RFC PATCH v4 1/15 linux-header: Update linux/kvm.h
Update linux-headers/linux/kvm.h from
https://github.com/avpatel/linux/tree/riscv_kvm_v15.
Only use this header file, so here do not update all linux headers by update-linux-headers.sh before above KVM series is accepted.
--- linux-headers/linux/kvm.h | 8 ++++++++ 1 file changed, 8 insertions(+)
linux-headers/linux/kvm.h +8 -0
@@ -250,6 +250,7 @@ struct kvm_hyperv_exit {#define KVM_EXIT_ARM_NISV 28#define KVM_EXIT_X86_RDMSR 29#define KVM_EXIT_X86_WRMSR 30 +#define KVM_EXIT_RISCV_SBI 31/* For KVM_EXIT_INTERNAL_ERROR */ /* Emulate instruction failed. */
@@ -426,6 +427,13 @@ struct kvm_run {__u32 index;/* kernel -> user */ __u64 data;/* kernel <-> user */ } msr; +/* KVM_EXIT_RISCV_SBI */ +struct { +unsigned long extension_id; +unsigned long function_id; +unsigned long args[6 ]; +unsigned long ret[2 ]; + } riscv_sbi;/* Fix the size of the union. */ char padding[256 ]; };
Signature · 1 line
2.19.1
RFC PATCH v4 2/15 target/riscv: Add target/riscv/kvm.c to place the public kvm interface
In reply to Yifei JiangAdd target/riscv/kvm.c to place kvm_arch_* function needed by kvm/kvm-all.c. Meanwhile, add kvm support in meson.build file.
--- meson.build | 2 + target/riscv/kvm.c | 128 +++++++++++++++++++++++++++++++++++++++ target/riscv/meson.build | 1 + 3 files changed, 131 insertions(+) create mode 100644 target/riscv/kvm.c
meson.build +2 -0
@@ -69,6 +69,8 @@ elif cpu in ['ppc', 'ppc64'] kvm_targets = ['ppc-softmmu', 'ppc64-softmmu'] elif cpu in ['mips', 'mips64'] kvm_targets = ['mips-softmmu', 'mipsel-softmmu', 'mips64-softmmu', 'mips64el-softmmu'] +elif cpu in ['riscv32', 'riscv64'] + kvm_targets = ['riscv32-softmmu', 'riscv64-softmmu'] else kvm_targets = [] endif
target/riscv/kvm.c new file +128 -0
128 lines not on this page · raw message
target/riscv/meson.build +1 -0
@@ -23,6 +23,7 @@ riscv_ss.add(files( 'vector_helper.c', 'translate.c', )) +riscv_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) riscv_softmmu_ss = ss.source_set() riscv_softmmu_ss.add(files(
Signature · 1 line
2.19.1
RFC PATCH v4 3/15 target/riscv: Implement function kvm_arch_init_vcpu
In reply to Yifei JiangGet isa info from kvm while kvm init.
--- target/riscv/kvm.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
target/riscv/kvm.c +26 -1
@@ -38,6 +38,18 @@#include "qemu/log.h" #include "hw/loader.h" +static __u64 kvm_riscv_reg_id (__u64 type,__u64 idx) +{ +__u64 id =KVM_REG_RISCV | type | idx; + +#if defined(TARGET_RISCV32 ) + id |=KVM_REG_SIZE_U32 ; +#elif defined(TARGET_RISCV64 ) + id |=KVM_REG_SIZE_U64 ; +#endif +return id; +} +const KVMCapabilityInfo kvm_arch_required_capabilities[] = {KVM_CAP_LAST_INFO };
@@ -79,7 +91,20 @@ void kvm_arch_init_irq_routing(KVMState *s)int kvm_arch_init_vcpu (CPUState *cs) { -return 0 ; +int ret =0 ; +target_ulong isa; +RISCVCPU *cpu =RISCV_CPU (cs); +CPURISCVState *env = &cpu->env; +__u64 id; + + id =kvm_riscv_reg_id (KVM_REG_RISCV_CONFIG ,KVM_REG_RISCV_CONFIG_REG (isa)); + ret =kvm_get_one_reg (cs, id, &isa); +if (ret) { +return ret; + } + env->misa = isa; + +return ret; }int kvm_arch_msi_data_to_gsi (uint32_t data)
Signature · 1 line
2.19.1
Re: [PATCH RFC v4 03/15] target/riscv: Implement function kvm_arch_init_vcpu
Quoted 16 lines · Yifei Jiang
Get isa info from kvm while kvm init.
Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>--- target/riscv/kvm.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)target/riscv/kvm.c +0
-0@@ -38,6 +38,18 @@#include "qemu/log.h" #include "hw/loader.h"
target/riscv/kvm.c line 49
Quoted 10 lines
target/riscv/kvm.c +9
-0+static __u64 kvm_riscv_reg_id (__u64 type,__u64 idx) +{ +__u64 id =KVM_REG_RISCV | type | idx; + +#if defined(TARGET_RISCV32 ) + id |=KVM_REG_SIZE_U32 ; +#elif defined(TARGET_RISCV64 ) + id |=KVM_REG_SIZE_U64 ; +#endif
There is a series on list (I'll send a v2 out later today) that starts to remove these #ifdef for the RISC-V XLEN. Next time you rebase it would be great if you can use that and hopefully remove this.
Alistair
Quoted 32 lines
target/riscv/kvm.c +17
-2+return id; +} +const KVMCapabilityInfo kvm_arch_required_capabilities[] = {KVM_CAP_LAST_INFO };@@ -79,7 +91,20 @@ void kvm_arch_init_irq_routing(KVMState *s)int kvm_arch_init_vcpu (CPUState *cs) { -return 0 ; +int ret =0 ; +target_ulong isa; +RISCVCPU *cpu =RISCV_CPU (cs); +CPURISCVState *env = &cpu->env; +__u64 id; + + id =kvm_riscv_reg_id (KVM_REG_RISCV_CONFIG ,KVM_REG_RISCV_CONFIG_REG (isa)); + ret =kvm_get_one_reg (cs, id, &isa); +if (ret) { +return ret; + } + env->misa = isa; + +return ret; }int kvm_arch_msi_data_to_gsi (uint32_t data) --2.19.1
RFC PATCH v4 4/15 target/riscv: Implement kvm_arch_get_registers
In reply to Yifei JiangGet GPR CSR and FP registers from kvm by KVM_GET_ONE_REG ioctl.
--- target/riscv/kvm.c | 150 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 149 insertions(+), 1 deletion(-)
target/riscv/kvm.c +149 -1
@@ -50,13 +50,161 @@ static __u64 kvm_riscv_reg_id(__u64 type, __u64 idx)return id; } +#define RISCV_CORE_REG (name) kvm_riscv_reg_id(KVM_REG_RISCV_CORE, \ + KVM_REG_RISCV_CORE_REG(name)) + +#define RISCV_CSR_REG (name) kvm_riscv_reg_id(KVM_REG_RISCV_CSR, \ + KVM_REG_RISCV_CSR_REG(name)) + +#define RISCV_FP_F_REG (idx) kvm_riscv_reg_id(KVM_REG_RISCV_FP_F, idx) + +#define RISCV_FP_D_REG (idx) kvm_riscv_reg_id(KVM_REG_RISCV_FP_D, idx) + +static int kvm_riscv_get_regs_core (CPUState *cs) +{ +int ret =0 ; +int i; +target_ulong reg; +CPURISCVState *env = &RISCV_CPU (cs)->env; + + ret =kvm_get_one_reg (cs,RISCV_CORE_REG (regs.pc), ®); +if (ret) { +return ret; + } + env->pc = reg; + +for (i =1 ; i <32 ; i++) { +__u64 id =kvm_riscv_reg_id (KVM_REG_RISCV_CORE , i); + ret =kvm_get_one_reg (cs, id, ®); +if (ret) { +return ret; + } + env->gpr[i] = reg; + } + +return ret; +} + +static int kvm_riscv_get_regs_csr (CPUState *cs) +{ +int ret =0 ; +target_ulong reg; +CPURISCVState *env = &RISCV_CPU (cs)->env; + + ret =kvm_get_one_reg (cs,RISCV_CSR_REG (sstatus), ®); +if (ret) { +return ret; + } + env->mstatus = reg; + + ret =kvm_get_one_reg (cs,RISCV_CSR_REG (sie), ®); +if (ret) { +return ret; + } + env->mie = reg; + + ret =kvm_get_one_reg (cs,RISCV_CSR_REG (stvec), ®); +if (ret) { +return ret; + } + env->stvec = reg; + + ret =kvm_get_one_reg (cs,RISCV_CSR_REG (sscratch), ®); +if (ret) { +return ret; + } + env->sscratch = reg; + + ret =kvm_get_one_reg (cs,RISCV_CSR_REG (sepc), ®); +if (ret) { +return ret; + } + env->sepc = reg; + + ret =kvm_get_one_reg (cs,RISCV_CSR_REG (scause), ®); +if (ret) { +return ret; + } + env->scause = reg; + + ret =kvm_get_one_reg (cs,RISCV_CSR_REG (stval), ®); +if (ret) { +return ret; + } + env->sbadaddr = reg; + + ret =kvm_get_one_reg (cs,RISCV_CSR_REG (sip), ®); +if (ret) { +return ret; + } + env->mip = reg; + + ret =kvm_get_one_reg (cs,RISCV_CSR_REG (satp), ®); +if (ret) { +return ret; + } + env->satp = reg; + +return ret; +} + +static int kvm_riscv_get_regs_fp (CPUState *cs) +{ +int ret =0 ; +int i; +CPURISCVState *env = &RISCV_CPU (cs)->env; + +if (riscv_has_ext (env,RVD )) { +uint64_t reg; +for (i =0 ; i <32 ; i++) { + ret =kvm_get_one_reg (cs,RISCV_FP_D_REG (i), ®); +if (ret) { +return ret; + } + env->fpr[i] = reg; + } +return ret; + } + +if (riscv_has_ext (env,RVF )) { +uint32_t reg; +for (i =0 ; i <32 ; i++) { + ret =kvm_get_one_reg (cs,RISCV_FP_F_REG (i), ®); +if (ret) { +return ret; + } + env->fpr[i] = reg; + } +return ret; + } + +return ret; +} +const KVMCapabilityInfo kvm_arch_required_capabilities[] = {KVM_CAP_LAST_INFO };int kvm_arch_get_registers (CPUState *cs) { -return 0 ; +int ret =0 ; + + ret =kvm_riscv_get_regs_core (cs); +if (ret) { +return ret; + } + + ret =kvm_riscv_get_regs_csr (cs); +if (ret) { +return ret; + } + + ret =kvm_riscv_get_regs_fp (cs); +if (ret) { +return ret; + } + +return ret; }int kvm_arch_put_registers (CPUState *cs,int level)
Signature · 1 line
2.19.1
RFC PATCH v4 5/15 target/riscv: Implement kvm_arch_put_registers
In reply to Yifei JiangPut GPR CSR and FP registers to kvm by KVM_SET_ONE_REG ioctl
--- target/riscv/kvm.c | 142 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 141 insertions(+), 1 deletion(-)
target/riscv/kvm.c +141 -1
@@ -85,6 +85,31 @@ static int kvm_riscv_get_regs_core(CPUState *cs)return ret; } +static int kvm_riscv_put_regs_core (CPUState *cs) +{ +int ret =0 ; +int i; +target_ulong reg; +CPURISCVState *env = &RISCV_CPU (cs)->env; + + reg = env->pc; + ret =kvm_set_one_reg (cs,RISCV_CORE_REG (regs.pc), ®); +if (ret) { +return ret; + } + +for (i =1 ; i <32 ; i++) { +__u64 id =kvm_riscv_reg_id (KVM_REG_RISCV_CORE , i); + reg = env->gpr[i]; + ret =kvm_set_one_reg (cs, id, ®); +if (ret) { +return ret; + } + } + +return ret; +} +static int kvm_riscv_get_regs_csr (CPUState *cs) {int ret =0 ;
@@ -148,6 +173,70 @@ static int kvm_riscv_get_regs_csr(CPUState *cs)return ret; } +static int kvm_riscv_put_regs_csr (CPUState *cs) +{ +int ret =0 ; +target_ulong reg; +CPURISCVState *env = &RISCV_CPU (cs)->env; + + reg = env->mstatus; + ret =kvm_set_one_reg (cs,RISCV_CSR_REG (sstatus), ®); +if (ret) { +return ret; + } + + reg = env->mie; + ret =kvm_set_one_reg (cs,RISCV_CSR_REG (sie), ®); +if (ret) { +return ret; + } + + reg = env->stvec; + ret =kvm_set_one_reg (cs,RISCV_CSR_REG (stvec), ®); +if (ret) { +return ret; + } + + reg = env->sscratch; + ret =kvm_set_one_reg (cs,RISCV_CSR_REG (sscratch), ®); +if (ret) { +return ret; + } + + reg = env->sepc; + ret =kvm_set_one_reg (cs,RISCV_CSR_REG (sepc), ®); +if (ret) { +return ret; + } + + reg = env->scause; + ret =kvm_set_one_reg (cs,RISCV_CSR_REG (scause), ®); +if (ret) { +return ret; + } + + reg = env->sbadaddr; + ret =kvm_set_one_reg (cs,RISCV_CSR_REG (stval), ®); +if (ret) { +return ret; + } + + reg = env->mip; + ret =kvm_set_one_reg (cs,RISCV_CSR_REG (sip), ®); +if (ret) { +return ret; + } + + reg = env->satp; + ret =kvm_set_one_reg (cs,RISCV_CSR_REG (satp), ®); +if (ret) { +return ret; + } + +return ret; +} + +static int kvm_riscv_get_regs_fp (CPUState *cs) {int ret =0 ;
@@ -181,6 +270,40 @@ static int kvm_riscv_get_regs_fp(CPUState *cs)return ret; } +static int kvm_riscv_put_regs_fp (CPUState *cs) +{ +int ret =0 ; +int i; +CPURISCVState *env = &RISCV_CPU (cs)->env; + +if (riscv_has_ext (env,RVD )) { +uint64_t reg; +for (i =0 ; i <32 ; i++) { + reg = env->fpr[i]; + ret =kvm_set_one_reg (cs,RISCV_FP_D_REG (i), ®); +if (ret) { +return ret; + } + } +return ret; + } + +if (riscv_has_ext (env,RVF )) { +uint32_t reg; +for (i =0 ; i <32 ; i++) { + reg = env->fpr[i]; + ret =kvm_set_one_reg (cs,RISCV_FP_F_REG (i), ®); +if (ret) { +return ret; + } + } +return ret; + } + +return ret; +} + +const KVMCapabilityInfo kvm_arch_required_capabilities[] = {KVM_CAP_LAST_INFO };
@@ -209,7 +332,24 @@ int kvm_arch_get_registers(CPUState *cs)int kvm_arch_put_registers (CPUState *cs,int level) { -return 0 ; +int ret =0 ; + + ret =kvm_riscv_put_regs_core (cs); +if (ret) { +return ret; + } + + ret =kvm_riscv_put_regs_csr (cs); +if (ret) { +return ret; + } + + ret =kvm_riscv_put_regs_fp (cs); +if (ret) { +return ret; + } + +return ret; }int kvm_arch_release_virq_post (int virq)
Signature · 1 line
2.19.1
RFC PATCH v4 6/15 target/riscv: Support start kernel directly by KVM
In reply to Yifei JiangGet kernel and fdt start address in virt.c, and pass them to KVM when cpu reset. In addition, add kvm_riscv.h to place riscv specific interface.
--- hw/riscv/virt.c | 8 ++++++++ target/riscv/cpu.c | 4 ++++ target/riscv/cpu.h | 3 +++ target/riscv/kvm.c | 15 +++++++++++++++ target/riscv/kvm_riscv.h | 24 ++++++++++++++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 target/riscv/kvm_riscv.h
hw/riscv/virt.c +8 -0
@@ -42,6 +42,7 @@#include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/pci-host/gpex.h" +#include "sysemu/kvm.h" #if defined(TARGET_RISCV32 )# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin"
@@ -511,6 +512,7 @@ static void virt_machine_init(MachineState *machine)uint64_t kernel_entry;DeviceState *mmio_plic, *virtio_plic, *pcie_plic;int i, j, base_hartid, hart_count; +CPUState *cs;/* Check socket count limit */ if (VIRT_SOCKETS_MAX <riscv_socket_count (machine)) {
@@ -660,6 +662,12 @@ static void virt_machine_init(MachineState *machine) virt_memmap[VIRT_MROM ].size, kernel_entry, fdt_load_addr, s->fdt); +for (cs = first_cpu; cs; cs =CPU_NEXT (cs)) { +RISCVCPU *riscv_cpu =RISCV_CPU (cs); + riscv_cpu->env.kernel_addr = kernel_entry; + riscv_cpu->env.fdt_addr = fdt_load_addr; + } +/* SiFive Test MMIO device */ sifive_test_create (memmap[VIRT_TEST ].base);
target/riscv/cpu.c +4 -0
@@ -29,6 +29,7 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "fpu/softfloat-helpers.h" +#include "kvm_riscv.h" /* RISC-V CPU definitions */
@@ -330,6 +331,9 @@ static void riscv_cpu_reset(DeviceState *dev) cs->exception_index =EXCP_NONE ; env->load_res =-1 ;set_default_nan_mode (1 , &env->fp_status); +#ifdef CONFIG_KVM +kvm_riscv_reset_vcpu (cpu); +#endif }static void riscv_cpu_disas_set_info (CPUState *s,disassemble_info *info)
target/riscv/cpu.h +3 -0
@@ -233,6 +233,9 @@ struct CPURISCVState {/* Fields from here on are preserved across CPU reset. */ QEMUTimer *timer;/* Internal timer */ + +hwaddr kernel_addr; +hwaddr fdt_addr; }; OBJECT_DECLARE_TYPE(RISCVCPU, RISCVCPUClass,
target/riscv/kvm.c +15 -0
@@ -37,6 +37,7 @@#include "hw/irq.h" #include "qemu/log.h" #include "hw/loader.h" +#include "kvm_riscv.h" static __u64 kvm_riscv_reg_id (__u64 type,__u64 idx) {
@@ -439,3 +440,17 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) {return 0 ; } + +void kvm_riscv_reset_vcpu (RISCVCPU *cpu) +{ +CPURISCVState *env = &cpu->env; + +if (!kvm_enabled ()) { +return ; + } + env->pc = cpu->env.kernel_addr; + env->gpr[10 ] =kvm_arch_vcpu_id (CPU (cpu));/* a0 */ + env->gpr[11 ] = cpu->env.fdt_addr;/* a1 */ + env->satp =0 ; +} +
target/riscv/kvm_riscv.h new file +24 -0
@@ -0,0 +1,24 @@ +/* +* QEMU KVM support -- RISC-V specific functions. +* +* Copyright (c) 2020 Huawei Technologies Co., Ltd +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef QEMU_KVM_RISCV_H +#define QEMU_KVM_RISCV_H + +void kvm_riscv_reset_vcpu (RISCVCPU *cpu); + +#endif
Signature · 1 line
2.19.1
Re: [PATCH RFC v4 06/15] target/riscv: Support start kernel directly by KVM
Quoted 4 lines · Yifei Jiang
Get kernel and fdt start address in
virt.c, and pass them to KVM when cpu reset. In addition, addkvm_riscv.hto place riscv specific interface.
This doesn't seem right. Why do we need to do this? Other architectures don't seem to do this.
Writing to the CPU from the board like this looks fishy and probably breaks some QOM rules.
Alistair
Quoted 145 lines
Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>--- hw/riscv/virt.c | 8 ++++++++ target/riscv/cpu.c | 4 ++++ target/riscv/cpu.h | 3 +++ target/riscv/kvm.c | 15 +++++++++++++++ target/riscv/kvm_riscv.h | 24 ++++++++++++++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 target/riscv/kvm_riscv.hhw/riscv/virt.c +8
-0@@ -42,6 +42,7 @@#include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/pci-host/gpex.h" +#include "sysemu/kvm.h" #if defined(TARGET_RISCV32 )# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin"@@ -511,6 +512,7 @@ static void virt_machine_init(MachineState *machine)uint64_t kernel_entry;DeviceState *mmio_plic, *virtio_plic, *pcie_plic;int i, j, base_hartid, hart_count; +CPUState *cs;/* Check socket count limit */ if (VIRT_SOCKETS_MAX <riscv_socket_count (machine)) {@@ -660,6 +662,12 @@ static void virt_machine_init(MachineState *machine) virt_memmap[VIRT_MROM ].size, kernel_entry, fdt_load_addr, s->fdt); +for (cs = first_cpu; cs; cs =CPU_NEXT (cs)) { +RISCVCPU *riscv_cpu =RISCV_CPU (cs); + riscv_cpu->env.kernel_addr = kernel_entry; + riscv_cpu->env.fdt_addr = fdt_load_addr; + } +/* SiFive Test MMIO device */ sifive_test_create (memmap[VIRT_TEST ].base);target/riscv/cpu.c +4
-0@@ -29,6 +29,7 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "fpu/softfloat-helpers.h" +#include "kvm_riscv.h" /* RISC-V CPU definitions */ @@ -330,6 +331,9 @@ static void riscv_cpu_reset(DeviceState *dev) cs->exception_index =EXCP_NONE ; env->load_res =-1 ;set_default_nan_mode (1 , &env->fp_status); +#ifdef CONFIG_KVM +kvm_riscv_reset_vcpu (cpu); +#endif }static void riscv_cpu_disas_set_info (CPUState *s,disassemble_info *info)target/riscv/cpu.h +3
-0@@ -233,6 +233,9 @@ struct CPURISCVState {/* Fields from here on are preserved across CPU reset. */ QEMUTimer *timer;/* Internal timer */ + +hwaddr kernel_addr; +hwaddr fdt_addr; }; OBJECT_DECLARE_TYPE(RISCVCPU, RISCVCPUClass,target/riscv/kvm.c +15
-0@@ -37,6 +37,7 @@#include "hw/irq.h" #include "qemu/log.h" #include "hw/loader.h" +#include "kvm_riscv.h" static __u64 kvm_riscv_reg_id (__u64 type,__u64 idx) {@@ -439,3 +440,17 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) {return 0 ; } + +void kvm_riscv_reset_vcpu (RISCVCPU *cpu) +{ +CPURISCVState *env = &cpu->env; + +if (!kvm_enabled ()) { +return ; + } + env->pc = cpu->env.kernel_addr; + env->gpr[10 ] =kvm_arch_vcpu_id (CPU (cpu));/* a0 */ + env->gpr[11 ] = cpu->env.fdt_addr;/* a1 */ + env->satp =0 ; +} +target/riscv/kvm_riscv.h new file +24
-1@@ -0,0 +1,24 @@ +/* +* QEMU KVM support -- RISC-V specific functions. +* +* Copyright (c) 2020 Huawei Technologies Co., Ltd +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef QEMU_KVM_RISCV_H +#define QEMU_KVM_RISCV_H + +void kvm_riscv_reset_vcpu (RISCVCPU *cpu); + +#endif --2.19.1
RE: [PATCH RFC v4 06/15] target/riscv: Support start kernel directly by KVM
Quoted 24 lines
-----Original Message-----
From: Alistair Francis [mailto:alistair23 at gmail.com]
Sent: Wednesday, December 9, 2020 6:19 AM
To: Jiangyifei <[email protected]>
Cc: qemu-devel at nongnu.org Developers <[email protected]>; open list:RISC-V <[email protected]>; Zhangxiaofeng (F) <[email protected]>; Sagar Karandikar <[email protected]>; open list:Overall <[email protected]>; libvir-list at redhat.com; Bastian Koppelmann <[email protected]>; Anup Patel <[email protected]>; yinyipeng <[email protected]>; Alistair Francis <[email protected]>; kvm-riscv at lists.infradead.org; Palmer Dabbelt <[email protected]>; dengkai (A) <[email protected]>; Wubin (H) <[email protected]>; Zhanghailiang <[email protected]>
Subject: Re: [PATCH RFC v4 06/15] target/riscv: Support start kernel directly by KVMQuoted 4 lines · Yifei Jiang
Get kernel and fdt start address in
virt.c, and pass them to KVM when cpu reset. In addition, addkvm_riscv.hto place riscv specific interface.
Quoted 8 lines
This doesn't seem right. Why do we need to do this? Other architectures don't seem to do this.
Writing to the CPU from the board like this looks fishy and probably breaks some QOM rules.
Alistair
Sorry for the delayed reply.
We need to set the starting address of the kernel and fdt to vcpu, which is implemented by firmware bootloader under other architectures and RISC-V emulators. However, the RISC-V virtual machine does not have bootloader, so we boot the kernel directly. In the future, we will support firmware loading.
Before supporting the firmware bootloader, we can add a public interface instead of modifying the CPU instance directly to comply with the QOM rules.
Yifei
Quoted 150 lines
hw/riscv/virt.c static void virt_machine_init(MachineState
Quoted 25 lines
Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>--- hw/riscv/virt.c | 8 ++++++++ target/riscv/cpu.c | 4 ++++ target/riscv/cpu.h | 3 +++ target/riscv/kvm.c | 15 +++++++++++++++ target/riscv/kvm_riscv.h | 24 ++++++++++++++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 target/riscv/kvm_riscv.hhw/riscv/virt.c index renamed from hw/riscv/virt.c +0
-0
25cea7aa67..47b7018193100644hw/riscv/virt.c +1
-0@@ -42,6 +42,7 @@#include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/pci-host/gpex.h" +#include "sysemu/kvm.h" #if defined(TARGET_RISCV32 )# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin"@@ -511,6 +512,7 @@ static void virt_machine_init(MachineState*machine)
hw/riscv/virt.c static void virt_machine_init(MachineState *machine)
Quoted 9 lines
hw/riscv/virt.c +2
-0uint64_t kernel_entry;DeviceState *mmio_plic, *virtio_plic, *pcie_plic;int i, j, base_hartid, hart_count; +CPUState *cs;/* Check socket count limit */ if (VIRT_SOCKETS_MAX < riscv_socket_count(machine)) { @@ -660,6 +662,12 @@ static void virt_machine_init(MachineState *machine) virt_memmap[VIRT_MROM].size,
kernel_entry,Quoted 83 lines
fdt_load_addr, s->fdt);hw/riscv/virt.c +6
-0+for (cs = first_cpu; cs; cs =CPU_NEXT (cs)) { +RISCVCPU *riscv_cpu =RISCV_CPU (cs); + riscv_cpu->env.kernel_addr = kernel_entry; + riscv_cpu->env.fdt_addr = fdt_load_addr; + } +/* SiFive Test MMIO device */ sifive_test_create (memmap[VIRT_TEST ].base);target/riscv/cpu.c index renamed from target/riscv/cpu.c +0
-0
6a0264fc6b..faee98a58c100644target/riscv/cpu.c +4
-0@@ -29,6 +29,7 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "fpu/softfloat-helpers.h" +#include "kvm_riscv.h" /* RISC-V CPU definitions */ @@ -330,6 +331,9 @@ static void riscv_cpu_reset(DeviceState *dev) cs->exception_index =EXCP_NONE ; env->load_res =-1 ;set_default_nan_mode (1 , &env->fp_status); +#ifdef CONFIG_KVM +kvm_riscv_reset_vcpu (cpu); +#endif } static void riscv_cpu_disas_set_info(CPUState *s, disassemble_info*info) diff --git
a/target/riscv/cpu.hb/target/riscv/cpu.hindexc0a326c843..ad1c90f798100644target/riscv/cpu.h +3
-0@@ -233,6 +233,9 @@ struct CPURISCVState {/* Fields from here on are preserved across CPU reset. */ QEMUTimer *timer;/* Internal timer */ + +hwaddr kernel_addr; +hwaddr fdt_addr; }; OBJECT_DECLARE_TYPE(RISCVCPU, RISCVCPUClass, diff --git
a/target/riscv/kvm.cb/target/riscv/kvm.cindex8b206ce99c..6250ca0c7d100644target/riscv/kvm.c +2
-0@@ -37,6 +37,7 @@#include "hw/irq.h" #include "qemu/log.h" #include "hw/loader.h" +#include "kvm_riscv.h" static __u64 kvm_riscv_reg_id(__u64 type, __u64 idx) { @@ -439,3 +440,17 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run){ return 0;}
target/riscv/kvm.c +13
-0+ +void kvm_riscv_reset_vcpu (RISCVCPU *cpu) { +CPURISCVState *env = &cpu->env; + +if (!kvm_enabled ()) { +return ; + } + env->pc = cpu->env.kernel_addr; + env->gpr[10 ] =kvm_arch_vcpu_id (CPU (cpu));/* a0 */ + env->gpr[11 ] = cpu->env.fdt_addr;/* a1 */ + env->satp =0 ; +} +target/riscv/kvm_riscv.h new renamed from target/riscv/kvm_riscv.h +0
-0file mode 100644 index 0000000000..f38c82bf59
target/riscv/kvm_riscv.h new file +3
-0@@ -0,0 +1,24 @@ +/* +* QEMU KVM support -- RISC-V specific functions. +* target/riscv/kvm_riscv.h line 13
Quoted 10 lines
target/riscv/kvm_riscv.h new file +10
-0+* Copyright (c) 2020 Huawei Technologies Co., Ltd +* +* This program is free software; you can redistribute it and/or +modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but +WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
Quoted 20 lines
target/riscv/kvm_riscv.h new file +16
-1+or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +License for +* more details. +* +* You should have received a copy of the GNU General Public License +along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef QEMU_KVM_RISCV_H +#define QEMU_KVM_RISCV_H + +void kvm_riscv_reset_vcpu (RISCVCPU *cpu); + +#endif --2.19.1
RFC PATCH v4 7/15 hw/riscv: PLIC update external interrupt by KVM when kvm enabled
In reply to Yifei JiangOnly support supervisor external interrupt currently.
--- hw/intc/sifive_plic.c | 31 ++++++++++++++++++++++--------- target/riscv/kvm.c | 19 +++++++++++++++++++ target/riscv/kvm_riscv.h | 1 + 3 files changed, 42 insertions(+), 9 deletions(-)
hw/intc/sifive_plic.c +22 -9
@@ -31,6 +31,8 @@#include "target/riscv/cpu.h" #include "sysemu/sysemu.h" #include "migration/vmstate.h" +#include "sysemu/kvm.h" +#include "kvm_riscv.h" #define RISCV_DEBUG_PLIC 0
@@ -147,15 +149,26 @@ static void sifive_plic_update(SiFivePLICState *plic)continue ; }int level =sifive_plic_irqs_pending (plic, addrid); -switch (mode) { -case PLICMode_M: -riscv_cpu_update_mip (RISCV_CPU (cpu),MIP_MEIP ,BOOL_TO_MASK (level)); -break ; -case PLICMode_S: -riscv_cpu_update_mip (RISCV_CPU (cpu),MIP_SEIP ,BOOL_TO_MASK (level)); -break ; -default : -break ; +if (kvm_enabled ()) { +if (mode == PLICMode_M) { +continue ; + } +#ifdef CONFIG_KVM +kvm_riscv_set_irq (RISCV_CPU (cpu),IRQ_S_EXT , level); +#endif + }else { +switch (mode) { +case PLICMode_M: +riscv_cpu_update_mip (RISCV_CPU (cpu), +MIP_MEIP ,BOOL_TO_MASK (level)); +break ; +case PLICMode_S: +riscv_cpu_update_mip (RISCV_CPU (cpu), +MIP_SEIP ,BOOL_TO_MASK (level)); +break ; +default : +break ; + } } }
target/riscv/kvm.c +19 -0
@@ -454,3 +454,22 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu) env->satp =0 ; } +void kvm_riscv_set_irq (RISCVCPU *cpu,int irq,int level) +{ +int ret; +unsigned virq = level ?KVM_INTERRUPT_SET :KVM_INTERRUPT_UNSET ; + +if (irq !=IRQ_S_EXT ) { +return ; + } + +if (!kvm_enabled ()) { +return ; + } + + ret =kvm_vcpu_ioctl (CPU (cpu),KVM_INTERRUPT , &virq); +if (ret <0 ) { +perror ("Set irq failed" ); +abort (); + } +}
target/riscv/kvm_riscv.h +1 -0
@@ -20,5 +20,6 @@#define QEMU_KVM_RISCV_H void kvm_riscv_reset_vcpu (RISCVCPU *cpu); +void kvm_riscv_set_irq (RISCVCPU *cpu,int irq,int level);#endif
Signature · 1 line
2.19.1
Re: [PATCH RFC v4 07/15] hw/riscv: PLIC update external interrupt by KVM when kvm enabled
Quoted 34 lines · Yifei Jiang
Only support supervisor external interrupt currently.
Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>--- hw/intc/sifive_plic.c | 31 ++++++++++++++++++++++--------- target/riscv/kvm.c | 19 +++++++++++++++++++ target/riscv/kvm_riscv.h | 1 + 3 files changed, 42 insertions(+), 9 deletions(-)hw/intc/sifive_plic.c +2
-6@@ -31,6 +31,8 @@#include "target/riscv/cpu.h" #include "sysemu/sysemu.h" #include "migration/vmstate.h" +#include "sysemu/kvm.h" +#include "kvm_riscv.h" #define RISCV_DEBUG_PLIC 0@@ -147,15 +149,26 @@ static void sifive_plic_update(SiFivePLICState *plic)continue ; }int level =sifive_plic_irqs_pending (plic, addrid); -switch (mode) { -case PLICMode_M: -riscv_cpu_update_mip (RISCV_CPU (cpu),MIP_MEIP ,BOOL_TO_MASK (level)); -break ; -case PLICMode_S: -riscv_cpu_update_mip (RISCV_CPU (cpu),MIP_SEIP ,BOOL_TO_MASK (level));
hw/intc/sifive_plic.c static void sifive_plic_update(SiFivePLICState *plic) · line 158
Quoted 10 lines
hw/intc/sifive_plic.c +7
-3-break ; -default : -break ; +if (kvm_enabled ()) { +if (mode == PLICMode_M) { +continue ; + } +#ifdef CONFIG_KVM +kvm_riscv_set_irq (RISCV_CPU (cpu),IRQ_S_EXT , level); +#endif
What if kvm_enalbed() is true, but CONFIG_KVM isn't defined?
Alistair
Quoted 58 lines
hw/intc/sifive_plic.c +13
-0+ }else { +switch (mode) { +case PLICMode_M: +riscv_cpu_update_mip (RISCV_CPU (cpu), +MIP_MEIP ,BOOL_TO_MASK (level)); +break ; +case PLICMode_S: +riscv_cpu_update_mip (RISCV_CPU (cpu), +MIP_SEIP ,BOOL_TO_MASK (level)); +break ; +default : +break ; + } } }target/riscv/kvm.c +19
-0@@ -454,3 +454,22 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu) env->satp =0 ; } +void kvm_riscv_set_irq (RISCVCPU *cpu,int irq,int level) +{ +int ret; +unsigned virq = level ?KVM_INTERRUPT_SET :KVM_INTERRUPT_UNSET ; + +if (irq !=IRQ_S_EXT ) { +return ; + } + +if (!kvm_enabled ()) { +return ; + } + + ret =kvm_vcpu_ioctl (CPU (cpu),KVM_INTERRUPT , &virq); +if (ret <0 ) { +perror ("Set irq failed" ); +abort (); + } +}target/riscv/kvm_riscv.h +1
-1@@ -20,5 +20,6 @@#define QEMU_KVM_RISCV_H void kvm_riscv_reset_vcpu (RISCVCPU *cpu); +void kvm_riscv_set_irq (RISCVCPU *cpu,int irq,int level);#endif --2.19.1
RE: [PATCH RFC v4 07/15] hw/riscv: PLIC update external interrupt by KVM when kvm enabled
Quoted 68 lines
-----Original Message-----
From: Alistair Francis [mailto:alistair23 at gmail.com]
Sent: Wednesday, December 9, 2020 6:30 AM
To: Jiangyifei <[email protected]>
Cc: qemu-devel at nongnu.org Developers <[email protected]>; open list:RISC-V <[email protected]>; Zhangxiaofeng (F) <[email protected]>; Sagar Karandikar <[email protected]>; open list:Overall <[email protected]>; libvir-list at redhat.com; Bastian Koppelmann <[email protected]>; Anup Patel <[email protected]>; yinyipeng <[email protected]>; Alistair Francis <[email protected]>; kvm-riscv at lists.infradead.org; Palmer Dabbelt <[email protected]>; dengkai (A) <[email protected]>; Wubin (H) <[email protected]>; Zhanghailiang <[email protected]>
Subject: Re: [PATCH RFC v4 07/15] hw/riscv: PLIC update external interrupt by KVM when kvm enabledQuoted 25 lines · Yifei Jiang
Only support supervisor external interrupt currently.
Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>--- hw/intc/sifive_plic.c | 31 ++++++++++++++++++++++--------- target/riscv/kvm.c | 19 +++++++++++++++++++ target/riscv/kvm_riscv.h | 1 + 3 files changed, 42 insertions(+), 9 deletions(-)hw/intc/sifive_plic.c index renamed from hw/intc/sifive_plic.c +0
-0
97a1a27a9a..a419ca3a3c100644hw/intc/sifive_plic.c +2
-0@@ -31,6 +31,8 @@#include "target/riscv/cpu.h" #include "sysemu/sysemu.h" #include "migration/vmstate.h" +#include "sysemu/kvm.h" +#include "kvm_riscv.h" #define RISCV_DEBUG_PLIC 0hw/intc/sifive_plic.c static void sifive_plic_update(SiFivePLICState *plic) · line 152
Quoted 6 lines
hw/intc/sifive_plic.c +0
-3@@ -147,15 +149,26 @@ static void sifive_plic_update(SiFivePLICState *plic)continue ; }int level =sifive_plic_irqs_pending (plic, addrid); -switch (mode) { -case PLICMode_M: - riscv_cpu_update_mip(RISCV_CPU(cpu), MIP_MEIP,
BOOL_TO_MASK(level));hw/intc/sifive_plic.c static void sifive_plic_update(SiFivePLICState *plic)
Quoted 3 lines
hw/intc/sifive_plic.c +0
-3-break ; -case PLICMode_S: - riscv_cpu_update_mip(RISCV_CPU(cpu), MIP_SEIP,
BOOL_TO_MASK(level));hw/intc/sifive_plic.c static void sifive_plic_update(SiFivePLICState *plic) · line 158
Quoted 10 lines
hw/intc/sifive_plic.c +7
-3-break ; -default : -break ; +if (kvm_enabled ()) { +if (mode == PLICMode_M) { +continue ; + } +#ifdef CONFIG_KVM +kvm_riscv_set_irq (RISCV_CPU (cpu),IRQ_S_EXT , level); +#endif What if
kvm_enalbed()is true, butCONFIG_KVMisn't defined?
Quoted 2 lines
Alistair
Impossible. It will cause compilation failure without CONFIG_KVM. We also introduce kvm-stub.c to solve the compilation failure like other architectures.
We will introduce kvm-stub.c in next series.
Yifei
Quoted 60 lines
hw/intc/sifive_plic.c static void sifive_plic_update(SiFivePLICState *plic)
Quoted 5 lines
hw/intc/sifive_plic.c +5
-0+ }else { +switch (mode) { +case PLICMode_M: + riscv_cpu_update_mip(RISCV_CPU(cpu), + MIP_MEIP,
BOOL_TO_MASK(level));hw/intc/sifive_plic.c static void sifive_plic_update(SiFivePLICState *plic)
Quoted 4 lines
hw/intc/sifive_plic.c +4
-0+break ; +case PLICMode_S: + riscv_cpu_update_mip(RISCV_CPU(cpu), + MIP_SEIP,
BOOL_TO_MASK(level));Quoted 12 lines
hw/intc/sifive_plic.c +4
-0+break ; +default : +break ; + } } }target/riscv/kvm.c index renamed from target/riscv/kvm.c +0
-0
6250ca0c7d..b01ff0754c100644target/riscv/kvm.c void kvm_riscv_reset_vcpu(RISCVCPU *cpu) · line 459
Quoted 6 lines
target/riscv/kvm.c +3
-0@@ -454,3 +454,22 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu) env->satp =0 ; } +void kvm_riscv_set_irq (RISCVCPU *cpu,int irq,int level) { +int ret; + unsigned virq = level ? KVM_INTERRUPT_SET :
KVM_INTERRUPT_UNSET;Quoted 30 lines
target/riscv/kvm.c +15
-0+ +if (irq !=IRQ_S_EXT ) { +return ; + } + +if (!kvm_enabled ()) { +return ; + } + + ret =kvm_vcpu_ioctl (CPU (cpu),KVM_INTERRUPT , &virq); +if (ret <0 ) { +perror ("Set irq failed" ); +abort (); + } +}target/riscv/kvm_riscv.h index renamed from target/riscv/kvm_riscv.h +0
-0
f38c82bf59..ed281bdce0100644target/riscv/kvm_riscv.h +1
-1@@ -20,5 +20,6 @@#define QEMU_KVM_RISCV_H void kvm_riscv_reset_vcpu (RISCVCPU *cpu); +void kvm_riscv_set_irq (RISCVCPU *cpu,int irq,int level);#endif --2.19.1
RFC PATCH v4 8/15 target/riscv: Handle KVM_EXIT_RISCV_SBI exit
In reply to Yifei JiangUse char-fe to handle console sbi call, which implement early console io while apply 'earlycon=sbi' into kernel parameters.
--- target/riscv/kvm.c | 42 ++++++++++++++++- target/riscv/sbi_ecall_interface.h | 72 ++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 target/riscv/sbi_ecall_interface.h
target/riscv/kvm.c +41 -1
@@ -38,6 +38,8 @@#include "qemu/log.h" #include "hw/loader.h" #include "kvm_riscv.h" +#include "sbi_ecall_interface.h" +#include "chardev/char-fe.h" static __u64 kvm_riscv_reg_id (__u64 type,__u64 idx) {
@@ -436,9 +438,47 @@ bool kvm_arch_stop_on_emulation_error(CPUState *cs)return true; } +static int kvm_riscv_handle_sbi (struct kvm_run *run) +{ +int ret =0 ; +unsigned char ch; +switch (run->riscv_sbi.extension_id) { +case SBI_EXT_0_1_CONSOLE_PUTCHAR : + ch = run->riscv_sbi.args[0 ]; +qemu_chr_fe_write (serial_hd (0 )->be, &ch,sizeof (ch)); +break ; +case SBI_EXT_0_1_CONSOLE_GETCHAR : + ret =qemu_chr_fe_read_all (serial_hd (0 )->be, &ch,sizeof (ch)); +if (ret ==sizeof (ch)) { + run->riscv_sbi.args[0 ] = ch; + }else { + run->riscv_sbi.args[0 ] =-1 ; + } +break ; +default : +qemu_log_mask (LOG_UNIMP , +"%s: un-handled SBI EXIT, specific reasons is %lu\n" , + __func__, run->riscv_sbi.extension_id); + ret =-1 ; +break ; + } +return ret; +} +int kvm_arch_handle_exit (CPUState *cs,struct kvm_run *run) { -return 0 ; +int ret =0 ; +switch (run->exit_reason) { +case KVM_EXIT_RISCV_SBI : + ret =kvm_riscv_handle_sbi (run); +break ; +default : +qemu_log_mask (LOG_UNIMP ,"%s: un-handled exit reason %d\n" , + __func__, run->exit_reason); + ret =-1 ; +break ; + } +return ret; }void kvm_riscv_reset_vcpu (RISCVCPU *cpu)
target/riscv/sbi_ecall_interface.h new file +72 -0
72 lines not on this page · raw message
Signature · 1 line
2.19.1
RFC PATCH v4 9/15 target/riscv: Add host cpu type
In reply to Yifei JiangCurrently, host cpu is inherited simply.
--- target/riscv/cpu.c | 6 ++++++ target/riscv/cpu.h | 1 + 2 files changed, 7 insertions(+)
target/riscv/cpu.c +6 -0
@@ -186,6 +186,10 @@ static void rv32_imafcu_nommu_cpu_init(Object *obj)#endif +static void riscv_host_cpu_init (Object *obj) +{ +} +static ObjectClass *riscv_cpu_class_by_name (const char *cpu_model) {ObjectClass *oc;
@@ -641,10 +645,12 @@ static const TypeInfo riscv_cpu_type_infos[] = { DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rvxx_sifive_e_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32_imafcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_sifive_u_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_HOST, riscv_host_cpu_init), #elif defined(TARGET_RISCV64)DEFINE_CPU (TYPE_RISCV_CPU_BASE64 , riscv_base_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_E51 , rvxx_sifive_e_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_U54 , rvxx_sifive_u_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_HOST, riscv_host_cpu_init), #endif };
target/riscv/cpu.h +1 -0
@@ -43,6 +43,7 @@#define TYPE_RISCV_CPU_SIFIVE_E51 RISCV_CPU_TYPE_NAME("sifive-e51")#define TYPE_RISCV_CPU_SIFIVE_U34 RISCV_CPU_TYPE_NAME("sifive-u34")#define TYPE_RISCV_CPU_SIFIVE_U54 RISCV_CPU_TYPE_NAME("sifive-u54") +#define TYPE_RISCV_CPU_HOST RISCV_CPU_TYPE_NAME("host")#define RV32 ((target_ulong)1 << (TARGET_LONG_BITS - 2))#define RV64 ((target_ulong)2 << (TARGET_LONG_BITS - 2))
Signature · 1 line
2.19.1
Re: [PATCH RFC v4 09/15] target/riscv: Add host cpu type
Quoted 26 lines · Yifei Jiang
Currently, host cpu is inherited simply.
Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>--- target/riscv/cpu.c | 6 ++++++ target/riscv/cpu.h | 1 + 2 files changed, 7 insertions(+)target/riscv/cpu.c +4
-0@@ -186,6 +186,10 @@ static void rv32_imafcu_nommu_cpu_init(Object *obj)#endif +static void riscv_host_cpu_init (Object *obj) +{ +} +static ObjectClass *riscv_cpu_class_by_name (const char *cpu_model) {ObjectClass *oc;
target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 653
Quoted 9 lines
target/riscv/cpu.c +2
-0@@ -641,10 +645,12 @@ static const TypeInfo riscv_cpu_type_infos[] = { DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rvxx_sifive_e_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32_imafcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_sifive_u_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_HOST, riscv_host_cpu_init), #elif defined(TARGET_RISCV64)DEFINE_CPU (TYPE_RISCV_CPU_BASE64 , riscv_base_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_E51 , rvxx_sifive_e_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_SIFIVE_U54 , rvxx_sifive_u_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_HOST, riscv_host_cpu_init),
Shouldn't this only be included if KVM is configured? Also it should be shared between RV32 and RV64.
Alistair
Quoted 19 lines
target/riscv/cpu.c +0
-0#endif };target/riscv/cpu.h +1
-1@@ -43,6 +43,7 @@#define TYPE_RISCV_CPU_SIFIVE_E51 RISCV_CPU_TYPE_NAME("sifive-e51")#define TYPE_RISCV_CPU_SIFIVE_U34 RISCV_CPU_TYPE_NAME("sifive-u34")#define TYPE_RISCV_CPU_SIFIVE_U54 RISCV_CPU_TYPE_NAME("sifive-u54") +#define TYPE_RISCV_CPU_HOST RISCV_CPU_TYPE_NAME("host")#define RV32 ((target_ulong)1 << (TARGET_LONG_BITS - 2))#define RV64 ((target_ulong)2 << (TARGET_LONG_BITS - 2)) --2.19.1
RE: [PATCH RFC v4 09/15] target/riscv: Add host cpu type
Quoted 56 lines
-----Original Message-----
From: Alistair Francis [mailto:alistair23 at gmail.com]
Sent: Wednesday, December 9, 2020 6:22 AM
To: Jiangyifei <[email protected]>
Cc: qemu-devel at nongnu.org Developers <[email protected]>; open list:RISC-V <[email protected]>; Zhangxiaofeng (F) <[email protected]>; Sagar Karandikar <[email protected]>; open list:Overall <[email protected]>; libvir-list at redhat.com; Bastian Koppelmann <[email protected]>; Anup Patel <[email protected]>; yinyipeng <[email protected]>; Alistair Francis <[email protected]>; kvm-riscv at lists.infradead.org; Palmer Dabbelt <[email protected]>; dengkai (A) <[email protected]>; Wubin (H) <[email protected]>; Zhanghailiang <[email protected]>
Subject: Re: [PATCH RFC v4 09/15] target/riscv: Add host cpu typeQuoted 24 lines · Yifei Jiang
Currently, host cpu is inherited simply.
Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>--- target/riscv/cpu.c | 6 ++++++ target/riscv/cpu.h | 1 + 2 files changed, 7 insertions(+)target/riscv/cpu.c index renamed from target/riscv/cpu.c +0
-0
faee98a58c..439dc89ee7100644target/riscv/cpu.c +2
-0@@ -186,6 +186,10 @@ static void rv32_imafcu_nommu_cpu_init(Object *obj)#endif +static void riscv_host_cpu_init (Object *obj) { } +static ObjectClass *riscv_cpu_class_by_name (const char *cpu_model) {ObjectClass *oc;target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 645
Quoted 1 line
target/riscv/cpu.c +0
-0@@ -641,10 +645,12 @@ static const TypeInfo riscv_cpu_type_infos[] = { DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31,
rvxx_sifive_e_cpu_init),target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 646
Quoted 1 line
target/riscv/cpu.c +0
-0DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34,
rv32_imafcu_nommu_cpu_init),target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 647
Quoted 1 line
target/riscv/cpu.c +0
-0DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34,
rvxx_sifive_u_cpu_init),target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 648
Quoted 1 line
target/riscv/cpu.c +1
-0+ DEFINE_CPU(TYPE_RISCV_CPU_HOST,
riscv_host_cpu_init),target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 650
Quoted 2 lines
target/riscv/cpu.c +0
-0#elif defined(TARGET_RISCV64 ) DEFINE_CPU(TYPE_RISCV_CPU_BASE64,
riscv_base_cpu_init),target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 651
Quoted 1 line
target/riscv/cpu.c +0
-0DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51,
rvxx_sifive_e_cpu_init),target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 652
Quoted 1 line
target/riscv/cpu.c +0
-0DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54,
Quoted 9 lines
rvxx_sifive_u_cpu_init),target/riscv/cpu.c static const TypeInfo riscv_cpu_type_infos[] = { · line 653
Quoted 1 line
target/riscv/cpu.c +1
-0+ DEFINE_CPU(TYPE_RISCV_CPU_HOST,
riscv_host_cpu_init),Shouldn't this only be included if KVM is configured? Also it should be shared between RV32 and RV64.
Alistair
Yes, It should be included by CONFIG_KVM and be shared between RV32 and RV64.
Yifei
Quoted 23 lines
target/riscv/cpu.h line 43
Quoted 9 lines
target/riscv/cpu.c +0
-0#endif };target/riscv/cpu.h index renamed from target/riscv/cpu.h +0
-0ad1c90f798..4288898019 100644
target/riscv/cpu.h +0
-0@@ -43,6 +43,7 @@#define TYPE_RISCV_CPU_SIFIVE_E51
RISCV_CPU_TYPE_NAME("sifive-e51")target/riscv/cpu.h line 44
Quoted 1 line
target/riscv/cpu.h +0
-0#define TYPE_RISCV_CPU_SIFIVE_U34
RISCV_CPU_TYPE_NAME("sifive-u34")target/riscv/cpu.h line 45
Quoted 1 line
target/riscv/cpu.h +0
-0#define TYPE_RISCV_CPU_SIFIVE_U54
RISCV_CPU_TYPE_NAME("sifive-u54")target/riscv/cpu.h line 46
Quoted 1 line
target/riscv/cpu.h +1
-0+#define TYPE_RISCV_CPU_HOST
RISCV_CPU_TYPE_NAME("host")Quoted 7 lines
target/riscv/cpu.h +0
-1#define RV32 ((target_ulong)1 << (TARGET_LONG_BITS - 2)) #defineRV64 ((target_ulong )2 << (TARGET_LONG_BITS -2 )) --2.19.1
RFC PATCH v4 10/15 target/riscv: Add kvm_riscv_get/put_regs_timer
In reply to Yifei JiangAdd kvm_riscv_get/put_regs_timer to synchronize virtual time context from KVM.
To set register of RISCV_TIMER_REG(state) will occur a error from KVM on kvm_timer_state == 0. It's better to adapt in KVM, but it doesn't matter that adaping in QEMU.
--- target/riscv/cpu.h | 6 ++++ target/riscv/kvm.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+)
target/riscv/cpu.h +6 -0
@@ -237,6 +237,12 @@ struct CPURISCVState {hwaddr kernel_addr;hwaddr fdt_addr; + +/* kvm timer */ +bool kvm_timer_dirty; +uint64_t kvm_timer_time; +uint64_t kvm_timer_compare; +uint64_t kvm_timer_state; }; OBJECT_DECLARE_TYPE(RISCVCPU, RISCVCPUClass,
target/riscv/kvm.c +72 -0
84 lines not on this page · raw message
Signature · 1 line
2.19.1
RFC PATCH v4 11/15 target/riscv: Implement virtual time adjusting with vm state changing
In reply to Yifei JiangWe hope that virtual time adjusts with vm state changing. When a vm is stopped, guest virtual time should stop counting and kvm_timer should be stopped. When the vm is resumed, guest virtual time should continue to count and kvm_timer should be restored.
--- target/riscv/kvm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
target/riscv/kvm.c +14 -0
@@ -40,6 +40,7 @@#include "kvm_riscv.h" #include "sbi_ecall_interface.h" #include "chardev/char-fe.h" +#include "sysemu/runstate.h" static __u64 kvm_riscv_reg_id (__u64 type,__u64 idx) {
@@ -448,6 +449,17 @@ unsigned long kvm_arch_vcpu_id(CPUState *cpu)return cpu->cpu_index; } +static void kvm_riscv_vm_state_change (void *opaque,int running,RunState state) +{ +CPUState *cs = opaque; + +if (running) { +kvm_riscv_put_regs_timer (cs); + }else { +kvm_riscv_get_regs_timer (cs); + } +} +void kvm_arch_init_irq_routing (KVMState *s) { }
@@ -460,6 +472,8 @@ int kvm_arch_init_vcpu(CPUState *cs)CPURISCVState *env = &cpu->env;__u64 id; +qemu_add_vm_change_state_handler (kvm_riscv_vm_state_change, cs); + id =kvm_riscv_reg_id (KVM_REG_RISCV_CONFIG ,KVM_REG_RISCV_CONFIG_REG (isa)); ret =kvm_get_one_reg (cs, id, &isa);if (ret) {
Signature · 1 line
2.19.1
RFC PATCH v4 12/15 target/riscv: Support virtual time context synchronization
In reply to Yifei JiangAdd virtual time context description to vmstate_riscv_cpu. After cpu being loaded, virtual time context is updated to KVM.
--- target/riscv/machine.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
target/riscv/machine.c +14 -0
@@ -138,10 +138,20 @@ static const VMStateDescription vmstate_hyper = { } }; +static int cpu_post_load (void *opaque,int version_id) +{ +RISCVCPU *cpu = opaque; +CPURISCVState *env = &cpu->env; + + env->kvm_timer_dirty = true; +return 0 ; +} +const VMStateDescription vmstate_riscv_cpu = { .name ="cpu" , .version_id =1 , .minimum_version_id =1 , + .post_load = cpu_post_load, .fields = (VMStateField []) {VMSTATE_UINTTL_ARRAY (env.gpr,RISCVCPU ,32 ),VMSTATE_UINT64_ARRAY (env.fpr,RISCVCPU ,32 ),
@@ -185,6 +195,10 @@ const VMStateDescription vmstate_riscv_cpu = {VMSTATE_UINT64 (env.mtohost,RISCVCPU ),VMSTATE_UINT64 (env.timecmp,RISCVCPU ), +VMSTATE_UINT64 (env.kvm_timer_time,RISCVCPU ), +VMSTATE_UINT64 (env.kvm_timer_compare,RISCVCPU ), +VMSTATE_UINT64 (env.kvm_timer_state,RISCVCPU ), +VMSTATE_END_OF_LIST () }, .subsections = (const VMStateDescription * []) {
Signature · 1 line
2.19.1
RFC PATCH v4 13/15 target/riscv: Introduce dynamic time frequency for virt machine
In reply to Yifei JiangCurrently, time base frequency was fixed as SIFIVE_CLINT_TIMEBASE_FREQ. Here introduce "time-frequency" property to set time base frequency dynamically of which default value is still SIFIVE_CLINT_TIMEBASE_FREQ. The virt machine uses frequency of the first cpu to create clint and fdt.
--- hw/riscv/virt.c | 18 ++++++++++++++---- target/riscv/cpu.c | 3 +++ target/riscv/cpu.h | 2 ++ 3 files changed, 19 insertions(+), 4 deletions(-)
hw/riscv/virt.c +14 -4
@@ -178,7 +178,7 @@ static void create_pcie_irq_map(void *fdt, char *nodename, }static void create_fdt (RISCVVirtState *s,const struct MemmapEntry *memmap, -uint64_t mem_size,const char *cmdline) +uint64_t mem_size,const char *cmdline,uint64_t timebase_frequency) {void *fdt;int i, cpu, socket;
@@ -225,7 +225,7 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,qemu_fdt_add_subnode (fdt,"/cpus" );qemu_fdt_setprop_cell (fdt,"/cpus" ,"timebase-frequency" , -SIFIVE_CLINT_TIMEBASE_FREQ ); + timebase_frequency);qemu_fdt_setprop_cell (fdt,"/cpus" ,"#size-cells" ,0x0 );qemu_fdt_setprop_cell (fdt,"/cpus" ,"#address-cells" ,0x1 );qemu_fdt_add_subnode (fdt,"/cpus/cpu-map" );
@@ -510,6 +510,7 @@ static void virt_machine_init(MachineState *machine)target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry; +uint64_t timebase_frequency =0 ;DeviceState *mmio_plic, *virtio_plic, *pcie_plic;int i, j, base_hartid, hart_count;CPUState *cs;
@@ -553,12 +554,20 @@ static void virt_machine_init(MachineState *machine) hart_count, &error_abort);sysbus_realize (SYS_BUS_DEVICE (&s->soc[i]), &error_abort); +if (!timebase_frequency) { + timebase_frequency =RISCV_CPU (first_cpu)->env.frequency; + } +/* If vcpu's time frequency is not specified, we use default frequency */ +if (!timebase_frequency) { + timebase_frequency =SIFIVE_CLINT_TIMEBASE_FREQ ; + } +/* Per-socket CLINT */ sifive_clint_create ( memmap[VIRT_CLINT ].base + i * memmap[VIRT_CLINT ].size, memmap[VIRT_CLINT ].size, base_hartid, hart_count,SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , -SIFIVE_CLINT_TIMEBASE_FREQ , true); + timebase_frequency, true);/* Per-socket PLIC hart topology configuration string */ plic_hart_config_len =
@@ -610,7 +619,8 @@ static void virt_machine_init(MachineState *machine) main_mem);/* create device tree */ -create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline); +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, + timebase_frequency);/* boot rom */ memory_region_init_rom(mask_rom, NULL, "riscv_virt_board.mrom",
target/riscv/cpu.c +3 -0
@@ -494,6 +494,8 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)riscv_cpu_register_gdb_regs_for_features (cs); + env->user_frequency = env->frequency; +qemu_init_vcpu (cs);cpu_reset (cs);
@@ -531,6 +533,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("mmu" ,RISCVCPU , cfg.mmu, true),DEFINE_PROP_BOOL ("pmp" ,RISCVCPU , cfg.pmp, true),DEFINE_PROP_UINT64 ("resetvec" ,RISCVCPU , cfg.resetvec,DEFAULT_RSTVEC ), +DEFINE_PROP_UINT64 ("time-frequency" ,RISCVCPU , env.frequency,0 ), DEFINE_PROP_END_OF_LIST(), };
target/riscv/cpu.h +2 -0
@@ -243,6 +243,8 @@ struct CPURISCVState {uint64_t kvm_timer_time;uint64_t kvm_timer_compare;uint64_t kvm_timer_state; +uint64_t user_frequency; +uint64_t frequency; }; OBJECT_DECLARE_TYPE(RISCVCPU, RISCVCPUClass,
Signature · 1 line
2.19.1
Re: [PATCH RFC v4 13/15] target/riscv: Introduce dynamic time frequency for virt machine
Quoted 90 lines · Yifei Jiang
Currently, time base frequency was fixed as
SIFIVE_CLINT_TIMEBASE_FREQ. Here introduce "time-frequency" property to set time base frequency dynamically of which default value is stillSIFIVE_CLINT_TIMEBASE_FREQ. The virt machine uses frequency of the first cpu to create clint and fdt.Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>--- hw/riscv/virt.c | 18 ++++++++++++++---- target/riscv/cpu.c | 3 +++ target/riscv/cpu.h | 2 ++ 3 files changed, 19 insertions(+), 4 deletions(-)hw/riscv/virt.c +14
-4@@ -178,7 +178,7 @@ static void create_pcie_irq_map(void *fdt, char *nodename, }static void create_fdt (RISCVVirtState *s,const struct MemmapEntry *memmap, -uint64_t mem_size,const char *cmdline) +uint64_t mem_size,const char *cmdline,uint64_t timebase_frequency) {void *fdt;int i, cpu, socket;@@ -225,7 +225,7 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,qemu_fdt_add_subnode (fdt,"/cpus" );qemu_fdt_setprop_cell (fdt,"/cpus" ,"timebase-frequency" , -SIFIVE_CLINT_TIMEBASE_FREQ ); + timebase_frequency);qemu_fdt_setprop_cell (fdt,"/cpus" ,"#size-cells" ,0x0 );qemu_fdt_setprop_cell (fdt,"/cpus" ,"#address-cells" ,0x1 );qemu_fdt_add_subnode (fdt,"/cpus/cpu-map" );@@ -510,6 +510,7 @@ static void virt_machine_init(MachineState *machine)target_ulong firmware_end_addr, kernel_start_addr;uint32_t fdt_load_addr;uint64_t kernel_entry; +uint64_t timebase_frequency =0 ;DeviceState *mmio_plic, *virtio_plic, *pcie_plic;int i, j, base_hartid, hart_count;CPUState *cs;@@ -553,12 +554,20 @@ static void virt_machine_init(MachineState *machine) hart_count, &error_abort);sysbus_realize (SYS_BUS_DEVICE (&s->soc[i]), &error_abort); +if (!timebase_frequency) { + timebase_frequency =RISCV_CPU (first_cpu)->env.frequency; + } +/* If vcpu's time frequency is not specified, we use default frequency */ +if (!timebase_frequency) { + timebase_frequency =SIFIVE_CLINT_TIMEBASE_FREQ ; + } +/* Per-socket CLINT */ sifive_clint_create ( memmap[VIRT_CLINT ].base + i * memmap[VIRT_CLINT ].size, memmap[VIRT_CLINT ].size, base_hartid, hart_count,SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , -SIFIVE_CLINT_TIMEBASE_FREQ , true); + timebase_frequency, true);/* Per-socket PLIC hart topology configuration string */ plic_hart_config_len =@@ -610,7 +619,8 @@ static void virt_machine_init(MachineState *machine) main_mem);/* create device tree */ -create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline); +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, + timebase_frequency);/* boot rom */ memory_region_init_rom(mask_rom, NULL, "riscv_virt_board.mrom",target/riscv/cpu.c +2
-0@@ -494,6 +494,8 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)riscv_cpu_register_gdb_regs_for_features (cs); + env->user_frequency = env->frequency; +qemu_init_vcpu (cs);cpu_reset (cs);
target/riscv/cpu.c static Property riscv_cpu_properties[] = { · line 536
Quoted 4 lines
target/riscv/cpu.c +1
-0@@ -531,6 +533,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("mmu" ,RISCVCPU , cfg.mmu, true),DEFINE_PROP_BOOL ("pmp" ,RISCVCPU , cfg.pmp, true),DEFINE_PROP_UINT64 ("resetvec" ,RISCVCPU , cfg.resetvec,DEFAULT_RSTVEC ), + DEFINE_PROP_UINT64("time-frequency", RISCVCPU, env.frequency, 0),
Why not set the default to SIFIVE_CLINT_TIMEBASE_FREQ?
Also, QEMU now has a clock API, is using that instead a better option?
Alistair
Quoted 20 lines
target/riscv/cpu.c +0
-0DEFINE_PROP_END_OF_LIST(), };target/riscv/cpu.h +2
-1@@ -243,6 +243,8 @@ struct CPURISCVState {uint64_t kvm_timer_time;uint64_t kvm_timer_compare;uint64_t kvm_timer_state; +uint64_t user_frequency; +uint64_t frequency; }; OBJECT_DECLARE_TYPE(RISCVCPU, RISCVCPUClass, --2.19.1
RE: [PATCH RFC v4 13/15] target/riscv: Introduce dynamic time frequency for virt machine
Quoted 121 lines
-----Original Message-----
From: Alistair Francis [mailto:alistair23 at gmail.com]
Sent: Wednesday, December 9, 2020 6:26 AM
To: Jiangyifei <[email protected]>
Cc: qemu-devel at nongnu.org Developers <[email protected]>; open list:RISC-V <[email protected]>; Zhangxiaofeng (F) <[email protected]>; Sagar Karandikar <[email protected]>; open list:Overall <[email protected]>; libvir-list at redhat.com; Bastian Koppelmann <[email protected]>; Anup Patel <[email protected]>; yinyipeng <[email protected]>; Alistair Francis <[email protected]>; kvm-riscv at lists.infradead.org; Palmer Dabbelt <[email protected]>; dengkai (A) <[email protected]>; Wubin (H) <[email protected]>; Zhanghailiang <[email protected]>
Subject: Re: [PATCH RFC v4 13/15] target/riscv: Introduce dynamic time frequency for virt machineQuoted 5 lines · Yifei Jiang
Currently, time base frequency was fixed as
SIFIVE_CLINT_TIMEBASE_FREQ. Here introduce "time-frequency" property to set time base frequency dynamically of which default value is stillSIFIVE_CLINT_TIMEBASE_FREQ. The virt machine uses frequency of the firstcpu to create clint and fdt.
Quoted 14 lines
Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>--- hw/riscv/virt.c | 18 ++++++++++++++---- target/riscv/cpu.c | 3 +++ target/riscv/cpu.h | 2 ++ 3 files changed, 19 insertions(+), 4 deletions(-)hw/riscv/virt.c index renamed from hw/riscv/virt.c +0
-0
47b7018193..788a7237b6100644hw/riscv/virt.c static void create_pcie_irq_map(void *fdt, char · line 180
Quoted 3 lines
hw/riscv/virt.c +0
-0@@ -178,7 +178,7 @@ static void create_pcie_irq_map(void *fdt, char *nodename, } static void create_fdt(RISCVVirtState *s, const struct MemmapEntry*memmap,
Quoted 15 lines
hw/riscv/virt.c +3
-2- uint64_t mem_size, const char *cmdline) + uint64_t mem_size, const char *cmdline, uint64_t + timebase_frequency) { void *fdt;int i, cpu, socket;@@ -225,7 +225,7 @@ static void create_fdt(RISCVVirtState *s, conststruct MemmapEntry *memmap, qemu_fdt_add_subnode(fdt, "/cpus");qemu_fdt_setprop_cell (fdt,"/cpus" ,"timebase-frequency" , -SIFIVE_CLINT_TIMEBASE_FREQ ); + timebase_frequency);qemu_fdt_setprop_cell (fdt,"/cpus" ,"#size-cells" ,0x0 );qemu_fdt_setprop_cell (fdt,"/cpus" ,"#address-cells" ,0x1 );Quoted 1 line
qemu_fdt_add_subnode(fdt, "/cpus/cpu-map"); @@ -510,6 +510,7@@
hw/riscv/virt.c static void virt_machine_init(MachineState
Quoted 9 lines
static void
virt_machine_init(MachineState *machine)target_ulong firmware_end_addr, kernel_start_addr; uint32_t fdt_load_addr; uint64_t kernel_entry;hw/riscv/virt.c +1
-0+uint64_t timebase_frequency =0 ;DeviceState *mmio_plic, *virtio_plic, *pcie_plic;int i, j, base_hartid, hart_count;CPUState *cs;@@ -553,12 +554,20 @@ static void virt_machine_init(MachineState*machine)
hw/riscv/virt.c static void virt_machine_init(MachineState *machine)
Quoted 7 lines
hw/riscv/virt.c +4
-0hart_count, &error_abort);sysbus_realize (SYS_BUS_DEVICE (&s->soc[i]), &error_abort); +if (!timebase_frequency) { + timebase_frequency =RISCV_CPU (first_cpu)->env.frequency; + } +/* If vcpu's time frequency is not specified, we use default frequency */
hw/riscv/virt.c static void virt_machine_init(MachineState *machine)
Quoted 7 lines
hw/riscv/virt.c +4
-0+if (!timebase_frequency) { + timebase_frequency =SIFIVE_CLINT_TIMEBASE_FREQ ; + } +/* Per-socket CLINT */ sifive_clint_create ( memmap[VIRT_CLINT].base + i *memmap[VIRT_CLINT].size,
hw/riscv/virt.c static void virt_machine_init(MachineState · line 569
Quoted 2 lines
hw/riscv/virt.c +0
-0memmap[VIRT_CLINT ].size, base_hartid, hart_count, SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE,
SIFIVE_TIME_BASE,hw/riscv/virt.c static void virt_machine_init(MachineState
Quoted 6 lines
hw/riscv/virt.c +1
-1- SIFIVE_CLINT_TIMEBASE_FREQ, true); + timebase_frequency, true);/* Per-socket PLIC hart topology configuration string */ plic_hart_config_len =@@ -610,7 +619,8 @@ static void virt_machine_init(MachineState*machine)
hw/riscv/virt.c static void virt_machine_init(MachineState *machine)
Quoted 4 lines
hw/riscv/virt.c +0
-1main_mem);/* create device tree */ - create_fdt(s, memmap, machine->ram_size,
machine->kernel_cmdline);hw/riscv/virt.c static void virt_machine_init(MachineState · line 622
Quoted 1 line
hw/riscv/virt.c +1
-0+ create_fdt(s, memmap, machine->ram_size,
machine->kernel_cmdline,Quoted 18 lines
hw/riscv/virt.c +1
-0+ timebase_frequency);/* boot rom */ memory_region_init_rom(mask_rom, NULL, "riscv_virt_board.mrom",target/riscv/cpu.c index renamed from target/riscv/cpu.c +0
-0
439dc89ee7..66f35bcbbf100644target/riscv/cpu.c +2
-0@@ -494,6 +494,8 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)riscv_cpu_register_gdb_regs_for_features (cs ); + env->user_frequency = env->frequency; +qemu_init_vcpu (cs);cpu_reset (cs);
Quoted 9 lines
target/riscv/cpu.c static Property riscv_cpu_properties[] = { · line 537
Quoted 6 lines
target/riscv/cpu.c +1
-0@@ -531,6 +533,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("mmu" ,RISCVCPU , cfg.mmu, true),DEFINE_PROP_BOOL ("pmp" ,RISCVCPU , cfg.pmp, true),DEFINE_PROP_UINT64 ("resetvec" ,RISCVCPU , cfg.resetvec,DEFAULT_RSTVEC ), + DEFINE_PROP_UINT64("time-frequency", RISCVCPU, env.frequency, 0),Why not set the default to
SIFIVE_CLINT_TIMEBASE_FREQ?
When the time frequency is not specified, it will follow the host or the migration source. And we define 0 as equivalent to not specified time frequency.
Quoted 2 lines
Also, QEMU now has a clock API, is using that instead a better option?
Sorry, I didn't find the clock API. Could you tell me what the API is.
I think that the time frequency is option of KVM VCPU. So it is appropriate to put this option in the CPU.
Yifei
Quoted 22 lines
Alistair
Quoted 20 lines
target/riscv/cpu.c +0
-0DEFINE_PROP_END_OF_LIST(), };target/riscv/cpu.h index renamed from target/riscv/cpu.h +0
-0
16d6050ead..f5b6c34176100644target/riscv/cpu.h +2
-1@@ -243,6 +243,8 @@ struct CPURISCVState {uint64_t kvm_timer_time;uint64_t kvm_timer_compare;uint64_t kvm_timer_state; +uint64_t user_frequency; +uint64_t frequency; }; OBJECT_DECLARE_TYPE(RISCVCPU, RISCVCPUClass, --2.19.1
Re: [PATCH RFC v4 13/15] target/riscv: Introduce dynamic time frequency for virt machine
Quoted 135 lines · Jiangyifei
Quoted 122 lines
-----Original Message-----
From: Alistair Francis [mailto:alistair23 at gmail.com]
Sent: Wednesday, December 9, 2020 6:26 AM
To: Jiangyifei <[email protected]>
Cc: qemu-devel at nongnu.org Developers <[email protected]>; open list:RISC-V <[email protected]>; Zhangxiaofeng (F) <[email protected]>; Sagar Karandikar <[email protected]>; open list:Overall <[email protected]>; libvir-list at redhat.com; Bastian Koppelmann <[email protected]>; Anup Patel <[email protected]>; yinyipeng <[email protected]>; Alistair Francis <[email protected]>; kvm-riscv at lists.infradead.org; Palmer Dabbelt <[email protected]>; dengkai (A) <[email protected]>; Wubin (H) <[email protected]>; Zhanghailiang <[email protected]>
Subject: Re: [PATCH RFC v4 13/15] target/riscv: Introduce dynamic time frequency for virt machineQuoted 5 lines · Yifei Jiang
Currently, time base frequency was fixed as
SIFIVE_CLINT_TIMEBASE_FREQ. Here introduce "time-frequency" property to set time base frequency dynamically of which default value is stillSIFIVE_CLINT_TIMEBASE_FREQ. The virt machine uses frequency of the firstcpu to create clint and fdt.
Quoted 14 lines
Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>--- hw/riscv/virt.c | 18 ++++++++++++++---- target/riscv/cpu.c | 3 +++ target/riscv/cpu.h | 2 ++ 3 files changed, 19 insertions(+), 4 deletions(-)hw/riscv/virt.c index renamed from hw/riscv/virt.c +0
-0
47b7018193..788a7237b6100644hw/riscv/virt.c static void create_pcie_irq_map(void *fdt, char · line 180
Quoted 3 lines
hw/riscv/virt.c +0
-0@@ -178,7 +178,7 @@ static void create_pcie_irq_map(void *fdt, char *nodename, } static void create_fdt(RISCVVirtState *s, const struct MemmapEntry*memmap,
Quoted 15 lines
hw/riscv/virt.c +3
-2- uint64_t mem_size, const char *cmdline) + uint64_t mem_size, const char *cmdline, uint64_t + timebase_frequency) { void *fdt;int i, cpu, socket;@@ -225,7 +225,7 @@ static void create_fdt(RISCVVirtState *s, conststruct MemmapEntry *memmap, qemu_fdt_add_subnode(fdt, "/cpus");qemu_fdt_setprop_cell (fdt,"/cpus" ,"timebase-frequency" , -SIFIVE_CLINT_TIMEBASE_FREQ ); + timebase_frequency);qemu_fdt_setprop_cell (fdt,"/cpus" ,"#size-cells" ,0x0 );qemu_fdt_setprop_cell (fdt,"/cpus" ,"#address-cells" ,0x1 );Quoted 1 line
qemu_fdt_add_subnode(fdt, "/cpus/cpu-map"); @@ -510,6 +510,7@@
hw/riscv/virt.c static void virt_machine_init(MachineState
Quoted 9 lines
static void
virt_machine_init(MachineState *machine)target_ulong firmware_end_addr, kernel_start_addr; uint32_t fdt_load_addr; uint64_t kernel_entry;hw/riscv/virt.c +1
-0+uint64_t timebase_frequency =0 ;DeviceState *mmio_plic, *virtio_plic, *pcie_plic;int i, j, base_hartid, hart_count;CPUState *cs;@@ -553,12 +554,20 @@ static void virt_machine_init(MachineState*machine)
hw/riscv/virt.c static void virt_machine_init(MachineState *machine)
Quoted 7 lines
hw/riscv/virt.c +4
-0hart_count, &error_abort);sysbus_realize (SYS_BUS_DEVICE (&s->soc[i]), &error_abort); +if (!timebase_frequency) { + timebase_frequency =RISCV_CPU (first_cpu)->env.frequency; + } +/* If vcpu's time frequency is not specified, we use default frequency */
hw/riscv/virt.c static void virt_machine_init(MachineState *machine)
Quoted 7 lines
hw/riscv/virt.c +4
-0+if (!timebase_frequency) { + timebase_frequency =SIFIVE_CLINT_TIMEBASE_FREQ ; + } +/* Per-socket CLINT */ sifive_clint_create ( memmap[VIRT_CLINT].base + i *memmap[VIRT_CLINT].size,
hw/riscv/virt.c static void virt_machine_init(MachineState · line 569
Quoted 2 lines
hw/riscv/virt.c +0
-0memmap[VIRT_CLINT ].size, base_hartid, hart_count, SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE,
SIFIVE_TIME_BASE,hw/riscv/virt.c static void virt_machine_init(MachineState
Quoted 6 lines
hw/riscv/virt.c +1
-1- SIFIVE_CLINT_TIMEBASE_FREQ, true); + timebase_frequency, true);/* Per-socket PLIC hart topology configuration string */ plic_hart_config_len =@@ -610,7 +619,8 @@ static void virt_machine_init(MachineState*machine)
hw/riscv/virt.c static void virt_machine_init(MachineState *machine)
Quoted 4 lines
hw/riscv/virt.c +0
-1main_mem);/* create device tree */ - create_fdt(s, memmap, machine->ram_size,
machine->kernel_cmdline);hw/riscv/virt.c static void virt_machine_init(MachineState · line 622
Quoted 1 line
hw/riscv/virt.c +1
-0+ create_fdt(s, memmap, machine->ram_size,
machine->kernel_cmdline,Quoted 18 lines
hw/riscv/virt.c +1
-0+ timebase_frequency);/* boot rom */ memory_region_init_rom(mask_rom, NULL, "riscv_virt_board.mrom",target/riscv/cpu.c index renamed from target/riscv/cpu.c +0
-0
439dc89ee7..66f35bcbbf100644target/riscv/cpu.c +2
-0@@ -494,6 +494,8 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)riscv_cpu_register_gdb_regs_for_features (cs ); + env->user_frequency = env->frequency; +qemu_init_vcpu (cs);cpu_reset (cs);Quoted 9 lines
target/riscv/cpu.c static Property riscv_cpu_properties[] = { · line 537
Quoted 6 lines
target/riscv/cpu.c +1
-0@@ -531,6 +533,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("mmu" ,RISCVCPU , cfg.mmu, true),DEFINE_PROP_BOOL ("pmp" ,RISCVCPU , cfg.pmp, true),DEFINE_PROP_UINT64 ("resetvec" ,RISCVCPU , cfg.resetvec,DEFAULT_RSTVEC ), + DEFINE_PROP_UINT64("time-frequency", RISCVCPU, env.frequency, 0),Why not set the default to
SIFIVE_CLINT_TIMEBASE_FREQ?When the time frequency is not specified, it will follow the host or the migration source. And we define 0 as equivalent to not specified time frequency.
Quoted 6 lines
Quoted 2 lines
Also, QEMU now has a clock API, is using that instead a better option?
Sorry, I didn't find the clock API. Could you tell me what the API is.
I think that the time frequency is option of KVM VCPU. So it is appropriate to put this option in the CPU.
The clock API is documented here:
https://gitlab.com/qemu-project/qemu/-/blob/master/docs/devel/clocks.rst
I'm not sure if it applies to KVM, but it is at least worth considering.
Alistair
Quoted 25 lines
Yifei
Quoted 22 lines
Alistair
Quoted 20 lines
target/riscv/cpu.c +0
-0DEFINE_PROP_END_OF_LIST(), };target/riscv/cpu.h index renamed from target/riscv/cpu.h +0
-0
16d6050ead..f5b6c34176100644target/riscv/cpu.h +2
-1@@ -243,6 +243,8 @@ struct CPURISCVState {uint64_t kvm_timer_time;uint64_t kvm_timer_compare;uint64_t kvm_timer_state; +uint64_t user_frequency; +uint64_t frequency; }; OBJECT_DECLARE_TYPE(RISCVCPU, RISCVCPUClass, --2.19.1
RFC PATCH v4 14/15 target/riscv: Synchronize vcpu's frequency with KVM
In reply to Yifei JiangIf vcpu's frequency is specified by cpu option 'frequency', it will be set into KVM by KVM_SET_ONE_REG ioctl. Otherwise, vcpu's frequency will follow KVM by KVM_GET_ONE_REG ioctl.
--- target/riscv/kvm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
target/riscv/kvm.c +17 -0
@@ -409,6 +409,8 @@ int kvm_arch_get_registers(CPUState *cs)int kvm_arch_put_registers (CPUState *cs,int level) {int ret =0 ; +RISCVCPU *cpu =RISCV_CPU (cs); +CPURISCVState *env = &cpu->env; ret =kvm_riscv_put_regs_core (cs);if (ret) {
@@ -425,6 +427,10 @@ int kvm_arch_put_registers(CPUState *cs, int level)return ret; } +if (env->frequency) { + ret =kvm_set_one_reg (cs,RISCV_TIMER_REG (frequency), &env->frequency); + } +return ret; }
@@ -481,6 +487,17 @@ int kvm_arch_init_vcpu(CPUState *cs) } env->misa = isa; +/* +* Synchronize vcpu's frequency with KVM. If vcpu's frequency is specified +* by cpu option 'frequency', this will be set to KVM. Otherwise, vcpu's +* frequency will follow KVM. +*/ +if (env->user_frequency) { + ret =kvm_set_one_reg (cs,RISCV_TIMER_REG (frequency), &env->frequency); + }else { + ret =kvm_get_one_reg (cs,RISCV_TIMER_REG (frequency), &env->frequency); + } +return ret; }
Signature · 1 line
2.19.1
RFC PATCH v4 15/15 target/riscv: Add time frequency migration support
In reply to Yifei JiangIf vcpu's time frequency is not specified by CPU option 'time-frequency' on the destination, the time frequency of destination will follow the source.
If vcpu's time frequency specified by CPU option 'time-frequency' on the destination is different from migrated time frequency. The migration will be abort.
--- target/riscv/machine.c | 8 ++++++++ 1 file changed, 8 insertions(+)
target/riscv/machine.c +8 -0
@@ -144,6 +144,13 @@ static int cpu_post_load(void *opaque, int version_id)CPURISCVState *env = &cpu->env; env->kvm_timer_dirty = true; + +if (env->user_frequency && env->user_frequency != env->frequency) { +error_report ("Mismatch between user-specified time frequency and " +"migrated time frequency" ); +return -EINVAL ; + } +return 0 ; }
@@ -198,6 +205,7 @@ const VMStateDescription vmstate_riscv_cpu = {VMSTATE_UINT64 (env.kvm_timer_time,RISCVCPU ),VMSTATE_UINT64 (env.kvm_timer_compare,RISCVCPU ),VMSTATE_UINT64 (env.kvm_timer_state,RISCVCPU ), +VMSTATE_UINT64 (env.frequency,RISCVCPU ),VMSTATE_END_OF_LIST () },
Signature · 1 line
2.19.1