From: Andrew Jones <drjones@redhat.com>
To: Oliver Upton <oupton@google.com>
Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
Marc Zyngier <maz@kernel.org>,
Raghavendra Rao Anata <rananta@google.com>,
Peter Shier <pshier@google.com>,
Sean Christopherson <seanjc@google.com>,
David Matlack <dmatlack@google.com>,
Paolo Bonzini <pbonzini@redhat.com>,
linux-arm-kernel@lists.infradead.org,
Jim Mattson <jmattson@google.com>
Subject: Re: [PATCH v3 11/12] selftests: KVM: Test physical counter offsetting
Date: Wed, 21 Jul 2021 18:46:36 +0200 [thread overview]
Message-ID: <20210721164636.yzzhguwzjrtj3ty6@gator> (raw)
In-Reply-To: <20210719184949.1385910-12-oupton@google.com>
On Mon, Jul 19, 2021 at 06:49:48PM +0000, Oliver Upton wrote:
> Test that userpace adjustment of the guest physical counter-timer
> results in the correct view of within the guest.
>
> Signed-off-by: Oliver Upton <oupton@google.com>
> ---
> .../selftests/kvm/include/aarch64/processor.h | 12 ++++++++
> .../kvm/system_counter_offset_test.c | 29 ++++++++++++++++---
> 2 files changed, 37 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h
> index 3168cdbae6ee..7f53d90e9512 100644
> --- a/tools/testing/selftests/kvm/include/aarch64/processor.h
> +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h
> @@ -141,4 +141,16 @@ static inline uint64_t read_cntvct_ordered(void)
> return r;
> }
>
> +static inline uint64_t read_cntpct_ordered(void)
> +{
> + uint64_t r;
> +
> + __asm__ __volatile__("isb\n\t"
> + "mrs %0, cntpct_el0\n\t"
> + "isb\n\t"
> + : "=r"(r));
> +
> + return r;
> +}
> +
> #endif /* SELFTEST_KVM_PROCESSOR_H */
> diff --git a/tools/testing/selftests/kvm/system_counter_offset_test.c b/tools/testing/selftests/kvm/system_counter_offset_test.c
> index 88ad997f5b69..3eed9dcb7693 100644
> --- a/tools/testing/selftests/kvm/system_counter_offset_test.c
> +++ b/tools/testing/selftests/kvm/system_counter_offset_test.c
> @@ -57,6 +57,7 @@ static uint64_t host_read_guest_system_counter(struct test_case *test)
>
> enum arch_counter {
> VIRTUAL,
> + PHYSICAL,
> };
>
> struct test_case {
> @@ -68,23 +69,41 @@ static struct test_case test_cases[] = {
> { .counter = VIRTUAL, .offset = 0 },
> { .counter = VIRTUAL, .offset = 180 * NSEC_PER_SEC },
> { .counter = VIRTUAL, .offset = -180 * NSEC_PER_SEC },
> + { .counter = PHYSICAL, .offset = 0 },
> + { .counter = PHYSICAL, .offset = 180 * NSEC_PER_SEC },
> + { .counter = PHYSICAL, .offset = -180 * NSEC_PER_SEC },
> };
>
> static void check_preconditions(struct kvm_vm *vm)
> {
> if (!_vcpu_has_device_attr(vm, VCPU_ID, KVM_ARM_VCPU_TIMER_CTRL,
> - KVM_ARM_VCPU_TIMER_OFFSET_VTIMER))
> + KVM_ARM_VCPU_TIMER_OFFSET_VTIMER) &&
> + !_vcpu_has_device_attr(vm, VCPU_ID, KVM_ARM_VCPU_TIMER_CTRL,
> + KVM_ARM_VCPU_TIMER_OFFSET_PTIMER))
> return;
>
> - print_skip("KVM_ARM_VCPU_TIMER_OFFSET_VTIMER not supported; skipping test");
> + print_skip("KVM_ARM_VCPU_TIMER_OFFSET_{VTIMER,PTIMER} not supported; skipping test");
> exit(KSFT_SKIP);
> }
>
> static void setup_system_counter(struct kvm_vm *vm, struct test_case *test)
> {
> + u64 attr = 0;
> +
> + switch (test->counter) {
> + case VIRTUAL:
> + attr = KVM_ARM_VCPU_TIMER_OFFSET_VTIMER;
> + break;
> + case PHYSICAL:
> + attr = KVM_ARM_VCPU_TIMER_OFFSET_PTIMER;
> + break;
> + default:
> + TEST_ASSERT(false, "unrecognized counter index %u",
> + test->counter);
> + }
> +
> vcpu_access_device_attr(vm, VCPU_ID, KVM_ARM_VCPU_TIMER_CTRL,
> - KVM_ARM_VCPU_TIMER_OFFSET_VTIMER, &test->offset,
> - true);
> + attr, &test->offset, true);
> }
>
> static uint64_t guest_read_system_counter(struct test_case *test)
> @@ -92,6 +111,8 @@ static uint64_t guest_read_system_counter(struct test_case *test)
> switch (test->counter) {
> case VIRTUAL:
> return read_cntvct_ordered();
> + case PHYSICAL:
> + return read_cntpct_ordered();
> default:
> GUEST_ASSERT(0);
> }
> --
> 2.32.0.402.g57bb445576-goog
>
> _______________________________________________
> kvmarm mailing list
> kvmarm@lists.cs.columbia.edu
> https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
>
Reviewed-by: Andrew Jones <drjones@redhat.com>
next prev parent reply other threads:[~2021-07-21 16:46 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-19 18:49 [PATCH v3 00/12] KVM: Add idempotent controls for migrating system counter state Oliver Upton
2021-07-19 18:49 ` [PATCH v3 01/12] KVM: x86: Report host tsc and realtime values in KVM_GET_CLOCK Oliver Upton
2021-07-19 18:49 ` [PATCH v3 02/12] KVM: x86: Refactor tsc synchronization code Oliver Upton
2021-07-19 18:49 ` [PATCH v3 03/12] KVM: x86: Expose TSC offset controls to userspace Oliver Upton
2021-07-19 18:49 ` [PATCH v3 04/12] tools: arch: x86: pull in pvclock headers Oliver Upton
2021-07-19 18:49 ` [PATCH v3 05/12] selftests: KVM: Add test for KVM_{GET,SET}_CLOCK Oliver Upton
2021-07-19 18:49 ` [PATCH v3 06/12] selftests: KVM: Add helpers for vCPU device attributes Oliver Upton
2021-07-19 18:49 ` [PATCH v3 07/12] selftests: KVM: Introduce system counter offset test Oliver Upton
2021-07-19 18:49 ` [PATCH v3 08/12] KVM: arm64: Allow userspace to configure a vCPU's virtual offset Oliver Upton
2021-07-21 16:16 ` Andrew Jones
2021-07-19 18:49 ` [PATCH v3 09/12] selftests: KVM: Add support for aarch64 to system_counter_offset_test Oliver Upton
2021-07-21 16:26 ` Andrew Jones
2021-07-19 18:49 ` [PATCH v3 10/12] KVM: arm64: Provide userspace access to the physical counter offset Oliver Upton
2021-07-21 16:44 ` Andrew Jones
2021-07-19 18:49 ` [PATCH v3 11/12] selftests: KVM: Test physical counter offsetting Oliver Upton
2021-07-21 16:46 ` Andrew Jones [this message]
2021-07-19 18:49 ` [PATCH v3 12/12] selftests: KVM: Add counter emulation benchmark Oliver Upton
2021-07-21 18:59 ` Andrew Jones
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=20210721164636.yzzhguwzjrtj3ty6@gator \
--to=drjones@redhat.com \
--cc=dmatlack@google.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=oupton@google.com \
--cc=pbonzini@redhat.com \
--cc=pshier@google.com \
--cc=rananta@google.com \
--cc=seanjc@google.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).