From: Andrew Jones <ajones@ventanamicro.com>
To: Haibo Xu <haibo1.xu@intel.com>
Cc: xiaobo55x@gmail.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
Subject: Re: [PATCH v5 11/13] KVM: selftests: Add skip_set facility to get_reg_list test
Date: Sat, 1 Jul 2023 16:28:43 +0200 [thread overview]
Message-ID: <20230701-2da2a0ffa7c1ccd3a549acea@orel> (raw)
In-Reply-To: <0a418f26388e744b6ae2f17639bea08a05643549.1688010022.git.haibo1.xu@intel.com>
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, ®);
> @@ -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, ®);
> 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>
next prev parent reply other threads:[~2023-07-01 14:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-01 13:42 [PATCH v5 00/13] RISCV: Add KVM_GET_REG_LIST API Haibo Xu
2023-07-01 13:42 ` [PATCH v5 01/13] KVM: arm64: selftests: Replace str_with_index with strdup_printf Haibo Xu
2023-07-01 13:42 ` [PATCH v5 02/13] KVM: arm64: selftests: Drop SVE cap check in print_reg Haibo Xu
2023-07-01 13:42 ` [PATCH v5 03/13] KVM: arm64: selftests: Remove print_reg's dependency on vcpu_config Haibo Xu
2023-07-01 13:42 ` [PATCH v5 04/13] KVM: arm64: selftests: Rename vcpu_config and add to kvm_util.h Haibo Xu
2023-07-01 13:42 ` [PATCH v5 05/13] KVM: arm64: selftests: Delete core_reg_fixup Haibo Xu
2023-07-01 13:42 ` [PATCH v5 06/13] KVM: arm64: selftests: Split get-reg-list test code Haibo Xu
2023-07-01 13:42 ` [PATCH v5 07/13] KVM: arm64: selftests: Finish generalizing get-reg-list Haibo Xu
2023-07-01 13:42 ` [PATCH v5 08/13] KVM: arm64: selftests: Move reject_set check logic to a function Haibo Xu
2023-07-01 14:21 ` Andrew Jones
2023-07-01 14:35 ` Haibo Xu
2023-07-01 13:42 ` [PATCH v5 09/13] KVM: arm64: selftests: Move finalize_vcpu back to run_test Haibo Xu
2023-07-01 13:42 ` [PATCH v5 10/13] KVM: selftests: Only do get/set tests on present blessed list Haibo Xu
2023-07-03 8:18 ` Andrew Jones
2023-07-04 1:09 ` Haibo Xu
2023-07-01 13:42 ` [PATCH v5 11/13] KVM: selftests: Add skip_set facility to get_reg_list test Haibo Xu
2023-07-01 14:28 ` Andrew Jones [this message]
2023-07-01 14:35 ` Haibo Xu
2023-07-01 13:43 ` [PATCH v5 12/13] KVM: riscv: Add KVM_GET_REG_LIST API support Haibo Xu
2023-07-01 13:43 ` [PATCH v5 13/13] KVM: riscv: selftests: Add get-reg-list test Haibo Xu
2023-07-01 14:53 ` [PATCH v5 00/13] RISCV: Add KVM_GET_REG_LIST API Andrew Jones
2023-07-03 2:53 ` Haibo Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230701-2da2a0ffa7c1ccd3a549acea@orel \
--to=ajones@ventanamicro.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=atishp@atishpatra.org \
--cc=coltonlewis@google.com \
--cc=corbet@lwn.net \
--cc=dmatlack@google.com \
--cc=haibo1.xu@intel.com \
--cc=james.morse@arm.com \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=pbonzini@redhat.com \
--cc=ricarkol@google.com \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--cc=suzuki.poulose@arm.com \
--cc=vannapurve@google.com \
--cc=vipinsh@google.com \
--cc=xiaobo55x@gmail.com \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).