Re: [PATCH v5 11/13] KVM: selftests: Add skip_set facility to get_reg_list test

On Sat, Jul 1, 2023 at 10:28 PM Andrew Jones ajones@ventanamicro.com wrote:

On Sat, Jul 01, 2023 at 09:42:59PM +0800, Haibo Xu wrote:

...

Add new skips_set members to vcpu_reg_sublist so as to skip set operation on some registers.

Suggested-by: Andrew Jones ajones@ventanamicro.com Signed-off-by: Haibo Xu haibo1.xu@intel.com

---

tools/testing/selftests/kvm/get-reg-list.c | 20 +++++++++++++------ .../selftests/kvm/include/kvm_util_base.h | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/kvm/get-reg-list.c b/tools/testing/selftests/kvm/get-reg-list.c index 74fb6f6fdd09..1a32a900aeea 100644 --- a/tools/testing/selftests/kvm/get-reg-list.c +++ b/tools/testing/selftests/kvm/get-reg-list.c @@ -157,6 +157,7 @@ static void run_test(struct vcpu_reg_list *c) { int new_regs = 0, missing_regs = 0, i, n; int failed_get = 0, failed_set = 0, failed_reject = 0;

• int skipped_set = 0;
  struct kvm_vcpu *vcpu;
  struct kvm_vm *vm;
  struct vcpu_reg_sublist *s;
  

@@ -210,7 +211,7 @@ static void run_test(struct vcpu_reg_list *c) .id = reg_list->reg[i], .addr = (__u64)&addr, };

•         bool reject_reg = false;
  

•         bool reject_reg = false, skip_reg = false;
          int ret;
  
          ret = __vcpu_get_reg(vcpu, reg_list->reg[i], &addr);
  

@@ -221,8 +222,8 @@ static void run_test(struct vcpu_reg_list *c) ++failed_get; }

•         /* rejects_set registers are rejected after KVM_ARM_VCPU_FINALIZE */
          for_each_sublist(c, s) {
  

•                 /* rejects_set registers are rejected for set operation */
                  if (s->rejects_set && find_reg(s->rejects_set, s->rejects_set_n, reg.id)) {
                          reject_reg = true;
                          ret = __vcpu_ioctl(vcpu, KVM_SET_ONE_REG, &reg);
  

@@ -234,9 +235,16 @@ static void run_test(struct vcpu_reg_list *c) } break; }

•                 /* skips_set registers are skipped for set operation */
  

•                 if (s->skips_set && find_reg(s->skips_set, s->skips_set_n, reg.id)) {
  

•                         skip_reg = true;
  

•                         ++skipped_set;
  

•                         break;
  

•                 }
          }
  
  

•         if (!reject_reg) {
  

•         if (!reject_reg && !skip_reg) {
                  ret = __vcpu_ioctl(vcpu, KVM_SET_ONE_REG, &reg);
                  if (ret) {
                          printf("%s: Failed to set ", config_name(c));
  

@@ -281,9 +289,9 @@ static void run_test(struct vcpu_reg_list *c) }

  TEST_ASSERT(!missing_regs && !failed_get && !failed_set && !failed_reject,

•             "%s: There are %d missing registers; "
  

•             "%d registers failed get; %d registers failed set; %d registers failed reject",
  

•             config_name(c), missing_regs, failed_get, failed_set, failed_reject);
  

•             "%s: There are %d missing registers; %d registers failed get; "
  

•             "%d registers failed set; %d registers failed reject; %d registers skipped set",
  

•             config_name(c), missing_regs, failed_get, failed_set, failed_reject, skipped_set);
  
  pr_info("%s: PASS\n", config_name(c));
  blessed_n = 0;
  

diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index e4480049000d..67c031fe89a1 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -134,6 +134,8 @@ struct vcpu_reg_sublist { __u64 regs_n; __u64 *rejects_set; __u64 rejects_set_n;

• __u64 *skips_set;
  

• __u64 skips_set_n;
  

};

struct vcpu_reg_list {

2.34.1

Reviewed-by: Andrew Jones ajones@ventanamicro.com

Thanks!