riscv: sbi: Ensure we can pass with any opensbi
Subsystems (3)
cover riscv: sbi: Ensure we can pass with any opensbi
At some point CI will update the version of QEMU it uses. If the version selected includes an opensbi that doesn't have all the fixes for current tests, then CI will start failing for riscv. Guard against that by using kfail for known opensbi failures. We only kfail for opensbi and for its versions less than 1.7, though, as we expect everything to be fixed then.
Andrew Jones (3):
lib/riscv: Also provide sbiret impl functions
riscv: sbi: Add kfail versions of sbiret_report functions
riscv: sbi: Use kfail for known opensbi failures
lib/riscv/asm/sbi.h | 6 ++++-- lib/riscv/sbi.c | 18 ++++++++++++++---- riscv/sbi-fwft.c | 20 +++++++++++++------- riscv/sbi-sse.c | 4 ++-- riscv/sbi-tests.h | 20 +++++++++++++++----- riscv/sbi.c | 6 ++++-- 6 files changed, 52 insertions(+), 22 deletions(-)
Signature · 1 line
2.48.1
PATCH 1/3 lib/riscv: Also provide sbiret impl functions
We almost always return sbiret from sbi wrapper functions so do that for sbi_get_imp_version() and sbi_get_imp_id(), but asserting no error and returning the value is also useful, so continue to provide those functions too, just with a slightly different name.
--- lib/riscv/asm/sbi.h | 6 ++++-- lib/riscv/sbi.c | 18 ++++++++++++++---- riscv/sbi-sse.c | 4 ++-- 3 files changed, 20 insertions(+), 8 deletions(-)
lib/riscv/asm/sbi.h +4 -2
@@ -260,9 +260,11 @@ struct sbiret sbi_send_ipi_cpumask(const cpumask_t *mask);struct sbiret sbi_send_ipi_broadcast (void );struct sbiret sbi_set_timer (unsigned long stime_value);struct sbiret sbi_get_spec_version (void ); -unsigned long sbi_get_imp_version (void ); -unsigned long sbi_get_imp_id (void ); +struct sbiret sbi_get_imp_version (void ); +struct sbiret sbi_get_imp_id (void );long sbi_probe (int ext); +unsigned long __sbi_get_imp_version (void ); +unsigned long __sbi_get_imp_id (void );typedef void (*sbi_sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid);
lib/riscv/sbi.c +14 -4
@@ -183,21 +183,31 @@ struct sbiret sbi_set_timer(unsigned long stime_value)return sbi_ecall (SBI_EXT_TIME ,SBI_EXT_TIME_SET_TIMER , stime_value,0 ,0 ,0 ,0 ,0 ); } -unsigned long sbi_get_imp_version (void ) +struct sbiret sbi_get_imp_version (void ) +{ +return sbi_ecall (SBI_EXT_BASE ,SBI_EXT_BASE_GET_IMP_VERSION ,0 ,0 ,0 ,0 ,0 ,0 ); +} + +struct sbiret sbi_get_imp_id (void ) +{ +return sbi_ecall (SBI_EXT_BASE ,SBI_EXT_BASE_GET_IMP_ID ,0 ,0 ,0 ,0 ,0 ,0 ); +} + +unsigned long __sbi_get_imp_version (void ) {struct sbiret ret; - ret =sbi_ecall (SBI_EXT_BASE ,SBI_EXT_BASE_GET_IMP_VERSION ,0 ,0 ,0 ,0 ,0 ,0 ); + ret =sbi_get_imp_version ();assert (!ret.error);return ret.value; } -unsigned long sbi_get_imp_id (void ) +unsigned long __sbi_get_imp_id (void ) {struct sbiret ret; - ret =sbi_ecall (SBI_EXT_BASE ,SBI_EXT_BASE_GET_IMP_ID ,0 ,0 ,0 ,0 ,0 ,0 ); + ret =sbi_get_imp_id ();assert (!ret.error);return ret.value;
riscv/sbi-sse.c +2 -2
@@ -1232,8 +1232,8 @@ void check_sse(void)return ; } -if (sbi_get_imp_id () ==SBI_IMPL_OPENSBI && -sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 )) { +if (__sbi_get_imp_id () ==SBI_IMPL_OPENSBI && +__sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 )) {report_skip ("OpenSBI < v1.7 detected, skipping tests" );report_prefix_pop ();return ;
Signature · 1 line
2.48.1
Re: [kvm-unit-tests PATCH 1/3] lib/riscv: Also provide sbiret impl functions
Quoted 76 lines · Andrew Jones
We almost always return sbiret from sbi wrapper functions so do that for
sbi_get_imp_version()andsbi_get_imp_id(), but asserting no error and returning the value is also useful, so continue to provide those functions too, just with a slightly different name.Signed-off-by Andrew Jones <[email protected]>--- lib/riscv/asm/sbi.h | 6 ++++-- lib/riscv/sbi.c | 18 ++++++++++++++---- riscv/sbi-sse.c | 4 ++-- 3 files changed, 20 insertions(+), 8 deletions(-)lib/riscv/asm/sbi.h +4
-2@@ -260,9 +260,11 @@ struct sbiret sbi_send_ipi_cpumask(const cpumask_t *mask);struct sbiret sbi_send_ipi_broadcast (void );struct sbiret sbi_set_timer (unsigned long stime_value);struct sbiret sbi_get_spec_version (void ); -unsigned long sbi_get_imp_version (void ); -unsigned long sbi_get_imp_id (void ); +struct sbiret sbi_get_imp_version (void ); +struct sbiret sbi_get_imp_id (void );long sbi_probe (int ext); +unsigned long __sbi_get_imp_version (void ); +unsigned long __sbi_get_imp_id (void );typedef void (*sbi_sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid);lib/riscv/sbi.c +14
-4@@ -183,21 +183,31 @@ struct sbiret sbi_set_timer(unsigned long stime_value)return sbi_ecall (SBI_EXT_TIME ,SBI_EXT_TIME_SET_TIMER , stime_value,0 ,0 ,0 ,0 ,0 ); } -unsigned long sbi_get_imp_version (void ) +struct sbiret sbi_get_imp_version (void ) +{ +return sbi_ecall (SBI_EXT_BASE ,SBI_EXT_BASE_GET_IMP_VERSION ,0 ,0 ,0 ,0 ,0 ,0 ); +} + +struct sbiret sbi_get_imp_id (void ) +{ +return sbi_ecall (SBI_EXT_BASE ,SBI_EXT_BASE_GET_IMP_ID ,0 ,0 ,0 ,0 ,0 ,0 ); +} + +unsigned long __sbi_get_imp_version (void ) {struct sbiret ret; - ret =sbi_ecall (SBI_EXT_BASE ,SBI_EXT_BASE_GET_IMP_VERSION ,0 ,0 ,0 ,0 ,0 ,0 ); + ret =sbi_get_imp_version ();assert (!ret.error);return ret.value; } -unsigned long sbi_get_imp_id (void ) +unsigned long __sbi_get_imp_id (void ) {struct sbiret ret; - ret =sbi_ecall (SBI_EXT_BASE ,SBI_EXT_BASE_GET_IMP_ID ,0 ,0 ,0 ,0 ,0 ,0 ); + ret =sbi_get_imp_id ();assert (!ret.error);return ret.value;riscv/sbi-sse.c +0
-0
riscv/sbi-sse.c void check_sse(void) · line 1239
Quoted 10 lines
riscv/sbi-sse.c +2
-2@@ -1232,8 +1232,8 @@ void check_sse(void)return ; } -if (sbi_get_imp_id () ==SBI_IMPL_OPENSBI && -sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 )) { +if (__sbi_get_imp_id () ==SBI_IMPL_OPENSBI && +__sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 )) {report_skip ("OpenSBI < v1.7 detected, skipping tests" );report_prefix_pop ();return ;
Hi Andrew,
Looks good to me,
Thanks,
Clément
PATCH 2/3 riscv: sbi: Add kfail versions of sbiret_report functions
In reply to Andrew Jonesreport_kfail is useful for SBI testing to allowing CI to PASS even when SBI implementations have known failures. Since sbiret_report functions are frequently used by SBI tests, make kfail versions of them too.
--- riscv/sbi-tests.h | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
riscv/sbi-tests.h +15 -5
@@ -39,7 +39,8 @@#include <libcflat.h> #include <asm/sbi.h> -#define __sbiret_report (ret, expected_error, expected_value, has_value, expected_error_name, fmt, ...) ({ \ +#define __sbiret_report (kfail, ret, expected_error, expected_value, \ + has_value, expected_error_name, fmt, ...) ({ \ long ex_err = expected_error; \ long ex_val = expected_value; \ bool has_val = !!(has_value); \
@@ -48,9 +49,9 @@bool pass; \ \if (has_val) \ - pass = report(ch_err && ch_val, fmt, ##__VA_ARGS__); \ + pass = report_kfail(kfail, ch_err && ch_val, fmt, ##__VA_ARGS__); \else \ - pass = report(ch_err, fmt ": %s", ##__VA_ARGS__, expected_error_name); \ + pass = report_kfail(kfail, ch_err, fmt ": %s", ##__VA_ARGS__, expected_error_name); \ \if (!pass && has_val) \ report_info(fmt ": expected (error: %ld, value: %ld), received: (error: %ld, value %ld)", \
@@ -63,14 +64,23 @@ })#define sbiret_report (ret, expected_error, expected_value, ...) \ - __sbiret_report(ret, expected_error, expected_value, true, #expected_error, __VA_ARGS__) + __sbiret_report(false, ret, expected_error, expected_value, true, #expected_error, __VA_ARGS__)#define sbiret_report_error (ret, expected_error, ...) \ - __sbiret_report(ret, expected_error, 0, false, #expected_error, __VA_ARGS__) + __sbiret_report(false, ret, expected_error, 0, false, #expected_error, __VA_ARGS__)#define sbiret_check (ret, expected_error, expected_value) \ sbiret_report(ret, expected_error, expected_value, "check sbi.error and sbi.value") +#define sbiret_kfail (kfail, ret, expected_error, expected_value, ...) \ + __sbiret_report(kfail, ret, expected_error, expected_value, true, #expected_error, __VA_ARGS__) + +#define sbiret_kfail_error (kfail, ret, expected_error, ...) \ + __sbiret_report(kfail, ret, expected_error, 0, false, #expected_error, __VA_ARGS__) + +#define sbiret_check_kfail (kfail, ret, expected_error, expected_value) \ + sbiret_kfail(kfail, ret, expected_error, expected_value, "check sbi.error and sbi.value") +static inline bool env_or_skip (const char *env) {if (!getenv (env)) {
Signature · 1 line
2.48.1
Re: [kvm-unit-tests PATCH 2/3] riscv: sbi: Add kfail versions of sbiret_report functions
Quoted 52 lines · Andrew Jones
report_kfailis useful for SBI testing to allowing CI to PASS even when SBI implementations have known failures. Sincesbiret_reportfunctions are frequently used by SBI tests, make kfail versions of them too.Signed-off-by Andrew Jones <[email protected]>--- riscv/sbi-tests.h | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)riscv/sbi-tests.h +8
-5@@ -39,7 +39,8 @@#include <libcflat.h> #include <asm/sbi.h> -#define __sbiret_report (ret, expected_error, expected_value, has_value, expected_error_name, fmt, ...) ({ \ +#define __sbiret_report (kfail, ret, expected_error, expected_value, \ + has_value, expected_error_name, fmt, ...) ({ \ long ex_err = expected_error; \ long ex_val = expected_value; \ bool has_val = !!(has_value); \@@ -48,9 +49,9 @@bool pass; \ \if (has_val) \ - pass = report(ch_err && ch_val, fmt, ##__VA_ARGS__); \ + pass = report_kfail(kfail, ch_err && ch_val, fmt, ##__VA_ARGS__); \else \ - pass = report(ch_err, fmt ": %s", ##__VA_ARGS__, expected_error_name); \ + pass = report_kfail(kfail, ch_err, fmt ": %s", ##__VA_ARGS__, expected_error_name); \ \if (!pass && has_val) \ report_info(fmt ": expected (error: %ld, value: %ld), received: (error: %ld, value %ld)", \@@ -63,14 +64,23 @@ })#define sbiret_report (ret, expected_error, expected_value, ...) \ - __sbiret_report(ret, expected_error, expected_value, true, #expected_error, __VA_ARGS__) + __sbiret_report(false, ret, expected_error, expected_value, true, #expected_error, __VA_ARGS__)#define sbiret_report_error (ret, expected_error, ...) \ - __sbiret_report(ret, expected_error, 0, false, #expected_error, __VA_ARGS__) + __sbiret_report(false, ret, expected_error, 0, false, #expected_error, __VA_ARGS__)#define sbiret_check (ret, expected_error, expected_value) \ sbiret_report(ret, expected_error, expected_value, "check sbi.error and sbi.value") +#define sbiret_kfail (kfail, ret, expected_error, expected_value, ...) \ + __sbiret_report(kfail, ret, expected_error, expected_value, true, #expected_error, __VA_ARGS__)
riscv/sbi-tests.h line 86
Quoted 10 lines
riscv/sbi-tests.h +7
-0+ +#define sbiret_kfail_error (kfail, ret, expected_error, ...) \ + __sbiret_report(kfail, ret, expected_error, 0, false, #expected_error, __VA_ARGS__) + +#define sbiret_check_kfail (kfail, ret, expected_error, expected_value) \ + sbiret_kfail(kfail, ret, expected_error, expected_value, "check sbi.error and sbi.value") +static inline bool env_or_skip (const char *env) {if (!getenv (env)) {
Hi Andrew,
I needed that as well in another test so:
Thanks,
Clément
PATCH 3/3 riscv: sbi: Use kfail for known opensbi failures
In reply to Andrew JonesUse kfail for the opensbi s/SBI_ERR_DENIED/SBI_ERR_DENIED_LOCKED/ change. We expect it to be fixed in 1.7, so only kfail for opensbi which has a version less than that. Also change the other uses of kfail to only kfail for opensbi versions less than 1.7.
--- riscv/sbi-fwft.c | 20 +++++++++++++------- riscv/sbi.c | 6 ++++-- 2 files changed, 17 insertions(+), 9 deletions(-)
riscv/sbi-fwft.c +13 -7
@@ -83,19 +83,21 @@ static void fwft_feature_lock_test_values(uint32_t feature, size_t nr_values,report_prefix_push ("locked" ); +bool kfail =__sbi_get_imp_id () ==SBI_IMPL_OPENSBI && +__sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 ); +for (int i =0 ; i < nr_values; ++i) { ret =fwft_set (feature, test_values[i],0 ); -sbiret_report_error (&ret,SBI_ERR_DENIED_LOCKED , -"Set to %lu without lock flag" , test_values[i]); +sbiret_kfail_error (kfail, &ret,SBI_ERR_DENIED_LOCKED , +"Set to %lu without lock flag" , test_values[i]); ret =fwft_set (feature, test_values[i],SBI_FWFT_SET_FLAG_LOCK ); -sbiret_report_error (&ret,SBI_ERR_DENIED_LOCKED , -"Set to %lu with lock flag" , test_values[i]); +sbiret_kfail_error (kfail, &ret,SBI_ERR_DENIED_LOCKED , +"Set to %lu with lock flag" , test_values[i]); } ret =fwft_get (feature); -sbiret_report (&ret,SBI_SUCCESS , locked_value, -"Get value %lu" , locked_value); +sbiret_report (&ret,SBI_SUCCESS , locked_value,"Get value %lu" , locked_value);report_prefix_pop (); }
@@ -103,6 +105,7 @@ static void fwft_feature_lock_test_values(uint32_t feature, size_t nr_values,static void fwft_feature_lock_test (uint32_t feature,unsigned long locked_value) {unsigned long values[] = {0 ,1 }; +fwft_feature_lock_test_values (feature,2 , values, locked_value); }
@@ -317,7 +320,10 @@ static void fwft_check_pte_ad_hw_updating(void)report (ret.value ==0 || ret.value ==1 ,"first get value is 0/1" ); enabled = ret.value; -report_kfail (true, !enabled,"resets to 0" ); + +bool kfail =__sbi_get_imp_id () ==SBI_IMPL_OPENSBI && +__sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 ); +report_kfail (kfail, !enabled,"resets to 0" );install_exception_handler (EXC_LOAD_PAGE_FAULT , adue_read_handler);install_exception_handler (EXC_STORE_PAGE_FAULT , adue_write_handler);
riscv/sbi.c +4 -2
@@ -515,10 +515,12 @@ end_two:sbiret_report_error (&ret,SBI_SUCCESS ,"no targets, hart_mask_base is 1" );/* Try the next higher hartid than the max */ +bool kfail =__sbi_get_imp_id () ==SBI_IMPL_OPENSBI && +__sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 ); ret =sbi_send_ipi (2 , max_hartid); -report_kfail (true, ret.error ==SBI_ERR_INVALID_PARAM ,"hart_mask got expected error (%ld)" , ret.error); +sbiret_kfail_error (kfail, &ret,SBI_ERR_INVALID_PARAM ,"hart_mask" ); ret =sbi_send_ipi (1 , max_hartid +1 ); -report_kfail (true, ret.error ==SBI_ERR_INVALID_PARAM ,"hart_mask_base got expected error (%ld)" , ret.error); +sbiret_kfail_error (kfail, &ret,SBI_ERR_INVALID_PARAM ,"hart_mask_base" );report_prefix_pop ();
Signature · 1 line
2.48.1
Re: [kvm-unit-tests PATCH 3/3] riscv: sbi: Use kfail for known opensbi failures
Quoted 30 lines · Andrew Jones
Use kfail for the opensbi s/SBI_ERR_DENIED/SBI_ERR_DENIED_LOCKED/ change. We expect it to be fixed in 1.7, so only kfail for opensbi which has a version less than that. Also change the other uses of kfail to only kfail for opensbi versions less than 1.7.
Signed-off-by Andrew Jones <[email protected]>--- riscv/sbi-fwft.c | 20 +++++++++++++------- riscv/sbi.c | 6 ++++-- 2 files changed, 17 insertions(+), 9 deletions(-)riscv/sbi-fwft.c +5
-2@@ -83,19 +83,21 @@ static void fwft_feature_lock_test_values(uint32_t feature, size_t nr_values,report_prefix_push ("locked" ); +bool kfail =__sbi_get_imp_id () ==SBI_IMPL_OPENSBI && +__sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 ); +for (int i =0 ; i < nr_values; ++i) { ret =fwft_set (feature, test_values[i],0 ); -sbiret_report_error (&ret,SBI_ERR_DENIED_LOCKED , -"Set to %lu without lock flag" , test_values[i]); +sbiret_kfail_error (kfail, &ret,SBI_ERR_DENIED_LOCKED , +"Set to %lu without lock flag" , test_values[i]); ret =fwft_set (feature, test_values[i],SBI_FWFT_SET_FLAG_LOCK );
riscv/sbi-fwft.c static void fwft_feature_lock_test_values(uint32_t feature, size_t nr_values, · line 100
Quoted 10 lines
riscv/sbi-fwft.c +3
-4-sbiret_report_error (&ret,SBI_ERR_DENIED_LOCKED , -"Set to %lu with lock flag" , test_values[i]); +sbiret_kfail_error (kfail, &ret,SBI_ERR_DENIED_LOCKED , +"Set to %lu with lock flag" , test_values[i]); } ret =fwft_get (feature); -sbiret_report (&ret,SBI_SUCCESS , locked_value, -"Get value %lu" , locked_value); +sbiret_report (&ret,SBI_SUCCESS , locked_value,"Get value %lu" , locked_value);
Reformatting ?
riscv/sbi-fwft.c static void fwft_feature_lock_test_values(uint32_t feature, size_t nr_values, · line 108
Quoted 8 lines
riscv/sbi-fwft.c +1
-0report_prefix_pop (); }@@ -103,6 +105,7 @@ static void fwft_feature_lock_test_values(uint32_t feature, size_t nr_values,static void fwft_feature_lock_test (uint32_t feature,unsigned long locked_value) {unsigned long values[] = {0 ,1 }; +
That's some spurious newline here.
Quoted 20 lines
riscv/sbi-fwft.c +4
-1fwft_feature_lock_test_values (feature,2 , values, locked_value); }@@ -317,7 +320,10 @@ static void fwft_check_pte_ad_hw_updating(void)report (ret.value ==0 || ret.value ==1 ,"first get value is 0/1" ); enabled = ret.value; -report_kfail (true, !enabled,"resets to 0" ); + +bool kfail =__sbi_get_imp_id () ==SBI_IMPL_OPENSBI && +__sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 ); +report_kfail (kfail, !enabled,"resets to 0" );install_exception_handler (EXC_LOAD_PAGE_FAULT , adue_read_handler);install_exception_handler (EXC_STORE_PAGE_FAULT , adue_write_handler);riscv/sbi.c +0
-0
riscv/sbi.c end_two: · line 520
Quoted 6 lines
riscv/sbi.c +2
-0@@ -515,10 +515,12 @@ end_two:sbiret_report_error (&ret,SBI_SUCCESS ,"no targets, hart_mask_base is 1" );/* Try the next higher hartid than the max */ +bool kfail =__sbi_get_imp_id () ==SBI_IMPL_OPENSBI && +__sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 ); ret = sbi_send_ipi(2, max_hartid);> - report_kfail(true, ret.error
== SBI_ERR_INVALID_PARAM, "hart_mask got expected error (%ld)", ret.error);
riscv/sbi.c end_two: · line 526
Quoted 7 lines
riscv/sbi.c +2
-1+sbiret_kfail_error (kfail, &ret,SBI_ERR_INVALID_PARAM ,"hart_mask" ); ret =sbi_send_ipi (1 , max_hartid +1 ); -report_kfail (true, ret.error ==SBI_ERR_INVALID_PARAM ,"hart_mask_base got expected error (%ld)" , ret.error); +sbiret_kfail_error (kfail, &ret,SBI_ERR_INVALID_PARAM ,"hart_mask_base" );report_prefix_pop ();
Hi Andrew,
I tried thinking of some way to factorize the version check but can't really find something elegant. Without the spurious newline:
Thanks,
Clément
Re: [kvm-unit-tests PATCH 3/3] riscv: sbi: Use kfail for known opensbi failures
Quoted 39 lines · Clément Léger
Quoted 36 lines · Andrew Jones
Use kfail for the opensbi s/SBI_ERR_DENIED/SBI_ERR_DENIED_LOCKED/ change. We expect it to be fixed in 1.7, so only kfail for opensbi which has a version less than that. Also change the other uses of kfail to only kfail for opensbi versions less than 1.7.
Signed-off-by Andrew Jones <[email protected]>--- riscv/sbi-fwft.c | 20 +++++++++++++------- riscv/sbi.c | 6 ++++-- 2 files changed, 17 insertions(+), 9 deletions(-)riscv/sbi-fwft.c +7
-4@@ -83,19 +83,21 @@ static void fwft_feature_lock_test_values(uint32_t feature, size_t nr_values,report_prefix_push ("locked" ); +bool kfail =__sbi_get_imp_id () ==SBI_IMPL_OPENSBI && +__sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 ); +for (int i =0 ; i < nr_values; ++i) { ret =fwft_set (feature, test_values[i],0 ); -sbiret_report_error (&ret,SBI_ERR_DENIED_LOCKED , -"Set to %lu without lock flag" , test_values[i]); +sbiret_kfail_error (kfail, &ret,SBI_ERR_DENIED_LOCKED , +"Set to %lu without lock flag" , test_values[i]); ret =fwft_set (feature, test_values[i],SBI_FWFT_SET_FLAG_LOCK ); -sbiret_report_error (&ret,SBI_ERR_DENIED_LOCKED , -"Set to %lu with lock flag" , test_values[i]); +sbiret_kfail_error (kfail, &ret,SBI_ERR_DENIED_LOCKED , +"Set to %lu with lock flag" , test_values[i]); }
Quoted 6 lines
riscv/sbi-fwft.c static void fwft_feature_lock_test_values(uint32_t feature, size_t nr_values, · line 100
Quoted 4 lines
riscv/sbi-fwft.c +1
-2ret =fwft_get (feature); -sbiret_report (&ret,SBI_SUCCESS , locked_value, -"Get value %lu" , locked_value); +sbiret_report (&ret,SBI_SUCCESS , locked_value,"Get value %lu" , locked_value);Reformatting ?
Yup, and the "Set..." strings above. I missed that the format was wrong when I applied the fwft_feature_lock_test_values patch and just lazily fixed it up with this patch. I still haven't merged to the master branch yet, so I can still squash a formatting fix into the fwft_feature_lock_test_values patch in order to make this patch cleaner.
Quoted 11 lines
riscv/sbi-fwft.c static void fwft_feature_lock_test_values(uint32_t feature, size_t nr_values, · line 108
Quoted 9 lines
riscv/sbi-fwft.c +1
-0report_prefix_pop (); }@@ -103,6 +105,7 @@ static void fwft_feature_lock_test_values(uint32_t feature, size_t nr_values,static void fwft_feature_lock_test (uint32_t feature,unsigned long locked_value) {unsigned long values[] = {0 ,1 }; +That's some spurious newline here.
It's also reformatting.
Quoted 34 lines
Quoted 22 lines
riscv/sbi-fwft.c +4
-1fwft_feature_lock_test_values (feature,2 , values, locked_value); }@@ -317,7 +320,10 @@ static void fwft_check_pte_ad_hw_updating(void)report (ret.value ==0 || ret.value ==1 ,"first get value is 0/1" ); enabled = ret.value; -report_kfail (true, !enabled,"resets to 0" ); + +bool kfail =__sbi_get_imp_id () ==SBI_IMPL_OPENSBI && +__sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 ); +report_kfail (kfail, !enabled,"resets to 0" );install_exception_handler (EXC_LOAD_PAGE_FAULT , adue_read_handler);install_exception_handler (EXC_STORE_PAGE_FAULT , adue_write_handler);riscv/sbi.c +0
-0riscv/sbi.c end_two: · line 520
Quoted 6 lines
riscv/sbi.c +2
-0@@ -515,10 +515,12 @@ end_two:sbiret_report_error (&ret,SBI_SUCCESS ,"no targets, hart_mask_base is 1" );/* Try the next higher hartid than the max */ +bool kfail =__sbi_get_imp_id () ==SBI_IMPL_OPENSBI && +__sbi_get_imp_version () <sbi_impl_opensbi_mk_version (1 ,7 ); ret = sbi_send_ipi(2, max_hartid);> - report_kfail(true, ret.error==
SBI_ERR_INVALID_PARAM, "hart_maskgot expected error (%ld)", ret.error);Quoted 5 lines
riscv/sbi.c +2
-1+sbiret_kfail_error (kfail, &ret,SBI_ERR_INVALID_PARAM ,"hart_mask" ); ret =sbi_send_ipi (1 , max_hartid +1 ); -report_kfail (true, ret.error ==SBI_ERR_INVALID_PARAM ,"hart_mask_base got expected error (%ld)" , ret.error); +sbiret_kfail_error (kfail, &ret,SBI_ERR_INVALID_PARAM ,"hart_mask_base" );
Quoted 7 lines
riscv/sbi.c end_two: · line 526
Quoted 2 lines
riscv/sbi.c +0
-0report_prefix_pop ();Hi Andrew,
I tried thinking of some way to factorize the version check but can't really find something elegant. Without the spurious newline:
I'll move the reformatting to the fwft_feature_lock_test_values patch, but I'm generally not overly opposed to sneaking a couple reformatting fixes into patches when the reformatting is obvious enough.
Quoted 2 lines
Reviewed-by Clément Léger <[email protected]>
Thanks,
drew
Quoted 9 lines
Thanks,
Clément
Signature · 3 lines
kvm-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kvm-riscv
Quoted 11 lines · Andrew Jones
At some point CI will update the version of QEMU it uses. If the version selected includes an opensbi that doesn't have all the fixes for current tests, then CI will start failing for riscv. Guard against that by using kfail for known opensbi failures. We only kfail for opensbi and for its versions less than 1.7, though, as we expect everything to be fixed then.
Andrew Jones (3):
lib/riscv: Also provide sbiret impl functions
riscv: sbi: Add kfail versions ofsbiret_reportfunctions
riscv: sbi: Use kfail for known opensbi failures
Quoted 11 lines
lib/riscv/asm/sbi.h | 6 ++++-- lib/riscv/sbi.c | 18 ++++++++++++++---- riscv/sbi-fwft.c | 20 +++++++++++++------- riscv/sbi-sse.c | 4 ++-- riscv/sbi-tests.h | 20 +++++++++++++++----- riscv/sbi.c | 6 ++++-- 6 files changed, 52 insertions(+), 22 deletions(-)Signature · 1 line
2.48.1
Merged.
Thanks,
drew