KVM RISC-V fixes for ONE_REG interface
Subsystems (4)
cover KVM RISC-V fixes for ONE_REG interface
This series includes few assorted fixes for KVM RISC-V ONE_REG interface and KVM_GET_REG_LIST API.
These patches can also be found in riscv_kvm_onereg_fixes_v1 branch at:
https://github.com/avpatel/linux.git
Anup Patel (4):
RISC-V: KVM: Fix KVM_GET_REG_LIST API for ISA_EXT registers
RISC-V: KVM: Fix riscv_vcpu_get_isa_ext_single() for missing
extensions
KVM: riscv: selftests: Fix ISA_EXT register handling in get-reg-list
KVM: riscv: selftests: Selectively filter-out AIA registers
arch/riscv/kvm/vcpu_onereg.c | 7 ++- .../selftests/kvm/riscv/get-reg-list.c | 58 ++++++++++++++----- 2 files changed, 47 insertions(+), 18 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/4 RISC-V: KVM: Fix KVM_GET_REG_LIST API for ISA_EXT registers
The ISA_EXT registers to enabled/disable ISA extensions for VCPU are always available when underlying host has the corresponding ISA extension. The copy_isa_ext_reg_indices() called by the KVM_GET_REG_LIST API does not align with this expectation so let's fix it.
--- arch/riscv/kvm/vcpu_onereg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kvm/vcpu_onereg.c +1 -1
@@ -842,7 +842,7 @@ static int copy_isa_ext_reg_indices(const struct kvm_vcpu *vcpu,u64 reg =KVM_REG_RISCV | size |KVM_REG_RISCV_ISA_EXT | i; isa_ext = kvm_isa_ext_arr[i]; -if (!__riscv_isa_extension_available (vcpu->arch.isa, isa_ext)) +if (!__riscv_isa_extension_available (NULL , isa_ext))continue ;if (uindices) {
Signature · 1 line
2.34.1
PATCH 2/4 RISC-V: KVM: Fix riscv_vcpu_get_isa_ext_single() for missing extensions
In reply to Anup PatelThe riscv_vcpu_get_isa_ext_single() should fail with -ENOENT error when corresponding ISA extension is not available on the host.
--- arch/riscv/kvm/vcpu_onereg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/riscv/kvm/vcpu_onereg.c +4 -1
@@ -460,8 +460,11 @@ static int riscv_vcpu_get_isa_ext_single(struct kvm_vcpu *vcpu, reg_num >= ARRAY_SIZE(kvm_isa_ext_arr))return -ENOENT ; - *reg_val =0 ; host_isa_ext = kvm_isa_ext_arr[reg_num]; +if (!__riscv_isa_extension_available (NULL , host_isa_ext)) +return -ENOENT ; + + *reg_val =0 ;if (__riscv_isa_extension_available (vcpu->arch.isa, host_isa_ext)) *reg_val =1 ;/* Mark the given extension as available */
Signature · 1 line
2.34.1
PATCH 3/4 KVM: riscv: selftests: Fix ISA_EXT register handling in get-reg-list
In reply to Anup PatelSame set of ISA_EXT registers are not present on all host because ISA_EXT registers are visible to the KVM user space based on the ISA extensions available on the host. Also, disabling an ISA extension using corresponding ISA_EXT register does not affect the visibility of the ISA_EXT register itself.
Based on the above, we should filter-out all ISA_EXT registers.
--- .../selftests/kvm/riscv/get-reg-list.c | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-)
tools/testing/selftests/kvm/riscv/get-reg-list.c +21 -14
@@ -14,17 +14,33 @@bool filter_reg (__u64 reg) { +switch (reg & ~REG_MASK ) {/* -* Some ISA extensions are optional and not present on all host, -* but they can't be disabled through ISA_EXT registers when present. -* So, to make life easy, just filtering out these kind of registers. +* Same set of ISA_EXT registers are not present on all host because +* ISA_EXT registers are visible to the KVM user space based on the +* ISA extensions available on the host. Also, disabling an ISA +* extension using corresponding ISA_EXT register does not affect +* the visibility of the ISA_EXT register itself. +* +* Based on above, we should filter-out all ISA_EXT registers. */ -switch (reg & ~REG_MASK ) { +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_D : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_F : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_H : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVPBMT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSTC :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVINVAL :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHINTPAUSE : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOM : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOZ :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBB :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_V : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVNAPOT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBA :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBS :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICNTR :
@@ -50,12 +66,7 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)unsigned long value; ret =__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (ext), &value); -if (ret) { -printf ("Failed to get ext %d" , ext); -return false; - } - -return !!value; +return (ret) ? false : !!value; }void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c)
@@ -506,10 +517,6 @@ static __u64 base_regs[] = {KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (time),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (compare),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (state), -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_V01 ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_TIME , KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_IPI,
Signature · 1 line
2.34.1
PATCH 4/4 KVM: riscv: selftests: Selectively filter-out AIA registers
In reply to Anup PatelCurrently the AIA ONE_REG registers are reported by get-reg-list as new registers for various vcpu_reg_list configs whenever Ssaia is available on the host because Ssaia extension can only be disabled by Smstateen extension which is not always available.
To tackle this, we should filter-out AIA ONE_REG registers only when Ssaia can't be disabled for a VCPU.
--- .../selftests/kvm/riscv/get-reg-list.c | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/riscv/get-reg-list.c +21 -2
@@ -12,6 +12,8 @@#define REG_MASK (KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK) +static bool isa_ext_cant_disable[KVM_RISCV_ISA_EXT_MAX ]; +bool filter_reg (__u64 reg) {switch (reg & ~REG_MASK ) {
@@ -48,6 +50,15 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIFENCEI :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHPM :return true; +/* AIA registers are always available when Ssaia can't be disabled */ +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siselect): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (sieh): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siph): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1h): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2h): +return isa_ext_cant_disable[KVM_RISCV_ISA_EXT_SSAIA ] ? true : false;default :break ; }
@@ -71,14 +82,22 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c) { +int rc;struct vcpu_reg_sublist *s; +unsigned long isa_ext_state[KVM_RISCV_ISA_EXT_MAX ] = {0 }; + +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) +__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (i), &isa_ext_state[i]);/* * Disable all extensions which were enabled by default * if they were available in the risc-v host. */ -for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) -__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) { + rc =__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +if (rc && isa_ext_state[i]) + isa_ext_cant_disable[i] = true; + }for_each_sublist (c, s) {if (!s->feature)
Signature · 1 line
2.34.1
Re: [PATCH 1/4] RISC-V: KVM: Fix KVM_GET_REG_LIST API for ISA_EXT registers
In reply to Anup PatelQuoted 27 lines · On Mon, Sep 18, 2023 at 11:07?AM Anup Patel <[email protected]> wrote:
The
ISA_EXTregisters to enabled/disable ISA extensions for VCPU are always available when underlying host has the corresponding ISA extension. Thecopy_isa_ext_reg_indices()called by theKVM_GET_REG_LISTAPI does not align with this expectation so let's fix it.Fixes 031f9efafc08 ("KVM: riscv: Add KVM_GET_REG_LIST API support")Signed-off-by Anup Patel <[email protected]>--- arch/riscv/kvm/vcpu_onereg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/riscv/kvm/vcpu_onereg.c +1
-2@@ -842,7 +842,7 @@ static int copy_isa_ext_reg_indices(const struct kvm_vcpu *vcpu,u64 reg =KVM_REG_RISCV | size |KVM_REG_RISCV_ISA_EXT | i; isa_ext = kvm_isa_ext_arr[i]; -if (!__riscv_isa_extension_available (vcpu->arch.isa, isa_ext)) +if (!__riscv_isa_extension_available (NULL , isa_ext))continue ;if (uindices) { --
Quoted 2 lines
2.34.1
Signature · 2 lines
Regards, Atish
Re: [PATCH 2/4] RISC-V: KVM: Fix riscv_vcpu_get_isa_ext_single() for missing extensions
In reply to Anup PatelQuoted 28 lines · On Mon, Sep 18, 2023 at 11:07?AM Anup Patel <[email protected]> wrote:
The
riscv_vcpu_get_isa_ext_single()should fail with-ENOENTerror when corresponding ISA extension is not available on the host.Fixes e98b1085be79 ("RISC-V: KVM: Factor-out ONE_REG related code to its own source file")Signed-off-by Anup Patel <[email protected]>--- arch/riscv/kvm/vcpu_onereg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)arch/riscv/kvm/vcpu_onereg.c +4
-2@@ -460,8 +460,11 @@ static int riscv_vcpu_get_isa_ext_single(struct kvm_vcpu *vcpu, reg_num >= ARRAY_SIZE(kvm_isa_ext_arr))return -ENOENT ; - *reg_val =0 ; host_isa_ext = kvm_isa_ext_arr[reg_num]; +if (!__riscv_isa_extension_available (NULL , host_isa_ext)) +return -ENOENT ; + + *reg_val =0 ;if (__riscv_isa_extension_available (vcpu->arch.isa, host_isa_ext)) *reg_val =1 ;/* Mark the given extension as available */ --
Quoted 2 lines
2.34.1
Signature · 2 lines
Regards, Atish
Re: [PATCH 3/4] KVM: riscv: selftests: Fix ISA_EXT register handling in get-reg-list
In reply to Anup PatelQuoted 9 lines · On Mon, Sep 18, 2023 at 11:07?AM Anup Patel <[email protected]> wrote:
Same set of
ISA_EXTregisters are not present on all host becauseISA_EXTregisters are visible to the KVM user space based on the ISA extensions available on the host. Also, disabling an ISA extension using correspondingISA_EXTregister does not affect the visibility of theISA_EXTregister itself.Based on the above, we should filter-out all
ISA_EXTregisters.
In that case, we don't need the switch case any more. Just a conditional check with KVM_RISCV_ISA_EXT_MAX should be sufficient.
Quoted 76 lines
Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +21
-15@@ -14,17 +14,33 @@bool filter_reg (__u64 reg) { +switch (reg & ~REG_MASK ) {/* -* Some ISA extensions are optional and not present on all host, -* but they can't be disabled through ISA_EXT registers when present. -* So, to make life easy, just filtering out these kind of registers. +* Same set of ISA_EXT registers are not present on all host because +* ISA_EXT registers are visible to the KVM user space based on the +* ISA extensions available on the host. Also, disabling an ISA +* extension using corresponding ISA_EXT register does not affect +* the visibility of the ISA_EXT register itself. +* +* Based on above, we should filter-out all ISA_EXT registers. */ -switch (reg & ~REG_MASK ) { +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_D : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_F : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_H : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVPBMT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSTC :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVINVAL :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHINTPAUSE : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOM : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOZ :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBB :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_V : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVNAPOT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBA :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBS :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICNTR :@@ -50,12 +66,7 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)unsigned long value; ret =__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (ext), &value); -if (ret) { -printf ("Failed to get ext %d" , ext); -return false; - } - -return !!value; +return (ret) ? false : !!value; }void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c)@@ -506,10 +517,6 @@ static __u64 base_regs[] = {KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (time),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (compare),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (state), -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_V01 ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_TIME , KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_IPI, --2.34.1
Signature · 2 lines
Regards, Atish
Re: [PATCH 4/4] KVM: riscv: selftests: Selectively filter-out AIA registers
In reply to Anup PatelQuoted 31 lines · On Mon, Sep 18, 2023 at 11:07?AM Anup Patel <[email protected]> wrote:
Currently the AIA
ONE_REGregisters are reported by get-reg-list as new registers for variousvcpu_reg_listconfigs whenever Ssaia is available on the host because Ssaia extension can only be disabled by Smstateen extension which is not always available.To tackle this, we should filter-out AIA
ONE_REGregisters only when Ssaia can't be disabled for a VCPU.Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +2
-0@@ -12,6 +12,8 @@#define REG_MASK (KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK) +static bool isa_ext_cant_disable[KVM_RISCV_ISA_EXT_MAX ]; +bool filter_reg (__u64 reg) {switch (reg & ~REG_MASK ) {@@ -48,6 +50,15 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIFENCEI :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHPM :
tools/testing/selftests/kvm/riscv/get-reg-list.c bool filter_reg(__u64 reg) · line 61
Quoted 10 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +9
-0return true; +/* AIA registers are always available when Ssaia can't be disabled */ +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siselect): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (sieh): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siph): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1h): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2h): +return isa_ext_cant_disable[KVM_RISCV_ISA_EXT_SSAIA ] ? true : false;
Ahh I guess. you do need the switch case for AIA CSRs but for ISA extensions can be avoided as it is contiguous.
Quoted 29 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +10
-3default :break ; }@@ -71,14 +82,22 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c) { +int rc;struct vcpu_reg_sublist *s; +unsigned long isa_ext_state[KVM_RISCV_ISA_EXT_MAX ] = {0 }; + +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) +__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (i), &isa_ext_state[i]);/* * Disable all extensions which were enabled by default * if they were available in the risc-v host. */ -for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) -__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) { + rc =__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +if (rc && isa_ext_state[i]) + isa_ext_cant_disable[i] = true; + }for_each_sublist (c, s) {if (!s->feature) --
Quoted 2 lines
2.34.1
Otherwise, LGTM.
Signature · 2 lines
Regards, Atish
Re: [PATCH 4/4] KVM: riscv: selftests: Selectively filter-out AIA registers
Quoted 37 lines · Atish Patra
Quoted 36 lines · On Mon, Sep 18, 2023 at 11:07?AM Anup Patel <[email protected]> wrote:
Currently the AIA
ONE_REGregisters are reported by get-reg-list as new registers for variousvcpu_reg_listconfigs whenever Ssaia is available on the host because Ssaia extension can only be disabled by Smstateen extension which is not always available.To tackle this, we should filter-out AIA
ONE_REGregisters only when Ssaia can't be disabled for a VCPU.Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +6
-0@@ -12,6 +12,8 @@#define REG_MASK (KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK) +static bool isa_ext_cant_disable[KVM_RISCV_ISA_EXT_MAX ]; +bool filter_reg (__u64 reg) {switch (reg & ~REG_MASK ) {@@ -48,6 +50,15 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIFENCEI :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHPM :return true; +/* AIA registers are always available when Ssaia can't be disabled */ +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siselect): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2):
Quoted 8 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c bool filter_reg(__u64 reg) · line 61
Quoted 5 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +5
-0+case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (sieh): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siph): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1h): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2h): +return isa_ext_cant_disable[KVM_RISCV_ISA_EXT_SSAIA ] ? true : false;Ahh I guess. you do need the switch case for AIA CSRs but for ISA extensions can be avoided as it is contiguous.
I guess we could so something like
case KVM_REG_RISCV_ISA_EXT ... KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_MAX:
for the ISA extensions.
Thanks,
drew
Re: [PATCH 1/4] RISC-V: KVM: Fix KVM_GET_REG_LIST API for ISA_EXT registers
In reply to Anup PatelQuoted 28 lines · Anup Patel
The
ISA_EXTregisters to enabled/disable ISA extensions for VCPU are always available when underlying host has the corresponding ISA extension. Thecopy_isa_ext_reg_indices()called by theKVM_GET_REG_LISTAPI does not align with this expectation so let's fix it.Fixes 031f9efafc08 ("KVM: riscv: Add KVM_GET_REG_LIST API support")Signed-off-by Anup Patel <[email protected]>--- arch/riscv/kvm/vcpu_onereg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/riscv/kvm/vcpu_onereg.c +1
-1@@ -842,7 +842,7 @@ static int copy_isa_ext_reg_indices(const struct kvm_vcpu *vcpu,u64 reg =KVM_REG_RISCV | size |KVM_REG_RISCV_ISA_EXT | i; isa_ext = kvm_isa_ext_arr[i]; -if (!__riscv_isa_extension_available (vcpu->arch.isa, isa_ext)) +if (!__riscv_isa_extension_available (NULL , isa_ext))continue ;if (uindices) {Signature · 1 line
2.34.1
Re: [PATCH 2/4] RISC-V: KVM: Fix riscv_vcpu_get_isa_ext_single() for missing extensions
In reply to Anup PatelQuoted 29 lines · Anup Patel
The
riscv_vcpu_get_isa_ext_single()should fail with-ENOENTerror when corresponding ISA extension is not available on the host.Fixes e98b1085be79 ("RISC-V: KVM: Factor-out ONE_REG related code to its own source file")Signed-off-by Anup Patel <[email protected]>--- arch/riscv/kvm/vcpu_onereg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)arch/riscv/kvm/vcpu_onereg.c +4
-1@@ -460,8 +460,11 @@ static int riscv_vcpu_get_isa_ext_single(struct kvm_vcpu *vcpu, reg_num >= ARRAY_SIZE(kvm_isa_ext_arr))return -ENOENT ; - *reg_val =0 ; host_isa_ext = kvm_isa_ext_arr[reg_num]; +if (!__riscv_isa_extension_available (NULL , host_isa_ext)) +return -ENOENT ; + + *reg_val =0 ;if (__riscv_isa_extension_available (vcpu->arch.isa, host_isa_ext)) *reg_val =1 ;/* Mark the given extension as available */ Signature · 1 line
2.34.1
Re: [PATCH 3/4] KVM: riscv: selftests: Fix ISA_EXT register handling in get-reg-list
In reply to Anup PatelQuoted 57 lines · Anup Patel
Same set of
ISA_EXTregisters are not present on all host becauseISA_EXTregisters are visible to the KVM user space based on the ISA extensions available on the host. Also, disabling an ISA extension using correspondingISA_EXTregister does not affect the visibility of theISA_EXTregister itself.Based on the above, we should filter-out all
ISA_EXTregisters.Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +20
-4@@ -14,17 +14,33 @@bool filter_reg (__u64 reg) { +switch (reg & ~REG_MASK ) {/* -* Some ISA extensions are optional and not present on all host, -* but they can't be disabled through ISA_EXT registers when present. -* So, to make life easy, just filtering out these kind of registers. +* Same set of ISA_EXT registers are not present on all host because +* ISA_EXT registers are visible to the KVM user space based on the +* ISA extensions available on the host. Also, disabling an ISA +* extension using corresponding ISA_EXT register does not affect +* the visibility of the ISA_EXT register itself. +* +* Based on above, we should filter-out all ISA_EXT registers. */ -switch (reg & ~REG_MASK ) { +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_D : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_F : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_H : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVPBMT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSTC :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVINVAL :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHINTPAUSE : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOM : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOZ :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBB :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_V : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVNAPOT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBA :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBS :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICNTR :
tools/testing/selftests/kvm/riscv/get-reg-list.c static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext) · line 69
Quoted 10 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +1
-6@@ -50,12 +66,7 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)unsigned long value; ret =__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (ext), &value); -if (ret) { -printf ("Failed to get ext %d" , ext); -return false; - } - -return !!value; +return (ret) ? false : !!value;
This is an unrelated change, but OK. It's consistent with the plan[1] we have on the timer test series
[1] https://lore.kernel.org/all/20230914-d6645bbc5ac80999674e9685 at orel/
Quoted 17 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +0
-4}void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c)@@ -506,10 +517,6 @@ static __u64 base_regs[] = {KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (time),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (compare),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (state), -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_V01 ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_TIME , KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_IPI,Signature · 1 line
2.34.1
Thanks,
drew
Re: [PATCH 4/4] KVM: riscv: selftests: Selectively filter-out AIA registers
In reply to Anup PatelQuoted 30 lines · Anup Patel
Currently the AIA
ONE_REGregisters are reported by get-reg-list as new registers for variousvcpu_reg_listconfigs whenever Ssaia is available on the host because Ssaia extension can only be disabled by Smstateen extension which is not always available.To tackle this, we should filter-out AIA
ONE_REGregisters only when Ssaia can't be disabled for a VCPU.Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +2
-0@@ -12,6 +12,8 @@#define REG_MASK (KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK) +static bool isa_ext_cant_disable[KVM_RISCV_ISA_EXT_MAX ]; +bool filter_reg (__u64 reg) {switch (reg & ~REG_MASK ) {@@ -48,6 +50,15 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIFENCEI :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHPM :
tools/testing/selftests/kvm/riscv/get-reg-list.c bool filter_reg(__u64 reg) · line 61
Quoted 10 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +9
-0return true; +/* AIA registers are always available when Ssaia can't be disabled */ +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siselect): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (sieh): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siph): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1h): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2h): +return isa_ext_cant_disable[KVM_RISCV_ISA_EXT_SSAIA ] ? true : false;
No need for the '? true : false'
tools/testing/selftests/kvm/riscv/get-reg-list.c static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext) · line 87
Quoted 10 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +2
-0default :break ; }@@ -71,14 +82,22 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c) { +int rc;struct vcpu_reg_sublist *s; +unsigned long isa_ext_state[KVM_RISCV_ISA_EXT_MAX ] = {0 };
nit: I think we prefer reverse xmas tree in kselftests, but whatever.
tools/testing/selftests/kvm/riscv/get-reg-list.c static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext) · line 98
Quoted 13 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +6
-2+ +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) +__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (i), &isa_ext_state[i]);/* * Disable all extensions which were enabled by default * if they were available in the risc-v host. */ -for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) -__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) { + rc =__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +if (rc && isa_ext_state[i])
How helpful is it to check that isa_ext_state[i] isn't zero? The value of the register could be zero, right? Shouldn't we instead capture the return values from __vcpu_get_reg and if the return value is zero for a get, but nonzero for a set, then we know we have it, but can't disable it.
Quoted 8 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +2
-0+ isa_ext_cant_disable[i] = true; + }for_each_sublist (c, s) {if (!s->feature)Signature · 1 line
2.34.1
Thanks,
drew
Re: [PATCH 4/4] KVM: riscv: selftests: Selectively filter-out AIA registers
In reply to Andrew JonesQuoted 47 lines · Andrew Jones
Quoted 37 lines · Atish Patra
Quoted 36 lines · On Mon, Sep 18, 2023 at 11:07?AM Anup Patel <[email protected]> wrote:
Currently the AIA
ONE_REGregisters are reported by get-reg-list as new registers for variousvcpu_reg_listconfigs whenever Ssaia is available on the host because Ssaia extension can only be disabled by Smstateen extension which is not always available.To tackle this, we should filter-out AIA
ONE_REGregisters only when Ssaia can't be disabled for a VCPU.Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +6
-0@@ -12,6 +12,8 @@#define REG_MASK (KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK) +static bool isa_ext_cant_disable[KVM_RISCV_ISA_EXT_MAX ]; +bool filter_reg (__u64 reg) {switch (reg & ~REG_MASK ) {@@ -48,6 +50,15 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIFENCEI :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHPM :return true; +/* AIA registers are always available when Ssaia can't be disabled */ +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siselect): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2):Quoted 8 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c bool filter_reg(__u64 reg) · line 61
Quoted 5 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +5
-0+case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (sieh): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siph): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1h): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2h): +return isa_ext_cant_disable[KVM_RISCV_ISA_EXT_SSAIA ] ? true : false;Ahh I guess. you do need the switch case for AIA CSRs but for ISA extensions can be avoided as it is contiguous.
Quoted 6 lines
I guess we could so something like
case
KVM_REG_RISCV_ISA_EXT...KVM_REG_RISCV_ISA_EXT|KVM_RISCV_ISA_EXT_MAX:for the ISA extensions.
On second thought, I think I like them each listed explicitly. When we add a new extension it will show up in the new register list, which will not only remind us that it needs to be filtered, but also that we should probably also create a specific config for it.
Thanks,
drew
Andrew Jones
Reviewed-byRe: [PATCH 4/4] KVM: riscv: selftests: Selectively filter-out AIA registers
In reply to Andrew JonesQuoted 61 lines · Andrew Jones
Quoted 30 lines · Anup Patel
Currently the AIA
ONE_REGregisters are reported by get-reg-list as new registers for variousvcpu_reg_listconfigs whenever Ssaia is available on the host because Ssaia extension can only be disabled by Smstateen extension which is not always available.To tackle this, we should filter-out AIA
ONE_REGregisters only when Ssaia can't be disabled for a VCPU.Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +2
-0@@ -12,6 +12,8 @@#define REG_MASK (KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK) +static bool isa_ext_cant_disable[KVM_RISCV_ISA_EXT_MAX ]; +bool filter_reg (__u64 reg) {switch (reg & ~REG_MASK ) {@@ -48,6 +50,15 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIFENCEI :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHPM :tools/testing/selftests/kvm/riscv/get-reg-list.c bool filter_reg(__u64 reg) · line 61
Quoted 10 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +9
-0return true; +/* AIA registers are always available when Ssaia can't be disabled */ +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siselect): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (sieh): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siph): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1h): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2h): +return isa_ext_cant_disable[KVM_RISCV_ISA_EXT_SSAIA ] ? true : false;No need for the '? true : false'
tools/testing/selftests/kvm/riscv/get-reg-list.c static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext) · line 87
Quoted 10 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +2
-0default :break ; }@@ -71,14 +82,22 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c) { +int rc;struct vcpu_reg_sublist *s; +unsigned long isa_ext_state[KVM_RISCV_ISA_EXT_MAX ] = {0 };nit: I think we prefer reverse xmas tree in kselftests, but whatever.
Quoted 4 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +3
-0+ +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) +__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (i), &isa_ext_state[i]);
Quoted 14 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext) · line 98
Quoted 9 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +3
-2/* * Disable all extensions which were enabled by default * if they were available in the risc-v host. */ -for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) -__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) { + rc =__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +if (rc && isa_ext_state[i])How helpful is it to check that isa_ext_state[i] isn't zero? The value of the register could be zero, right? Shouldn't we instead capture the return values from
__vcpu_get_regand if the return value is zero for a get, but nonzero for a set, then we know we have it, but can't disable it.
Eh, never mind. After sending this, I felt like there was something fishy about my interpretation of how this works, so I took a second look. The patch is correct as is, since we're checking for when the ISA extension is present, but we can't disable it (just like it says it's doing :-) I was thinking too much about AIA registers and not ISA extension registers.
Quoted 10 lines
Quoted 9 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +2
-0+ isa_ext_cant_disable[i] = true; + }for_each_sublist (c, s) {if (!s->feature)Signature · 1 line
2.34.1
Thanks,
drew
Re: [PATCH 4/4] KVM: riscv: selftests: Selectively filter-out AIA registers
In reply to Andrew JonesQuoted 36 lines · On Wed, Sep 20, 2023 at 10:54?AM Andrew Jones <[email protected]> wrote:
Quoted 34 lines · Anup Patel
Currently the AIA
ONE_REGregisters are reported by get-reg-list as new registers for variousvcpu_reg_listconfigs whenever Ssaia is available on the host because Ssaia extension can only be disabled by Smstateen extension which is not always available.To tackle this, we should filter-out AIA
ONE_REGregisters only when Ssaia can't be disabled for a VCPU.Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +5
-0@@ -12,6 +12,8 @@#define REG_MASK (KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK) +static bool isa_ext_cant_disable[KVM_RISCV_ISA_EXT_MAX ]; +bool filter_reg (__u64 reg) {switch (reg & ~REG_MASK ) {@@ -48,6 +50,15 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIFENCEI :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHPM :return true; +/* AIA registers are always available when Ssaia can't be disabled */ +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siselect): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1):
Quoted 8 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c bool filter_reg(__u64 reg) · line 61
Quoted 6 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +6
-0+case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (sieh): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siph): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1h): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2h): +return isa_ext_cant_disable[KVM_RISCV_ISA_EXT_SSAIA ] ? true : false;No need for the '? true : false'
Okay, I will update.
Quoted 6 lines
Quoted 6 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +0
-0default :break ; }@@ -71,14 +82,22 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)
Quoted 7 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext) · line 87
Quoted 5 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +2
-0void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c) { +int rc;struct vcpu_reg_sublist *s; +unsigned long isa_ext_state[KVM_RISCV_ISA_EXT_MAX ] = {0 };nit: I think we prefer reverse xmas tree in kselftests, but whatever.
Okay, I will update.
Quoted 15 lines
Quoted 4 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +3
-0+ +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) +__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (i), &isa_ext_state[i]);tools/testing/selftests/kvm/riscv/get-reg-list.c static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext) · line 98
Quoted 10 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +3
-2/* * Disable all extensions which were enabled by default * if they were available in the risc-v host. */ -for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) -__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) { + rc =__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +if (rc && isa_ext_state[i])
Quoted 4 lines
How helpful is it to check that isa_ext_state[i] isn't zero? The value of the register could be zero, right? Shouldn't we instead capture the return values from
__vcpu_get_regand if the return value is zero for a get, but nonzero for a set, then we know we have it, but can't disable it.
The intent is to find-out the ISA_EXT registers which are enabled but we are not able to disable it.
Quoted 4 lines
Quoted 4 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +2
-0+ isa_ext_cant_disable[i] = true; + }
Quoted 8 lines
Quoted 5 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +0
-1for_each_sublist (c, s) {if (!s->feature) --2.34.1
Thanks,
drew
Regards,
Anup
Re: [PATCH 4/4] KVM: riscv: selftests: Selectively filter-out AIA registers
In reply to Atish PatraQuoted 38 lines · On Wed, Sep 20, 2023 at 1:43?AM Atish Patra <[email protected]> wrote:
Quoted 36 lines · On Mon, Sep 18, 2023 at 11:07?AM Anup Patel <[email protected]> wrote:
Currently the AIA
ONE_REGregisters are reported by get-reg-list as new registers for variousvcpu_reg_listconfigs whenever Ssaia is available on the host because Ssaia extension can only be disabled by Smstateen extension which is not always available.To tackle this, we should filter-out AIA
ONE_REGregisters only when Ssaia can't be disabled for a VCPU.Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +6
-0@@ -12,6 +12,8 @@#define REG_MASK (KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK) +static bool isa_ext_cant_disable[KVM_RISCV_ISA_EXT_MAX ]; +bool filter_reg (__u64 reg) {switch (reg & ~REG_MASK ) {@@ -48,6 +50,15 @@ bool filter_reg(__u64 reg)case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIFENCEI :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHPM :return true; +/* AIA registers are always available when Ssaia can't be disabled */ +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siselect): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2):
Quoted 8 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c bool filter_reg(__u64 reg) · line 61
Quoted 5 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +5
-0+case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (sieh): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (siph): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio1h): +case KVM_REG_RISCV_CSR |KVM_REG_RISCV_CSR_AIA |KVM_REG_RISCV_CSR_AIA_REG (iprio2h): +return isa_ext_cant_disable[KVM_RISCV_ISA_EXT_SSAIA ] ? true : false;Ahh I guess. you do need the switch case for AIA CSRs but for ISA extensions can be avoided as it is contiguous.
Fow now, let's leave it as-is because this way get-reg-list will complain if some new ONE_REG register is missed out.
Quoted 35 lines
Quoted 30 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +10
-3default :break ; }@@ -71,14 +82,22 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c) { +int rc;struct vcpu_reg_sublist *s; +unsigned long isa_ext_state[KVM_RISCV_ISA_EXT_MAX ] = {0 }; + +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) +__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (i), &isa_ext_state[i]);/* * Disable all extensions which were enabled by default * if they were available in the risc-v host. */ -for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) -__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +for (int i =0 ; i <KVM_RISCV_ISA_EXT_MAX ; i++) { + rc =__vcpu_set_reg (vcpu,RISCV_ISA_EXT_REG (i),0 ); +if (rc && isa_ext_state[i]) + isa_ext_cant_disable[i] = true; + }for_each_sublist (c, s) {if (!s->feature) --Quoted 2 lines
2.34.1
Otherwise, LGTM.
Quoted 5 lines
Reviewed-by Atish Patra <[email protected]>--
Regards,
Atish
Regards,
Anup
Re: [PATCH 3/4] KVM: riscv: selftests: Fix ISA_EXT register handling in get-reg-list
In reply to Atish PatraQuoted 9 lines · On Wed, Sep 20, 2023 at 1:24?AM Atish Patra <[email protected]> wrote:
Quoted 7 lines · On Mon, Sep 18, 2023 at 11:07?AM Anup Patel <[email protected]> wrote:
Same set of
ISA_EXTregisters are not present on all host becauseISA_EXTregisters are visible to the KVM user space based on the ISA extensions available on the host. Also, disabling an ISA extension using correspondingISA_EXTregister does not affect the visibility of theISA_EXTregister itself.
Quoted 5 lines
Quoted 2 lines
Based on the above, we should filter-out all
ISA_EXTregisters.In that case, we don't need the switch case any more. Just a conditional check with
KVM_RISCV_ISA_EXT_MAXshould be sufficient.
If we compare against KVM_RISCV_ISA_EXT_MAX then we will forget adding test configs for newer ISA extensions.
Quoted 74 lines
Quoted 74 lines
Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +21
-14@@ -14,17 +14,33 @@bool filter_reg (__u64 reg) { +switch (reg & ~REG_MASK ) {/* -* Some ISA extensions are optional and not present on all host, -* but they can't be disabled through ISA_EXT registers when present. -* So, to make life easy, just filtering out these kind of registers. +* Same set of ISA_EXT registers are not present on all host because +* ISA_EXT registers are visible to the KVM user space based on the +* ISA extensions available on the host. Also, disabling an ISA +* extension using corresponding ISA_EXT register does not affect +* the visibility of the ISA_EXT register itself. +* +* Based on above, we should filter-out all ISA_EXT registers. */ -switch (reg & ~REG_MASK ) { +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_D : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_F : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_H : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVPBMT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSTC :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVINVAL :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHINTPAUSE : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOM : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOZ :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBB :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_V : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVNAPOT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBA :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBS :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICNTR :@@ -50,12 +66,7 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)unsigned long value; ret =__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (ext), &value); -if (ret) { -printf ("Failed to get ext %d" , ext); -return false; - } - -return !!value; +return (ret) ? false : !!value; }void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c)@@ -506,10 +517,6 @@ static __u64 base_regs[] = {KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (time),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (compare),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (state), -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_V01 ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_TIME , KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_IPI,
Quoted 8 lines
Quoted 3 lines
--
2.34.1--
Regards,
Atish
Regards,
Anup
Re: [PATCH 3/4] KVM: riscv: selftests: Fix ISA_EXT register handling in get-reg-list
Quoted 11 lines · On Wed, Sep 20, 2023 at 6:56?AM Anup Patel <[email protected]> wrote:
Quoted 9 lines · On Wed, Sep 20, 2023 at 1:24?AM Atish Patra <[email protected]> wrote:
Quoted 7 lines · On Mon, Sep 18, 2023 at 11:07?AM Anup Patel <[email protected]> wrote:
Same set of
ISA_EXTregisters are not present on all host becauseISA_EXTregisters are visible to the KVM user space based on the ISA extensions available on the host. Also, disabling an ISA extension using correspondingISA_EXTregister does not affect the visibility of theISA_EXTregister itself.
Quoted 9 lines
Quoted 5 lines
Quoted 2 lines
Based on the above, we should filter-out all
ISA_EXTregisters.In that case, we don't need the switch case any more. Just a conditional check with
KVM_RISCV_ISA_EXT_MAXshould be sufficient.If we compare against
KVM_RISCV_ISA_EXT_MAXthen we will forget adding test configs for newer ISA extensions.
I feel it just bloats the code as we may end up in hundreds of extensions in the future
given the state of the extension scheme.
Quoted 85 lines
Quoted 74 lines
Quoted 74 lines
Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +21
-14@@ -14,17 +14,33 @@bool filter_reg (__u64 reg) { +switch (reg & ~REG_MASK ) {/* -* Some ISA extensions are optional and not present on all host, -* but they can't be disabled through ISA_EXT registers when present. -* So, to make life easy, just filtering out these kind of registers. +* Same set of ISA_EXT registers are not present on all host because +* ISA_EXT registers are visible to the KVM user space based on the +* ISA extensions available on the host. Also, disabling an ISA +* extension using corresponding ISA_EXT register does not affect +* the visibility of the ISA_EXT register itself. +* +* Based on above, we should filter-out all ISA_EXT registers. */ -switch (reg & ~REG_MASK ) { +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_D : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_F : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_H : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVPBMT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSTC :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVINVAL :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHINTPAUSE : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOM : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOZ :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBB :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_V : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVNAPOT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBA :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBS :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICNTR :@@ -50,12 +66,7 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)unsigned long value; ret =__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (ext), &value); -if (ret) { -printf ("Failed to get ext %d" , ext); -return false; - } - -return !!value; +return (ret) ? false : !!value; }void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c)@@ -506,10 +517,6 @@ static __u64 base_regs[] = {KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (time),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (compare),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (state), -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_V01 ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_TIME , KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_IPI,Quoted 8 lines
Quoted 3 lines
--
2.34.1--
Regards,
AtishRegards,
Anup
Signature · 2 lines
Regards, Atish
Re: [PATCH 3/4] KVM: riscv: selftests: Fix ISA_EXT register handling in get-reg-list
Quoted 19 lines · On Thu, Sep 21, 2023 at 4:31?AM Atish Patra <[email protected]> wrote:
Quoted 17 lines · On Wed, Sep 20, 2023 at 6:56?AM Anup Patel <[email protected]> wrote:
Quoted 14 lines · On Wed, Sep 20, 2023 at 1:24?AM Atish Patra <[email protected]> wrote:
Quoted 9 lines · On Mon, Sep 18, 2023 at 11:07?AM Anup Patel <[email protected]> wrote:
Same set of
ISA_EXTregisters are not present on all host becauseISA_EXTregisters are visible to the KVM user space based on the ISA extensions available on the host. Also, disabling an ISA extension using correspondingISA_EXTregister does not affect the visibility of theISA_EXTregister itself.Based on the above, we should filter-out all
ISA_EXTregisters.In that case, we don't need the switch case any more. Just a conditional check with
KVM_RISCV_ISA_EXT_MAXshould be sufficient.
Quoted 7 lines
Quoted 3 lines
If we compare against
KVM_RISCV_ISA_EXT_MAXthen we will forget adding test configs for newer ISA extensions.I feel it just bloats the code as we may end up in hundreds of extensions in the future
given the state of the extension scheme.
That is bound to happen so eventually we will have to revisit the get-reg-list test.
Regards,
Anup
Quoted 92 lines
Quoted 84 lines
Quoted 75 lines
Quoted 75 lines
Fixes 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test")Signed-off-by Anup Patel <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +21
-14@@ -14,17 +14,33 @@bool filter_reg (__u64 reg) { +switch (reg & ~REG_MASK ) {/* -* Some ISA extensions are optional and not present on all host, -* but they can't be disabled through ISA_EXT registers when present. -* So, to make life easy, just filtering out these kind of registers. +* Same set of ISA_EXT registers are not present on all host because +* ISA_EXT registers are visible to the KVM user space based on the +* ISA extensions available on the host. Also, disabling an ISA +* extension using corresponding ISA_EXT register does not affect +* the visibility of the ISA_EXT register itself. +* +* Based on above, we should filter-out all ISA_EXT registers. */ -switch (reg & ~REG_MASK ) { +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_D : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_F : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_H : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVPBMT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSTC :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVINVAL :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHINTPAUSE : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOM : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICBOZ :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBB :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_V : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SVNAPOT :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBA :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBS :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICNTR :@@ -50,12 +66,7 @@ static inline bool vcpu_has_ext(struct kvm_vcpu *vcpu, int ext)unsigned long value; ret =__vcpu_get_reg (vcpu,RISCV_ISA_EXT_REG (ext), &value); -if (ret) { -printf ("Failed to get ext %d" , ext); -return false; - } - -return !!value; +return (ret) ? false : !!value; }void finalize_vcpu (struct kvm_vcpu *vcpu,struct vcpu_reg_list *c)@@ -506,10 +517,6 @@ static __u64 base_regs[] = {KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (time),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (compare),KVM_REG_RISCV |KVM_REG_SIZE_U64 |KVM_REG_RISCV_TIMER |KVM_REG_RISCV_TIMER_REG (state), -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_A , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_C , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_I , -KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_M ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_V01 ,KVM_REG_RISCV |KVM_REG_SIZE_ULONG |KVM_REG_RISCV_SBI_EXT |KVM_REG_RISCV_SBI_SINGLE |KVM_RISCV_SBI_EXT_TIME , KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_SBI_EXT | KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_IPI,Quoted 8 lines
Quoted 3 lines
--
2.34.1--
Regards,
AtishQuoted 2 lines
Regards,
Anup--
Regards,
Atish