Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <cover.1688010022.git.haibo1.xu@intel.com> <0a418f26388e744b6ae2f17639bea08a05643549.1688010022.git.haibo1.xu@intel.com>
 <20230701-2da2a0ffa7c1ccd3a549acea@orel>
In-Reply-To: <20230701-2da2a0ffa7c1ccd3a549acea@orel>
From:   Haibo Xu <xiaobo55x@gmail.com>
Date:   Sat, 1 Jul 2023 22:35:45 +0800
Message-ID: <CAJve8o=c9TV6arYd=sOTOM8BS37cgV+oO8LBjLwb1Za9NZnA+Q@mail.gmail.com>
Subject: Re: [PATCH v5 11/13] KVM: selftests: Add skip_set facility to
 get_reg_list test
To:     Andrew Jones <ajones@ventanamicro.com>
Cc:     Haibo Xu <haibo1.xu@intel.com>, maz@kernel.org,
        oliver.upton@linux.dev, seanjc@google.com,
        Paolo Bonzini <pbonzini@redhat.com>,
        Jonathan Corbet <corbet@lwn.net>,
        Anup Patel <anup@brainfault.org>,
        Atish Patra <atishp@atishpatra.org>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Albert Ou <aou@eecs.berkeley.edu>,
        Shuah Khan <shuah@kernel.org>,
        James Morse <james.morse@arm.com>,
        Suzuki K Poulose <suzuki.poulose@arm.com>,
        Zenghui Yu <yuzenghui@huawei.com>,
        Ricardo Koller <ricarkol@google.com>,
        Vishal Annapurve <vannapurve@google.com>,
        Vipin Sharma <vipinsh@google.com>,
        David Matlack <dmatlack@google.com>,
        Colton Lewis <coltonlewis@google.com>, kvm@vger.kernel.org,
        linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
        kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org,
        linux-kselftest@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sat, Jul 1, 2023 at 10:28=E2=80=AFPM Andrew Jones <ajones@ventanamicro.c=
om> 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 =3D 0, missing_regs =3D 0, i, n;
> >       int failed_get =3D 0, failed_set =3D 0, failed_reject =3D 0;
> > +     int skipped_set =3D 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 =3D reg_list->reg[i],
> >                       .addr =3D (__u64)&addr,
> >               };
> > -             bool reject_reg =3D false;
> > +             bool reject_reg =3D false, skip_reg =3D false;
> >               int ret;
> >
> >               ret =3D __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 ope=
ration */
> >                       if (s->rejects_set && find_reg(s->rejects_set, s-=
>rejects_set_n, reg.id)) {
> >                               reject_reg =3D true;
> >                               ret =3D __vcpu_ioctl(vcpu, KVM_SET_ONE_RE=
G, &reg);
> > @@ -234,9 +235,16 @@ static void run_test(struct vcpu_reg_list *c)
> >                               }
> >                               break;
> >                       }
> > +
> > +                     /* skips_set registers are skipped for set operat=
ion */
> > +                     if (s->skips_set && find_reg(s->skips_set, s->ski=
ps_set_n, reg.id)) {
> > +                             skip_reg =3D true;
> > +                             ++skipped_set;
> > +                             break;
> > +                     }
> >               }
> >
> > -             if (!reject_reg) {
> > +             if (!reject_reg && !skip_reg) {
> >                       ret =3D __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 && !faile=
d_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 fai=
led 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 =3D 0;
> > diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tool=
s/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!