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 v4 10/11] KVM: arm64: selftests: Add test for legacy GICv3 REDIST base partially above IPA range Date: Mon, 4 Oct 2021 18:19:20 -0700 [thread overview] Message-ID: <20211005011921.437353-11-ricarkol@google.com> (raw) In-Reply-To: <20211005011921.437353-1-ricarkol@google.com> Add a new test into vgic_init which checks that the first vcpu fails to run if there is not sufficient REDIST space below the addressable IPA range. This only applies to the KVM_VGIC_V3_ADDR_TYPE_REDIST legacy API as the required REDIST space is not know when setting the DIST region. Note that using the REDIST_REGION API results in a different check at first vcpu run: that the number of redist regions is enough for all vcpus. And there is already a test for that case in, the first step of test_v3_new_redist_regions. Reviewed-by: Eric Auger <eric.auger@redhat.com> Signed-off-by: Ricardo Koller <ricarkol@google.com> --- .../testing/selftests/kvm/aarch64/vgic_init.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c index eadd448b3a96..80be1940d2ad 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c @@ -565,6 +565,39 @@ static void test_v3_last_bit_single_rdist(void) vm_gic_destroy(&v); } +/* Uses the legacy REDIST region API. */ +static void test_v3_redist_ipa_range_check_at_vcpu_run(void) +{ + struct vm_gic v; + int ret, i; + uint64_t addr; + + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, 1); + + /* Set space for 3 redists, we have 1 vcpu, so this succeeds. */ + addr = max_phys_size - (3 * 2 * 0x10000); + kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST, &addr, true); + + addr = 0x00000; + kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_DIST, &addr, true); + + /* Add the rest of the VCPUs */ + for (i = 1; i < NR_VCPUS; ++i) + vm_vcpu_add_default(v.vm, i, guest_code); + + kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, + KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true); + + /* Attempt to run a vcpu without enough redist space. */ + ret = run_vcpu(v.vm, 2); + TEST_ASSERT(ret && errno == EINVAL, + "redist base+size above PA range detected on 1st vcpu run"); + + vm_gic_destroy(&v); +} + /* * Returns 0 if it's possible to create GIC device of a given type (V2 or V3). */ @@ -616,6 +649,7 @@ void run_tests(uint32_t gic_dev_type) test_v3_typer_accesses(); test_v3_last_bit_redist_regions(); test_v3_last_bit_single_rdist(); + test_v3_redist_ipa_range_check_at_vcpu_run(); } } -- 2.33.0.800.g4c38ced690-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 v4 10/11] KVM: arm64: selftests: Add test for legacy GICv3 REDIST base partially above IPA range Date: Mon, 4 Oct 2021 18:19:20 -0700 [thread overview] Message-ID: <20211005011921.437353-11-ricarkol@google.com> (raw) In-Reply-To: <20211005011921.437353-1-ricarkol@google.com> Add a new test into vgic_init which checks that the first vcpu fails to run if there is not sufficient REDIST space below the addressable IPA range. This only applies to the KVM_VGIC_V3_ADDR_TYPE_REDIST legacy API as the required REDIST space is not know when setting the DIST region. Note that using the REDIST_REGION API results in a different check at first vcpu run: that the number of redist regions is enough for all vcpus. And there is already a test for that case in, the first step of test_v3_new_redist_regions. Reviewed-by: Eric Auger <eric.auger@redhat.com> Signed-off-by: Ricardo Koller <ricarkol@google.com> --- .../testing/selftests/kvm/aarch64/vgic_init.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c index eadd448b3a96..80be1940d2ad 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c @@ -565,6 +565,39 @@ static void test_v3_last_bit_single_rdist(void) vm_gic_destroy(&v); } +/* Uses the legacy REDIST region API. */ +static void test_v3_redist_ipa_range_check_at_vcpu_run(void) +{ + struct vm_gic v; + int ret, i; + uint64_t addr; + + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, 1); + + /* Set space for 3 redists, we have 1 vcpu, so this succeeds. */ + addr = max_phys_size - (3 * 2 * 0x10000); + kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST, &addr, true); + + addr = 0x00000; + kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_DIST, &addr, true); + + /* Add the rest of the VCPUs */ + for (i = 1; i < NR_VCPUS; ++i) + vm_vcpu_add_default(v.vm, i, guest_code); + + kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, + KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true); + + /* Attempt to run a vcpu without enough redist space. */ + ret = run_vcpu(v.vm, 2); + TEST_ASSERT(ret && errno == EINVAL, + "redist base+size above PA range detected on 1st vcpu run"); + + vm_gic_destroy(&v); +} + /* * Returns 0 if it's possible to create GIC device of a given type (V2 or V3). */ @@ -616,6 +649,7 @@ void run_tests(uint32_t gic_dev_type) test_v3_typer_accesses(); test_v3_last_bit_redist_regions(); test_v3_last_bit_single_rdist(); + test_v3_redist_ipa_range_check_at_vcpu_run(); } } -- 2.33.0.800.g4c38ced690-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2021-10-05 1:19 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-05 1:19 [PATCH v4 00/11] KVM: arm64: vgic: Missing checks for REDIST/CPU and ITS regions above the VM IPA size Ricardo Koller 2021-10-05 1:19 ` Ricardo Koller 2021-10-05 1:19 ` [PATCH v4 01/11] kvm: arm64: vgic: Introduce vgic_check_iorange Ricardo Koller 2021-10-05 1:19 ` Ricardo Koller 2021-10-05 1:19 ` [PATCH v4 02/11] KVM: arm64: vgic-v3: Check redist region is not above the VM IPA size Ricardo Koller 2021-10-05 1:19 ` Ricardo Koller 2021-10-05 1:19 ` [PATCH v4 03/11] KVM: arm64: vgic-v2: Check cpu interface " Ricardo Koller 2021-10-05 1:19 ` Ricardo Koller 2021-10-05 1:19 ` [PATCH v4 04/11] KVM: arm64: vgic-v3: Check ITS " Ricardo Koller 2021-10-05 1:19 ` Ricardo Koller 2021-10-05 1:19 ` [PATCH v4 05/11] KVM: arm64: vgic: Drop vgic_check_ioaddr() Ricardo Koller 2021-10-05 1:19 ` Ricardo Koller 2021-10-05 7:56 ` Eric Auger 2021-10-05 7:56 ` Eric Auger 2021-10-05 1:19 ` [PATCH v4 06/11] KVM: arm64: selftests: Make vgic_init gic version agnostic Ricardo Koller 2021-10-05 1:19 ` Ricardo Koller 2021-10-06 9:46 ` Andrew Jones 2021-10-06 9:46 ` Andrew Jones 2021-10-05 1:19 ` [PATCH v4 07/11] KVM: arm64: selftests: Make vgic_init/vm_gic_create " Ricardo Koller 2021-10-05 1:19 ` Ricardo Koller 2021-10-06 9:47 ` Andrew Jones 2021-10-06 9:47 ` Andrew Jones 2021-10-05 1:19 ` [PATCH v4 08/11] KVM: arm64: selftests: Add some tests for GICv2 in vgic_init Ricardo Koller 2021-10-05 1:19 ` Ricardo Koller 2021-10-05 8:09 ` Eric Auger 2021-10-05 8:09 ` Eric Auger 2021-10-06 9:52 ` Andrew Jones 2021-10-06 9:52 ` Andrew Jones 2021-10-05 1:19 ` [PATCH v4 09/11] KVM: arm64: selftests: Add tests for GIC redist/cpuif partially above IPA range Ricardo Koller 2021-10-05 1:19 ` Ricardo Koller 2021-10-05 8:12 ` Eric Auger 2021-10-05 8:12 ` Eric Auger 2021-10-06 10:07 ` Andrew Jones 2021-10-06 10:07 ` Andrew Jones 2021-10-05 1:19 ` Ricardo Koller [this message] 2021-10-05 1:19 ` [PATCH v4 10/11] KVM: arm64: selftests: Add test for legacy GICv3 REDIST base " Ricardo Koller 2021-10-06 10:12 ` Andrew Jones 2021-10-06 10:12 ` Andrew Jones 2021-10-05 1:19 ` [PATCH v4 11/11] KVM: arm64: selftests: Add init ITS device test Ricardo Koller 2021-10-05 1:19 ` Ricardo Koller 2021-10-05 8:06 ` Eric Auger 2021-10-05 8:06 ` Eric Auger 2021-10-06 10:13 ` Andrew Jones 2021-10-06 10:13 ` Andrew Jones 2021-10-11 8:43 ` [PATCH v4 00/11] KVM: arm64: vgic: Missing checks for REDIST/CPU and ITS regions above the VM IPA size Marc Zyngier 2021-10-11 8:43 ` Marc Zyngier
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=20211005011921.437353-11-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.