RISC-V: KVM: A couple kselftests improvements
Subsystems (4)
cover RISC-V: KVM: A couple kselftests improvements
Add the riscv kselftests test dir to MAINTAINERS and improve the maintainability of the arrays in the get-reg-list test.
These tests are based on kvm-riscv/riscv_kvm_queue.
Andrew Jones (2):
MAINTAINERS: RISC-V: KVM: Add another kselftests path
KVM: selftests: Add array order helpers to riscv get-reg-list
MAINTAINERS | 1 + .../selftests/kvm/riscv/get-reg-list.c | 76 ++++++++++--------- 2 files changed, 42 insertions(+), 35 deletions(-)
Signature · 1 line
2.41.0
PATCH 1/2 MAINTAINERS: RISC-V: KVM: Add another kselftests path
With the introduction of the get-reg-list test for riscv, another directory has been added that should be tracked by riscv kvm maintainers.
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -11463,6 +11463,7 @@ F: arch/riscv/include/asm/kvm* F: arch/riscv/include/uapi/asm/kvm* F: arch/riscv/kvm/ F: tools/testing/selftests/kvm/*/riscv/ +F: tools/testing/selftests/kvm/riscv/ KERNEL VIRTUAL MACHINE for s390 (KVM/s390) M: Christian Borntraeger <[email protected]>
Signature · 1 line
2.41.0
Xu
PATCH 1/2 MAINTAINERS: RISC-V: KVM: Add another kselftests path
Quoted 22 lines
-----Original Message-----
From: Andrew Jones <[email protected]>
Sent: Friday, August 18, 2023 12:24 AM
To: kvm-riscv at lists.infradead.org; linux-riscv at lists.infradead.org
Cc: anup at brainfault.org; atishp at atishpatra.org; Xu, Haibo1 <[email protected]>; paul.walmsley at sifive.com; palmer at dabbelt.com; aou at eecs.berkeley.edu
Subject: [PATCH 1/2]MAINTAINERS: RISC-V: KVM: Add another kselftests pathWith the introduction of the get-reg-list test for riscv, another directory has been added that should be tracked by riscv kvm maintainers.
Signed-off-by Andrew Jones <[email protected]>--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)MAINTAINERS +0
-0
MAINTAINERS F: arch/riscv/include/asm/kvm* · line 11467
Quoted 5 lines
MAINTAINERS +1
-0@@ -11463,6 +11463,7 @@ F: arch/riscv/include/asm/kvm* F: arch/riscv/include/uapi/asm/kvm* F: arch/riscv/kvm/ F: tools/testing/selftests/kvm/*/riscv/ +F: tools/testing/selftests/kvm/riscv/
LGTM!
Thanks,
Haibo
Quoted 4 lines
MAINTAINERS +0
-1KERNEL VIRTUAL MACHINE for s390 (KVM/s390) M: Christian Borntraeger <[email protected]> --2.41.0
PATCH 1/2 MAINTAINERS: RISC-V: KVM: Add another kselftests path
Quoted 17 lines · On Fri, Aug 18, 2023 at 01:29:25AM +0000, Xu, Haibo1 wrote:
Quoted 17 lines
-----Original Message-----
From: Andrew Jones <[email protected]>
Sent: Friday, August 18, 2023 12:24 AM
To: kvm-riscv at lists.infradead.org; linux-riscv at lists.infradead.org
Cc: anup at brainfault.org; atishp at atishpatra.org; Xu, Haibo1 <[email protected]>; paul.walmsley at sifive.com; palmer at dabbelt.com; aou at eecs.berkeley.edu
Subject: [PATCH 1/2]MAINTAINERS: RISC-V: KVM: Add another kselftests pathWith the introduction of the get-reg-list test for riscv, another directory has been added that should be tracked by riscv kvm maintainers.
Signed-off-by Andrew Jones <[email protected]>--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
Quoted 11 lines
MAINTAINERS F: arch/riscv/include/asm/kvm* · line 11467
Quoted 10 lines
MAINTAINERS +1
-0@@ -11463,6 +11463,7 @@ F: arch/riscv/include/asm/kvm* F: arch/riscv/include/uapi/asm/kvm* F: arch/riscv/kvm/ F: tools/testing/selftests/kvm/*/riscv/ +F: tools/testing/selftests/kvm/riscv/LGTM!
Hi Haibo,
Please reply with a Reviewed-by tag, assuming your LGTM held the same meaning as an r-b. See [1] to ensure it does.
Thanks,
drew
Xu
PATCH 1/2 MAINTAINERS: RISC-V: KVM: Add another kselftests path
In reply to Andrew JonesQuoted 22 lines
-----Original Message-----
From: Andrew Jones <[email protected]>
Sent: Friday, August 18, 2023 12:24 AM
To: kvm-riscv at lists.infradead.org; linux-riscv at lists.infradead.org
Cc: anup at brainfault.org; atishp at atishpatra.org; Xu, Haibo1 <[email protected]>; paul.walmsley at sifive.com; palmer at dabbelt.com; aou at eecs.berkeley.edu
Subject: [PATCH 1/2]MAINTAINERS: RISC-V: KVM: Add another kselftests pathWith the introduction of the get-reg-list test for riscv, another directory has been added that should be tracked by riscv kvm maintainers.
Signed-off-by Andrew Jones <[email protected]>--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)MAINTAINERS +0
-0
MAINTAINERS F: arch/riscv/include/asm/kvm* · line 11467
Quoted 5 lines
MAINTAINERS +1
-0@@ -11463,6 +11463,7 @@ F: arch/riscv/include/asm/kvm* F: arch/riscv/include/uapi/asm/kvm* F: arch/riscv/kvm/ F: tools/testing/selftests/kvm/*/riscv/ +F: tools/testing/selftests/kvm/riscv/
LGTM!
Quoted 4 lines
MAINTAINERS +0
-1KERNEL VIRTUAL MACHINE for s390 (KVM/s390) M: Christian Borntraeger <[email protected]> --2.41.0
PATCH 2/2 KVM: selftests: Add array order helpers to riscv get-reg-list
In reply to Andrew JonesAdd a couple macros to use when filling arrays in order to ensure the elements are placed in the right order, regardless of the order we prefer to read them. And immediately apply the new macro to resorting the ISA extension lists alphabetically.
--- .../selftests/kvm/riscv/get-reg-list.c | 76 ++++++++++--------- 1 file changed, 41 insertions(+), 35 deletions(-)
tools/testing/selftests/kvm/riscv/get-reg-list.c +41 -35
@@ -20,16 +20,16 @@ bool filter_reg(__u64 reg)* So, to make life easy, just filtering out these kind of registers. */ switch (reg & ~REG_MASK ) { +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA :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_ZBB : -case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBA : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBB :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBS :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICNTR :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICSR :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIFENCEI : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHINTPAUSE :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHPM :return true;default :
@@ -281,35 +281,38 @@ static const char *fp_d_id_to_str(const char *prefix, __u64 id)return NULL ; } +#define KVM_ISA_EXT_ARR (ext) \ +[KVM_RISCV_ISA_EXT_##ext] = "KVM_RISCV_ISA_EXT_" #ext +static const char *isa_ext_id_to_str (__u64 id) {/* reg_off is the offset into unsigned long kvm_isa_ext_arr[] */ __u64 reg_off = id & ~(REG_MASK |KVM_REG_RISCV_ISA_EXT );static const char *const kvm_isa_ext_reg_name[] = { -"KVM_RISCV_ISA_EXT_A" , -"KVM_RISCV_ISA_EXT_C" , -"KVM_RISCV_ISA_EXT_D" , -"KVM_RISCV_ISA_EXT_F" , -"KVM_RISCV_ISA_EXT_H" , -"KVM_RISCV_ISA_EXT_I" , -"KVM_RISCV_ISA_EXT_M" , -"KVM_RISCV_ISA_EXT_SVPBMT" , -"KVM_RISCV_ISA_EXT_SSTC" , -"KVM_RISCV_ISA_EXT_SVINVAL" , -"KVM_RISCV_ISA_EXT_ZIHINTPAUSE" , -"KVM_RISCV_ISA_EXT_ZICBOM" , -"KVM_RISCV_ISA_EXT_ZICBOZ" , -"KVM_RISCV_ISA_EXT_ZBB" , -"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_ZICNTR" , -"KVM_RISCV_ISA_EXT_ZICSR" , -"KVM_RISCV_ISA_EXT_ZIFENCEI" , -"KVM_RISCV_ISA_EXT_ZIHPM" , +KVM_ISA_EXT_ARR (A ), +KVM_ISA_EXT_ARR (C ), +KVM_ISA_EXT_ARR (D ), +KVM_ISA_EXT_ARR (F ), +KVM_ISA_EXT_ARR (H ), +KVM_ISA_EXT_ARR (I ), +KVM_ISA_EXT_ARR (M ), +KVM_ISA_EXT_ARR (V ), +KVM_ISA_EXT_ARR (SSAIA ), +KVM_ISA_EXT_ARR (SSTC ), +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 (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 ), };if (reg_off >=ARRAY_SIZE (kvm_isa_ext_reg_name)) {
@@ -323,19 +326,22 @@ static const char *isa_ext_id_to_str(__u64 id)return kvm_isa_ext_reg_name[reg_off]; } +#define KVM_SBI_EXT_ARR (ext) \ +[ext] = "KVM_REG_RISCV_SBI_SINGLE | " #ext +static const char *sbi_ext_single_id_to_str (__u64 reg_off) {/* reg_off is KVM_RISCV_SBI_EXT_ID */ static const char *const kvm_sbi_ext_reg_name[] = { -"KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_V01" , -"KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_TIME" , -"KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_IPI" , -"KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_RFENCE" , -"KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_SRST" , -"KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_HSM" , -"KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_PMU" , -"KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_EXPERIMENTAL" , -"KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_VENDOR" , +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_V01 ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_TIME ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_IPI ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_RFENCE ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_SRST ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_HSM ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_PMU ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_EXPERIMENTAL ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_VENDOR ), };if (reg_off >=ARRAY_SIZE (kvm_sbi_ext_reg_name)) {
Signature · 1 line
2.41.0
Xu
PATCH 2/2 KVM: selftests: Add array order helpers to riscv get-reg-list
Quoted 128 lines
-----Original Message-----
From: Andrew Jones <[email protected]>
Sent: Friday, August 18, 2023 12:24 AM
To: kvm-riscv at lists.infradead.org; linux-riscv at lists.infradead.org
Cc: anup at brainfault.org; atishp at atishpatra.org; Xu, Haibo1 <[email protected]>; paul.walmsley at sifive.com; palmer at dabbelt.com; aou at eecs.berkeley.edu
Subject: [PATCH 2/2] KVM: selftests: Add array order helpers to riscv get-reg- listAdd a couple macros to use when filling arrays in order to ensure the elements are placed in the right order, regardless of the order we prefer to read them. And immediately apply the new macro to resorting the ISA extension lists alphabetically.
Signed-off-by Andrew Jones <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 76 ++++++++++--------- 1 file changed, 41 insertions(+), 35 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +33
-34@@ -20,16 +20,16 @@ bool filter_reg(__u64 reg)* So, to make life easy, just filtering out these kind of registers. */ switch (reg & ~REG_MASK ) { +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA :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_ZBB : -case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBA : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBB :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBS :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICNTR :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICSR :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIFENCEI : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHINTPAUSE :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHPM :return true;default :@@ -281,35 +281,38 @@ static const char *fp_d_id_to_str(const char *prefix, __u64 id)return NULL ; } +#define KVM_ISA_EXT_ARR (ext) \ +[KVM_RISCV_ISA_EXT_##ext] = "KVM_RISCV_ISA_EXT_" #ext +static const char *isa_ext_id_to_str (__u64 id) {/* reg_off is the offset into unsigned long kvm_isa_ext_arr[] */ __u64 reg_off = id & ~(REG_MASK |KVM_REG_RISCV_ISA_EXT );static const char *const kvm_isa_ext_reg_name[] = { - "KVM_RISCV_ISA_EXT_A", - "KVM_RISCV_ISA_EXT_C", - "KVM_RISCV_ISA_EXT_D", - "KVM_RISCV_ISA_EXT_F", - "KVM_RISCV_ISA_EXT_H", - "KVM_RISCV_ISA_EXT_I", - "KVM_RISCV_ISA_EXT_M", - "KVM_RISCV_ISA_EXT_SVPBMT", - "KVM_RISCV_ISA_EXT_SSTC", - "KVM_RISCV_ISA_EXT_SVINVAL", - "KVM_RISCV_ISA_EXT_ZIHINTPAUSE", - "KVM_RISCV_ISA_EXT_ZICBOM", - "KVM_RISCV_ISA_EXT_ZICBOZ", - "KVM_RISCV_ISA_EXT_ZBB", - "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_ZICNTR", - "KVM_RISCV_ISA_EXT_ZICSR", - "KVM_RISCV_ISA_EXT_ZIFENCEI", - "KVM_RISCV_ISA_EXT_ZIHPM", +KVM_ISA_EXT_ARR (A ), +KVM_ISA_EXT_ARR (C ), +KVM_ISA_EXT_ARR (D ), +KVM_ISA_EXT_ARR (F ), +KVM_ISA_EXT_ARR (H ), +KVM_ISA_EXT_ARR (I ), +KVM_ISA_EXT_ARR (M ), +KVM_ISA_EXT_ARR (V ), +KVM_ISA_EXT_ARR (SSAIA ), +KVM_ISA_EXT_ARR (SSTC ), +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 (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 ), }; if (reg_off >= ARRAY_SIZE(kvm_isa_ext_reg_name)) { @@ -323,19 +326,22 @@ static const char *isa_ext_id_to_str(__u64 id) return kvm_isa_ext_reg_name[reg_off]; } +#define KVM_SBI_EXT_ARR (ext) \ +[ext] = "KVM_REG_RISCV_SBI_SINGLE | " #ext +static const char *sbi_ext_single_id_to_str (__u64 reg_off) {/* reg_off is KVM_RISCV_SBI_EXT_ID */ static const char * const kvm_sbi_ext_reg_name[] = { - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_V01", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_TIME", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_IPI", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_RFENCE", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_SRST", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_HSM", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_PMU", - "KVM_REG_RISCV_SBI_SINGLE |
KVM_RISCV_SBI_EXT_EXPERIMENTAL",tools/testing/selftests/kvm/riscv/get-reg-list.c +0
-1- "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_VENDOR",
tools/testing/selftests/kvm/riscv/get-reg-list.c static const char *isa_ext_id_to_str(__u64 id) · line 345
Quoted 10 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +9
-0+KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_V01 ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_TIME ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_IPI ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_RFENCE ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_SRST ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_HSM ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_PMU ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_EXPERIMENTAL ), + KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_VENDOR), };
LGTM!
Thanks,
Haibo
Quoted 3 lines
if (
reg_off>=ARRAY_SIZE(kvm_sbi_ext_reg_name)) {
--
2.41.0
Xu
PATCH 2/2 KVM: selftests: Add array order helpers to riscv get-reg-list
In reply to Andrew JonesQuoted 128 lines
-----Original Message-----
From: Andrew Jones <[email protected]>
Sent: Friday, August 18, 2023 12:24 AM
To: kvm-riscv at lists.infradead.org; linux-riscv at lists.infradead.org
Cc: anup at brainfault.org; atishp at atishpatra.org; Xu, Haibo1 <[email protected]>; paul.walmsley at sifive.com; palmer at dabbelt.com; aou at eecs.berkeley.edu
Subject: [PATCH 2/2] KVM: selftests: Add array order helpers to riscv get-reg- listAdd a couple macros to use when filling arrays in order to ensure the elements are placed in the right order, regardless of the order we prefer to read them. And immediately apply the new macro to resorting the ISA extension lists alphabetically.
Signed-off-by Andrew Jones <[email protected]>--- .../selftests/kvm/riscv/get-reg-list.c | 76 ++++++++++--------- 1 file changed, 41 insertions(+), 35 deletions(-)tools/testing/selftests/kvm/riscv/get-reg-list.c +33
-34@@ -20,16 +20,16 @@ bool filter_reg(__u64 reg)* So, to make life easy, just filtering out these kind of registers. */ switch (reg & ~REG_MASK ) { +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA :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_ZBB : -case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_SSAIA :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBA : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBB :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZBS :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICNTR :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZICSR :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIFENCEI : +case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHINTPAUSE :case KVM_REG_RISCV_ISA_EXT |KVM_RISCV_ISA_EXT_ZIHPM :return true;default :@@ -281,35 +281,38 @@ static const char *fp_d_id_to_str(const char *prefix, __u64 id)return NULL ; } +#define KVM_ISA_EXT_ARR (ext) \ +[KVM_RISCV_ISA_EXT_##ext] = "KVM_RISCV_ISA_EXT_" #ext +static const char *isa_ext_id_to_str (__u64 id) {/* reg_off is the offset into unsigned long kvm_isa_ext_arr[] */ __u64 reg_off = id & ~(REG_MASK |KVM_REG_RISCV_ISA_EXT );static const char *const kvm_isa_ext_reg_name[] = { - "KVM_RISCV_ISA_EXT_A", - "KVM_RISCV_ISA_EXT_C", - "KVM_RISCV_ISA_EXT_D", - "KVM_RISCV_ISA_EXT_F", - "KVM_RISCV_ISA_EXT_H", - "KVM_RISCV_ISA_EXT_I", - "KVM_RISCV_ISA_EXT_M", - "KVM_RISCV_ISA_EXT_SVPBMT", - "KVM_RISCV_ISA_EXT_SSTC", - "KVM_RISCV_ISA_EXT_SVINVAL", - "KVM_RISCV_ISA_EXT_ZIHINTPAUSE", - "KVM_RISCV_ISA_EXT_ZICBOM", - "KVM_RISCV_ISA_EXT_ZICBOZ", - "KVM_RISCV_ISA_EXT_ZBB", - "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_ZICNTR", - "KVM_RISCV_ISA_EXT_ZICSR", - "KVM_RISCV_ISA_EXT_ZIFENCEI", - "KVM_RISCV_ISA_EXT_ZIHPM", +KVM_ISA_EXT_ARR (A ), +KVM_ISA_EXT_ARR (C ), +KVM_ISA_EXT_ARR (D ), +KVM_ISA_EXT_ARR (F ), +KVM_ISA_EXT_ARR (H ), +KVM_ISA_EXT_ARR (I ), +KVM_ISA_EXT_ARR (M ), +KVM_ISA_EXT_ARR (V ), +KVM_ISA_EXT_ARR (SSAIA ), +KVM_ISA_EXT_ARR (SSTC ), +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 (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 ), }; if (reg_off >= ARRAY_SIZE(kvm_isa_ext_reg_name)) { @@ -323,19 +326,22 @@ static const char *isa_ext_id_to_str(__u64 id) return kvm_isa_ext_reg_name[reg_off]; } +#define KVM_SBI_EXT_ARR (ext) \ +[ext] = "KVM_REG_RISCV_SBI_SINGLE | " #ext +static const char *sbi_ext_single_id_to_str (__u64 reg_off) {/* reg_off is KVM_RISCV_SBI_EXT_ID */ static const char * const kvm_sbi_ext_reg_name[] = { - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_V01", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_TIME", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_IPI", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_RFENCE", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_SRST", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_HSM", - "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_PMU", - "KVM_REG_RISCV_SBI_SINGLE |
KVM_RISCV_SBI_EXT_EXPERIMENTAL",tools/testing/selftests/kvm/riscv/get-reg-list.c +0
-1- "KVM_REG_RISCV_SBI_SINGLE | KVM_RISCV_SBI_EXT_VENDOR",
tools/testing/selftests/kvm/riscv/get-reg-list.c static const char *isa_ext_id_to_str(__u64 id) · line 345
Quoted 10 lines
tools/testing/selftests/kvm/riscv/get-reg-list.c +9
-0+KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_V01 ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_TIME ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_IPI ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_RFENCE ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_SRST ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_HSM ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_PMU ), +KVM_SBI_EXT_ARR (KVM_RISCV_SBI_EXT_EXPERIMENTAL ), + KVM_SBI_EXT_ARR(KVM_RISCV_SBI_EXT_VENDOR), };
LGTM!
Quoted 3 lines
if (
reg_off>=ARRAY_SIZE(kvm_sbi_ext_reg_name)) {
--
2.41.0
Anup Patel
maintainercover RISC-V: KVM: A couple kselftests improvements
In reply to Andrew JonesQuoted 9 lines · On Thu, Aug 17, 2023 at 9:53?PM Andrew Jones <[email protected]> wrote:
Add the riscv kselftests test dir to
MAINTAINERSand improve the maintainability of the arrays in the get-reg-list test.These tests are based on kvm-riscv/riscv_kvm_queue.
Andrew Jones (2):
MAINTAINERS: RISC-V: KVM: Add another kselftests path
KVM: selftests: Add array order helpers to riscv get-reg-list
Queued this series for Linux-6.7
Thanks,
Anup
Quoted 8 lines
MAINTAINERS | 1 + .../selftests/kvm/riscv/get-reg-list.c | 76 ++++++++++--------- 2 files changed, 42 insertions(+), 35 deletions(-)--
2.41.0