From patchwork Thu Oct 7 23:34:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghavendra Rao Ananta X-Patchwork-Id: 12543781 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D570C433F5 for ; Thu, 7 Oct 2021 23:37:23 +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 D5DB46128C for ; Thu, 7 Oct 2021 23:37:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D5DB46128C 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:From:Subject:Mime-Version: Message-Id:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=ywInu0y3HLrpPpPZNGi7Cfn4TffbLFFYvhFkHRDD1cU=; b=fhN kCdgY+iY8XDr/kRnktTy4Wl9ApsiR5z53qIrH3sbY6y2/7zN9XYbl6m8nDgRCVMIeAWpwhf6Rn5Jw fv11u1Ttlh1I9gfTuOzY9WZ0DmB3huOuu2CpDZHoVcHtLDOGZYQFp+4u4reb1EicevLGfi7/v3hAB R46j2fzmwiSKsO7SItbqgmmoYcVSOqoVtiUPR82GJhvsix/vdD8z3oLJ30IFPW2OayUO9SmNZ9+4j qNyy2cnxSejtot7xfbED2AD+9u+Nz8qFjvSlIykT5JW3fqwHjZHrL/nc+YMy9wU0kVZ3Nr79VNy91 oGp9wDavP8fJ6/FKdoxGbfTM9NR8Pkw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYcuf-000yEF-RY; Thu, 07 Oct 2021 23:34:58 +0000 Received: from mail-pl1-x649.google.com ([2607:f8b0:4864:20::649]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYcub-000yCj-Bo for linux-arm-kernel@lists.infradead.org; Thu, 07 Oct 2021 23:34:55 +0000 Received: by mail-pl1-x649.google.com with SMTP id p5-20020a170902a405b029012cbb4fcc03so3926175plq.19 for ; Thu, 07 Oct 2021 16:34:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=g7iIkwlne9Sa7lfZkbcJUihiJupaxB1Tb8xFasVQkMo=; b=UcHoR5GV0UNnYk/86R126CtSpHBpMBOTDQJOtiQS6tasW2lLpZC84abALkaPeBNpK+ kgzsy5iIsCRZ2XiM8y+GlXVwRB9Pyuy6xxS3GP2L4yslidZwtDBrJOL+A2e2Qy5+V2/k rXobPjPhUu6R48EfLk13sNPual7ukPApDqfCVRt9bjSX4gW8ncBedPxsl+rg7WFw8vsB UdShIX3kQS3ck3nWwrHd1GsiBHI9cN71LrplURzly5RZISHTYQhH5dbZGdc4GFJ81P36 miLK3aBy+K3HM54yt9ldcfZBxAjJNm7/dBekiBCeesxjLB5+ylNgZlo3PR5nXP8QrEGL KtdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=g7iIkwlne9Sa7lfZkbcJUihiJupaxB1Tb8xFasVQkMo=; b=H3pageaMzJ/SOGKLc7OiNHDSd6ZqjiEdL5viaOA8RYfgukirtkcvfHo3lRf22qGCHI an2JpyfTl4QzXzxjJdEPeg1L1TnHS23Qm+C4oE2lqmOOiD8hcqGZVMYlAb8IfbU6kF1/ vGzdyVJLt1ZA3U3jigLHo/B51/9Bl0Jjdnw/B5TLfXQioqtgoautPzp/bDTWQKnC2QIU Ti9pKlcp1yflkPikl7S9EGjd2a2jQF36uCKdHKjXspIjZK0E7dk2Y1iz4gl7nyFZbmm9 bM/LR3yHrvDKfQeKyRiUyouGgTtL9xdWnoyqz0wJK+s5j80n0rFaXdniwDeOB2a8BF+n H56g== X-Gm-Message-State: AOAM532yXenS5TQX3kjTbP3M/keDvswoUKm4dyaXSm82WyopBEi6uFYB FQMyV9B872pDiVBBcxwjXQiU/Uut7TWF X-Google-Smtp-Source: ABdhPJxofBFpscUXOyOCZE73M50oDV4VauLwGstJGsvy2ZoWHylAPJi5gFovUZXFjwau7yRSWKTl16QGJzoK X-Received: from rananta-virt.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1bcc]) (user=rananta job=sendgmr) by 2002:a17:903:120e:b0:138:d732:3b01 with SMTP id l14-20020a170903120e00b00138d7323b01mr6350704plh.21.1633649684717; Thu, 07 Oct 2021 16:34:44 -0700 (PDT) Date: Thu, 7 Oct 2021 23:34:24 +0000 Message-Id: <20211007233439.1826892-1-rananta@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH v8 00/15] KVM: arm64: selftests: Introduce arch_timer selftest From: Raghavendra Rao Ananta To: Paolo Bonzini , Marc Zyngier , Andrew Jones , James Morse , Alexandru Elisei , Suzuki K Poulose Cc: Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Oliver Upton , Reiji Watanabe , Jing Zhang , Raghavendra Rao Anata , 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-20211007_163453_455034_9ADCD769 X-CRM114-Status: GOOD ( 30.79 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hello, The patch series adds a KVM selftest to validate the behavior of ARM's generic timer (patch-14). The test programs the timer IRQs periodically, and for each interrupt, it validates the behaviour against the architecture specifications. The test further provides a command-line interface to configure the number of vCPUs, the period of the timer, and the number of iterations that the test has to run for. Patch-15 adds an option to randomly migrate the vCPUs to different physical CPUs across the system. The bug for the fix provided by Marc with commit 3134cc8beb69d0d ("KVM: arm64: vgic: Resample HW pending state on deactivation") was discovered using arch_timer test with vCPU migrations. Since the test heavily depends on interrupts, patch-13 adds a host library to setup ARM Generic Interrupt Controller v3 (GICv3). This includes creating a vGIC device, setting up distributor and redistributor attributes, and mapping the guest physical addresses. Symmetrical to this, patch-12 adds a guest library to talk to the vGIC, which includes initializing the controller, enabling/disabling the interrupts, and so on. The following patches are utility patches that the above ones make use of: Patch-1 adds readl/writel support for guests to access MMIO space. Patch-2 imports arch/arm64/include/asm/sysreg.h into tools/arch/arm64/include/asm/ to make use of the register encodings and read/write definitions. Patch-3 is not directly related to the test, but makes aarch64/debug-exceptions.c use the read/write definitions from the imported sysreg.h and remove the existing definitions of read_sysreg() and write_sysreg(). Patch-4 introduces ARM64_SYS_KVM_REG, that helps convert the SYS_* register encodings in sysreg.h to be acceptable by get_reg() and set_reg(). It further replaces the users of ARM64_SYS_REG to use the new macro. Patch-5 adds the support for cpu_relax(). Patch-6 adds basic arch_timer framework. Patch-7 adds udelay() support for the guests to utilize. Patch-8 adds local_irq_enable() and local_irq_disable() for the guests to enable/disable interrupts. Patch-9 is also unrelated to the test. It modifies the prototype of aarch64_vcpu_setup() to accept vcpuid as uint32_t, to keep it consistent with the other parts of code. Patch-10 adds the support to get the vcpuid for the guests. This allows them to access any cpu-centric private data in the upcoming patches. Patch-11 adds a light-weight support for spinlocks for the guests to use. The patch series, specifically the library support, is derived from the kvm-unit-tests and the kernel itself. Regards, Raghavendra v7 -> v8 Addressed comments by Zenghui Yu (thank you): - Rebased the series on Linus's tree (5.15-rc4) and replaced bitmap_alloc() (15/15) with bitmap_zalloc() due to the change in API's name. - Changed the name of the function gicr_base_gpa_cpu() to gicr_base_cpu(), removing the 'gpa' as the former made less sense from a guest's point of view. v6 -> v7: Addressed comments by Andrew: - Changed the prototype of aarch64_vcpu_setup() to accept vcpuid as uint32_t. - Modified the prototype of guest_get_vcpuid() to return uint32_t. - Renamed assert messages in lib/aarch64/vgic.c to use "Number". v5 -> v6: - Corrected the syntax for write_sysreg_s in gic_v3.c (11/14) so that the file can be compiled with the unmodified arch/arm64/include/asm/sysreg.h that's imported into tools/. v4 -> v5: Addressed the comments by Andrew, Oliver, and Reiji (Thanks, again): - Squashed patches 17/18 and 18/18 into 3/18 and 14/18, respectively. - Dropped patches to keep track kvm_utils of nr_vcpus (12/18) and vm_get_mode() (13/18) as they were no longer needed. - Instead of creating the a map, exporting the vcpuid to the guest is done by using the TPIDR_EL1 register. - Just to be on the safer side, gic.c's gic_dist_init() explicitly checks if gic_ops is NULL. - Move sysreg.h from within selftests to tool/arch/arm64/include/asm/. - Rename ARM64_SYS_KVM_REG to KVM_ARM64_SYS_REG to improve readability. - Use the GIC regions' sizes from asm/kvm.h instead of re-defining it in the vgic host support. - Get the timer IRQ numbers via timer's device attributes (KVM_ARM_VCPU_TIMER_IRQ_PTIMER, KVM_ARM_VCPU_TIMER_IRQ_VTIMER) instead of depending on default numbers to be safe. - Add check to see if the vCPU migrations are in fact enabled, before looking for at least two online physical CPUs for the test. - Add missing blank lines in the arch_timer test. v3 -> v4: Addressed the comments by Andrew, Oliver, and Ricardo (Thank you): - Reimplemented get_vcpuid() by exporting a map of vcpuid:mpidr to the guest. - Import sysreg.h from arch/arm64/include/asm/sysreg.h to get the system register encodings and its read/write support. As a result, delete the existing definitions in processor.h. - Introduce ARM64_SYS_KVM_REG that converts SYS_* register definitions from sysreg.h into the encodings accepted by get_reg() and set_reg(). - Hence, remove the existing encodings of system registers (CPACR_EL1, TCR_EL1, and friends) and replace all the its consumers throughout the selftests with ARM64_SYS_KVM_REG. - Keep track of number of vCPUs in 'struct kvm_vm'. - Add a helper method to get the KVM VM's mode. - Modify the vGIC host function vgic_v3_setup to make use of the above two helper methods, which prevents it from accepting nr_vcpus as an argument. - Move the definition of REDIST_REGION_ATTR_ADDR from lib/aarch64/vgic.c to include/aarch64/vgic.h. - Make the selftest, vgic_init.c, use the definition of REDIST_REGION_ATTR_ADDR from include/aarch64/vgic.h. - Turn ON vCPU migration by default (-m 2). - Add pr_debug() to log vCPU migrations. Helpful for diagnosis. - Change TEST_ASSERT(false,...) to TEST_FAIL() in the base arch_timer test. - Include linux/types.h for __force definitions. - Change the type of 'val' to 'int' in spin_lock() to match the lock value type. - Fix typos in code files and comments. v2 -> v3: - Addressed the comments from Ricardo regarding moving the vGIC host support for selftests to its own library. - Added an option (-m) to migrate the guest vCPUs to physical CPUs in the system. v1 -> v2: Addressed comments from Zenghui in include/aarch64/arch_timer.h: - Correct the header description - Remove unnecessary inclusion of linux/sizes.h - Re-arrange CTL_ defines in ascending order - Remove inappropriate 'return' from timer_set_* functions, which returns 'void'. v1: https://lore.kernel.org/kvmarm/20210813211211.2983293-1-rananta@google.com/ v2: https://lore.kernel.org/kvmarm/20210818184311.517295-1-rananta@google.com/ v3: https://lore.kernel.org/kvmarm/20210901211412.4171835-1-rananta@google.com/ v4: https://lore.kernel.org/kvmarm/20210909013818.1191270-1-rananta@google.com/ v5: https://lore.kernel.org/kvmarm/20210913204930.130715-1-rananta@google.com/ v6: https://lore.kernel.org/kvmarm/20210913230955.156323-1-rananta@google.com/ v7: https://lore.kernel.org/kvmarm/20210914223114.435273-1-rananta@google.com/ Raghavendra Rao Ananta (15): KVM: arm64: selftests: Add MMIO readl/writel support tools: arm64: Import sysreg.h KVM: arm64: selftests: Use read/write definitions from sysreg.h KVM: arm64: selftests: Introduce ARM64_SYS_KVM_REG KVM: arm64: selftests: Add support for cpu_relax KVM: arm64: selftests: Add basic support for arch_timers KVM: arm64: selftests: Add basic support to generate delays KVM: arm64: selftests: Add support to disable and enable local IRQs KVM: arm64: selftests: Maintain consistency for vcpuid type KVM: arm64: selftests: Add guest support to get the vcpuid KVM: arm64: selftests: Add light-weight spinlock support KVM: arm64: selftests: Add basic GICv3 support KVM: arm64: selftests: Add host support for vGIC KVM: arm64: selftests: Add arch_timer test KVM: arm64: selftests: arch_timer: Support vCPU migration tools/arch/arm64/include/asm/sysreg.h | 1296 +++++++++++++++++ tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 3 +- .../selftests/kvm/aarch64/arch_timer.c | 479 ++++++ .../selftests/kvm/aarch64/debug-exceptions.c | 30 +- .../selftests/kvm/aarch64/psci_cpu_on_test.c | 2 +- .../testing/selftests/kvm/aarch64/vgic_init.c | 3 +- .../kvm/include/aarch64/arch_timer.h | 142 ++ .../selftests/kvm/include/aarch64/delay.h | 25 + .../selftests/kvm/include/aarch64/gic.h | 21 + .../selftests/kvm/include/aarch64/processor.h | 90 +- .../selftests/kvm/include/aarch64/spinlock.h | 13 + .../selftests/kvm/include/aarch64/vgic.h | 20 + .../testing/selftests/kvm/include/kvm_util.h | 2 + tools/testing/selftests/kvm/lib/aarch64/gic.c | 95 ++ .../selftests/kvm/lib/aarch64/gic_private.h | 21 + .../selftests/kvm/lib/aarch64/gic_v3.c | 240 +++ .../selftests/kvm/lib/aarch64/gic_v3.h | 70 + .../selftests/kvm/lib/aarch64/processor.c | 24 +- .../selftests/kvm/lib/aarch64/spinlock.c | 27 + .../testing/selftests/kvm/lib/aarch64/vgic.c | 70 + 21 files changed, 2626 insertions(+), 48 deletions(-) create mode 100644 tools/arch/arm64/include/asm/sysreg.h create mode 100644 tools/testing/selftests/kvm/aarch64/arch_timer.c create mode 100644 tools/testing/selftests/kvm/include/aarch64/arch_timer.h create mode 100644 tools/testing/selftests/kvm/include/aarch64/delay.h create mode 100644 tools/testing/selftests/kvm/include/aarch64/gic.h create mode 100644 tools/testing/selftests/kvm/include/aarch64/spinlock.h create mode 100644 tools/testing/selftests/kvm/include/aarch64/vgic.h create mode 100644 tools/testing/selftests/kvm/lib/aarch64/gic.c create mode 100644 tools/testing/selftests/kvm/lib/aarch64/gic_private.h create mode 100644 tools/testing/selftests/kvm/lib/aarch64/gic_v3.c create mode 100644 tools/testing/selftests/kvm/lib/aarch64/gic_v3.h create mode 100644 tools/testing/selftests/kvm/lib/aarch64/spinlock.c create mode 100644 tools/testing/selftests/kvm/lib/aarch64/vgic.c