[PATCH RFC v4 06/15] target/riscv: Support start kernel directly by KVM
Jiangyifei
jiangyifei at huawei.com
Tue Dec 15 07:19:45 UTC 2020
> -----Original Message-----
> From: Alistair Francis [mailto:alistair23 at gmail.com]
> Sent: Wednesday, December 9, 2020 6:19 AM
> To: Jiangyifei <jiangyifei at huawei.com>
> Cc: qemu-devel at nongnu.org Developers <qemu-devel at nongnu.org>; open
> list:RISC-V <qemu-riscv at nongnu.org>; Zhangxiaofeng (F)
> <victor.zhangxiaofeng at huawei.com>; Sagar Karandikar
> <sagark at eecs.berkeley.edu>; open list:Overall <kvm at vger.kernel.org>;
> libvir-list at redhat.com; Bastian Koppelmann
> <kbastian at mail.uni-paderborn.de>; Anup Patel <anup.patel at wdc.com>;
> yinyipeng <yinyipeng1 at huawei.com>; Alistair Francis
> <Alistair.Francis at wdc.com>; kvm-riscv at lists.infradead.org; Palmer Dabbelt
> <palmer at dabbelt.com>; dengkai (A) <dengkai1 at huawei.com>; Wubin (H)
> <wu.wubin at huawei.com>; Zhanghailiang <zhang.zhanghailiang at huawei.com>
> Subject: Re: [PATCH RFC v4 06/15] target/riscv: Support start kernel directly by
> KVM
>
> On Thu, Dec 3, 2020 at 4:58 AM Yifei Jiang <jiangyifei at huawei.com> wrote:
> >
> > Get 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.
>
> 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
> >
> > Signed-off-by: Yifei Jiang <jiangyifei at huawei.com>
> > Signed-off-by: Yipeng Yin <yinyipeng1 at huawei.com>
> > ---
> > 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
> >
> > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index
> > 25cea7aa67..47b7018193 100644
> > --- a/hw/riscv/virt.c
> > +++ b/hw/riscv/virt.c
> > @@ -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);
> >
> > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index
> > 6a0264fc6b..faee98a58c 100644
> > --- a/target/riscv/cpu.c
> > +++ b/target/riscv/cpu.c
> > @@ -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.h b/target/riscv/cpu.h index
> > c0a326c843..ad1c90f798 100644
> > --- a/target/riscv/cpu.h
> > +++ b/target/riscv/cpu.h
> > @@ -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.c b/target/riscv/kvm.c index 8b206ce99c..6250ca0c7d
> > 100644
> > --- a/target/riscv/kvm.c
> > +++ b/target/riscv/kvm.c
> > @@ -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;
> > +}
> > +
> > diff --git a/target/riscv/kvm_riscv.h b/target/riscv/kvm_riscv.h new
> > file mode 100644 index 0000000000..f38c82bf59
> > --- /dev/null
> > +++ b/target/riscv/kvm_riscv.h
> > @@ -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
> >
> >
More information about the libvir-list
mailing list