SBI MPXY support for KVM Guest
Subsystems (4)
cover SBI MPXY support for KVM Guest
This series adds SBI MPXY support for KVM Guest/VM which will enable QEMU-KVM or KVMTOOL to emulate RPMI MPXY channels for the Guest/VM.
These patches can also be found in riscv_kvm_sbi_mpxy_v1 branch
at: https://github.com/avpatel/linux.git
Anup Patel (4):
RISC-V: KVM: Convert kvm_riscv_vcpu_sbi_forward() into extension
handler
RISC-V: KVM: Add separate source for forwarded SBI extensions
RISC-V: KVM: Add SBI MPXY extension support for Guest
KVM: riscv: selftests: Add SBI MPXY extension to get-reg-list
arch/riscv/include/asm/kvm_vcpu_sbi.h | 5 ++- arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/vcpu_sbi.c | 10 +++++- arch/riscv/kvm/vcpu_sbi_base.c | 28 +-------------- arch/riscv/kvm/vcpu_sbi_forward.c | 34 +++++++++++++++++++ arch/riscv/kvm/vcpu_sbi_replace.c | 32 ----------------- arch/riscv/kvm/vcpu_sbi_system.c | 4 +-- arch/riscv/kvm/vcpu_sbi_v01.c | 3 +- .../selftests/kvm/riscv/get-reg-list.c | 4 +++ 10 files changed, 56 insertions(+), 66 deletions(-) create mode 100644 arch/riscv/kvm/vcpu_sbi_forward.c
Signature · 1 line
2.43.0
PATCH 1/4 RISC-V: KVM: Convert kvm_riscv_vcpu_sbi_forward() into extension handler
All uses of kvm_riscv_vcpu_sbi_forward() also updates retdata->uexit so to further reduce code duplication move retdata->uexit assignment to kvm_riscv_vcpu_sbi_forward() and convert it into SBI extension handler.
--- arch/riscv/include/asm/kvm_vcpu_sbi.h | 4 +++- arch/riscv/kvm/vcpu_sbi.c | 6 +++++- arch/riscv/kvm/vcpu_sbi_base.c | 20 +++----------------- arch/riscv/kvm/vcpu_sbi_replace.c | 27 +-------------------------- arch/riscv/kvm/vcpu_sbi_system.c | 4 +--- arch/riscv/kvm/vcpu_sbi_v01.c | 3 +-- 6 files changed, 14 insertions(+), 50 deletions(-)
arch/riscv/include/asm/kvm_vcpu_sbi.h +3 -1
@@ -69,7 +69,9 @@ struct kvm_vcpu_sbi_extension { unsigned long reg_size, const void *reg_val); }; -void kvm_riscv_vcpu_sbi_forward (struct kvm_vcpu *vcpu,struct kvm_run *run); +int kvm_riscv_vcpu_sbi_forward_handler (struct kvm_vcpu *vcpu, +struct kvm_run *run, +struct kvm_vcpu_sbi_return *retdata);void kvm_riscv_vcpu_sbi_system_reset (struct kvm_vcpu *vcpu,struct kvm_run *run,u32 type,u64 flags);
arch/riscv/kvm/vcpu_sbi.c +5 -1
@@ -120,7 +120,9 @@ static bool riscv_vcpu_supports_sbi_ext(struct kvm_vcpu *vcpu, int idx)return sext && scontext->ext_status[sext->ext_idx] !=KVM_RISCV_SBI_EXT_STATUS_UNAVAILABLE ; } -void kvm_riscv_vcpu_sbi_forward (struct kvm_vcpu *vcpu,struct kvm_run *run) +int kvm_riscv_vcpu_sbi_forward_handler (struct kvm_vcpu *vcpu, +struct kvm_run *run, +struct kvm_vcpu_sbi_return *retdata) {struct kvm_cpu_context *cp = &vcpu->arch.guest_context;
@@ -137,6 +139,8 @@ void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run) run->riscv_sbi.args[5 ] = cp->a5; run->riscv_sbi.ret[0 ] =SBI_ERR_NOT_SUPPORTED ; run->riscv_sbi.ret[1 ] =0 ; + retdata->uexit = true; +return 0 ; } void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu,
arch/riscv/kvm/vcpu_sbi_base.c +3 -17
@@ -41,8 +41,7 @@ static int kvm_sbi_ext_base_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,* For experimental/vendor extensions * forward it to the userspace */ -kvm_riscv_vcpu_sbi_forward (vcpu, run); - retdata->uexit = true; +return kvm_riscv_vcpu_sbi_forward_handler (vcpu, run, retdata); }else { sbi_ext =kvm_vcpu_sbi_find_ext (vcpu, cp->a0); *out_val = sbi_ext && sbi_ext->probe ?
@@ -72,27 +71,14 @@ const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_base = { .handler = kvm_sbi_ext_base_handler, }; -static int kvm_sbi_ext_forward_handler (struct kvm_vcpu *vcpu, -struct kvm_run *run, -struct kvm_vcpu_sbi_return *retdata) -{ -/* -* Both SBI experimental and vendor extensions are -* unconditionally forwarded to userspace. -*/ -kvm_riscv_vcpu_sbi_forward (vcpu, run); - retdata->uexit = true; -return 0 ; -} -const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental = { .extid_start =SBI_EXT_EXPERIMENTAL_START , .extid_end =SBI_EXT_EXPERIMENTAL_END , - .handler = kvm_sbi_ext_forward_handler, + .handler = kvm_riscv_vcpu_sbi_forward_handler, };const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor = { .extid_start =SBI_EXT_VENDOR_START , .extid_end =SBI_EXT_VENDOR_END , - .handler = kvm_sbi_ext_forward_handler, + .handler = kvm_riscv_vcpu_sbi_forward_handler, };
arch/riscv/kvm/vcpu_sbi_replace.c +1 -26
@@ -186,34 +186,9 @@ const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_srst = { .handler = kvm_sbi_ext_srst_handler, }; -static int kvm_sbi_ext_dbcn_handler (struct kvm_vcpu *vcpu, -struct kvm_run *run, -struct kvm_vcpu_sbi_return *retdata) -{ -struct kvm_cpu_context *cp = &vcpu->arch.guest_context; -unsigned long funcid = cp->a6; - -switch (funcid) { -case SBI_EXT_DBCN_CONSOLE_WRITE : -case SBI_EXT_DBCN_CONSOLE_READ : -case SBI_EXT_DBCN_CONSOLE_WRITE_BYTE : -/* -* The SBI debug console functions are unconditionally -* forwarded to the userspace. -*/ -kvm_riscv_vcpu_sbi_forward (vcpu, run); - retdata->uexit = true; -break ; -default : - retdata->err_val =SBI_ERR_NOT_SUPPORTED ; - } - -return 0 ; -} -const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_dbcn = { .extid_start =SBI_EXT_DBCN , .extid_end =SBI_EXT_DBCN , .default_disabled = true, - .handler = kvm_sbi_ext_dbcn_handler, + .handler = kvm_riscv_vcpu_sbi_forward_handler, };
arch/riscv/kvm/vcpu_sbi_system.c +1 -3
@@ -47,9 +47,7 @@ static int kvm_sbi_ext_susp_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,kvm_riscv_vcpu_sbi_request_reset (vcpu, cp->a1, cp->a2);/* userspace provides the suspend implementation */ -kvm_riscv_vcpu_sbi_forward (vcpu, run); - retdata->uexit = true; -break ; +return kvm_riscv_vcpu_sbi_forward_handler (vcpu, run, retdata);default : retdata->err_val =SBI_ERR_NOT_SUPPORTED ;break ;
arch/riscv/kvm/vcpu_sbi_v01.c +1 -2
@@ -32,8 +32,7 @@ static int kvm_sbi_ext_v01_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,* The CONSOLE_GETCHAR/CONSOLE_PUTCHAR SBI calls cannot be * handled in kernel so we forward these to user-space */ -kvm_riscv_vcpu_sbi_forward (vcpu, run); - retdata->uexit = true; + ret =kvm_riscv_vcpu_sbi_forward_handler (vcpu, run, retdata);break ;case SBI_EXT_0_1_SET_TIMER :#if __riscv_xlen ==32
Signature · 1 line
2.43.0
Re: [PATCH 1/4] RISC-V: KVM: Convert kvm_riscv_vcpu_sbi_forward() into extension handler
Quoted 169 lines · Anup Patel
All uses of
kvm_riscv_vcpu_sbi_forward()also updatesretdata->uexitso to further reduce code duplication moveretdata->uexitassignment tokvm_riscv_vcpu_sbi_forward()and convert it into SBI extension handler.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/kvm_vcpu_sbi.h | 4 +++- arch/riscv/kvm/vcpu_sbi.c | 6 +++++- arch/riscv/kvm/vcpu_sbi_base.c | 20 +++----------------- arch/riscv/kvm/vcpu_sbi_replace.c | 27 +-------------------------- arch/riscv/kvm/vcpu_sbi_system.c | 4 +--- arch/riscv/kvm/vcpu_sbi_v01.c | 3 +-- 6 files changed, 14 insertions(+), 50 deletions(-)arch/riscv/include/asm/kvm_vcpu_sbi.h +3
-1@@ -69,7 +69,9 @@ struct kvm_vcpu_sbi_extension { unsigned long reg_size, const void *reg_val); }; -void kvm_riscv_vcpu_sbi_forward (struct kvm_vcpu *vcpu,struct kvm_run *run); +int kvm_riscv_vcpu_sbi_forward_handler (struct kvm_vcpu *vcpu, +struct kvm_run *run, +struct kvm_vcpu_sbi_return *retdata);void kvm_riscv_vcpu_sbi_system_reset (struct kvm_vcpu *vcpu,struct kvm_run *run,u32 type,u64 flags);arch/riscv/kvm/vcpu_sbi.c +5
-1@@ -120,7 +120,9 @@ static bool riscv_vcpu_supports_sbi_ext(struct kvm_vcpu *vcpu, int idx)return sext && scontext->ext_status[sext->ext_idx] !=KVM_RISCV_SBI_EXT_STATUS_UNAVAILABLE ; } -void kvm_riscv_vcpu_sbi_forward (struct kvm_vcpu *vcpu,struct kvm_run *run) +int kvm_riscv_vcpu_sbi_forward_handler (struct kvm_vcpu *vcpu, +struct kvm_run *run, +struct kvm_vcpu_sbi_return *retdata) {struct kvm_cpu_context *cp = &vcpu->arch.guest_context;@@ -137,6 +139,8 @@ void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run) run->riscv_sbi.args[5 ] = cp->a5; run->riscv_sbi.ret[0 ] =SBI_ERR_NOT_SUPPORTED ; run->riscv_sbi.ret[1 ] =0 ; + retdata->uexit = true; +return 0 ; } void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu,arch/riscv/kvm/vcpu_sbi_base.c +3
-17@@ -41,8 +41,7 @@ static int kvm_sbi_ext_base_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,* For experimental/vendor extensions * forward it to the userspace */ -kvm_riscv_vcpu_sbi_forward (vcpu, run); - retdata->uexit = true; +return kvm_riscv_vcpu_sbi_forward_handler (vcpu, run, retdata); }else { sbi_ext =kvm_vcpu_sbi_find_ext (vcpu, cp->a0); *out_val = sbi_ext && sbi_ext->probe ?@@ -72,27 +71,14 @@ const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_base = { .handler = kvm_sbi_ext_base_handler, }; -static int kvm_sbi_ext_forward_handler (struct kvm_vcpu *vcpu, -struct kvm_run *run, -struct kvm_vcpu_sbi_return *retdata) -{ -/* -* Both SBI experimental and vendor extensions are -* unconditionally forwarded to userspace. -*/ -kvm_riscv_vcpu_sbi_forward (vcpu, run); - retdata->uexit = true; -return 0 ; -} -const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental = { .extid_start =SBI_EXT_EXPERIMENTAL_START , .extid_end =SBI_EXT_EXPERIMENTAL_END , - .handler = kvm_sbi_ext_forward_handler, + .handler = kvm_riscv_vcpu_sbi_forward_handler, };const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor = { .extid_start =SBI_EXT_VENDOR_START , .extid_end =SBI_EXT_VENDOR_END , - .handler = kvm_sbi_ext_forward_handler, + .handler = kvm_riscv_vcpu_sbi_forward_handler, };arch/riscv/kvm/vcpu_sbi_replace.c +1
-26@@ -186,34 +186,9 @@ const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_srst = { .handler = kvm_sbi_ext_srst_handler, }; -static int kvm_sbi_ext_dbcn_handler (struct kvm_vcpu *vcpu, -struct kvm_run *run, -struct kvm_vcpu_sbi_return *retdata) -{ -struct kvm_cpu_context *cp = &vcpu->arch.guest_context; -unsigned long funcid = cp->a6; - -switch (funcid) { -case SBI_EXT_DBCN_CONSOLE_WRITE : -case SBI_EXT_DBCN_CONSOLE_READ : -case SBI_EXT_DBCN_CONSOLE_WRITE_BYTE : -/* -* The SBI debug console functions are unconditionally -* forwarded to the userspace. -*/ -kvm_riscv_vcpu_sbi_forward (vcpu, run); - retdata->uexit = true; -break ; -default : - retdata->err_val =SBI_ERR_NOT_SUPPORTED ; - } - -return 0 ; -} -const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_dbcn = { .extid_start =SBI_EXT_DBCN , .extid_end =SBI_EXT_DBCN , .default_disabled = true, - .handler = kvm_sbi_ext_dbcn_handler, + .handler = kvm_riscv_vcpu_sbi_forward_handler, };arch/riscv/kvm/vcpu_sbi_system.c +1
-3@@ -47,9 +47,7 @@ static int kvm_sbi_ext_susp_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,kvm_riscv_vcpu_sbi_request_reset (vcpu, cp->a1, cp->a2);/* userspace provides the suspend implementation */ -kvm_riscv_vcpu_sbi_forward (vcpu, run); - retdata->uexit = true; -break ; +return kvm_riscv_vcpu_sbi_forward_handler (vcpu, run, retdata);default : retdata->err_val =SBI_ERR_NOT_SUPPORTED ;break ;arch/riscv/kvm/vcpu_sbi_v01.c +1
-2@@ -32,8 +32,7 @@ static int kvm_sbi_ext_v01_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,* The CONSOLE_GETCHAR/CONSOLE_PUTCHAR SBI calls cannot be * handled in kernel so we forward these to user-space */ -kvm_riscv_vcpu_sbi_forward (vcpu, run); - retdata->uexit = true; + ret =kvm_riscv_vcpu_sbi_forward_handler (vcpu, run, retdata);break ;case SBI_EXT_0_1_SET_TIMER :#if __riscv_xlen ==32 Signature · 1 line
2.43.0
PATCH 2/4 RISC-V: KVM: Add separate source for forwarded SBI extensions
In reply to Anup PatelAdd a separate source vcpu_sbi_forward.c for SBI extensions which are entirely forwarded to KVM user-space.
--- arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/vcpu_sbi_base.c | 12 ------------ arch/riscv/kvm/vcpu_sbi_forward.c | 27 +++++++++++++++++++++++++++ arch/riscv/kvm/vcpu_sbi_replace.c | 7 ------- 4 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 arch/riscv/kvm/vcpu_sbi_forward.c
arch/riscv/kvm/Makefile +1 -0
@@ -27,6 +27,7 @@ kvm-y += vcpu_onereg.o kvm-$(CONFIG_RISCV_PMU_SBI) += vcpu_pmu.o kvm-y += vcpu_sbi.o kvm-y += vcpu_sbi_base.o +kvm-y += vcpu_sbi_forward.o kvm-y += vcpu_sbi_fwft.o kvm-y += vcpu_sbi_hsm.o kvm-$(CONFIG_RISCV_PMU_SBI) += vcpu_sbi_pmu.o
arch/riscv/kvm/vcpu_sbi_base.c +0 -12
@@ -70,15 +70,3 @@ const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_base = { .extid_end = SBI_EXT_BASE, .handler = kvm_sbi_ext_base_handler, }; - -const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental = { - .extid_start =SBI_EXT_EXPERIMENTAL_START , - .extid_end =SBI_EXT_EXPERIMENTAL_END , - .handler = kvm_riscv_vcpu_sbi_forward_handler, -}; - -const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor = { - .extid_start =SBI_EXT_VENDOR_START , - .extid_end =SBI_EXT_VENDOR_END , - .handler = kvm_riscv_vcpu_sbi_forward_handler, -};
arch/riscv/kvm/vcpu_sbi_forward.c new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2025 Ventana Micro Systems Inc. +*/ + +#include <linux/kvm_host.h> +#include <asm/kvm_vcpu_sbi.h> +#include <asm/sbi.h> + +const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental = { + .extid_start =SBI_EXT_EXPERIMENTAL_START , + .extid_end =SBI_EXT_EXPERIMENTAL_END , + .handler = kvm_riscv_vcpu_sbi_forward_handler, +}; + +const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor = { + .extid_start =SBI_EXT_VENDOR_START , + .extid_end =SBI_EXT_VENDOR_END , + .handler = kvm_riscv_vcpu_sbi_forward_handler, +}; + +const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_dbcn = { + .extid_start =SBI_EXT_DBCN , + .extid_end =SBI_EXT_DBCN , + .default_disabled = true, + .handler = kvm_riscv_vcpu_sbi_forward_handler, +};
arch/riscv/kvm/vcpu_sbi_replace.c +0 -7
@@ -185,10 +185,3 @@ const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_srst = { .extid_end = SBI_EXT_SRST, .handler = kvm_sbi_ext_srst_handler, }; - -const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_dbcn = { - .extid_start =SBI_EXT_DBCN , - .extid_end =SBI_EXT_DBCN , - .default_disabled = true, - .handler = kvm_riscv_vcpu_sbi_forward_handler, -};
Signature · 1 line
2.43.0
Re: [PATCH 2/4] RISC-V: KVM: Add separate source for forwarded SBI extensions
Quoted 12 lines · Anup Patel
Add a separate source
vcpu_sbi_forward.cfor SBI extensions which are entirely forwarded to KVM user-space.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/vcpu_sbi_base.c | 12 ------------ arch/riscv/kvm/vcpu_sbi_forward.c | 27 +++++++++++++++++++++++++++ arch/riscv/kvm/vcpu_sbi_replace.c | 7 ------- 4 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 arch/riscv/kvm/vcpu_sbi_forward.c
PATCH 3/4 RISC-V: KVM: Add SBI MPXY extension support for Guest
In reply to Anup PatelThe SBI MPXY extension is a platform-level functionality so KVM only needs to forward SBI MPXY calls to KVM user-space.
--- arch/riscv/include/asm/kvm_vcpu_sbi.h | 1 + arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kvm/vcpu_sbi.c | 4 ++++ arch/riscv/kvm/vcpu_sbi_forward.c | 7 +++++++ 4 files changed, 13 insertions(+)
arch/riscv/include/asm/kvm_vcpu_sbi.h +1 -0
@@ -107,6 +107,7 @@ extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_dbcn;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_susp;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_sta;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_fwft; +extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_mpxy;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental;extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor;
arch/riscv/include/uapi/asm/kvm.h +1 -0
@@ -211,6 +211,7 @@ enum KVM_RISCV_SBI_EXT_ID {KVM_RISCV_SBI_EXT_STA ,KVM_RISCV_SBI_EXT_SUSP ,KVM_RISCV_SBI_EXT_FWFT , +KVM_RISCV_SBI_EXT_MPXY , KVM_RISCV_SBI_EXT_MAX, };
arch/riscv/kvm/vcpu_sbi.c +4 -0
@@ -82,6 +82,10 @@ static const struct kvm_riscv_sbi_extension_entry sbi_ext[] = { .ext_idx = KVM_RISCV_SBI_EXT_FWFT, .ext_ptr = &vcpu_sbi_ext_fwft, }, + { + .ext_idx = KVM_RISCV_SBI_EXT_MPXY, + .ext_ptr = &vcpu_sbi_ext_mpxy, + }, { .ext_idx = KVM_RISCV_SBI_EXT_EXPERIMENTAL, .ext_ptr = &vcpu_sbi_ext_experimental,
arch/riscv/kvm/vcpu_sbi_forward.c +7 -0
@@ -25,3 +25,10 @@ const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_dbcn = { .default_disabled = true, .handler = kvm_riscv_vcpu_sbi_forward_handler, }; + +const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_mpxy = { + .extid_start =SBI_EXT_MPXY , + .extid_end =SBI_EXT_MPXY , + .default_disabled = true, + .handler = kvm_riscv_vcpu_sbi_forward_handler, +};
Signature · 1 line
2.43.0
Re: [PATCH 3/4] RISC-V: KVM: Add SBI MPXY extension support for Guest
Quoted 11 lines · Anup Patel
The SBI MPXY extension is a platform-level functionality so KVM only needs to forward SBI MPXY calls to KVM user-space.
Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/kvm_vcpu_sbi.h | 1 + arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kvm/vcpu_sbi.c | 4 ++++ arch/riscv/kvm/vcpu_sbi_forward.c | 7 +++++++ 4 files changed, 13 insertions(+)
PATCH 4/4 KVM: riscv: selftests: Add SBI MPXY extension to get-reg-list
In reply to Anup PatelThe KVM RISC-V allows SBI MPXY extensions for Guest/VM so add it to the get-reg-list test.
--- tools/testing/selftests/kvm/riscv/get-reg-list.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/testing/selftests/kvm/riscv/get-reg-list.c +4 -0
@@ -133,6 +133,7 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_SUSP :case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_STA :case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_FWFT : +case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_MPXY :case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_EXPERIMENTAL :case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_VENDOR :return true;
@@ -639,6 +640,7 @@ static const char *sbi_ext_single_id_to_str(__u64 reg_off)KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_SUSP ),KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_STA ),KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_FWFT ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_MPXY ),KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_EXPERIMENTAL ), KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_VENDOR), };
@@ -1142,6 +1144,7 @@ KVM_SBI_EXT_SUBLIST_CONFIG(sta, STA);KVM_SBI_EXT_SIMPLE_CONFIG (pmu,PMU );KVM_SBI_EXT_SIMPLE_CONFIG (dbcn,DBCN );KVM_SBI_EXT_SIMPLE_CONFIG (susp,SUSP ); +KVM_SBI_EXT_SIMPLE_CONFIG (mpxy,MPXY );KVM_SBI_EXT_SUBLIST_CONFIG (fwft,FWFT );KVM_ISA_EXT_SUBLIST_CONFIG (aia,AIA );
@@ -1222,6 +1225,7 @@ struct vcpu_reg_list *vcpu_configs[] = { &config_sbi_pmu, &config_sbi_dbcn, &config_sbi_susp, + &config_sbi_mpxy, &config_sbi_fwft, &config_aia, &config_fp_f,
Signature · 1 line
2.43.0
Re: [PATCH 4/4] KVM: riscv: selftests: Add SBI MPXY extension to get-reg-list
Quoted 47 lines · Anup Patel
The KVM RISC-V allows SBI MPXY extensions for Guest/VM so add it to the get-reg-list test.
Signed-off-by Anup Patel <[email protected]>--- tools/testing/selftests/kvm/riscv/get-reg-list.c | 4 ++++ 1 file changed, 4 insertions(+)tools/testing/selftests/kvm/riscv/get-reg-list.c +4
-0@@ -133,6 +133,7 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_SUSP :case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_STA :case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_FWFT : +case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_MPXY :case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_EXPERIMENTAL :case KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_VENDOR :return true;@@ -639,6 +640,7 @@ static const char *sbi_ext_single_id_to_str(__u64 reg_off)KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_SUSP ),KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_STA ),KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_FWFT ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_MPXY ),KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_EXPERIMENTAL ), KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_VENDOR), };@@ -1142,6 +1144,7 @@ KVM_SBI_EXT_SUBLIST_CONFIG(sta, STA);KVM_SBI_EXT_SIMPLE_CONFIG (pmu,PMU );KVM_SBI_EXT_SIMPLE_CONFIG (dbcn,DBCN );KVM_SBI_EXT_SIMPLE_CONFIG (susp,SUSP ); +KVM_SBI_EXT_SIMPLE_CONFIG (mpxy,MPXY );KVM_SBI_EXT_SUBLIST_CONFIG (fwft,FWFT );KVM_ISA_EXT_SUBLIST_CONFIG (aia,AIA );@@ -1222,6 +1225,7 @@ struct vcpu_reg_list *vcpu_configs[] = { &config_sbi_pmu, &config_sbi_dbcn, &config_sbi_susp, + &config_sbi_mpxy, &config_sbi_fwft, &config_aia, &config_fp_f,Signature · 1 line
2.43.0
Anup Patel
maintainerQuoted 15 lines · Anup Patel
This series adds SBI MPXY support for KVM Guest/VM which will enable QEMU-KVM or KVMTOOL to emulate RPMI MPXY channels for the Guest/VM.
These patches can also be found in
riscv_kvm_sbi_mpxy_v1branch
at: https://github.com/avpatel/linux.gitAnup Patel (4):
RISC-V: KVM: Convertkvm_riscv_vcpu_sbi_forward()into extension
handler
RISC-V: KVM: Add separate source for forwarded SBI extensions
RISC-V: KVM: Add SBI MPXY extension support for Guest
KVM: riscv: selftests: Add SBI MPXY extension to get-reg-list
Quoted 13 lines
arch/riscv/include/asm/kvm_vcpu_sbi.h | 5 ++- arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/vcpu_sbi.c | 10 +++++- arch/riscv/kvm/vcpu_sbi_base.c | 28 +-------------- arch/riscv/kvm/vcpu_sbi_forward.c | 34 +++++++++++++++++++ arch/riscv/kvm/vcpu_sbi_replace.c | 32 ----------------- arch/riscv/kvm/vcpu_sbi_system.c | 4 +-- arch/riscv/kvm/vcpu_sbi_v01.c | 3 +- .../selftests/kvm/riscv/get-reg-list.c | 4 +++ 10 files changed, 56 insertions(+), 66 deletions(-) create mode 100644 arch/riscv/kvm/vcpu_sbi_forward.c
Queued this series for Linux-6.19
Thanks,
Anup