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 06/10] KVM: arm64: selftests: Make vgic_init/vm_gic_create version agnostic Date: Tue, 28 Sep 2021 11:48:00 -0700 [thread overview] Message-ID: <20210928184803.2496885-7-ricarkol@google.com> (raw) In-Reply-To: <20210928184803.2496885-1-ricarkol@google.com> Make vm_gic_create GIC version agnostic in the vgic_init test. Also add a nr_vcpus arg into it instead of defaulting to NR_VCPUS. No functional change. Signed-off-by: Ricardo Koller <ricarkol@google.com> --- .../testing/selftests/kvm/aarch64/vgic_init.c | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c index 896a29f2503d..b24067dbdac0 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c @@ -28,6 +28,7 @@ struct vm_gic { struct kvm_vm *vm; int gic_fd; + uint32_t gic_dev_type; }; static int max_ipa_bits; @@ -61,12 +62,13 @@ static int run_vcpu(struct kvm_vm *vm, uint32_t vcpuid) return 0; } -static struct vm_gic vm_gic_v3_create(void) +static struct vm_gic vm_gic_create_with_vcpus(uint32_t gic_dev_type, uint32_t nr_vcpus) { struct vm_gic v; - v.vm = vm_create_default_with_vcpus(NR_VCPUS, 0, 0, guest_code, NULL); - v.gic_fd = kvm_create_device(v.vm, KVM_DEV_TYPE_ARM_VGIC_V3, false); + v.gic_dev_type = gic_dev_type; + v.vm = vm_create_default_with_vcpus(nr_vcpus, 0, 0, guest_code, NULL); + v.gic_fd = kvm_create_device(v.vm, gic_dev_type, false); return v; } @@ -153,6 +155,8 @@ static void subtest_v3_redist_regions(struct vm_gic *v) uint64_t addr, expected_addr; int ret; + TEST_ASSERT(VGIC_DEV_IS_V3(v->gic_dev_type), "Only applies to v3"); + ret = kvm_device_check_attr(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, KVM_VGIC_V3_ADDR_TYPE_REDIST); TEST_ASSERT(!ret, "Multiple redist regions advertised"); @@ -257,8 +261,7 @@ static void test_v3_vgic_then_vcpus(uint32_t gic_dev_type) struct vm_gic v; int ret, i; - v.vm = vm_create_default(0, 0, guest_code); - v.gic_fd = kvm_create_device(v.vm, KVM_DEV_TYPE_ARM_VGIC_V3, false); + v = vm_gic_create_with_vcpus(gic_dev_type, 1); subtest_v3_dist_rdist(&v); @@ -278,7 +281,7 @@ static void test_v3_vcpus_then_vgic(uint32_t gic_dev_type) struct vm_gic v; int ret; - v = vm_gic_v3_create(); + v = vm_gic_create_with_vcpus(gic_dev_type, NR_VCPUS); subtest_v3_dist_rdist(&v); @@ -295,7 +298,7 @@ static void test_v3_new_redist_regions(void) uint64_t addr; int ret; - v = vm_gic_v3_create(); + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS); subtest_v3_redist_regions(&v); kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true); @@ -306,7 +309,7 @@ static void test_v3_new_redist_regions(void) /* step2 */ - v = vm_gic_v3_create(); + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS); subtest_v3_redist_regions(&v); addr = REDIST_REGION_ATTR_ADDR(1, 0x280000, 0, 2); @@ -320,7 +323,7 @@ static void test_v3_new_redist_regions(void) /* step 3 */ - v = vm_gic_v3_create(); + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS); subtest_v3_redist_regions(&v); _kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, -- 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 06/10] KVM: arm64: selftests: Make vgic_init/vm_gic_create version agnostic Date: Tue, 28 Sep 2021 11:48:00 -0700 [thread overview] Message-ID: <20210928184803.2496885-7-ricarkol@google.com> (raw) In-Reply-To: <20210928184803.2496885-1-ricarkol@google.com> Make vm_gic_create GIC version agnostic in the vgic_init test. Also add a nr_vcpus arg into it instead of defaulting to NR_VCPUS. No functional change. Signed-off-by: Ricardo Koller <ricarkol@google.com> --- .../testing/selftests/kvm/aarch64/vgic_init.c | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c index 896a29f2503d..b24067dbdac0 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c @@ -28,6 +28,7 @@ struct vm_gic { struct kvm_vm *vm; int gic_fd; + uint32_t gic_dev_type; }; static int max_ipa_bits; @@ -61,12 +62,13 @@ static int run_vcpu(struct kvm_vm *vm, uint32_t vcpuid) return 0; } -static struct vm_gic vm_gic_v3_create(void) +static struct vm_gic vm_gic_create_with_vcpus(uint32_t gic_dev_type, uint32_t nr_vcpus) { struct vm_gic v; - v.vm = vm_create_default_with_vcpus(NR_VCPUS, 0, 0, guest_code, NULL); - v.gic_fd = kvm_create_device(v.vm, KVM_DEV_TYPE_ARM_VGIC_V3, false); + v.gic_dev_type = gic_dev_type; + v.vm = vm_create_default_with_vcpus(nr_vcpus, 0, 0, guest_code, NULL); + v.gic_fd = kvm_create_device(v.vm, gic_dev_type, false); return v; } @@ -153,6 +155,8 @@ static void subtest_v3_redist_regions(struct vm_gic *v) uint64_t addr, expected_addr; int ret; + TEST_ASSERT(VGIC_DEV_IS_V3(v->gic_dev_type), "Only applies to v3"); + ret = kvm_device_check_attr(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, KVM_VGIC_V3_ADDR_TYPE_REDIST); TEST_ASSERT(!ret, "Multiple redist regions advertised"); @@ -257,8 +261,7 @@ static void test_v3_vgic_then_vcpus(uint32_t gic_dev_type) struct vm_gic v; int ret, i; - v.vm = vm_create_default(0, 0, guest_code); - v.gic_fd = kvm_create_device(v.vm, KVM_DEV_TYPE_ARM_VGIC_V3, false); + v = vm_gic_create_with_vcpus(gic_dev_type, 1); subtest_v3_dist_rdist(&v); @@ -278,7 +281,7 @@ static void test_v3_vcpus_then_vgic(uint32_t gic_dev_type) struct vm_gic v; int ret; - v = vm_gic_v3_create(); + v = vm_gic_create_with_vcpus(gic_dev_type, NR_VCPUS); subtest_v3_dist_rdist(&v); @@ -295,7 +298,7 @@ static void test_v3_new_redist_regions(void) uint64_t addr; int ret; - v = vm_gic_v3_create(); + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS); subtest_v3_redist_regions(&v); kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true); @@ -306,7 +309,7 @@ static void test_v3_new_redist_regions(void) /* step2 */ - v = vm_gic_v3_create(); + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS); subtest_v3_redist_regions(&v); addr = REDIST_REGION_ATTR_ADDR(1, 0x280000, 0, 2); @@ -320,7 +323,7 @@ static void test_v3_new_redist_regions(void) /* step 3 */ - v = vm_gic_v3_create(); + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS); subtest_v3_redist_regions(&v); _kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, -- 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 ` Ricardo Koller [this message] 2021-09-28 18:48 ` [PATCH v3 06/10] KVM: arm64: selftests: Make vgic_init/vm_gic_create " 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 ` [PATCH v3 08/10] KVM: arm64: selftests: Add tests for GIC redist/cpuif partially above IPA range Ricardo Koller 2021-09-28 18:48 ` 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-7-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.