From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9792C433FE for ; Thu, 9 Sep 2021 18:03:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C3A6C610E9 for ; Thu, 9 Sep 2021 18:03:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242964AbhIISEw (ORCPT ); Thu, 9 Sep 2021 14:04:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237271AbhIISEv (ORCPT ); Thu, 9 Sep 2021 14:04:51 -0400 Received: from mail-yb1-xb2c.google.com (mail-yb1-xb2c.google.com [IPv6:2607:f8b0:4864:20::b2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE7FCC061575 for ; Thu, 9 Sep 2021 11:03:41 -0700 (PDT) Received: by mail-yb1-xb2c.google.com with SMTP id k65so5587033yba.13 for ; Thu, 09 Sep 2021 11:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=dWL21g/rXe18UfESw/aaz44TTu3ssz4XBLjDX0WcUyk=; b=d+94kHs+4IZjViu0Pw4WlubOZd+QVd/+0eYHqky/a/P+T2HE53UG5u7HCW9sXGAsBd XhY9d1nkotc/j6dCyNZV+CxQDD3voftkf5lGhgqHYq+hkM8JCM+hDN3hizxPu9xrwgi7 mxMyOhbEN9Q9+Ffy3NJ20L8OotiUn87KAa+sLn6ELUMotiL9j3vNYkpQZnbkIi8SS2uK 6R/+y1Jm4f3BWuGw7SeG6k8ePXSVIHmyU8omq5kpU9OD0kKolhVTIHOggCcyD1d0W//a h3JezLaBCRTBuZ/xVk9cwCiwQlzugV2GQ6Is+MJw8Ts2h+3ZuxnEUMvnVXFFdxOCoON3 ipYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=dWL21g/rXe18UfESw/aaz44TTu3ssz4XBLjDX0WcUyk=; b=IDrkRKPrFCnu0lgy+rLy0doJb2w0T8C44uxWs6mUKaP79AR14JB05FeyzObwFzYFIo 86GyS4AQJJkDqCKTU7WKKfk7iocMyO9W74TL3IIuQCq/56/PC3Gh71JxTwCcSqQTW+mB 4xY9bO/Byc8dS0vbwCkrdlWcRCkEQYas26J5IGwmHP6cdgNF/Jy6WZk/dlUxGHDEFsEz 6tFBVcKARdY5LCFpFTNWVm86uBe7z9AqncdTtAG4aTG95D6rLvf2oFjt915pik2v9xlR aEWXq32YucgQ3GEaUKWMRW6Ij63QphZH/a9vy2xbEDLlkhRdSPGnlvB1pd3gVoGjacBz bVBw== X-Gm-Message-State: AOAM531VwKVQUwPwoRjyRfJMgX4khfhlWAt81mKOHUxY0uJKp+DDABWE WOuv7RtVRSVEDMu4kc7uKdOQkgXeKm7R5P5bIyv3Vg== X-Google-Smtp-Source: ABdhPJyXn5O0sf6dFHJNLFcOUg+mANyRxY78u6mwTtzf7t5Ikb3iVfFm5DDcyg386Swn8J8qYJw1LQjSo1YiRjJXpGo= X-Received: by 2002:a25:1c09:: with SMTP id c9mr5756013ybc.350.1631210620661; Thu, 09 Sep 2021 11:03:40 -0700 (PDT) MIME-Version: 1.0 References: <20210909013818.1191270-1-rananta@google.com> <20210909013818.1191270-16-rananta@google.com> In-Reply-To: From: Raghavendra Rao Ananta Date: Thu, 9 Sep 2021 11:03:29 -0700 Message-ID: Subject: Re: [PATCH v4 15/18] KVM: arm64: selftests: Add arch_timer test To: Oliver Upton Cc: Paolo Bonzini , Marc Zyngier , Andrew Jones , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Reiji Watanabe , Jing Zhang , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 8, 2021 at 10:51 PM Oliver Upton wrote: > > On Thu, Sep 09, 2021 at 01:38:15AM +0000, Raghavendra Rao Ananta wrote: > > Add a KVM selftest to validate the arch_timer functionality. > > Primarily, the test sets up periodic timer interrupts and > > validates the basic architectural expectations upon its receipt. > > > > The test provides command-line options to configure the period > > of the timer, number of iterations, and number of vCPUs. > > > > Signed-off-by: Raghavendra Rao Ananta > > Reviewed-by: Andrew Jones > > --- > > tools/testing/selftests/kvm/.gitignore | 1 + > > tools/testing/selftests/kvm/Makefile | 1 + > > .../selftests/kvm/aarch64/arch_timer.c | 351 ++++++++++++++++++ > > 3 files changed, 353 insertions(+) > > create mode 100644 tools/testing/selftests/kvm/aarch64/arch_timer.c > > > > diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore > > index 98053d3afbda..c6058df0cd18 100644 > > --- a/tools/testing/selftests/kvm/.gitignore > > +++ b/tools/testing/selftests/kvm/.gitignore > > @@ -1,4 +1,5 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > +/aarch64/arch_timer > > /aarch64/debug-exceptions > > /aarch64/get-reg-list > > /aarch64/psci_cpu_on_test > > diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile > > index 8342f65c1d96..46d43e706b20 100644 > > --- a/tools/testing/selftests/kvm/Makefile > > +++ b/tools/testing/selftests/kvm/Makefile > > @@ -84,6 +84,7 @@ TEST_GEN_PROGS_x86_64 += set_memory_region_test > > TEST_GEN_PROGS_x86_64 += steal_time > > TEST_GEN_PROGS_x86_64 += kvm_binary_stats_test > > > > +TEST_GEN_PROGS_aarch64 += aarch64/arch_timer > > TEST_GEN_PROGS_aarch64 += aarch64/debug-exceptions > > TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list > > TEST_GEN_PROGS_aarch64 += aarch64/psci_cpu_on_test > > diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c > > new file mode 100644 > > index 000000000000..6141c387e6dc > > --- /dev/null > > +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c > > @@ -0,0 +1,351 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +/* > > + * arch_timer.c - Tests the aarch64 timer IRQ functionality > > + * > > + * The test validates both the virtual and physical timer IRQs using > > + * CVAL and TVAL registers. This consitutes the four stages in the test. > > + * The guest's main thread configures the timer interrupt for a stage > > + * and waits for it to fire, with a timeout equal to the timer period. > > + * It asserts that the timeout doesn't exceed the timer period. > > + * > > + * On the other hand, upon receipt of an interrupt, the guest's interrupt > > + * handler validates the interrupt by checking if the architectural state > > + * is in compliance with the specifications. > > + * > > + * The test provides command-line options to configure the timer's > > + * period (-p), number of vCPUs (-n), and iterations per stage (-i). > > + * > > + * Copyright (c) 2021, Google LLC. > > + */ > > + > > +#define _GNU_SOURCE > > + > > +#include > > +#include > > +#include > > +#include > > + > > +#include "kvm_util.h" > > +#include "processor.h" > > +#include "delay.h" > > +#include "arch_timer.h" > > +#include "gic.h" > > +#include "vgic.h" > > + > > +#define NR_VCPUS_DEF 4 > > +#define NR_TEST_ITERS_DEF 5 > > +#define TIMER_TEST_PERIOD_MS_DEF 10 > > +#define TIMER_TEST_ERR_MARGIN_US 100 > > + > > +struct test_args { > > + int nr_vcpus; > > + int nr_iter; > > + int timer_period_ms; > > +}; > > + > > +static struct test_args test_args = { > > + .nr_vcpus = NR_VCPUS_DEF, > > + .nr_iter = NR_TEST_ITERS_DEF, > > + .timer_period_ms = TIMER_TEST_PERIOD_MS_DEF, > > +}; > > + > > +#define msecs_to_usecs(msec) ((msec) * 1000LL) > > + > > +#define VTIMER_IRQ 27 > > +#define PTIMER_IRQ 30 > > I don't know if these are guaranteed, necessarily. Probably safest to > determine the IRQ# from the KVM_ARM_VCPU_TIMER_IRQ_{P,V}TIMER vCPU > device attributes. Either that or write these values to the attributes. > Correct me if I'm wrong, but aren't these the default INTIDs? And I believe KVM follows the same. Or are you just concerned since these are not defined as a part of UAPI, and have a potential to change? Regards, Raghavendra > > +#define GICD_BASE_GPA 0x8000000ULL > > +#define GICR_BASE_GPA 0x80A0000ULL > > + > > +enum guest_stage { > > + GUEST_STAGE_VTIMER_CVAL = 1, > > + GUEST_STAGE_VTIMER_TVAL, > > + GUEST_STAGE_PTIMER_CVAL, > > + GUEST_STAGE_PTIMER_TVAL, > > + GUEST_STAGE_MAX, > > +}; > > + > > +/* Shared variables between host and guest */ > > +struct test_vcpu_shared_data { > > + int nr_iter; > > + enum guest_stage guest_stage; > > + uint64_t xcnt; > > +}; > > + > > +struct test_vcpu { > > + uint32_t vcpuid; > > + pthread_t pt_vcpu_run; > > + struct kvm_vm *vm; > > +}; > > + > > +static struct test_vcpu test_vcpu[KVM_MAX_VCPUS]; > > +static struct test_vcpu_shared_data vcpu_shared_data[KVM_MAX_VCPUS]; > > + > > +static void > > +guest_configure_timer_action(struct test_vcpu_shared_data *shared_data) > > +{ > > + switch (shared_data->guest_stage) { > > + case GUEST_STAGE_VTIMER_CVAL: > > + timer_set_next_cval_ms(VIRTUAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(VIRTUAL); > > + timer_set_ctl(VIRTUAL, CTL_ENABLE); > > + break; > > + case GUEST_STAGE_VTIMER_TVAL: > > + timer_set_next_tval_ms(VIRTUAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(VIRTUAL); > > + timer_set_ctl(VIRTUAL, CTL_ENABLE); > > + break; > > + case GUEST_STAGE_PTIMER_CVAL: > > + timer_set_next_cval_ms(PHYSICAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(PHYSICAL); > > + timer_set_ctl(PHYSICAL, CTL_ENABLE); > > + break; > > + case GUEST_STAGE_PTIMER_TVAL: > > + timer_set_next_tval_ms(PHYSICAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(PHYSICAL); > > + timer_set_ctl(PHYSICAL, CTL_ENABLE); > > + break; > > + default: > > + GUEST_ASSERT(0); > > + } > > +} > > + > > +static void guest_validate_irq(unsigned int intid, > > + struct test_vcpu_shared_data *shared_data) > > +{ > > + enum guest_stage stage = shared_data->guest_stage; > > + uint64_t xcnt = 0, xcnt_diff_us, cval = 0; > > + unsigned long xctl = 0; > > + unsigned int timer_irq = 0; > > + > > + if (stage == GUEST_STAGE_VTIMER_CVAL || > > + stage == GUEST_STAGE_VTIMER_TVAL) { > > + xctl = timer_get_ctl(VIRTUAL); > > + timer_set_ctl(VIRTUAL, CTL_IMASK); > > + xcnt = timer_get_cntct(VIRTUAL); > > + cval = timer_get_cval(VIRTUAL); > > + timer_irq = VTIMER_IRQ; > > + } else if (stage == GUEST_STAGE_PTIMER_CVAL || > > + stage == GUEST_STAGE_PTIMER_TVAL) { > > + xctl = timer_get_ctl(PHYSICAL); > > + timer_set_ctl(PHYSICAL, CTL_IMASK); > > + xcnt = timer_get_cntct(PHYSICAL); > > + cval = timer_get_cval(PHYSICAL); > > + timer_irq = PTIMER_IRQ; > > + } else { > > + GUEST_ASSERT(0); > > + } > > + > > + xcnt_diff_us = cycles_to_usec(xcnt - shared_data->xcnt); > > + > > + /* Make sure we are dealing with the correct timer IRQ */ > > + GUEST_ASSERT_2(intid == timer_irq, intid, timer_irq); > > + > > + /* Basic 'timer condition met' check */ > > + GUEST_ASSERT_3(xcnt >= cval, xcnt, cval, xcnt_diff_us); > > + GUEST_ASSERT_1(xctl & CTL_ISTATUS, xctl); > > +} > > + > > +static void guest_irq_handler(struct ex_regs *regs) > > +{ > > + unsigned int intid = gic_get_and_ack_irq(); > > + uint32_t cpu = get_vcpuid(); > > + struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[cpu]; > > + > > + guest_validate_irq(intid, shared_data); > > + > > + WRITE_ONCE(shared_data->nr_iter, shared_data->nr_iter + 1); > > + > > + gic_set_eoi(intid); > > +} > > + > > +static void guest_run_stage(struct test_vcpu_shared_data *shared_data, > > + enum guest_stage stage) > > +{ > > + uint32_t irq_iter, config_iter; > > + > > + shared_data->guest_stage = stage; > > + shared_data->nr_iter = 0; > > + > > + for (config_iter = 0; config_iter < test_args.nr_iter; config_iter++) { > > + /* Setup the next interrupt */ > > + guest_configure_timer_action(shared_data); > > + > > + /* Setup a timeout for the interrupt to arrive */ > > + udelay(msecs_to_usecs(test_args.timer_period_ms) + > > + TIMER_TEST_ERR_MARGIN_US); > > + > > + irq_iter = READ_ONCE(shared_data->nr_iter); > > + GUEST_ASSERT_2(config_iter + 1 == irq_iter, > > + config_iter + 1, irq_iter); > > + } > > +} > > + > > +static void guest_code(void) > > +{ > > + uint32_t cpu = get_vcpuid(); > > + struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[cpu]; > > + > > + local_irq_disable(); > > + > > + gic_init(GIC_V3, test_args.nr_vcpus, > > + (void *)GICD_BASE_GPA, (void *)GICR_BASE_GPA); > > + > > + timer_set_ctl(VIRTUAL, CTL_IMASK); > > + timer_set_ctl(PHYSICAL, CTL_IMASK); > > + > > + gic_irq_enable(VTIMER_IRQ); > > + gic_irq_enable(PTIMER_IRQ); > > + local_irq_enable(); > > + > > + guest_run_stage(shared_data, GUEST_STAGE_VTIMER_CVAL); > > + guest_run_stage(shared_data, GUEST_STAGE_VTIMER_TVAL); > > + guest_run_stage(shared_data, GUEST_STAGE_PTIMER_CVAL); > > + guest_run_stage(shared_data, GUEST_STAGE_PTIMER_TVAL); > > + > > + GUEST_DONE(); > > +} > > + > > +static void *test_vcpu_run(void *arg) > > +{ > > + struct ucall uc; > > + struct test_vcpu *vcpu = arg; > > + struct kvm_vm *vm = vcpu->vm; > > + uint32_t vcpuid = vcpu->vcpuid; > > + struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[vcpuid]; > > + > > + vcpu_run(vm, vcpuid); > > + > > + switch (get_ucall(vm, vcpuid, &uc)) { > > + case UCALL_SYNC: > > + case UCALL_DONE: > > + break; > > + case UCALL_ABORT: > > + sync_global_from_guest(vm, *shared_data); > > + TEST_FAIL("%s at %s:%ld\n\tvalues: %lu, %lu; %lu, vcpu: %u; stage: %u; iter: %u", > > + (const char *)uc.args[0], __FILE__, uc.args[1], > > + uc.args[2], uc.args[3], uc.args[4], vcpuid, > > + shared_data->guest_stage, shared_data->nr_iter); > > + break; > > + default: > > + TEST_FAIL("Unexpected guest exit\n"); > > + } > > + > > + return NULL; > > +} > > + > > +static void test_run(struct kvm_vm *vm) > > +{ > > + int i, ret; > > + > > + for (i = 0; i < test_args.nr_vcpus; i++) { > > + ret = pthread_create(&test_vcpu[i].pt_vcpu_run, NULL, > > + test_vcpu_run, &test_vcpu[i]); > > + TEST_ASSERT(!ret, "Failed to create vCPU-%d pthread\n", i); > > + } > > + > > + for (i = 0; i < test_args.nr_vcpus; i++) > > + pthread_join(test_vcpu[i].pt_vcpu_run, NULL); > > +} > > + > > +static struct kvm_vm *test_vm_create(void) > > +{ > > + struct kvm_vm *vm; > > + unsigned int i; > > + int nr_vcpus = test_args.nr_vcpus; > > + > > + vm = vm_create_default_with_vcpus(nr_vcpus, 0, 0, guest_code, NULL); > > + > > + vm_init_descriptor_tables(vm); > > + vm_install_exception_handler(vm, VECTOR_IRQ_CURRENT, guest_irq_handler); > > + > > + for (i = 0; i < nr_vcpus; i++) { > > + vcpu_init_descriptor_tables(vm, i); > > + > > + test_vcpu[i].vcpuid = i; > > + test_vcpu[i].vm = vm; > > + } > > + > > + ucall_init(vm, NULL); > > + vm_vcpuid_map_init(vm); > > + vgic_v3_setup(vm, GICD_BASE_GPA, GICR_BASE_GPA); > > + > > + /* Make all the test's cmdline args visible to the guest */ > > + sync_global_to_guest(vm, test_args); > > + > > + return vm; > > +} > > + > > +static void test_print_help(char *name) > > +{ > > + pr_info("Usage: %s [-h] [-n nr_vcpus] [-i iterations] [-p timer_period_ms]\n", > > + name); > > + pr_info("\t-n: Number of vCPUs to configure (default: %u; max: %u)\n", > > + NR_VCPUS_DEF, KVM_MAX_VCPUS); > > + pr_info("\t-i: Number of iterations per stage (default: %u)\n", > > + NR_TEST_ITERS_DEF); > > + pr_info("\t-p: Periodicity (in ms) of the guest timer (default: %u)\n", > > + TIMER_TEST_PERIOD_MS_DEF); > > + pr_info("\t-h: print this help screen\n"); > > +} > > + > > +static bool parse_args(int argc, char *argv[]) > > +{ > > + int opt; > > + > > + while ((opt = getopt(argc, argv, "hn:i:p:")) != -1) { > > + switch (opt) { > > + case 'n': > > + test_args.nr_vcpus = atoi(optarg); > > + if (test_args.nr_vcpus <= 0) { > > + pr_info("Positive value needed for -n\n"); > > + goto err; > > + } else if (test_args.nr_vcpus > KVM_MAX_VCPUS) { > > + pr_info("Max allowed vCPUs: %u\n", > > + KVM_MAX_VCPUS); > > + goto err; > > + } > > + break; > > + case 'i': > > + test_args.nr_iter = atoi(optarg); > > + if (test_args.nr_iter <= 0) { > > + pr_info("Positive value needed for -i\n"); > > + goto err; > > + } > > + break; > > + case 'p': > > + test_args.timer_period_ms = atoi(optarg); > > + if (test_args.timer_period_ms <= 0) { > > + pr_info("Positive value needed for -p\n"); > > + goto err; > > + } > > + break; > > + case 'h': > > + default: > > + goto err; > > + } > > + } > > + > > + return true; > > + > > +err: > > + test_print_help(argv[0]); > > + return false; > > +} > > + > > +int main(int argc, char *argv[]) > > +{ > > + struct kvm_vm *vm; > > + > > + /* Tell stdout not to buffer its content */ > > + setbuf(stdout, NULL); > > + > > + if (!parse_args(argc, argv)) > > + exit(KSFT_SKIP); > > + > > + vm = test_vm_create(); > > + test_run(vm); > > + kvm_vm_free(vm); > > + > > + return 0; > > +} > > -- > > 2.33.0.153.gba50c8fa24-goog > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F37E6C433F5 for ; Thu, 9 Sep 2021 18:03:48 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 7779C610E9 for ; Thu, 9 Sep 2021 18:03:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7779C610E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id D8A734B1AA; Thu, 9 Sep 2021 14:03:47 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gZUtyk1omBaK; Thu, 9 Sep 2021 14:03:46 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 521F84B17C; Thu, 9 Sep 2021 14:03:46 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 17FD64B130 for ; Thu, 9 Sep 2021 14:03:45 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yt6EPBtym2Ma for ; Thu, 9 Sep 2021 14:03:41 -0400 (EDT) Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 86AFD4B12F for ; Thu, 9 Sep 2021 14:03:41 -0400 (EDT) Received: by mail-yb1-f177.google.com with SMTP id a93so5665878ybi.1 for ; Thu, 09 Sep 2021 11:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=dWL21g/rXe18UfESw/aaz44TTu3ssz4XBLjDX0WcUyk=; b=d+94kHs+4IZjViu0Pw4WlubOZd+QVd/+0eYHqky/a/P+T2HE53UG5u7HCW9sXGAsBd XhY9d1nkotc/j6dCyNZV+CxQDD3voftkf5lGhgqHYq+hkM8JCM+hDN3hizxPu9xrwgi7 mxMyOhbEN9Q9+Ffy3NJ20L8OotiUn87KAa+sLn6ELUMotiL9j3vNYkpQZnbkIi8SS2uK 6R/+y1Jm4f3BWuGw7SeG6k8ePXSVIHmyU8omq5kpU9OD0kKolhVTIHOggCcyD1d0W//a h3JezLaBCRTBuZ/xVk9cwCiwQlzugV2GQ6Is+MJw8Ts2h+3ZuxnEUMvnVXFFdxOCoON3 ipYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=dWL21g/rXe18UfESw/aaz44TTu3ssz4XBLjDX0WcUyk=; b=FT9Jo6gaTRiLVkUReebxbnV/l+j5Sw0Ru216sxktqsPR8aXFDXbc9pLkfnzdUX7Ev5 arN5moKwPFaoZzR97Wy2Fxzmm7LT2Ur+eloOYqD6M65PqGFRlk2Opi3ZL8P4Y55hywPk CQ8RFtzpOGY+WonDYAtqH2f0J8EjqVtsLz4PcGk+gT2OLioxJSP+6ZZGjsKv4qO1EfvG u6Dzx5Q//yv2Unga6cS4y4WbK1FFkAFoWRorgTTOPr/ZoEkEtJNDmEpWFuEcXwkcNS56 J50y7Z80eYosLMPy7fcNudTpZMpYm3KBgUU88wSFgOqi2vfwOWGEnfqWjp5jQfPJLrog sVMA== X-Gm-Message-State: AOAM531za6agHNrGN98hgUSPoZbQKxOJinuijFsW9t/lFdeFQoyT7xfG SYl315vNrlao/V3jOjUNgL3Q1JZBCDvKeGZkYmKYNg== X-Google-Smtp-Source: ABdhPJyXn5O0sf6dFHJNLFcOUg+mANyRxY78u6mwTtzf7t5Ikb3iVfFm5DDcyg386Swn8J8qYJw1LQjSo1YiRjJXpGo= X-Received: by 2002:a25:1c09:: with SMTP id c9mr5756013ybc.350.1631210620661; Thu, 09 Sep 2021 11:03:40 -0700 (PDT) MIME-Version: 1.0 References: <20210909013818.1191270-1-rananta@google.com> <20210909013818.1191270-16-rananta@google.com> In-Reply-To: From: Raghavendra Rao Ananta Date: Thu, 9 Sep 2021 11:03:29 -0700 Message-ID: Subject: Re: [PATCH v4 15/18] KVM: arm64: selftests: Add arch_timer test To: Oliver Upton Cc: kvm@vger.kernel.org, Will Deacon , Marc Zyngier , Peter Shier , linux-kernel@vger.kernel.org, Catalin Marinas , Paolo Bonzini , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On Wed, Sep 8, 2021 at 10:51 PM Oliver Upton wrote: > > On Thu, Sep 09, 2021 at 01:38:15AM +0000, Raghavendra Rao Ananta wrote: > > Add a KVM selftest to validate the arch_timer functionality. > > Primarily, the test sets up periodic timer interrupts and > > validates the basic architectural expectations upon its receipt. > > > > The test provides command-line options to configure the period > > of the timer, number of iterations, and number of vCPUs. > > > > Signed-off-by: Raghavendra Rao Ananta > > Reviewed-by: Andrew Jones > > --- > > tools/testing/selftests/kvm/.gitignore | 1 + > > tools/testing/selftests/kvm/Makefile | 1 + > > .../selftests/kvm/aarch64/arch_timer.c | 351 ++++++++++++++++++ > > 3 files changed, 353 insertions(+) > > create mode 100644 tools/testing/selftests/kvm/aarch64/arch_timer.c > > > > diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore > > index 98053d3afbda..c6058df0cd18 100644 > > --- a/tools/testing/selftests/kvm/.gitignore > > +++ b/tools/testing/selftests/kvm/.gitignore > > @@ -1,4 +1,5 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > +/aarch64/arch_timer > > /aarch64/debug-exceptions > > /aarch64/get-reg-list > > /aarch64/psci_cpu_on_test > > diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile > > index 8342f65c1d96..46d43e706b20 100644 > > --- a/tools/testing/selftests/kvm/Makefile > > +++ b/tools/testing/selftests/kvm/Makefile > > @@ -84,6 +84,7 @@ TEST_GEN_PROGS_x86_64 += set_memory_region_test > > TEST_GEN_PROGS_x86_64 += steal_time > > TEST_GEN_PROGS_x86_64 += kvm_binary_stats_test > > > > +TEST_GEN_PROGS_aarch64 += aarch64/arch_timer > > TEST_GEN_PROGS_aarch64 += aarch64/debug-exceptions > > TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list > > TEST_GEN_PROGS_aarch64 += aarch64/psci_cpu_on_test > > diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c > > new file mode 100644 > > index 000000000000..6141c387e6dc > > --- /dev/null > > +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c > > @@ -0,0 +1,351 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +/* > > + * arch_timer.c - Tests the aarch64 timer IRQ functionality > > + * > > + * The test validates both the virtual and physical timer IRQs using > > + * CVAL and TVAL registers. This consitutes the four stages in the test. > > + * The guest's main thread configures the timer interrupt for a stage > > + * and waits for it to fire, with a timeout equal to the timer period. > > + * It asserts that the timeout doesn't exceed the timer period. > > + * > > + * On the other hand, upon receipt of an interrupt, the guest's interrupt > > + * handler validates the interrupt by checking if the architectural state > > + * is in compliance with the specifications. > > + * > > + * The test provides command-line options to configure the timer's > > + * period (-p), number of vCPUs (-n), and iterations per stage (-i). > > + * > > + * Copyright (c) 2021, Google LLC. > > + */ > > + > > +#define _GNU_SOURCE > > + > > +#include > > +#include > > +#include > > +#include > > + > > +#include "kvm_util.h" > > +#include "processor.h" > > +#include "delay.h" > > +#include "arch_timer.h" > > +#include "gic.h" > > +#include "vgic.h" > > + > > +#define NR_VCPUS_DEF 4 > > +#define NR_TEST_ITERS_DEF 5 > > +#define TIMER_TEST_PERIOD_MS_DEF 10 > > +#define TIMER_TEST_ERR_MARGIN_US 100 > > + > > +struct test_args { > > + int nr_vcpus; > > + int nr_iter; > > + int timer_period_ms; > > +}; > > + > > +static struct test_args test_args = { > > + .nr_vcpus = NR_VCPUS_DEF, > > + .nr_iter = NR_TEST_ITERS_DEF, > > + .timer_period_ms = TIMER_TEST_PERIOD_MS_DEF, > > +}; > > + > > +#define msecs_to_usecs(msec) ((msec) * 1000LL) > > + > > +#define VTIMER_IRQ 27 > > +#define PTIMER_IRQ 30 > > I don't know if these are guaranteed, necessarily. Probably safest to > determine the IRQ# from the KVM_ARM_VCPU_TIMER_IRQ_{P,V}TIMER vCPU > device attributes. Either that or write these values to the attributes. > Correct me if I'm wrong, but aren't these the default INTIDs? And I believe KVM follows the same. Or are you just concerned since these are not defined as a part of UAPI, and have a potential to change? Regards, Raghavendra > > +#define GICD_BASE_GPA 0x8000000ULL > > +#define GICR_BASE_GPA 0x80A0000ULL > > + > > +enum guest_stage { > > + GUEST_STAGE_VTIMER_CVAL = 1, > > + GUEST_STAGE_VTIMER_TVAL, > > + GUEST_STAGE_PTIMER_CVAL, > > + GUEST_STAGE_PTIMER_TVAL, > > + GUEST_STAGE_MAX, > > +}; > > + > > +/* Shared variables between host and guest */ > > +struct test_vcpu_shared_data { > > + int nr_iter; > > + enum guest_stage guest_stage; > > + uint64_t xcnt; > > +}; > > + > > +struct test_vcpu { > > + uint32_t vcpuid; > > + pthread_t pt_vcpu_run; > > + struct kvm_vm *vm; > > +}; > > + > > +static struct test_vcpu test_vcpu[KVM_MAX_VCPUS]; > > +static struct test_vcpu_shared_data vcpu_shared_data[KVM_MAX_VCPUS]; > > + > > +static void > > +guest_configure_timer_action(struct test_vcpu_shared_data *shared_data) > > +{ > > + switch (shared_data->guest_stage) { > > + case GUEST_STAGE_VTIMER_CVAL: > > + timer_set_next_cval_ms(VIRTUAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(VIRTUAL); > > + timer_set_ctl(VIRTUAL, CTL_ENABLE); > > + break; > > + case GUEST_STAGE_VTIMER_TVAL: > > + timer_set_next_tval_ms(VIRTUAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(VIRTUAL); > > + timer_set_ctl(VIRTUAL, CTL_ENABLE); > > + break; > > + case GUEST_STAGE_PTIMER_CVAL: > > + timer_set_next_cval_ms(PHYSICAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(PHYSICAL); > > + timer_set_ctl(PHYSICAL, CTL_ENABLE); > > + break; > > + case GUEST_STAGE_PTIMER_TVAL: > > + timer_set_next_tval_ms(PHYSICAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(PHYSICAL); > > + timer_set_ctl(PHYSICAL, CTL_ENABLE); > > + break; > > + default: > > + GUEST_ASSERT(0); > > + } > > +} > > + > > +static void guest_validate_irq(unsigned int intid, > > + struct test_vcpu_shared_data *shared_data) > > +{ > > + enum guest_stage stage = shared_data->guest_stage; > > + uint64_t xcnt = 0, xcnt_diff_us, cval = 0; > > + unsigned long xctl = 0; > > + unsigned int timer_irq = 0; > > + > > + if (stage == GUEST_STAGE_VTIMER_CVAL || > > + stage == GUEST_STAGE_VTIMER_TVAL) { > > + xctl = timer_get_ctl(VIRTUAL); > > + timer_set_ctl(VIRTUAL, CTL_IMASK); > > + xcnt = timer_get_cntct(VIRTUAL); > > + cval = timer_get_cval(VIRTUAL); > > + timer_irq = VTIMER_IRQ; > > + } else if (stage == GUEST_STAGE_PTIMER_CVAL || > > + stage == GUEST_STAGE_PTIMER_TVAL) { > > + xctl = timer_get_ctl(PHYSICAL); > > + timer_set_ctl(PHYSICAL, CTL_IMASK); > > + xcnt = timer_get_cntct(PHYSICAL); > > + cval = timer_get_cval(PHYSICAL); > > + timer_irq = PTIMER_IRQ; > > + } else { > > + GUEST_ASSERT(0); > > + } > > + > > + xcnt_diff_us = cycles_to_usec(xcnt - shared_data->xcnt); > > + > > + /* Make sure we are dealing with the correct timer IRQ */ > > + GUEST_ASSERT_2(intid == timer_irq, intid, timer_irq); > > + > > + /* Basic 'timer condition met' check */ > > + GUEST_ASSERT_3(xcnt >= cval, xcnt, cval, xcnt_diff_us); > > + GUEST_ASSERT_1(xctl & CTL_ISTATUS, xctl); > > +} > > + > > +static void guest_irq_handler(struct ex_regs *regs) > > +{ > > + unsigned int intid = gic_get_and_ack_irq(); > > + uint32_t cpu = get_vcpuid(); > > + struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[cpu]; > > + > > + guest_validate_irq(intid, shared_data); > > + > > + WRITE_ONCE(shared_data->nr_iter, shared_data->nr_iter + 1); > > + > > + gic_set_eoi(intid); > > +} > > + > > +static void guest_run_stage(struct test_vcpu_shared_data *shared_data, > > + enum guest_stage stage) > > +{ > > + uint32_t irq_iter, config_iter; > > + > > + shared_data->guest_stage = stage; > > + shared_data->nr_iter = 0; > > + > > + for (config_iter = 0; config_iter < test_args.nr_iter; config_iter++) { > > + /* Setup the next interrupt */ > > + guest_configure_timer_action(shared_data); > > + > > + /* Setup a timeout for the interrupt to arrive */ > > + udelay(msecs_to_usecs(test_args.timer_period_ms) + > > + TIMER_TEST_ERR_MARGIN_US); > > + > > + irq_iter = READ_ONCE(shared_data->nr_iter); > > + GUEST_ASSERT_2(config_iter + 1 == irq_iter, > > + config_iter + 1, irq_iter); > > + } > > +} > > + > > +static void guest_code(void) > > +{ > > + uint32_t cpu = get_vcpuid(); > > + struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[cpu]; > > + > > + local_irq_disable(); > > + > > + gic_init(GIC_V3, test_args.nr_vcpus, > > + (void *)GICD_BASE_GPA, (void *)GICR_BASE_GPA); > > + > > + timer_set_ctl(VIRTUAL, CTL_IMASK); > > + timer_set_ctl(PHYSICAL, CTL_IMASK); > > + > > + gic_irq_enable(VTIMER_IRQ); > > + gic_irq_enable(PTIMER_IRQ); > > + local_irq_enable(); > > + > > + guest_run_stage(shared_data, GUEST_STAGE_VTIMER_CVAL); > > + guest_run_stage(shared_data, GUEST_STAGE_VTIMER_TVAL); > > + guest_run_stage(shared_data, GUEST_STAGE_PTIMER_CVAL); > > + guest_run_stage(shared_data, GUEST_STAGE_PTIMER_TVAL); > > + > > + GUEST_DONE(); > > +} > > + > > +static void *test_vcpu_run(void *arg) > > +{ > > + struct ucall uc; > > + struct test_vcpu *vcpu = arg; > > + struct kvm_vm *vm = vcpu->vm; > > + uint32_t vcpuid = vcpu->vcpuid; > > + struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[vcpuid]; > > + > > + vcpu_run(vm, vcpuid); > > + > > + switch (get_ucall(vm, vcpuid, &uc)) { > > + case UCALL_SYNC: > > + case UCALL_DONE: > > + break; > > + case UCALL_ABORT: > > + sync_global_from_guest(vm, *shared_data); > > + TEST_FAIL("%s at %s:%ld\n\tvalues: %lu, %lu; %lu, vcpu: %u; stage: %u; iter: %u", > > + (const char *)uc.args[0], __FILE__, uc.args[1], > > + uc.args[2], uc.args[3], uc.args[4], vcpuid, > > + shared_data->guest_stage, shared_data->nr_iter); > > + break; > > + default: > > + TEST_FAIL("Unexpected guest exit\n"); > > + } > > + > > + return NULL; > > +} > > + > > +static void test_run(struct kvm_vm *vm) > > +{ > > + int i, ret; > > + > > + for (i = 0; i < test_args.nr_vcpus; i++) { > > + ret = pthread_create(&test_vcpu[i].pt_vcpu_run, NULL, > > + test_vcpu_run, &test_vcpu[i]); > > + TEST_ASSERT(!ret, "Failed to create vCPU-%d pthread\n", i); > > + } > > + > > + for (i = 0; i < test_args.nr_vcpus; i++) > > + pthread_join(test_vcpu[i].pt_vcpu_run, NULL); > > +} > > + > > +static struct kvm_vm *test_vm_create(void) > > +{ > > + struct kvm_vm *vm; > > + unsigned int i; > > + int nr_vcpus = test_args.nr_vcpus; > > + > > + vm = vm_create_default_with_vcpus(nr_vcpus, 0, 0, guest_code, NULL); > > + > > + vm_init_descriptor_tables(vm); > > + vm_install_exception_handler(vm, VECTOR_IRQ_CURRENT, guest_irq_handler); > > + > > + for (i = 0; i < nr_vcpus; i++) { > > + vcpu_init_descriptor_tables(vm, i); > > + > > + test_vcpu[i].vcpuid = i; > > + test_vcpu[i].vm = vm; > > + } > > + > > + ucall_init(vm, NULL); > > + vm_vcpuid_map_init(vm); > > + vgic_v3_setup(vm, GICD_BASE_GPA, GICR_BASE_GPA); > > + > > + /* Make all the test's cmdline args visible to the guest */ > > + sync_global_to_guest(vm, test_args); > > + > > + return vm; > > +} > > + > > +static void test_print_help(char *name) > > +{ > > + pr_info("Usage: %s [-h] [-n nr_vcpus] [-i iterations] [-p timer_period_ms]\n", > > + name); > > + pr_info("\t-n: Number of vCPUs to configure (default: %u; max: %u)\n", > > + NR_VCPUS_DEF, KVM_MAX_VCPUS); > > + pr_info("\t-i: Number of iterations per stage (default: %u)\n", > > + NR_TEST_ITERS_DEF); > > + pr_info("\t-p: Periodicity (in ms) of the guest timer (default: %u)\n", > > + TIMER_TEST_PERIOD_MS_DEF); > > + pr_info("\t-h: print this help screen\n"); > > +} > > + > > +static bool parse_args(int argc, char *argv[]) > > +{ > > + int opt; > > + > > + while ((opt = getopt(argc, argv, "hn:i:p:")) != -1) { > > + switch (opt) { > > + case 'n': > > + test_args.nr_vcpus = atoi(optarg); > > + if (test_args.nr_vcpus <= 0) { > > + pr_info("Positive value needed for -n\n"); > > + goto err; > > + } else if (test_args.nr_vcpus > KVM_MAX_VCPUS) { > > + pr_info("Max allowed vCPUs: %u\n", > > + KVM_MAX_VCPUS); > > + goto err; > > + } > > + break; > > + case 'i': > > + test_args.nr_iter = atoi(optarg); > > + if (test_args.nr_iter <= 0) { > > + pr_info("Positive value needed for -i\n"); > > + goto err; > > + } > > + break; > > + case 'p': > > + test_args.timer_period_ms = atoi(optarg); > > + if (test_args.timer_period_ms <= 0) { > > + pr_info("Positive value needed for -p\n"); > > + goto err; > > + } > > + break; > > + case 'h': > > + default: > > + goto err; > > + } > > + } > > + > > + return true; > > + > > +err: > > + test_print_help(argv[0]); > > + return false; > > +} > > + > > +int main(int argc, char *argv[]) > > +{ > > + struct kvm_vm *vm; > > + > > + /* Tell stdout not to buffer its content */ > > + setbuf(stdout, NULL); > > + > > + if (!parse_args(argc, argv)) > > + exit(KSFT_SKIP); > > + > > + vm = test_vm_create(); > > + test_run(vm); > > + kvm_vm_free(vm); > > + > > + return 0; > > +} > > -- > > 2.33.0.153.gba50c8fa24-goog > > _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95917C433EF for ; Thu, 9 Sep 2021 18:05:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 660C5610C9 for ; Thu, 9 Sep 2021 18:05:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 660C5610C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GeFSaETpLsqzcPkcOBLys6SRsC0zopGsSKu+NCqU7Xg=; b=HpOoUrleFUbbW8 cLfTN3f1QfQNx7zrg8UzvFpApZ9PbL3xn9BS/beVRIl3NAwxoKzLjNQkHpc7zRuRSgjZFzOtJ5LZI zKdEOtTv8/OZe7d6cTxSHqM7kcv9fZMDLgktD9n5lVIbVwh5WoV7ANyHFbROAA/+pFZR1YdQVfGlL lYOMmDuh/85Yb7lOhHGWbeZoehQ82SeF/TX9dyNTGtw3XPefyYPCK9aTYRh/xRkbsNiEuKuq0JKix K+LVJLpgzwRhB6fM5zrqp+lsjsb18d542Z4NS4zsn1WgYge6AjODsniLLLvWpjIrJQyt7GZ34ZDm7 Y5dKMWMbao+ohHmkthxw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mOOOo-00AZFl-MO; Thu, 09 Sep 2021 18:03:46 +0000 Received: from mail-yb1-xb2f.google.com ([2607:f8b0:4864:20::b2f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mOOOk-00AZEj-BK for linux-arm-kernel@lists.infradead.org; Thu, 09 Sep 2021 18:03:44 +0000 Received: by mail-yb1-xb2f.google.com with SMTP id z18so5611010ybg.8 for ; Thu, 09 Sep 2021 11:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=dWL21g/rXe18UfESw/aaz44TTu3ssz4XBLjDX0WcUyk=; b=d+94kHs+4IZjViu0Pw4WlubOZd+QVd/+0eYHqky/a/P+T2HE53UG5u7HCW9sXGAsBd XhY9d1nkotc/j6dCyNZV+CxQDD3voftkf5lGhgqHYq+hkM8JCM+hDN3hizxPu9xrwgi7 mxMyOhbEN9Q9+Ffy3NJ20L8OotiUn87KAa+sLn6ELUMotiL9j3vNYkpQZnbkIi8SS2uK 6R/+y1Jm4f3BWuGw7SeG6k8ePXSVIHmyU8omq5kpU9OD0kKolhVTIHOggCcyD1d0W//a h3JezLaBCRTBuZ/xVk9cwCiwQlzugV2GQ6Is+MJw8Ts2h+3ZuxnEUMvnVXFFdxOCoON3 ipYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=dWL21g/rXe18UfESw/aaz44TTu3ssz4XBLjDX0WcUyk=; b=PDz/wAEvde8tl8RMp5X5cpLFf85VJyXdFyiubK1Qnqnw8Yz9Xxvev07SsGLDD3OIwz BH6SKdkgpQE06+LzxsFEOlB5lRbYAnfoKlXi+6Iijy8+UAQwyzWgsVEvSKl3JEqVoMWD OM8GL1HxhST654Q4Cj9JvVLWZsA0DJtUCNthLaVgB+v01Iz8J59kz5G/IEthiaFyEK2s LfBSnAxEcS0xo4c+KGO7ag7EtZNOSavPfEKcipEcS+efirJJT6KzuUD+n3g/Cb/x3I1b n6/Ca7My09ixEsAhTrYInJJI2PudvWcrLXM8LOXszeJgspcCR5B5BXlWlGpK/eflSfiz 49lA== X-Gm-Message-State: AOAM530n4sRczQxl0ZOjghfji8ieJCfFbvkZ9tqedxe7OabHPs7MICOA B81GtDeI0rBkhyQEOx0Ut6j5OTGYtjJqTLCfzzXosw== X-Google-Smtp-Source: ABdhPJyXn5O0sf6dFHJNLFcOUg+mANyRxY78u6mwTtzf7t5Ikb3iVfFm5DDcyg386Swn8J8qYJw1LQjSo1YiRjJXpGo= X-Received: by 2002:a25:1c09:: with SMTP id c9mr5756013ybc.350.1631210620661; Thu, 09 Sep 2021 11:03:40 -0700 (PDT) MIME-Version: 1.0 References: <20210909013818.1191270-1-rananta@google.com> <20210909013818.1191270-16-rananta@google.com> In-Reply-To: From: Raghavendra Rao Ananta Date: Thu, 9 Sep 2021 11:03:29 -0700 Message-ID: Subject: Re: [PATCH v4 15/18] KVM: arm64: selftests: Add arch_timer test To: Oliver Upton Cc: Paolo Bonzini , Marc Zyngier , Andrew Jones , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Reiji Watanabe , Jing Zhang , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kvm@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210909_110342_460958_D9E77C3F X-CRM114-Status: GOOD ( 38.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Sep 8, 2021 at 10:51 PM Oliver Upton wrote: > > On Thu, Sep 09, 2021 at 01:38:15AM +0000, Raghavendra Rao Ananta wrote: > > Add a KVM selftest to validate the arch_timer functionality. > > Primarily, the test sets up periodic timer interrupts and > > validates the basic architectural expectations upon its receipt. > > > > The test provides command-line options to configure the period > > of the timer, number of iterations, and number of vCPUs. > > > > Signed-off-by: Raghavendra Rao Ananta > > Reviewed-by: Andrew Jones > > --- > > tools/testing/selftests/kvm/.gitignore | 1 + > > tools/testing/selftests/kvm/Makefile | 1 + > > .../selftests/kvm/aarch64/arch_timer.c | 351 ++++++++++++++++++ > > 3 files changed, 353 insertions(+) > > create mode 100644 tools/testing/selftests/kvm/aarch64/arch_timer.c > > > > diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore > > index 98053d3afbda..c6058df0cd18 100644 > > --- a/tools/testing/selftests/kvm/.gitignore > > +++ b/tools/testing/selftests/kvm/.gitignore > > @@ -1,4 +1,5 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > +/aarch64/arch_timer > > /aarch64/debug-exceptions > > /aarch64/get-reg-list > > /aarch64/psci_cpu_on_test > > diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile > > index 8342f65c1d96..46d43e706b20 100644 > > --- a/tools/testing/selftests/kvm/Makefile > > +++ b/tools/testing/selftests/kvm/Makefile > > @@ -84,6 +84,7 @@ TEST_GEN_PROGS_x86_64 += set_memory_region_test > > TEST_GEN_PROGS_x86_64 += steal_time > > TEST_GEN_PROGS_x86_64 += kvm_binary_stats_test > > > > +TEST_GEN_PROGS_aarch64 += aarch64/arch_timer > > TEST_GEN_PROGS_aarch64 += aarch64/debug-exceptions > > TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list > > TEST_GEN_PROGS_aarch64 += aarch64/psci_cpu_on_test > > diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c > > new file mode 100644 > > index 000000000000..6141c387e6dc > > --- /dev/null > > +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c > > @@ -0,0 +1,351 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +/* > > + * arch_timer.c - Tests the aarch64 timer IRQ functionality > > + * > > + * The test validates both the virtual and physical timer IRQs using > > + * CVAL and TVAL registers. This consitutes the four stages in the test. > > + * The guest's main thread configures the timer interrupt for a stage > > + * and waits for it to fire, with a timeout equal to the timer period. > > + * It asserts that the timeout doesn't exceed the timer period. > > + * > > + * On the other hand, upon receipt of an interrupt, the guest's interrupt > > + * handler validates the interrupt by checking if the architectural state > > + * is in compliance with the specifications. > > + * > > + * The test provides command-line options to configure the timer's > > + * period (-p), number of vCPUs (-n), and iterations per stage (-i). > > + * > > + * Copyright (c) 2021, Google LLC. > > + */ > > + > > +#define _GNU_SOURCE > > + > > +#include > > +#include > > +#include > > +#include > > + > > +#include "kvm_util.h" > > +#include "processor.h" > > +#include "delay.h" > > +#include "arch_timer.h" > > +#include "gic.h" > > +#include "vgic.h" > > + > > +#define NR_VCPUS_DEF 4 > > +#define NR_TEST_ITERS_DEF 5 > > +#define TIMER_TEST_PERIOD_MS_DEF 10 > > +#define TIMER_TEST_ERR_MARGIN_US 100 > > + > > +struct test_args { > > + int nr_vcpus; > > + int nr_iter; > > + int timer_period_ms; > > +}; > > + > > +static struct test_args test_args = { > > + .nr_vcpus = NR_VCPUS_DEF, > > + .nr_iter = NR_TEST_ITERS_DEF, > > + .timer_period_ms = TIMER_TEST_PERIOD_MS_DEF, > > +}; > > + > > +#define msecs_to_usecs(msec) ((msec) * 1000LL) > > + > > +#define VTIMER_IRQ 27 > > +#define PTIMER_IRQ 30 > > I don't know if these are guaranteed, necessarily. Probably safest to > determine the IRQ# from the KVM_ARM_VCPU_TIMER_IRQ_{P,V}TIMER vCPU > device attributes. Either that or write these values to the attributes. > Correct me if I'm wrong, but aren't these the default INTIDs? And I believe KVM follows the same. Or are you just concerned since these are not defined as a part of UAPI, and have a potential to change? Regards, Raghavendra > > +#define GICD_BASE_GPA 0x8000000ULL > > +#define GICR_BASE_GPA 0x80A0000ULL > > + > > +enum guest_stage { > > + GUEST_STAGE_VTIMER_CVAL = 1, > > + GUEST_STAGE_VTIMER_TVAL, > > + GUEST_STAGE_PTIMER_CVAL, > > + GUEST_STAGE_PTIMER_TVAL, > > + GUEST_STAGE_MAX, > > +}; > > + > > +/* Shared variables between host and guest */ > > +struct test_vcpu_shared_data { > > + int nr_iter; > > + enum guest_stage guest_stage; > > + uint64_t xcnt; > > +}; > > + > > +struct test_vcpu { > > + uint32_t vcpuid; > > + pthread_t pt_vcpu_run; > > + struct kvm_vm *vm; > > +}; > > + > > +static struct test_vcpu test_vcpu[KVM_MAX_VCPUS]; > > +static struct test_vcpu_shared_data vcpu_shared_data[KVM_MAX_VCPUS]; > > + > > +static void > > +guest_configure_timer_action(struct test_vcpu_shared_data *shared_data) > > +{ > > + switch (shared_data->guest_stage) { > > + case GUEST_STAGE_VTIMER_CVAL: > > + timer_set_next_cval_ms(VIRTUAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(VIRTUAL); > > + timer_set_ctl(VIRTUAL, CTL_ENABLE); > > + break; > > + case GUEST_STAGE_VTIMER_TVAL: > > + timer_set_next_tval_ms(VIRTUAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(VIRTUAL); > > + timer_set_ctl(VIRTUAL, CTL_ENABLE); > > + break; > > + case GUEST_STAGE_PTIMER_CVAL: > > + timer_set_next_cval_ms(PHYSICAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(PHYSICAL); > > + timer_set_ctl(PHYSICAL, CTL_ENABLE); > > + break; > > + case GUEST_STAGE_PTIMER_TVAL: > > + timer_set_next_tval_ms(PHYSICAL, test_args.timer_period_ms); > > + shared_data->xcnt = timer_get_cntct(PHYSICAL); > > + timer_set_ctl(PHYSICAL, CTL_ENABLE); > > + break; > > + default: > > + GUEST_ASSERT(0); > > + } > > +} > > + > > +static void guest_validate_irq(unsigned int intid, > > + struct test_vcpu_shared_data *shared_data) > > +{ > > + enum guest_stage stage = shared_data->guest_stage; > > + uint64_t xcnt = 0, xcnt_diff_us, cval = 0; > > + unsigned long xctl = 0; > > + unsigned int timer_irq = 0; > > + > > + if (stage == GUEST_STAGE_VTIMER_CVAL || > > + stage == GUEST_STAGE_VTIMER_TVAL) { > > + xctl = timer_get_ctl(VIRTUAL); > > + timer_set_ctl(VIRTUAL, CTL_IMASK); > > + xcnt = timer_get_cntct(VIRTUAL); > > + cval = timer_get_cval(VIRTUAL); > > + timer_irq = VTIMER_IRQ; > > + } else if (stage == GUEST_STAGE_PTIMER_CVAL || > > + stage == GUEST_STAGE_PTIMER_TVAL) { > > + xctl = timer_get_ctl(PHYSICAL); > > + timer_set_ctl(PHYSICAL, CTL_IMASK); > > + xcnt = timer_get_cntct(PHYSICAL); > > + cval = timer_get_cval(PHYSICAL); > > + timer_irq = PTIMER_IRQ; > > + } else { > > + GUEST_ASSERT(0); > > + } > > + > > + xcnt_diff_us = cycles_to_usec(xcnt - shared_data->xcnt); > > + > > + /* Make sure we are dealing with the correct timer IRQ */ > > + GUEST_ASSERT_2(intid == timer_irq, intid, timer_irq); > > + > > + /* Basic 'timer condition met' check */ > > + GUEST_ASSERT_3(xcnt >= cval, xcnt, cval, xcnt_diff_us); > > + GUEST_ASSERT_1(xctl & CTL_ISTATUS, xctl); > > +} > > + > > +static void guest_irq_handler(struct ex_regs *regs) > > +{ > > + unsigned int intid = gic_get_and_ack_irq(); > > + uint32_t cpu = get_vcpuid(); > > + struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[cpu]; > > + > > + guest_validate_irq(intid, shared_data); > > + > > + WRITE_ONCE(shared_data->nr_iter, shared_data->nr_iter + 1); > > + > > + gic_set_eoi(intid); > > +} > > + > > +static void guest_run_stage(struct test_vcpu_shared_data *shared_data, > > + enum guest_stage stage) > > +{ > > + uint32_t irq_iter, config_iter; > > + > > + shared_data->guest_stage = stage; > > + shared_data->nr_iter = 0; > > + > > + for (config_iter = 0; config_iter < test_args.nr_iter; config_iter++) { > > + /* Setup the next interrupt */ > > + guest_configure_timer_action(shared_data); > > + > > + /* Setup a timeout for the interrupt to arrive */ > > + udelay(msecs_to_usecs(test_args.timer_period_ms) + > > + TIMER_TEST_ERR_MARGIN_US); > > + > > + irq_iter = READ_ONCE(shared_data->nr_iter); > > + GUEST_ASSERT_2(config_iter + 1 == irq_iter, > > + config_iter + 1, irq_iter); > > + } > > +} > > + > > +static void guest_code(void) > > +{ > > + uint32_t cpu = get_vcpuid(); > > + struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[cpu]; > > + > > + local_irq_disable(); > > + > > + gic_init(GIC_V3, test_args.nr_vcpus, > > + (void *)GICD_BASE_GPA, (void *)GICR_BASE_GPA); > > + > > + timer_set_ctl(VIRTUAL, CTL_IMASK); > > + timer_set_ctl(PHYSICAL, CTL_IMASK); > > + > > + gic_irq_enable(VTIMER_IRQ); > > + gic_irq_enable(PTIMER_IRQ); > > + local_irq_enable(); > > + > > + guest_run_stage(shared_data, GUEST_STAGE_VTIMER_CVAL); > > + guest_run_stage(shared_data, GUEST_STAGE_VTIMER_TVAL); > > + guest_run_stage(shared_data, GUEST_STAGE_PTIMER_CVAL); > > + guest_run_stage(shared_data, GUEST_STAGE_PTIMER_TVAL); > > + > > + GUEST_DONE(); > > +} > > + > > +static void *test_vcpu_run(void *arg) > > +{ > > + struct ucall uc; > > + struct test_vcpu *vcpu = arg; > > + struct kvm_vm *vm = vcpu->vm; > > + uint32_t vcpuid = vcpu->vcpuid; > > + struct test_vcpu_shared_data *shared_data = &vcpu_shared_data[vcpuid]; > > + > > + vcpu_run(vm, vcpuid); > > + > > + switch (get_ucall(vm, vcpuid, &uc)) { > > + case UCALL_SYNC: > > + case UCALL_DONE: > > + break; > > + case UCALL_ABORT: > > + sync_global_from_guest(vm, *shared_data); > > + TEST_FAIL("%s at %s:%ld\n\tvalues: %lu, %lu; %lu, vcpu: %u; stage: %u; iter: %u", > > + (const char *)uc.args[0], __FILE__, uc.args[1], > > + uc.args[2], uc.args[3], uc.args[4], vcpuid, > > + shared_data->guest_stage, shared_data->nr_iter); > > + break; > > + default: > > + TEST_FAIL("Unexpected guest exit\n"); > > + } > > + > > + return NULL; > > +} > > + > > +static void test_run(struct kvm_vm *vm) > > +{ > > + int i, ret; > > + > > + for (i = 0; i < test_args.nr_vcpus; i++) { > > + ret = pthread_create(&test_vcpu[i].pt_vcpu_run, NULL, > > + test_vcpu_run, &test_vcpu[i]); > > + TEST_ASSERT(!ret, "Failed to create vCPU-%d pthread\n", i); > > + } > > + > > + for (i = 0; i < test_args.nr_vcpus; i++) > > + pthread_join(test_vcpu[i].pt_vcpu_run, NULL); > > +} > > + > > +static struct kvm_vm *test_vm_create(void) > > +{ > > + struct kvm_vm *vm; > > + unsigned int i; > > + int nr_vcpus = test_args.nr_vcpus; > > + > > + vm = vm_create_default_with_vcpus(nr_vcpus, 0, 0, guest_code, NULL); > > + > > + vm_init_descriptor_tables(vm); > > + vm_install_exception_handler(vm, VECTOR_IRQ_CURRENT, guest_irq_handler); > > + > > + for (i = 0; i < nr_vcpus; i++) { > > + vcpu_init_descriptor_tables(vm, i); > > + > > + test_vcpu[i].vcpuid = i; > > + test_vcpu[i].vm = vm; > > + } > > + > > + ucall_init(vm, NULL); > > + vm_vcpuid_map_init(vm); > > + vgic_v3_setup(vm, GICD_BASE_GPA, GICR_BASE_GPA); > > + > > + /* Make all the test's cmdline args visible to the guest */ > > + sync_global_to_guest(vm, test_args); > > + > > + return vm; > > +} > > + > > +static void test_print_help(char *name) > > +{ > > + pr_info("Usage: %s [-h] [-n nr_vcpus] [-i iterations] [-p timer_period_ms]\n", > > + name); > > + pr_info("\t-n: Number of vCPUs to configure (default: %u; max: %u)\n", > > + NR_VCPUS_DEF, KVM_MAX_VCPUS); > > + pr_info("\t-i: Number of iterations per stage (default: %u)\n", > > + NR_TEST_ITERS_DEF); > > + pr_info("\t-p: Periodicity (in ms) of the guest timer (default: %u)\n", > > + TIMER_TEST_PERIOD_MS_DEF); > > + pr_info("\t-h: print this help screen\n"); > > +} > > + > > +static bool parse_args(int argc, char *argv[]) > > +{ > > + int opt; > > + > > + while ((opt = getopt(argc, argv, "hn:i:p:")) != -1) { > > + switch (opt) { > > + case 'n': > > + test_args.nr_vcpus = atoi(optarg); > > + if (test_args.nr_vcpus <= 0) { > > + pr_info("Positive value needed for -n\n"); > > + goto err; > > + } else if (test_args.nr_vcpus > KVM_MAX_VCPUS) { > > + pr_info("Max allowed vCPUs: %u\n", > > + KVM_MAX_VCPUS); > > + goto err; > > + } > > + break; > > + case 'i': > > + test_args.nr_iter = atoi(optarg); > > + if (test_args.nr_iter <= 0) { > > + pr_info("Positive value needed for -i\n"); > > + goto err; > > + } > > + break; > > + case 'p': > > + test_args.timer_period_ms = atoi(optarg); > > + if (test_args.timer_period_ms <= 0) { > > + pr_info("Positive value needed for -p\n"); > > + goto err; > > + } > > + break; > > + case 'h': > > + default: > > + goto err; > > + } > > + } > > + > > + return true; > > + > > +err: > > + test_print_help(argv[0]); > > + return false; > > +} > > + > > +int main(int argc, char *argv[]) > > +{ > > + struct kvm_vm *vm; > > + > > + /* Tell stdout not to buffer its content */ > > + setbuf(stdout, NULL); > > + > > + if (!parse_args(argc, argv)) > > + exit(KSFT_SKIP); > > + > > + vm = test_vm_create(); > > + test_run(vm); > > + kvm_vm_free(vm); > > + > > + return 0; > > +} > > -- > > 2.33.0.153.gba50c8fa24-goog > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel