KVM RISC-V ONE_REG ISA extension improvements
Subsystems (3)
cover KVM RISC-V ONE_REG ISA extension improvements
This series improves the ISA extension ONE_REG interface in following ways:
1) Move ONE_REG related code to dedicated source file
2) Allow multiple ISA extensions to be enabled/disabled in one ioctl
3) Add more ISA extensions to the ONE_REG interface
The series has following dependencies:
1) PATCH6 depends on
https://lore.kernel.org/linux-riscv/20230712084134.1648008-1-sameo at rivosinc.com/
2) PATCH7 depends on
https://lore.kernel.org/linux-riscv/20230711153743.1970625-1-heiko at sntech.de/
The PATCH1 to PATCH5 of this series don't depend on any patches.
These patches can also be found in the riscv_kvm_onereg_imp_v1 branch at:
https://github.com/avpatel/linux.git
Anup Patel (7):
RISC-V: KVM: Factor-out ONE_REG related code to its own source file
RISC-V: KVM: Extend ONE_REG to enable/disable multiple ISA extensions
RISC-V: KVM: Allow Zba and Zbs extensions for Guest/VM
RISC-V: KVM: Allow Zicntr, Zicsr, Zifencei, and Zihpm for Guest/VM
RISC-V: KVM: Sort ISA extensions alphabetically in ONE_REG interface
RISC-V: KVM: Allow Zbc, Zbk* and Zk* extensions for Guest/VM
RISC-V: KVM: Allow Zvb* and Zvk* extensions for Guest/VM
arch/riscv/include/asm/kvm_host.h | 6 + arch/riscv/include/uapi/asm/kvm.h | 35 ++ arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/vcpu.c | 529 +---------------------- arch/riscv/kvm/vcpu_onereg.c | 695 ++++++++++++++++++++++++++++++ 5 files changed, 738 insertions(+), 528 deletions(-) create mode 100644 arch/riscv/kvm/vcpu_onereg.c
Signature · 1 line
2.34.1
PATCH 1/7 RISC-V: KVM: Factor-out ONE_REG related code to its own source file
The VCPU ONE_REG interface has grown over time and it will continue to grow with new ISA extensions and other features. Let us move all ONE_REG related code to its own source file so that vcpu.c only focuses only on high-level VCPU functions.
--- arch/riscv/include/asm/kvm_host.h | 6 + arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/vcpu.c | 529 +---------------------------- arch/riscv/kvm/vcpu_onereg.c | 547 ++++++++++++++++++++++++++++++ 4 files changed, 555 insertions(+), 528 deletions(-) create mode 100644 arch/riscv/kvm/vcpu_onereg.c
arch/riscv/include/asm/kvm_host.h +6 -0
@@ -337,6 +337,12 @@ int kvm_riscv_vcpu_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,void __kvm_riscv_switch_to (struct kvm_vcpu_arch *vcpu_arch); +void kvm_riscv_vcpu_setup_isa (struct kvm_vcpu *vcpu); +int kvm_riscv_vcpu_get_reg (struct kvm_vcpu *vcpu, +const struct kvm_one_reg *reg); +int kvm_riscv_vcpu_set_reg (struct kvm_vcpu *vcpu, +const struct kvm_one_reg *reg); +int kvm_riscv_vcpu_set_interrupt (struct kvm_vcpu *vcpu,unsigned int irq);int kvm_riscv_vcpu_unset_interrupt (struct kvm_vcpu *vcpu,unsigned int irq);void kvm_riscv_vcpu_flush_interrupts (struct kvm_vcpu *vcpu);
arch/riscv/kvm/Makefile +1 -0
@@ -19,6 +19,7 @@ kvm-y += vcpu_exit.o kvm-y += vcpu_fp.o kvm-y += vcpu_vector.o kvm-y += vcpu_insn.o +kvm-y += vcpu_onereg.o kvm-y += vcpu_switch.o kvm-y += vcpu_sbi.o kvm-$(CONFIG_RISCV_SBI_V01) += vcpu_sbi_v01.o
arch/riscv/kvm/vcpu.c +1 -528
565 lines not on this page · raw message
arch/riscv/kvm/vcpu_onereg.c new file +547 -0
547 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH 1/7] RISC-V: KVM: Factor-out ONE_REG related code to its own source file
Quoted 5 lines · Anup Patel
The VCPU
ONE_REGinterface has grown over time and it will continue to grow with new ISA extensions and other features. Let us move allONE_REGrelated code to its own source file so thatvcpu.conly focuses only on high-level VCPU functions.
Quoted 9 lines
Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/kvm_host.h | 6 + arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/vcpu.c | 529 +---------------------------- arch/riscv/kvm/vcpu_onereg.c | 547 ++++++++++++++++++++++++++++++ 4 files changed, 555 insertions(+), 528 deletions(-) create mode 100644 arch/riscv/kvm/vcpu_onereg.c
PATCH 2/7 RISC-V: KVM: Extend ONE_REG to enable/disable multiple ISA extensions
In reply to Anup PatelCurrently, the ISA extension ONE_REG interface only allows enabling or disabling one extension at a time. To improve this, we extend the ISA extension ONE_REG interface (similar to SBI extension ONE_REG interface) so that KVM user space can enable/disable multiple extensions in one ioctl.
--- arch/riscv/include/uapi/asm/kvm.h | 9 ++ arch/riscv/kvm/vcpu_onereg.c | 153 ++++++++++++++++++++++++------ 2 files changed, 133 insertions(+), 29 deletions(-)
arch/riscv/include/uapi/asm/kvm.h +9 -0
@@ -193,6 +193,15 @@ enum KVM_RISCV_SBI_EXT_ID {/* ISA Extension registers are mapped as type 7 */ #define KVM_REG_RISCV_ISA_EXT (0x07 << KVM_REG_RISCV_TYPE_SHIFT) +#define KVM_REG_RISCV_ISA_SINGLE (0x0 << KVM_REG_RISCV_SUBTYPE_SHIFT) +#define KVM_REG_RISCV_ISA_MULTI_EN (0x1 << KVM_REG_RISCV_SUBTYPE_SHIFT) +#define KVM_REG_RISCV_ISA_MULTI_DIS (0x2 << KVM_REG_RISCV_SUBTYPE_SHIFT) +#define KVM_REG_RISCV_ISA_MULTI_REG (__ext_id) \ + ((__ext_id) / __BITS_PER_LONG) +#define KVM_REG_RISCV_ISA_MULTI_MASK (__ext_id) \ + (1UL << ((__ext_id) % __BITS_PER_LONG)) +#define KVM_REG_RISCV_ISA_MULTI_REG_LAST \ + KVM_REG_RISCV_ISA_MULTI_REG(KVM_RISCV_ISA_EXT_MAX - 1)/* SBI extension registers are mapped as type 8 */ #define KVM_REG_RISCV_SBI_EXT (0x08 << KVM_REG_RISCV_TYPE_SHIFT)
arch/riscv/kvm/vcpu_onereg.c +124 -29
185 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH 2/7] RISC-V: KVM: Extend ONE_REG to enable/disable multiple ISA extensions
Quoted 6 lines · Anup Patel
Currently, the ISA extension
ONE_REGinterface only allows enabling or disabling one extension at a time. To improve this, we extend the ISA extensionONE_REGinterface (similar to SBI extensionONE_REGinterface) so that KVM user space can enable/disable multiple extensions in one ioctl.
Quoted 6 lines
Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/uapi/asm/kvm.h | 9 ++ arch/riscv/kvm/vcpu_onereg.c | 153 ++++++++++++++++++++++++------ 2 files changed, 133 insertions(+), 29 deletions(-)
PATCH 3/7 RISC-V: KVM: Allow Zba and Zbs extensions for Guest/VM
In reply to Anup PatelWe extend the KVM ISA extension ONE_REG interface to allow KVM user space to detect and enable Zba and Zbs extensions for Guest/VM.
--- arch/riscv/include/uapi/asm/kvm.h | 2 ++ arch/riscv/kvm/vcpu_onereg.c | 4 ++++ 2 files changed, 6 insertions(+)
arch/riscv/include/uapi/asm/kvm.h +2 -0
@@ -124,6 +124,8 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_SSAIA ,KVM_RISCV_ISA_EXT_V ,KVM_RISCV_ISA_EXT_SVNAPOT , +KVM_RISCV_ISA_EXT_ZBA , +KVM_RISCV_ISA_EXT_ZBS , KVM_RISCV_ISA_EXT_MAX, };
arch/riscv/kvm/vcpu_onereg.c +4 -0
@@ -37,7 +37,9 @@ static const unsigned long kvm_isa_ext_arr[] = {KVM_ISA_EXT_ARR (SVINVAL ),KVM_ISA_EXT_ARR (SVNAPOT ),KVM_ISA_EXT_ARR (SVPBMT ), +KVM_ISA_EXT_ARR (ZBA ),KVM_ISA_EXT_ARR (ZBB ), +KVM_ISA_EXT_ARR (ZBS ),KVM_ISA_EXT_ARR (ZIHINTPAUSE ),KVM_ISA_EXT_ARR (ZICBOM ), KVM_ISA_EXT_ARR(ZICBOZ),
@@ -81,7 +83,9 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext)case KVM_RISCV_ISA_EXT_SVINVAL :case KVM_RISCV_ISA_EXT_SVNAPOT :case KVM_RISCV_ISA_EXT_ZIHINTPAUSE : +case KVM_RISCV_ISA_EXT_ZBA :case KVM_RISCV_ISA_EXT_ZBB : +case KVM_RISCV_ISA_EXT_ZBS :return false;default :break ;
Signature · 1 line
2.34.1
Re: [PATCH 3/7] RISC-V: KVM: Allow Zba and Zbs extensions for Guest/VM
Quoted 9 lines · Anup Patel
We extend the KVM ISA extension
ONE_REGinterface to allow KVM user space to detect and enable Zba and Zbs extensions for Guest/VM.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/uapi/asm/kvm.h | 2 ++ arch/riscv/kvm/vcpu_onereg.c | 4 ++++ 2 files changed, 6 insertions(+)
PATCH 4/7 RISC-V: KVM: Allow Zicntr, Zicsr, Zifencei, and Zihpm for Guest/VM
In reply to Anup PatelWe extend the KVM ISA extension ONE_REG interface to allow KVM user space to detect and enable Zicntr, Zicsr, Zifencei, and Zihpm extensions for Guest/VM.
--- arch/riscv/include/uapi/asm/kvm.h | 4 ++++ arch/riscv/kvm/vcpu_onereg.c | 8 ++++++++ 2 files changed, 12 insertions(+)
arch/riscv/include/uapi/asm/kvm.h +4 -0
@@ -126,6 +126,10 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_SVNAPOT ,KVM_RISCV_ISA_EXT_ZBA ,KVM_RISCV_ISA_EXT_ZBS , +KVM_RISCV_ISA_EXT_ZICNTR , +KVM_RISCV_ISA_EXT_ZICSR , +KVM_RISCV_ISA_EXT_ZIFENCEI , +KVM_RISCV_ISA_EXT_ZIHPM , KVM_RISCV_ISA_EXT_MAX, };
arch/riscv/kvm/vcpu_onereg.c +8 -0
@@ -40,7 +40,11 @@ static const unsigned long kvm_isa_ext_arr[] = {KVM_ISA_EXT_ARR (ZBA ),KVM_ISA_EXT_ARR (ZBB ),KVM_ISA_EXT_ARR (ZBS ), +KVM_ISA_EXT_ARR (ZICNTR ), +KVM_ISA_EXT_ARR (ZICSR ), +KVM_ISA_EXT_ARR (ZIFENCEI ),KVM_ISA_EXT_ARR (ZIHINTPAUSE ), +KVM_ISA_EXT_ARR (ZIHPM ),KVM_ISA_EXT_ARR (ZICBOM ), KVM_ISA_EXT_ARR(ZICBOZ), };
@@ -82,7 +86,11 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext)case KVM_RISCV_ISA_EXT_SSTC :case KVM_RISCV_ISA_EXT_SVINVAL :case KVM_RISCV_ISA_EXT_SVNAPOT : +case KVM_RISCV_ISA_EXT_ZICNTR : +case KVM_RISCV_ISA_EXT_ZICSR : +case KVM_RISCV_ISA_EXT_ZIFENCEI :case KVM_RISCV_ISA_EXT_ZIHINTPAUSE : +case KVM_RISCV_ISA_EXT_ZIHPM :case KVM_RISCV_ISA_EXT_ZBA :case KVM_RISCV_ISA_EXT_ZBB :case KVM_RISCV_ISA_EXT_ZBS :
Signature · 1 line
2.34.1
Re: [PATCH 4/7] RISC-V: KVM: Allow Zicntr, Zicsr, Zifencei, and Zihpm for Guest/VM
Quoted 10 lines · Anup Patel
We extend the KVM ISA extension
ONE_REGinterface to allow KVM user space to detect and enable Zicntr, Zicsr, Zifencei, and Zihpm extensions for Guest/VM.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/uapi/asm/kvm.h | 4 ++++ arch/riscv/kvm/vcpu_onereg.c | 8 ++++++++ 2 files changed, 12 insertions(+)
PATCH 5/7 RISC-V: KVM: Sort ISA extensions alphabetically in ONE_REG interface
In reply to Anup PatelLet us sort isa extensions alphabetically in kvm_isa_ext_arr[] and kvm_riscv_vcpu_isa_disable_allowed() so that future insertions are more predictable.
--- arch/riscv/kvm/vcpu_onereg.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/riscv/kvm/vcpu_onereg.c +7 -6
@@ -23,6 +23,7 @@/* Mapping between KVM ISA Extension ID & Host ISA extension ID */ static const unsigned long kvm_isa_ext_arr[] = { +/* Single letter extensions (alphabetically sorted) */ [KVM_RISCV_ISA_EXT_A ] = RISCV_ISA_EXT_a, [KVM_RISCV_ISA_EXT_C ] = RISCV_ISA_EXT_c, [KVM_RISCV_ISA_EXT_D ] = RISCV_ISA_EXT_d,
@@ -31,7 +32,7 @@ static const unsigned long kvm_isa_ext_arr[] = { [KVM_RISCV_ISA_EXT_I] = RISCV_ISA_EXT_i, [KVM_RISCV_ISA_EXT_M] = RISCV_ISA_EXT_m, [KVM_RISCV_ISA_EXT_V] = RISCV_ISA_EXT_v, - +/* Multi letter extensions (alphabetically sorted) */ KVM_ISA_EXT_ARR (SSAIA ),KVM_ISA_EXT_ARR (SSTC ), KVM_ISA_EXT_ARR(SVINVAL),
@@ -40,13 +41,13 @@ static const unsigned long kvm_isa_ext_arr[] = {KVM_ISA_EXT_ARR (ZBA ),KVM_ISA_EXT_ARR (ZBB ),KVM_ISA_EXT_ARR (ZBS ), +KVM_ISA_EXT_ARR (ZICBOM ), +KVM_ISA_EXT_ARR (ZICBOZ ),KVM_ISA_EXT_ARR (ZICNTR ),KVM_ISA_EXT_ARR (ZICSR ),KVM_ISA_EXT_ARR (ZIFENCEI ),KVM_ISA_EXT_ARR (ZIHINTPAUSE ), KVM_ISA_EXT_ARR(ZIHPM), -KVM_ISA_EXT_ARR (ZICBOM ), - KVM_ISA_EXT_ARR(ZICBOZ), };static unsigned long kvm_riscv_vcpu_base2isa_ext (unsigned long base_ext)
@@ -86,14 +87,14 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext)case KVM_RISCV_ISA_EXT_SSTC :case KVM_RISCV_ISA_EXT_SVINVAL :case KVM_RISCV_ISA_EXT_SVNAPOT : +case KVM_RISCV_ISA_EXT_ZBA : +case KVM_RISCV_ISA_EXT_ZBB : +case KVM_RISCV_ISA_EXT_ZBS :case KVM_RISCV_ISA_EXT_ZICNTR :case KVM_RISCV_ISA_EXT_ZICSR :case KVM_RISCV_ISA_EXT_ZIFENCEI :case KVM_RISCV_ISA_EXT_ZIHINTPAUSE :case KVM_RISCV_ISA_EXT_ZIHPM : -case KVM_RISCV_ISA_EXT_ZBA : -case KVM_RISCV_ISA_EXT_ZBB : -case KVM_RISCV_ISA_EXT_ZBS :return false;default :break ;
Signature · 1 line
2.34.1
Re: [PATCH 5/7] RISC-V: KVM: Sort ISA extensions alphabetically in ONE_REG interface
Quoted 9 lines · Anup Patel
Let us sort isa extensions alphabetically in kvm_isa_ext_arr[] and
kvm_riscv_vcpu_isa_disable_allowed()so that future insertions are more predictable.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/kvm/vcpu_onereg.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
PATCH 6/7 RISC-V: KVM: Allow Zbc, Zbk* and Zk* extensions for Guest/VM
In reply to Anup PatelWe extend the KVM ISA extension ONE_REG interface to allow KVM user space to detect and enable Zbc, Zbk* and Zk* extensions for Guest/VM.
--- arch/riscv/include/uapi/asm/kvm.h | 11 +++++++++++ arch/riscv/kvm/vcpu_onereg.c | 22 ++++++++++++++++++++++ 2 files changed, 33 insertions(+)
arch/riscv/include/uapi/asm/kvm.h +11 -0
@@ -130,6 +130,17 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_ZICSR ,KVM_RISCV_ISA_EXT_ZIFENCEI ,KVM_RISCV_ISA_EXT_ZIHPM , +KVM_RISCV_ISA_EXT_ZBC , +KVM_RISCV_ISA_EXT_ZBKB , +KVM_RISCV_ISA_EXT_ZBKC , +KVM_RISCV_ISA_EXT_ZBKX , +KVM_RISCV_ISA_EXT_ZKND , +KVM_RISCV_ISA_EXT_ZKNE , +KVM_RISCV_ISA_EXT_ZKNH , +KVM_RISCV_ISA_EXT_ZKR , +KVM_RISCV_ISA_EXT_ZKSED , +KVM_RISCV_ISA_EXT_ZKSH , +KVM_RISCV_ISA_EXT_ZKT , KVM_RISCV_ISA_EXT_MAX, };
arch/riscv/kvm/vcpu_onereg.c +22 -0
@@ -40,6 +40,10 @@ static const unsigned long kvm_isa_ext_arr[] = {KVM_ISA_EXT_ARR (SVPBMT ),KVM_ISA_EXT_ARR (ZBA ),KVM_ISA_EXT_ARR (ZBB ), +KVM_ISA_EXT_ARR (ZBC ), +KVM_ISA_EXT_ARR (ZBKB ), +KVM_ISA_EXT_ARR (ZBKC ), +KVM_ISA_EXT_ARR (ZBKX ),KVM_ISA_EXT_ARR (ZBS ),KVM_ISA_EXT_ARR (ZICBOM ), KVM_ISA_EXT_ARR(ZICBOZ),
@@ -48,6 +52,13 @@ static const unsigned long kvm_isa_ext_arr[] = {KVM_ISA_EXT_ARR (ZIFENCEI ),KVM_ISA_EXT_ARR (ZIHINTPAUSE ),KVM_ISA_EXT_ARR (ZIHPM ), +KVM_ISA_EXT_ARR (ZKND ), +KVM_ISA_EXT_ARR (ZKNE ), +KVM_ISA_EXT_ARR (ZKNH ), +KVM_ISA_EXT_ARR (ZKR ), +KVM_ISA_EXT_ARR (ZKSED ), +KVM_ISA_EXT_ARR (ZKSH ), + KVM_ISA_EXT_ARR(ZKT), };static unsigned long kvm_riscv_vcpu_base2isa_ext (unsigned long base_ext)
@@ -89,12 +100,23 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext)case KVM_RISCV_ISA_EXT_SVNAPOT :case KVM_RISCV_ISA_EXT_ZBA :case KVM_RISCV_ISA_EXT_ZBB : +case KVM_RISCV_ISA_EXT_ZBC : +case KVM_RISCV_ISA_EXT_ZBKB : +case KVM_RISCV_ISA_EXT_ZBKC : +case KVM_RISCV_ISA_EXT_ZBKX :case KVM_RISCV_ISA_EXT_ZBS :case KVM_RISCV_ISA_EXT_ZICNTR :case KVM_RISCV_ISA_EXT_ZICSR :case KVM_RISCV_ISA_EXT_ZIFENCEI :case KVM_RISCV_ISA_EXT_ZIHINTPAUSE :case KVM_RISCV_ISA_EXT_ZIHPM : +case KVM_RISCV_ISA_EXT_ZKND : +case KVM_RISCV_ISA_EXT_ZKNE : +case KVM_RISCV_ISA_EXT_ZKNH : +case KVM_RISCV_ISA_EXT_ZKR : +case KVM_RISCV_ISA_EXT_ZKSED : +case KVM_RISCV_ISA_EXT_ZKSH : +case KVM_RISCV_ISA_EXT_ZKT :return false;default :break ;
Signature · 1 line
2.34.1
Re: [PATCH 6/7] RISC-V: KVM: Allow Zbc, Zbk* and Zk* extensions for Guest/VM
Quoted 10 lines · Anup Patel
We extend the KVM ISA extension
ONE_REGinterface to allow KVM user space to detect and enable Zbc, Zbk* and Zk* extensions for Guest/VM.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/uapi/asm/kvm.h | 11 +++++++++++ arch/riscv/kvm/vcpu_onereg.c | 22 ++++++++++++++++++++++ 2 files changed, 33 insertions(+)
PATCH 7/7 RISC-V: KVM: Allow Zvb* and Zvk* extensions for Guest/VM
In reply to Anup PatelWe extend the KVM ISA extension ONE_REG interface to allow KVM user space to detect and enable Zvb* and Zvk* extensions for Guest/VM.
--- arch/riscv/include/uapi/asm/kvm.h | 9 +++++++++ arch/riscv/kvm/vcpu_onereg.c | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+)
arch/riscv/include/uapi/asm/kvm.h +9 -0
@@ -141,6 +141,15 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_ZKSED ,KVM_RISCV_ISA_EXT_ZKSH ,KVM_RISCV_ISA_EXT_ZKT , +KVM_RISCV_ISA_EXT_ZVBB , +KVM_RISCV_ISA_EXT_ZVBC , +KVM_RISCV_ISA_EXT_ZVKG , +KVM_RISCV_ISA_EXT_ZVKNED , +KVM_RISCV_ISA_EXT_ZVKNHA , +KVM_RISCV_ISA_EXT_ZVKNHB , +KVM_RISCV_ISA_EXT_ZVKSED , +KVM_RISCV_ISA_EXT_ZVKSH , +KVM_RISCV_ISA_EXT_ZVKT , KVM_RISCV_ISA_EXT_MAX, };
arch/riscv/kvm/vcpu_onereg.c +18 -0
@@ -59,6 +59,15 @@ static const unsigned long kvm_isa_ext_arr[] = {KVM_ISA_EXT_ARR (ZKSED ),KVM_ISA_EXT_ARR (ZKSH ),KVM_ISA_EXT_ARR (ZKT ), +KVM_ISA_EXT_ARR (ZVBB ), +KVM_ISA_EXT_ARR (ZVBC ), +KVM_ISA_EXT_ARR (ZVKG ), +KVM_ISA_EXT_ARR (ZVKNED ), +KVM_ISA_EXT_ARR (ZVKNHA ), +KVM_ISA_EXT_ARR (ZVKNHB ), +KVM_ISA_EXT_ARR (ZVKSED ), +KVM_ISA_EXT_ARR (ZVKSH ), + KVM_ISA_EXT_ARR(ZVKT), };static unsigned long kvm_riscv_vcpu_base2isa_ext (unsigned long base_ext)
@@ -117,6 +126,15 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext)case KVM_RISCV_ISA_EXT_ZKSED :case KVM_RISCV_ISA_EXT_ZKSH :case KVM_RISCV_ISA_EXT_ZKT : +case KVM_RISCV_ISA_EXT_ZVBB : +case KVM_RISCV_ISA_EXT_ZVBC : +case KVM_RISCV_ISA_EXT_ZVKG : +case KVM_RISCV_ISA_EXT_ZVKNED : +case KVM_RISCV_ISA_EXT_ZVKNHA : +case KVM_RISCV_ISA_EXT_ZVKNHB : +case KVM_RISCV_ISA_EXT_ZVKSED : +case KVM_RISCV_ISA_EXT_ZVKSH : +case KVM_RISCV_ISA_EXT_ZVKT :return false;default :break ;
Signature · 1 line
2.34.1
Re: [PATCH 7/7] RISC-V: KVM: Allow Zvb* and Zvk* extensions for Guest/VM
Quoted 10 lines · Anup Patel
We extend the KVM ISA extension
ONE_REGinterface to allow KVM user space to detect and enable Zvb* and Zvk* extensions for Guest/VM.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/uapi/asm/kvm.h | 9 +++++++++ arch/riscv/kvm/vcpu_onereg.c | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+)
Anup Patel
maintainerQuoted 17 lines · On Wed, Jul 12, 2023 at 9:41?PM Anup Patel <[email protected]> wrote:
This series improves the ISA extension
ONE_REGinterface in following ways:
1) MoveONE_REGrelated code to dedicated source file
2) Allow multiple ISA extensions to be enabled/disabled in one ioctl
3) Add more ISA extensions to theONE_REGinterfaceThe series has following dependencies:
1) PATCH6 depends on
https://lore.kernel.org/linux-riscv/20230712084134.1648008-1-sameo at rivosinc.com/
2) PATCH7 depends on
https://lore.kernel.org/linux-riscv/20230711153743.1970625-1-heiko at sntech.de/The PATCH1 to PATCH5 of this series don't depend on any patches.
These patches can also be found in the
riscv_kvm_onereg_imp_v1branch at:
https://github.com/avpatel/linux.git
Quoted 8 lines
Anup Patel (7):
RISC-V: KVM: Factor-outONE_REGrelated code to its own source file
RISC-V: KVM: ExtendONE_REGto enable/disable multiple ISA extensions
RISC-V: KVM: Allow Zba and Zbs extensions for Guest/VM
RISC-V: KVM: Allow Zicntr, Zicsr, Zifencei, and Zihpm for Guest/VM
RISC-V: KVM: Sort ISA extensions alphabetically inONE_REGinterface
RISC-V: KVM: Allow Zbc, Zbk* and Zk* extensions for Guest/VM
RISC-V: KVM: Allow Zvb* and Zvk* extensions for Guest/VM
I have queued PATCH1 to PATCH5 for Linux-6.6 so that other in-flight patches can be rebased on the riscv_kvm_queue.
The PATCH6 and PATCH7 will have to wait until required dependencies are merged in arch/riscv.
Thanks,
Anup
Quoted 12 lines
arch/riscv/include/asm/kvm_host.h | 6 + arch/riscv/include/uapi/asm/kvm.h | 35 ++ arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/vcpu.c | 529 +---------------------- arch/riscv/kvm/vcpu_onereg.c | 695 ++++++++++++++++++++++++++++++ 5 files changed, 738 insertions(+), 528 deletions(-) create mode 100644 arch/riscv/kvm/vcpu_onereg.c--
2.34.1