From: Ricardo Koller <ricarkol@google.com> To: kvm@vger.kernel.org, maz@kernel.org, kvmarm@lists.cs.columbia.edu, drjones@redhat.com, eric.auger@redhat.com, alexandru.elisei@arm.com Cc: Paolo Bonzini <pbonzini@redhat.com>, oupton@google.com, james.morse@arm.com, suzuki.poulose@arm.com, shuah@kernel.org, jingzhangos@google.com, pshier@google.com, rananta@google.com, reijiw@google.com, Ricardo Koller <ricarkol@google.com> Subject: [PATCH v3 08/10] KVM: arm64: selftests: Add tests for GIC redist/cpuif partially above IPA range Date: Tue, 28 Sep 2021 11:48:02 -0700 [thread overview] Message-ID: <20210928184803.2496885-9-ricarkol@google.com> (raw) In-Reply-To: <20210928184803.2496885-1-ricarkol@google.com> Add tests for checking that KVM returns the right error when trying to set GICv2 CPU interfaces or GICv3 Redistributors partially above the addressable IPA range. Also tighten the IPA range by replacing KVM_CAP_ARM_VM_IPA_SIZE with the IPA range currently configured for the guest (i.e., the default). The check for the GICv3 redistributor created using the REDIST legacy API is not sufficient as this new test only checks the check done using vcpus already created when setting the base. The next commit will add the missing test which verifies that the KVM check is done at first vcpu run. Signed-off-by: Ricardo Koller <ricarkol@google.com> --- .../testing/selftests/kvm/aarch64/vgic_init.c | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c index 92f5c6ca6b8b..77a1941e61fa 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c @@ -31,7 +31,7 @@ struct vm_gic { uint32_t gic_dev_type; }; -static int max_ipa_bits; +static uint64_t max_phys_size; /* helper to access a redistributor register */ static int access_v3_redist_reg(int gicv3_fd, int vcpu, int offset, @@ -150,16 +150,21 @@ static void subtest_dist_rdist(struct vm_gic *v) TEST_ASSERT(ret && errno == EINVAL, "GIC redist/cpu base not aligned"); /* out of range address */ - if (max_ipa_bits) { - addr = 1ULL << max_ipa_bits; - ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, - dist.attr, &addr, true); - TEST_ASSERT(ret && errno == E2BIG, "dist address beyond IPA limit"); + addr = max_phys_size; + ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + dist.attr, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, "dist address beyond IPA limit"); - ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, - rdist.attr, &addr, true); - TEST_ASSERT(ret && errno == E2BIG, "redist address beyond IPA limit"); - } + ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + rdist.attr, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, "redist address beyond IPA limit"); + + /* Space for half a rdist (a rdist is: 2 * rdist.alignment). */ + addr = max_phys_size - dist.alignment; + ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + rdist.attr, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, + "half of the redist is beyond IPA limit"); /* set REDIST base address @0x0*/ addr = 0x00000; @@ -248,7 +253,21 @@ static void subtest_v3_redist_regions(struct vm_gic *v) kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true); - addr = REDIST_REGION_ATTR_ADDR(1, 1ULL << max_ipa_bits, 0, 2); + addr = REDIST_REGION_ATTR_ADDR(1, max_phys_size, 0, 2); + ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, + "register redist region with base address beyond IPA range"); + + /* The last redist is above the pa range. */ + addr = REDIST_REGION_ATTR_ADDR(1, max_phys_size - 0x10000, 0, 2); + ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, + "register redist region with base address beyond IPA range"); + + /* The last redist is above the pa range. */ + addr = REDIST_REGION_ATTR_ADDR(2, max_phys_size - 0x30000, 0, 2); ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true); TEST_ASSERT(ret && errno == E2BIG, @@ -608,8 +627,13 @@ void run_tests(uint32_t gic_dev_type) int main(int ac, char **av) { int ret; + int max_ipa_bits, pa_bits; max_ipa_bits = kvm_check_cap(KVM_CAP_ARM_VM_IPA_SIZE); + pa_bits = vm_guest_mode_params[VM_MODE_DEFAULT].pa_bits; + TEST_ASSERT(max_ipa_bits && pa_bits <= max_ipa_bits, + "The default PA range should not be larger than the max."); + max_phys_size = 1ULL << pa_bits; ret = test_kvm_device(KVM_DEV_TYPE_ARM_VGIC_V3); if (!ret) { -- 2.33.0.685.g46640cef36-goog
WARNING: multiple messages have this Message-ID (diff)
From: Ricardo Koller <ricarkol@google.com> To: kvm@vger.kernel.org, maz@kernel.org, kvmarm@lists.cs.columbia.edu, drjones@redhat.com, eric.auger@redhat.com, alexandru.elisei@arm.com Cc: pshier@google.com, Paolo Bonzini <pbonzini@redhat.com>, shuah@kernel.org Subject: [PATCH v3 08/10] KVM: arm64: selftests: Add tests for GIC redist/cpuif partially above IPA range Date: Tue, 28 Sep 2021 11:48:02 -0700 [thread overview] Message-ID: <20210928184803.2496885-9-ricarkol@google.com> (raw) In-Reply-To: <20210928184803.2496885-1-ricarkol@google.com> Add tests for checking that KVM returns the right error when trying to set GICv2 CPU interfaces or GICv3 Redistributors partially above the addressable IPA range. Also tighten the IPA range by replacing KVM_CAP_ARM_VM_IPA_SIZE with the IPA range currently configured for the guest (i.e., the default). The check for the GICv3 redistributor created using the REDIST legacy API is not sufficient as this new test only checks the check done using vcpus already created when setting the base. The next commit will add the missing test which verifies that the KVM check is done at first vcpu run. Signed-off-by: Ricardo Koller <ricarkol@google.com> --- .../testing/selftests/kvm/aarch64/vgic_init.c | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c index 92f5c6ca6b8b..77a1941e61fa 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c @@ -31,7 +31,7 @@ struct vm_gic { uint32_t gic_dev_type; }; -static int max_ipa_bits; +static uint64_t max_phys_size; /* helper to access a redistributor register */ static int access_v3_redist_reg(int gicv3_fd, int vcpu, int offset, @@ -150,16 +150,21 @@ static void subtest_dist_rdist(struct vm_gic *v) TEST_ASSERT(ret && errno == EINVAL, "GIC redist/cpu base not aligned"); /* out of range address */ - if (max_ipa_bits) { - addr = 1ULL << max_ipa_bits; - ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, - dist.attr, &addr, true); - TEST_ASSERT(ret && errno == E2BIG, "dist address beyond IPA limit"); + addr = max_phys_size; + ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + dist.attr, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, "dist address beyond IPA limit"); - ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, - rdist.attr, &addr, true); - TEST_ASSERT(ret && errno == E2BIG, "redist address beyond IPA limit"); - } + ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + rdist.attr, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, "redist address beyond IPA limit"); + + /* Space for half a rdist (a rdist is: 2 * rdist.alignment). */ + addr = max_phys_size - dist.alignment; + ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + rdist.attr, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, + "half of the redist is beyond IPA limit"); /* set REDIST base address @0x0*/ addr = 0x00000; @@ -248,7 +253,21 @@ static void subtest_v3_redist_regions(struct vm_gic *v) kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true); - addr = REDIST_REGION_ATTR_ADDR(1, 1ULL << max_ipa_bits, 0, 2); + addr = REDIST_REGION_ATTR_ADDR(1, max_phys_size, 0, 2); + ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, + "register redist region with base address beyond IPA range"); + + /* The last redist is above the pa range. */ + addr = REDIST_REGION_ATTR_ADDR(1, max_phys_size - 0x10000, 0, 2); + ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, + "register redist region with base address beyond IPA range"); + + /* The last redist is above the pa range. */ + addr = REDIST_REGION_ATTR_ADDR(2, max_phys_size - 0x30000, 0, 2); ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true); TEST_ASSERT(ret && errno == E2BIG, @@ -608,8 +627,13 @@ void run_tests(uint32_t gic_dev_type) int main(int ac, char **av) { int ret; + int max_ipa_bits, pa_bits; max_ipa_bits = kvm_check_cap(KVM_CAP_ARM_VM_IPA_SIZE); + pa_bits = vm_guest_mode_params[VM_MODE_DEFAULT].pa_bits; + TEST_ASSERT(max_ipa_bits && pa_bits <= max_ipa_bits, + "The default PA range should not be larger than the max."); + max_phys_size = 1ULL << pa_bits; ret = test_kvm_device(KVM_DEV_TYPE_ARM_VGIC_V3); if (!ret) { -- 2.33.0.685.g46640cef36-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2021-09-28 18:48 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-28 18:47 [PATCH v3 00/10] KVM: arm64: vgic: Missing checks for REDIST/CPU and ITS regions above the VM IPA size Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller 2021-09-28 18:47 ` [PATCH v3 01/10] kvm: arm64: vgic: Introduce vgic_check_iorange Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller 2021-09-29 16:29 ` Eric Auger 2021-09-29 16:29 ` Eric Auger 2021-09-29 21:17 ` Ricardo Koller 2021-09-29 21:17 ` Ricardo Koller 2021-09-30 7:02 ` Eric Auger 2021-09-30 7:02 ` Eric Auger 2021-09-30 21:19 ` Ricardo Koller 2021-09-30 21:19 ` Ricardo Koller 2021-10-01 13:12 ` Marc Zyngier 2021-10-01 13:12 ` Marc Zyngier 2021-10-04 15:48 ` Ricardo Koller 2021-10-04 15:48 ` Ricardo Koller 2021-09-28 18:47 ` [PATCH v3 02/10] KVM: arm64: vgic-v3: Check redist region is not above the VM IPA size Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller 2021-09-29 16:23 ` Eric Auger 2021-09-29 16:23 ` Eric Auger 2021-09-29 21:10 ` Ricardo Koller 2021-09-29 21:10 ` Ricardo Koller 2021-09-30 7:05 ` Eric Auger 2021-09-30 7:05 ` Eric Auger 2021-10-01 13:14 ` Marc Zyngier 2021-10-01 13:14 ` Marc Zyngier 2021-10-04 15:51 ` Ricardo Koller 2021-10-04 15:51 ` Ricardo Koller 2021-09-28 18:47 ` [PATCH v3 03/10] KVM: arm64: vgic-v2: Check cpu interface " Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller 2021-09-29 16:30 ` Eric Auger 2021-09-29 16:30 ` Eric Auger 2021-09-28 18:47 ` [PATCH v3 04/10] KVM: arm64: vgic-v3: Check ITS " Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller 2021-09-29 16:24 ` Eric Auger 2021-09-29 16:24 ` Eric Auger 2021-09-28 18:47 ` [PATCH v3 05/10] KVM: arm64: selftests: Make vgic_init gic version agnostic Ricardo Koller 2021-09-28 18:47 ` Ricardo Koller 2021-09-29 17:12 ` Eric Auger 2021-09-29 17:12 ` Eric Auger 2021-09-29 21:13 ` Ricardo Koller 2021-09-29 21:13 ` Ricardo Koller 2021-09-30 8:05 ` Marc Zyngier 2021-09-30 8:05 ` Marc Zyngier 2021-09-30 21:27 ` Ricardo Koller 2021-09-30 21:27 ` Ricardo Koller 2021-09-28 18:48 ` [PATCH v3 06/10] KVM: arm64: selftests: Make vgic_init/vm_gic_create " Ricardo Koller 2021-09-28 18:48 ` Ricardo Koller 2021-09-30 7:17 ` Eric Auger 2021-09-30 7:17 ` Eric Auger 2021-09-28 18:48 ` [PATCH v3 07/10] KVM: arm64: selftests: Add some tests for GICv2 in vgic_init Ricardo Koller 2021-09-28 18:48 ` Ricardo Koller 2021-09-30 7:42 ` Eric Auger 2021-09-30 7:42 ` Eric Auger 2021-09-30 21:14 ` Ricardo Koller 2021-09-30 21:14 ` Ricardo Koller 2021-09-28 18:48 ` Ricardo Koller [this message] 2021-09-28 18:48 ` [PATCH v3 08/10] KVM: arm64: selftests: Add tests for GIC redist/cpuif partially above IPA range Ricardo Koller 2021-09-30 8:51 ` Eric Auger 2021-09-30 8:51 ` Eric Auger 2021-09-30 20:49 ` Ricardo Koller 2021-09-30 20:49 ` Ricardo Koller 2021-09-28 18:48 ` [PATCH v3 09/10] KVM: arm64: selftests: Add test for legacy GICv3 REDIST base " Ricardo Koller 2021-09-28 18:48 ` Ricardo Koller 2021-09-30 9:00 ` Eric Auger 2021-09-30 9:00 ` Eric Auger 2021-09-29 0:10 ` [PATCH v3 10/10] KVM: arm64: selftests: Add basic ITS device tests Ricardo Koller 2021-09-29 0:10 ` Ricardo Koller 2021-09-30 9:14 ` Eric Auger 2021-09-30 9:14 ` Eric Auger 2021-09-30 20:10 ` Ricardo Koller 2021-09-30 20:10 ` Ricardo Koller 2021-10-05 8:04 ` Eric Auger 2021-10-05 8:04 ` Eric Auger 2021-10-05 1:03 ` Ricardo Koller 2021-10-05 1:03 ` Ricardo Koller
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=20210928184803.2496885-9-ricarkol@google.com \ --to=ricarkol@google.com \ --cc=alexandru.elisei@arm.com \ --cc=drjones@redhat.com \ --cc=eric.auger@redhat.com \ --cc=james.morse@arm.com \ --cc=jingzhangos@google.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=maz@kernel.org \ --cc=oupton@google.com \ --cc=pbonzini@redhat.com \ --cc=pshier@google.com \ --cc=rananta@google.com \ --cc=reijiw@google.com \ --cc=shuah@kernel.org \ --cc=suzuki.poulose@arm.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.