Improve instruction and CSR emulation in KVM RISC-V
Subsystems (3)
cover Improve instruction and CSR emulation in KVM RISC-V
Currently, the instruction emulation for MMIO traps and Virtual instruction traps co-exist with general VCPU exit handling. The instruction and CSR emulation will grow with upcoming SBI PMU, AIA, and Nested virtualization in KVM RISC-V. In addition, we also need a mechanism to allow user-space emulate certain CSRs under certain situation (example, host has AIA support but user-space does not wants to use in-kernel AIA IMSIC and APLIC support).
This series improves instruction and CSR emulation in KVM RISC-V to make it extensible based on above.
These patches can also be found in riscv_kvm_csr_v1 branch at:
https://github.com/avpatel/linux.git
Anup Patel (3):
RISC-V: KVM: Factor-out instruction emulation into separate sources
RISC-V: KVM: Add extensible system instruction emulation framework
RISC-V: KVM: Add extensible CSR emulation framework
arch/riscv/include/asm/kvm_host.h | 16 +-
arch/riscv/include/asm/kvm_vcpu_insn.h | 48 ++
arch/riscv/kvm/Makefile | 1 +
arch/riscv/kvm/vcpu.c | 11 +
arch/riscv/kvm/vcpu_exit.c | 490 +----------------
arch/riscv/kvm/{vcpu_exit.c => vcpu_insn.c} | 560 +++++++++++---------
include/uapi/linux/kvm.h | 8 +
7 files changed, 382 insertions(+), 752 deletions(-)
create mode 100644 arch/riscv/include/asm/kvm_vcpu_insn.h
copy arch/riscv/kvm/{vcpu_exit.c => vcpu_insn.c} (64%)Signature · 1 line
2.34.1
PATCH 1/3 RISC-V: KVM: Factor-out instruction emulation into separate sources
The instruction and CSR emulation for VCPU is going to grow over time due to upcoming AIA, PMU, Nested and other virtualization features.
Let us factor-out VCPU instruction emulation from vcpu_exit.c to a separate source dedicated for this purpose.
---
arch/riscv/include/asm/kvm_host.h | 11 +-
arch/riscv/include/asm/kvm_vcpu_insn.h | 33 ++
arch/riscv/kvm/Makefile | 1 +
arch/riscv/kvm/vcpu_exit.c | 490 +-------------------
arch/riscv/kvm/{vcpu_exit.c => vcpu_insn.c} | 309 +++---------
5 files changed, 101 insertions(+), 743 deletions(-)
create mode 100644 arch/riscv/include/asm/kvm_vcpu_insn.h
copy arch/riscv/kvm/{vcpu_exit.c => vcpu_insn.c} (67%)arch/riscv/include/asm/kvm_host.h +1 -10
@@ -15,6 +15,7 @@#include <linux/spinlock.h> #include <asm/csr.h> #include <asm/kvm_vcpu_fp.h> +#include <asm/kvm_vcpu_insn.h> #include <asm/kvm_vcpu_timer.h> #define KVM_MAX_VCPUS 1024
@@ -90,14 +91,6 @@ struct kvm_arch {struct kvm_guest_timer timer; }; -struct kvm_mmio_decode { -unsigned long insn; -int insn_len; -int len; -int shift; -int return_handled; -}; -struct kvm_sbi_context {int return_handled; };
@@ -303,14 +296,12 @@ void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu);void __kvm_riscv_unpriv_trap (void ); -void kvm_riscv_vcpu_wfi (struct kvm_vcpu *vcpu);unsigned long kvm_riscv_vcpu_unpriv_read (struct kvm_vcpu *vcpu,bool read_insn,unsigned long guest_addr,struct kvm_cpu_trap *trap);void kvm_riscv_vcpu_trap_redirect (struct kvm_vcpu *vcpu,struct kvm_cpu_trap *trap); -int kvm_riscv_vcpu_mmio_return (struct kvm_vcpu *vcpu,struct kvm_run *run);int kvm_riscv_vcpu_exit (struct kvm_vcpu *vcpu,struct kvm_run *run,struct kvm_cpu_trap *trap);
arch/riscv/include/asm/kvm_vcpu_insn.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2022 Ventana Micro Systems Inc. +*/ + +#ifndef __KVM_VCPU_RISCV_INSN_H +#define __KVM_VCPU_RISCV_INSN_H + +struct kvm_vcpu ; +struct kvm_run ; +struct kvm_cpu_trap ; + +struct kvm_mmio_decode { +unsigned long insn; +int insn_len; +int len; +int shift; +int return_handled; +}; + +void kvm_riscv_vcpu_wfi (struct kvm_vcpu *vcpu); +int kvm_riscv_vcpu_virtual_insn (struct kvm_vcpu *vcpu,struct kvm_run *run, +struct kvm_cpu_trap *trap); + +int kvm_riscv_vcpu_mmio_load (struct kvm_vcpu *vcpu,struct kvm_run *run, +unsigned long fault_addr, +unsigned long htinst); +int kvm_riscv_vcpu_mmio_store (struct kvm_vcpu *vcpu,struct kvm_run *run, +unsigned long fault_addr, +unsigned long htinst); +int kvm_riscv_vcpu_mmio_return (struct kvm_vcpu *vcpu,struct kvm_run *run); + +#endif
arch/riscv/kvm/Makefile +1 -0
@@ -17,6 +17,7 @@ kvm-y += mmu.o kvm-y += vcpu.o kvm-y += vcpu_exit.o kvm-y += vcpu_fp.o +kvm-y += vcpu_insn.o kvm-y += vcpu_switch.o kvm-y += vcpu_sbi.o kvm-$(CONFIG_RISCV_SBI_V01) += vcpu_sbi_v01.o
arch/riscv/kvm/vcpu_exit.c +7 -483
524 lines not on this page · raw message
arch/riscv/kvm/vcpu_insn.c renamed from arch/riscv/kvm/vcpu_exit.c +59 -250
352 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 2/3 RISC-V: KVM: Add extensible system instruction emulation framework
In reply to Anup PatelWe will be emulating more system instructions in near future with upcoming AIA, PMU, Nested and other virtualization features.
To accommodate above, we add an extensible system instruction emulation framework in vcpu_insn.c.
--- arch/riscv/include/asm/kvm_vcpu_insn.h | 9 +++ arch/riscv/kvm/vcpu_insn.c | 82 +++++++++++++++++++++++--- 2 files changed, 82 insertions(+), 9 deletions(-)
arch/riscv/include/asm/kvm_vcpu_insn.h +9 -0
@@ -18,6 +18,15 @@ struct kvm_mmio_decode {int return_handled; }; +/* Return values used by function emulating a particular instruction */ +enum kvm_insn_return { +KVM_INSN_EXIT_TO_USER_SPACE =0 , +KVM_INSN_CONTINUE_NEXT_SEPC , +KVM_INSN_CONTINUE_SAME_SEPC , +KVM_INSN_ILLEGAL_TRAP , +KVM_INSN_VIRTUAL_TRAP +}; +void kvm_riscv_vcpu_wfi (struct kvm_vcpu *vcpu);int kvm_riscv_vcpu_virtual_insn (struct kvm_vcpu *vcpu,struct kvm_run *run,struct kvm_cpu_trap *trap);
arch/riscv/kvm/vcpu_insn.c +73 -9
105 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH 2/3] RISC-V: KVM: Add extensible system instruction emulation framework
Quoted 131 lines · Anup Patel
Date: Fri, 10 Jun 2022 10:35:54 +0530
From: Anup Patel <[email protected]>
Subject: [PATCH 2/3] RISC-V: KVM: Add extensible system instruction
emulation framework
X-Mailer: git-send-email 2.34.1We will be emulating more system instructions in near future with upcoming AIA, PMU, Nested and other virtualization features.
To accommodate above, we add an extensible system instruction emulation framework in
vcpu_insn.c.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/kvm_vcpu_insn.h | 9 +++ arch/riscv/kvm/vcpu_insn.c | 82 +++++++++++++++++++++++--- 2 files changed, 82 insertions(+), 9 deletions(-)arch/riscv/include/asm/kvm_vcpu_insn.h +9
-0@@ -18,6 +18,15 @@ struct kvm_mmio_decode {int return_handled; }; +/* Return values used by function emulating a particular instruction */ +enum kvm_insn_return { +KVM_INSN_EXIT_TO_USER_SPACE =0 , +KVM_INSN_CONTINUE_NEXT_SEPC , +KVM_INSN_CONTINUE_SAME_SEPC , +KVM_INSN_ILLEGAL_TRAP , +KVM_INSN_VIRTUAL_TRAP +}; +void kvm_riscv_vcpu_wfi (struct kvm_vcpu *vcpu);int kvm_riscv_vcpu_virtual_insn (struct kvm_vcpu *vcpu,struct kvm_run *run,struct kvm_cpu_trap *trap);arch/riscv/kvm/vcpu_insn.c +62
-7@@ -118,8 +118,24 @@ (s32)(((insn) >> 7) & 0x1f))#define MASK_FUNCT3 0x7000 -static int truly_illegal_insn (struct kvm_vcpu *vcpu, -struct kvm_run *run, +struct insn_func { +unsigned long mask; +unsigned long match; +/* +* Possible return values are as follows: +* 1) Returns < 0 for error case +* 2) Returns 0 for exit to user-space +* 3) Returns 1 to continue with next sepc +* 4) Returns 2 to continue with same sepc +* 5) Returns 3 to inject illegal instruction trap and continue +* 6) Returns 4 to inject virtual instruction trap and continue +* +* Use enum kvm_insn_return for return values +*/ +int (*func)(struct kvm_vcpu *vcpu,struct kvm_run *run,ulong insn); +}; + +static int truly_illegal_insn (struct kvm_vcpu *vcpu,struct kvm_run *run,ulong insn) {struct kvm_cpu_trap utrap = {0 };@@ -128,6 +144,24 @@ static int truly_illegal_insn(struct kvm_vcpu *vcpu, utrap.sepc = vcpu->arch.guest_context.sepc; utrap.scause =EXC_INST_ILLEGAL ; utrap.stval = insn; + utrap.htval =0 ; + utrap.htinst =0 ; +kvm_riscv_vcpu_trap_redirect (vcpu, &utrap); + +return 1 ; +} + +static int truly_virtual_insn (struct kvm_vcpu *vcpu,struct kvm_run *run, +ulong insn) +{ +struct kvm_cpu_trap utrap = {0 }; + +/* Redirect trap to Guest VCPU */ + utrap.sepc = vcpu->arch.guest_context.sepc; + utrap.scause =EXC_VIRTUAL_INST_FAULT ; + utrap.stval = insn; + utrap.htval =0 ; + utrap.htinst =0 ;kvm_riscv_vcpu_trap_redirect (vcpu, &utrap);return 1 ;@@ -148,18 +182,48 @@ void kvm_riscv_vcpu_wfi(struct kvm_vcpu *vcpu) } } -static int system_opcode_insn (struct kvm_vcpu *vcpu, -struct kvm_run *run, +static int wfi_insn (struct kvm_vcpu *vcpu,struct kvm_run *run,ulong insn) +{ + vcpu->stat.wfi_exit_stat++; +kvm_riscv_vcpu_wfi (vcpu); +return KVM_INSN_CONTINUE_NEXT_SEPC ; +} + +static const struct insn_func system_opcode_funcs[] = { + { + .mask =INSN_MASK_WFI , + .match =INSN_MATCH_WFI , + .func = wfi_insn, + }, +}; + +static int system_opcode_insn (struct kvm_vcpu *vcpu,struct kvm_run *run,ulong insn) { -if ((insn &INSN_MASK_WFI ) ==INSN_MATCH_WFI ) { - vcpu->stat.wfi_exit_stat++; -kvm_riscv_vcpu_wfi (vcpu); +int i, rc =KVM_INSN_ILLEGAL_TRAP ; +const struct insn_func *ifn; + +for (i =0 ; i <ARRAY_SIZE (system_opcode_funcs); i++) { + ifn = &system_opcode_funcs[i]; +if ((insn & ifn->mask) == ifn->match) { + rc = ifn->func (vcpu, run, insn); +break ; + } + }
arch/riscv/kvm/vcpu_insn.c void kvm_riscv_vcpu_wfi(struct kvm_vcpu *vcpu) · line 221
Quoted 10 lines
arch/riscv/kvm/vcpu_insn.c +8
-1+ +switch (rc) { +case KVM_INSN_ILLEGAL_TRAP : +return truly_illegal_insn (vcpu, run, insn); +case KVM_INSN_VIRTUAL_TRAP : +return truly_virtual_insn (vcpu, run, insn); +case KVM_INSN_CONTINUE_NEXT_SEPC : vcpu->arch.guest_context.sepc +=INSN_LEN (insn); -return 1 ; +break ;
Hi Anup,
What about adding KVM_INSN_CONTINUE_SAME_SEPC and KVM_INSN_EXIT_TO_USER_SPACE cases here and set rc to 1?
This is the explicit indication that both cases are handled.
Quoted 17 lines
arch/riscv/kvm/vcpu_insn.c +3
-1+default : +break ; } -return truly_illegal_insn (vcpu, run, insn); +return (rc <=0 ) ? rc :1 ; }/** Signature · 7 lines
2.34.1 -- kvm-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kvm-riscv
Anup Patel
maintainerRe: [PATCH 2/3] RISC-V: KVM: Add extensible system instruction emulation framework
Quoted 139 lines · Liu Zhao
Quoted 137 lines · Anup Patel
Date: Fri, 10 Jun 2022 10:35:54 +0530
From: Anup Patel <[email protected]>
Subject: [PATCH 2/3] RISC-V: KVM: Add extensible system instruction
emulation framework
X-Mailer: git-send-email 2.34.1We will be emulating more system instructions in near future with upcoming AIA, PMU, Nested and other virtualization features.
To accommodate above, we add an extensible system instruction emulation framework in
vcpu_insn.c.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/kvm_vcpu_insn.h | 9 +++ arch/riscv/kvm/vcpu_insn.c | 82 +++++++++++++++++++++++--- 2 files changed, 82 insertions(+), 9 deletions(-)arch/riscv/include/asm/kvm_vcpu_insn.h +9
-0@@ -18,6 +18,15 @@ struct kvm_mmio_decode {int return_handled; }; +/* Return values used by function emulating a particular instruction */ +enum kvm_insn_return { +KVM_INSN_EXIT_TO_USER_SPACE =0 , +KVM_INSN_CONTINUE_NEXT_SEPC , +KVM_INSN_CONTINUE_SAME_SEPC , +KVM_INSN_ILLEGAL_TRAP , +KVM_INSN_VIRTUAL_TRAP +}; +void kvm_riscv_vcpu_wfi (struct kvm_vcpu *vcpu);int kvm_riscv_vcpu_virtual_insn (struct kvm_vcpu *vcpu,struct kvm_run *run,struct kvm_cpu_trap *trap);arch/riscv/kvm/vcpu_insn.c +68
-7@@ -118,8 +118,24 @@ (s32)(((insn) >> 7) & 0x1f))#define MASK_FUNCT3 0x7000 -static int truly_illegal_insn (struct kvm_vcpu *vcpu, -struct kvm_run *run, +struct insn_func { +unsigned long mask; +unsigned long match; +/* +* Possible return values are as follows: +* 1) Returns < 0 for error case +* 2) Returns 0 for exit to user-space +* 3) Returns 1 to continue with next sepc +* 4) Returns 2 to continue with same sepc +* 5) Returns 3 to inject illegal instruction trap and continue +* 6) Returns 4 to inject virtual instruction trap and continue +* +* Use enum kvm_insn_return for return values +*/ +int (*func)(struct kvm_vcpu *vcpu,struct kvm_run *run,ulong insn); +}; + +static int truly_illegal_insn (struct kvm_vcpu *vcpu,struct kvm_run *run,ulong insn) {struct kvm_cpu_trap utrap = {0 };@@ -128,6 +144,24 @@ static int truly_illegal_insn(struct kvm_vcpu *vcpu, utrap.sepc = vcpu->arch.guest_context.sepc; utrap.scause =EXC_INST_ILLEGAL ; utrap.stval = insn; + utrap.htval =0 ; + utrap.htinst =0 ; +kvm_riscv_vcpu_trap_redirect (vcpu, &utrap); + +return 1 ; +} + +static int truly_virtual_insn (struct kvm_vcpu *vcpu,struct kvm_run *run, +ulong insn) +{ +struct kvm_cpu_trap utrap = {0 }; + +/* Redirect trap to Guest VCPU */ + utrap.sepc = vcpu->arch.guest_context.sepc; + utrap.scause =EXC_VIRTUAL_INST_FAULT ; + utrap.stval = insn; + utrap.htval =0 ; + utrap.htinst =0 ;kvm_riscv_vcpu_trap_redirect (vcpu, &utrap);return 1 ;@@ -148,18 +182,48 @@ void kvm_riscv_vcpu_wfi(struct kvm_vcpu *vcpu) } } -static int system_opcode_insn (struct kvm_vcpu *vcpu, -struct kvm_run *run, +static int wfi_insn (struct kvm_vcpu *vcpu,struct kvm_run *run,ulong insn) +{ + vcpu->stat.wfi_exit_stat++; +kvm_riscv_vcpu_wfi (vcpu); +return KVM_INSN_CONTINUE_NEXT_SEPC ; +} + +static const struct insn_func system_opcode_funcs[] = { + { + .mask =INSN_MASK_WFI , + .match =INSN_MATCH_WFI , + .func = wfi_insn, + }, +}; + +static int system_opcode_insn (struct kvm_vcpu *vcpu,struct kvm_run *run,ulong insn) { -if ((insn &INSN_MASK_WFI ) ==INSN_MATCH_WFI ) { - vcpu->stat.wfi_exit_stat++; -kvm_riscv_vcpu_wfi (vcpu); +int i, rc =KVM_INSN_ILLEGAL_TRAP ; +const struct insn_func *ifn; + +for (i =0 ; i <ARRAY_SIZE (system_opcode_funcs); i++) { + ifn = &system_opcode_funcs[i]; +if ((insn & ifn->mask) == ifn->match) { + rc = ifn->func (vcpu, run, insn); +break ; + } + } + +switch (rc) { +case KVM_INSN_ILLEGAL_TRAP : +return truly_illegal_insn (vcpu, run, insn); +case KVM_INSN_VIRTUAL_TRAP : +return truly_virtual_insn (vcpu, run, insn);
Quoted 8 lines
arch/riscv/kvm/vcpu_insn.c void kvm_riscv_vcpu_wfi(struct kvm_vcpu *vcpu) · line 221
Quoted 4 lines
arch/riscv/kvm/vcpu_insn.c +2
-1+case KVM_INSN_CONTINUE_NEXT_SEPC : vcpu->arch.guest_context.sepc +=INSN_LEN (insn); -return 1 ; +break ;Hi Anup,
What about addingKVM_INSN_CONTINUE_SAME_SEPCandKVM_INSN_EXIT_TO_USER_SPACEcases here and set rc to 1?
For KVM_INSN_CONTINUE_SAME_SEPC (and any rc >= 1) we should return 1 whereas for KVM_INSN_EXIT_TO_USER_SPACE we should return 0.
Quoted 1 line
This is the explicit indication that both cases are handled.
The KVM_INSN_EXIT_TO_USER_SPACE is always 0 whereas KVM_INSN_CONTINUE_SAME_SEPC is always 1 so the statement "return (rc <= 0) ? rc : 1;" handles both these cases.
Regards,
Anup
Quoted 18 lines
Quoted 18 lines
arch/riscv/kvm/vcpu_insn.c +3
-2+default : +break ; } -return truly_illegal_insn (vcpu, run, insn); +return (rc <=0 ) ? rc :1 ; }/** -- 2.34.1
--
kvm-riscv mailing list
kvm-riscv at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kvm-riscv
PATCH 3/3 RISC-V: KVM: Add extensible CSR emulation framework
In reply to Anup PatelWe add an extensible CSR emulation framework which is based upon the existing system instruction emulation. This will be useful to upcoming AIA, PMU, Nested and other virtualization features.
The CSR emulation framework also has provision to emulate CSR in user space but this will be used only in very specific cases such as AIA IMSIC CSR emulation in user space or vendor specific CSR emulation in user space.
By default, all CSRs not handled by KVM RISC-V will be redirected back to Guest VCPU as illegal instruction trap.
--- arch/riscv/include/asm/kvm_host.h | 5 + arch/riscv/include/asm/kvm_vcpu_insn.h | 6 + arch/riscv/kvm/vcpu.c | 11 ++ arch/riscv/kvm/vcpu_insn.c | 169 +++++++++++++++++++++++++ include/uapi/linux/kvm.h | 8 ++ 5 files changed, 199 insertions(+)
arch/riscv/include/asm/kvm_host.h +5 -0
@@ -64,6 +64,8 @@ struct kvm_vcpu_stat {u64 wfi_exit_stat;u64 mmio_exit_user;u64 mmio_exit_kernel; +u64 csr_exit_user; +u64 csr_exit_kernel;u64 exits; };
@@ -209,6 +211,9 @@ struct kvm_vcpu_arch {/* MMIO instruction details */ struct kvm_mmio_decode mmio_decode; +/* CSR instruction details */ +struct kvm_csr_decode csr_decode; +/* SBI context */ struct kvm_sbi_context sbi_context;
arch/riscv/include/asm/kvm_vcpu_insn.h +6 -0
@@ -18,6 +18,11 @@ struct kvm_mmio_decode {int return_handled; }; +struct kvm_csr_decode { +unsigned long insn; +int return_handled; +}; +/* Return values used by function emulating a particular instruction */ enum kvm_insn_return {KVM_INSN_EXIT_TO_USER_SPACE =0 ,
@@ -28,6 +33,7 @@ enum kvm_insn_return { };void kvm_riscv_vcpu_wfi (struct kvm_vcpu *vcpu); +int kvm_riscv_vcpu_csr_return (struct kvm_vcpu *vcpu,struct kvm_run *run);int kvm_riscv_vcpu_virtual_insn (struct kvm_vcpu *vcpu,struct kvm_run *run,struct kvm_cpu_trap *trap);
arch/riscv/kvm/vcpu.c +11 -0
@@ -26,6 +26,8 @@ const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = {STATS_DESC_COUNTER (VCPU , wfi_exit_stat),STATS_DESC_COUNTER (VCPU , mmio_exit_user),STATS_DESC_COUNTER (VCPU , mmio_exit_kernel), +STATS_DESC_COUNTER (VCPU , csr_exit_user), +STATS_DESC_COUNTER (VCPU , csr_exit_kernel), STATS_DESC_COUNTER(VCPU, exits) };
@@ -869,6 +871,15 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) } } +/* Process CSR value returned from user-space */ +if (run->exit_reason ==KVM_EXIT_RISCV_CSR ) { + ret =kvm_riscv_vcpu_csr_return (vcpu, vcpu->run); +if (ret) { +kvm_vcpu_srcu_read_unlock (vcpu); +return ret; + } + } +if (run->immediate_exit) {kvm_vcpu_srcu_read_unlock (vcpu);return -EINTR ;
arch/riscv/kvm/vcpu_insn.c +169 -0
188 lines not on this page · raw message
include/uapi/linux/kvm.h +8 -0
@@ -270,6 +270,7 @@ struct kvm_xen_exit {#define KVM_EXIT_X86_BUS_LOCK 33#define KVM_EXIT_XEN 34#define KVM_EXIT_RISCV_SBI 35 +#define KVM_EXIT_RISCV_CSR 36/* For KVM_EXIT_INTERNAL_ERROR */ /* Emulate instruction failed. */
@@ -496,6 +497,13 @@ struct kvm_run {unsigned long args[6 ];unsigned long ret[2 ]; } riscv_sbi; +/* KVM_EXIT_RISCV_CSR */ +struct { +unsigned long csr_num; +unsigned long new_value; +unsigned long write_mask; +unsigned long ret_value; + } riscv_csr;/* Fix the size of the union. */ char padding[256 ]; };
Signature · 1 line
2.34.1