KVM/ARM: Some vgic fixes and init sequence KVM selftests
Subsystems (5)
v3 cover KVM/ARM: Some vgic fixes and init sequence KVM selftests
While writting vgic v3 init sequence KVM selftests I noticed some relatively minor issues. This was also the opportunity to try to fix the issue laterly reported by Zenghui, related to the RDIST_TYPER last bit emulation. The final patch is a first batch of VGIC init sequence selftests. Of course they can be augmented with a lot more register access tests, but let's try to move forward incrementally ...
Best Regards
Eric
This series can be found at:
https://github.com/eauger/linux/tree/vgic_kvmselftests_v3
History:
v2 ->v3:
- reworked last bit read accessor to handle contiguous redist regions and rdist not registered in ascending order
- removed [PATCH 5/9] KVM: arm: move has_run_once after the map_resources
v1 -> v2:
- Took into account all comments from Marc and Alexandru's except the has_run_once still after the map_resources (this would oblige me to revisit in depth the selftests)
Eric Auger (8):
KVM: arm64: vgic-v3: Fix some error codes when setting RDIST base
KVM: arm64: Fix KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION read
KVM: arm64: vgic-v3: Fix error handling in vgic_v3_set_redist_base()
KVM: arm/arm64: vgic: Reset base address on kvm_vgic_dist_destroy()
docs: kvm: devices/arm-vgic-v3: enhance KVM_DEV_ARM_VGIC_CTRL_INIT doc
KVM: arm64: Simplify argument passing to vgic_uaccess_[read|write]
KVM: arm64: vgic-v3: Expose GICR_TYPER.Last for userspace
KVM: selftests: aarch64/vgic-v3 init sequence tests
.../virt/kvm/devices/arm-vgic-v3.rst | 2 +- arch/arm64/kvm/vgic/vgic-init.c | 13 +- arch/arm64/kvm/vgic/vgic-kvm-device.c | 3 + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 116 ++- arch/arm64/kvm/vgic/vgic-mmio.c | 10 +- arch/arm64/kvm/vgic/vgic.h | 1 + include/kvm/arm_vgic.h | 3 + tools/testing/selftests/kvm/Makefile | 1 + .../testing/selftests/kvm/aarch64/vgic_init.c | 672 ++++++++++++++++++ .../testing/selftests/kvm/include/kvm_util.h | 5 + tools/testing/selftests/kvm/lib/kvm_util.c | 51 ++ 11 files changed, 827 insertions(+), 50 deletions(-) create mode 100644 tools/testing/selftests/kvm/aarch64/vgic_init.c
Signature · 6 lines
2.26.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 1/8 KVM: arm64: vgic-v3: Fix some error codes when setting RDIST base
KVM_DEV_ARM_VGIC_GRP_ADDR group doc says we should return -EEXIST in case the base address of the redist is already set. We currently return -EINVAL.
However we need to return -EINVAL in case a legacy REDIST address is attempted to be set while REDIST_REGIONS were set. This case is discriminated by looking at the count field.
---
v1 -> v2:
- simplify the check sequence
--- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
arch/arm64/kvm/vgic/vgic-mmio-v3.c +7 -8
@@ -791,10 +791,6 @@ static int vgic_v3_insert_redist_region(struct kvm *kvm, uint32_t index,size_t size = count *KVM_VGIC_V3_REDIST_SIZE ;int ret; -/* single rdist region already set ?*/ -if (!count && !list_empty (rd_regions)) -return -EINVAL ; -/* cross the end of memory ? */ if (base + size < base)return -EINVAL ;
@@ -805,11 +801,14 @@ static int vgic_v3_insert_redist_region(struct kvm *kvm, uint32_t index, }else { rdreg =list_last_entry (rd_regions, struct vgic_redist_region, list); -if (index != rdreg->index +1 ) -return -EINVAL ; -/* Cannot add an explicitly sized regions after legacy region */ -if (!rdreg->count) +if ((!count) != (!rdreg->count)) +return -EINVAL ;/* Mix REDIST and REDIST_REGION */ + +if (!count) +return -EEXIST ; + +if (index != rdreg->index +1 )return -EINVAL ; }
Signature · 6 lines
2.26.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 2/8 KVM: arm64: Fix KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION read
In reply to Eric AugerThe doc says:
"The characteristics of a specific redistributor region can
be read by presetting the index field in the attr data. Only valid for KVM_DEV_TYPE_ARM_VGIC_V3"
Unfortunately the existing code fails to read the input attr data.
---
v1 -> v2:
- in the commit message, remove the statement that the index always is 0
- add Alexandru's R-b
--- arch/arm64/kvm/vgic/vgic-kvm-device.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/kvm/vgic/vgic-kvm-device.c +3 -0
@@ -226,6 +226,9 @@ static int vgic_get_common_attr(struct kvm_device *dev,u64 addr;unsigned long type = (unsigned long )attr->attr; +if (copy_from_user (&addr, uaddr,sizeof (addr))) +return -EFAULT ; + r =kvm_vgic_addr (dev->kvm, type, &addr, false);if (r)return (r == -ENODEV ) ? -ENXIO : r;
Signature · 6 lines
2.26.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 3/8 KVM: arm64: vgic-v3: Fix error handling in vgic_v3_set_redist_base()
In reply to Eric Augervgic_v3_insert_redist_region() may succeed while vgic_register_all_redist_iodevs fails. For example this happens while adding a redistributor region overlapping a dist region. The failure only is detected on vgic_register_all_redist_iodevs when vgic_v3_check_base() gets called in vgic_register_redist_iodev().
In such a case, remove the newly added redistributor region and free it.
---
v1 -> v2:
- fix the commit message and split declaration/assignment of rdreg
--- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/arm64/kvm/vgic/vgic-mmio-v3.c +7 -1
@@ -860,8 +860,14 @@ int vgic_v3_set_redist_base(struct kvm *kvm, u32 index, u64 addr, u32 count)* afterwards will register the iodevs when needed. */ ret =vgic_register_all_redist_iodevs (kvm); -if (ret) +if (ret) { +struct vgic_redist_region *rdreg; + + rdreg =vgic_v3_rdist_region_from_index (kvm, index); +list_del (&rdreg->list); +kfree (rdreg);return ret; + }return 0 ; }
Signature · 6 lines
2.26.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 4/8 KVM: arm/arm64: vgic: Reset base address on kvm_vgic_dist_destroy()
In reply to Eric AugerOn vgic_dist_destroy(), the addresses are not reset. However for kvm selftest purpose this would allow to continue the test execution even after a failure when running KVM_RUN. So let's reset the base addresses.
---
v1 -> v2:
- use dist-> in the else and add braces
--- arch/arm64/kvm/vgic/vgic-init.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/kvm/vgic/vgic-init.c +5 -1
@@ -335,13 +335,16 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm)kfree (dist->spis); dist->spis =NULL ; dist->nr_spis =0 ; + dist->vgic_dist_base =VGIC_ADDR_UNDEF ; -if (kvm->arch.vgic.vgic_model ==KVM_DEV_TYPE_ARM_VGIC_V3 ) { +if (dist->vgic_model ==KVM_DEV_TYPE_ARM_VGIC_V3 ) {list_for_each_entry_safe (rdreg, next, &dist->rd_regions, list) {list_del (&rdreg->list);kfree (rdreg); }INIT_LIST_HEAD (&dist->rd_regions); + }else { + dist->vgic_cpu_base =VGIC_ADDR_UNDEF ; }if (vgic_has_its (kvm))
@@ -362,6 +365,7 @@ void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)vgic_flush_pending_lpis (vcpu);INIT_LIST_HEAD (&vgic_cpu->ap_list_head); + vgic_cpu->rd_iodev.base_addr =VGIC_ADDR_UNDEF ; }/* To be called with kvm->lock held */
Signature · 6 lines
2.26.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 5/8 docs: kvm: devices/arm-vgic-v3: enhance KVM_DEV_ARM_VGIC_CTRL_INIT doc
In reply to Eric Augerkvm_arch_vcpu_precreate() returns -EBUSY if the vgic is already initialized. So let's document that KVM_DEV_ARM_VGIC_CTRL_INIT must be called after all vcpu creations.
---
v1 -> v2:
- Must be called after all vcpu creations -> Must be called after all VCPUs have been created as per Alexandru's suggestion
--- Documentation/virt/kvm/devices/arm-vgic-v3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/virt/kvm/devices/arm-vgic-v3.rst +1 -1
@@ -228,7 +228,7 @@ Groups: KVM_DEV_ARM_VGIC_CTRL_INIT request the initialization of the VGIC, no additional parameter in - kvm_device_attr.addr. + kvm_device_attr.addr. Must be called after all VCPUs have been created. KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES save all LPI pending bits into guest RAM pending tables.
Signature · 6 lines
2.26.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 6/8 KVM: arm64: Simplify argument passing to vgic_uaccess_[read|write]
In reply to Eric Augervgic_uaccess() takes a struct vgic_io_device argument, converts it to a struct kvm_io_device and passes it to the read/write accessor functions, which convert it back to a struct vgic_io_device. Avoid the indirection by passing the struct vgic_io_device argument directly to vgic_uaccess_{read,write}.
---
v1 -> v2:
- reworded the commit message as suggested by Alexandru
--- arch/arm64/kvm/vgic/vgic-mmio.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
arch/arm64/kvm/vgic/vgic-mmio.c +4 -6
@@ -938,10 +938,9 @@ vgic_get_mmio_region(struct kvm_vcpu *vcpu, struct vgic_io_device *iodev,return region; } -static int vgic_uaccess_read (struct kvm_vcpu *vcpu,struct kvm_io_device *dev, +static int vgic_uaccess_read (struct kvm_vcpu *vcpu,struct vgic_io_device *iodev,gpa_t addr,u32 *val) { -struct vgic_io_device *iodev =kvm_to_vgic_iodev (dev);const struct vgic_register_region *region;struct kvm_vcpu *r_vcpu;
@@ -960,10 +959,9 @@ static int vgic_uaccess_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,return 0 ; } -static int vgic_uaccess_write (struct kvm_vcpu *vcpu,struct kvm_io_device *dev, +static int vgic_uaccess_write (struct kvm_vcpu *vcpu,struct vgic_io_device *iodev,gpa_t addr,const u32 *val) { -struct vgic_io_device *iodev =kvm_to_vgic_iodev (dev);const struct vgic_register_region *region;struct kvm_vcpu *r_vcpu;
@@ -986,9 +984,9 @@ int vgic_uaccess(struct kvm_vcpu *vcpu, struct vgic_io_device *dev, bool is_write, int offset, u32 *val) { if (is_write) - return vgic_uaccess_write(vcpu, &dev->dev, offset, val); + return vgic_uaccess_write(vcpu, dev, offset, val); else - return vgic_uaccess_read(vcpu, &dev->dev, offset, val); + return vgic_uaccess_read(vcpu, dev, offset, val); } static int dispatch_mmio_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,
Signature · 6 lines
2.26.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 7/8 KVM: arm64: vgic-v3: Expose GICR_TYPER.Last for userspace
In reply to Eric AugerCommit 23bde34771f1 ("KVM: arm64: vgic-v3: Drop the reporting of GICR_TYPER.Last for userspace") temporarily fixed a bug identified when attempting to access the GICR_TYPER register before the redistributor region setting, but dropped the support of the LAST bit.
Emulating the GICR_TYPER.Last bit still makes sense for architecture compliance though. This patch restores its support (if the redistributor region was set) while keeping the code safe.
We introduce a new helper, vgic_mmio_vcpu_rdist_is_last() which computes whether a redistributor is the highest one of a series of redistributor contributor pages.
The spec says "Indicates whether this Redistributor is the highest-numbered Redistributor in a series of contiguous Redistributor pages."
The code is a bit convulated since there is no guarantee redistributors are added in a given reditributor region in ascending order. In that case the current implementation was wrong. Also redistributor regions can be contiguous and registered in non increasing base address order.
So the index of redistributors are stored in an array within the redistributor region structure.
With this new implementation we do not need to have a uaccess read accessor anymore.
--- arch/arm64/kvm/vgic/vgic-init.c | 7 +-- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 97 ++++++++++++++++++++---------- arch/arm64/kvm/vgic/vgic.h | 1 + include/kvm/arm_vgic.h | 3 + 4 files changed, 73 insertions(+), 35 deletions(-)
arch/arm64/kvm/vgic/vgic-init.c +3 -4
@@ -190,6 +190,7 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)int i; vgic_cpu->rd_iodev.base_addr =VGIC_ADDR_UNDEF ; + vgic_cpu->index = vcpu->vcpu_id;INIT_LIST_HEAD (&vgic_cpu->ap_list_head);raw_spin_lock_init (&vgic_cpu->ap_list_lock);
@@ -338,10 +339,8 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) dist->vgic_dist_base =VGIC_ADDR_UNDEF ;if (dist->vgic_model ==KVM_DEV_TYPE_ARM_VGIC_V3 ) { -list_for_each_entry_safe (rdreg, next, &dist->rd_regions, list) { -list_del (&rdreg->list); -kfree (rdreg); - } +list_for_each_entry_safe (rdreg, next, &dist->rd_regions, list) +vgic_v3_free_redist_region (rdreg);INIT_LIST_HEAD (&dist->rd_regions); }else { dist->vgic_cpu_base =VGIC_ADDR_UNDEF ;
arch/arm64/kvm/vgic/vgic-mmio-v3.c +66 -31
164 lines not on this page · raw message
arch/arm64/kvm/vgic/vgic.h +1 -0
@@ -293,6 +293,7 @@ vgic_v3_rd_region_size(struct kvm *kvm, struct vgic_redist_region *rdreg)struct vgic_redist_region *vgic_v3_rdist_region_from_index (struct kvm *kvm,u32 index); +void vgic_v3_free_redist_region (struct vgic_redist_region *rdreg);bool vgic_v3_rdist_overlap (struct kvm *kvm,gpa_t base,size_t size);
include/kvm/arm_vgic.h +3 -0
@@ -197,6 +197,7 @@ struct vgic_redist_region {gpa_t base;u32 count;/* number of redistributors or 0 if single region */ u32 free_index;/* index of the next free redistributor */ +int *rdist_indices;/* indices of the redistributors */ struct list_head list; };
@@ -322,6 +323,8 @@ struct vgic_cpu {*/ struct vgic_io_device rd_iodev;struct vgic_redist_region *rdreg; +u32 rdreg_index; +int index;/* vcpu index */ /* Contains the attributes and gpa of the LPI pending tables. */ u64 pendbaser;
Signature · 6 lines
2.26.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v3 8/8 KVM: selftests: aarch64/vgic-v3 init sequence tests
In reply to Eric AugerThe tests exercise the VGIC_V3 device creation including the associated KVM_DEV_ARM_VGIC_GRP_ADDR group attributes:
- KVM_VGIC_V3_ADDR_TYPE_DIST/REDIST
- KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION
Some other tests dedicate to KVM_DEV_ARM_VGIC_GRP_REDIST_REGS group and especially the GICR_TYPER read. The goal was to test the case recently fixed by commit 23bde34771f1
("KVM: arm64: vgic-v3: Drop the reporting of GICR_TYPER.Last for userspace").
The API under test can be found atDocumentation/virt/kvm/devices/arm-vgic-v3.rst
--- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +- tools/testing/selftests/kvm/Makefile | 1 + .../testing/selftests/kvm/aarch64/vgic_init.c | 672 ++++++++++++++++++ .../testing/selftests/kvm/include/kvm_util.h | 5 + tools/testing/selftests/kvm/lib/kvm_util.c | 51 ++ 5 files changed, 730 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/kvm/aarch64/vgic_init.c
arch/arm64/kvm/vgic/vgic-mmio-v3.c +1 -1
@@ -260,7 +260,7 @@ static bool vgic_mmio_vcpu_rdist_is_last(struct kvm_vcpu *vcpu)if (!rdreg)return false; -if (!rdreg->count && vgic_cpu->rdreg_index == (rdreg->count -1 )) { +if (rdreg->count && vgic_cpu->rdreg_index == (rdreg->count -1 )) {/* check whether there is no other contiguous rdist region */ struct list_head *rd_regions = &vgic->rd_regions;struct vgic_redist_region *iter;
tools/testing/selftests/kvm/Makefile +1 -0
@@ -75,6 +75,7 @@ TEST_GEN_PROGS_x86_64 += steal_time TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list-sve +TEST_GEN_PROGS_aarch64 += aarch64/vgic_init TEST_GEN_PROGS_aarch64 += demand_paging_test TEST_GEN_PROGS_aarch64 += dirty_log_test TEST_GEN_PROGS_aarch64 += dirty_log_perf_test
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +672 -0
672 lines not on this page · raw message
tools/testing/selftests/kvm/include/kvm_util.h +5 -0
@@ -223,6 +223,11 @@ int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,#endif void *vcpu_map_dirty_ring (struct kvm_vm *vm,uint32_t vcpuid); +int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr); +int kvm_create_device (struct kvm_vm *vm,uint64_t type,bool test); +int kvm_device_access (int dev_fd,uint32_t group,uint64_t attr, +void *val,bool write); +const char *exit_reason_str (unsigned int exit_reason);void virt_pgd_alloc (struct kvm_vm *vm,uint32_t pgd_memslot);
tools/testing/selftests/kvm/lib/kvm_util.c +51 -0
57 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v3 8/8] KVM: selftests: aarch64/vgic-v3 init sequence tests
Quoted 29 lines · Eric Auger
The tests exercise the
VGIC_V3device creation including the associatedKVM_DEV_ARM_VGIC_GRP_ADDRgroup attributes:- KVM_VGIC_V3_ADDR_TYPE_DIST/REDIST
-KVM_VGIC_V3_ADDR_TYPE_REDIST_REGIONSome other tests dedicate to
KVM_DEV_ARM_VGIC_GRP_REDIST_REGSgroup and especially theGICR_TYPERread. The goal was to test the case recently fixed by commit23bde34771f1
("KVM: arm64: vgic-v3: Drop the reporting of GICR_TYPER.Last for userspace").The API under test can be found at
Documentation/virt/kvm/devices/arm-vgic-v3.rstSigned-off-by Eric Auger <[email protected]>--- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +- tools/testing/selftests/kvm/Makefile | 1 + .../testing/selftests/kvm/aarch64/vgic_init.c | 672 ++++++++++++++++++ .../testing/selftests/kvm/include/kvm_util.h | 5 + tools/testing/selftests/kvm/lib/kvm_util.c | 51 ++ 5 files changed, 730 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/kvm/aarch64/vgic_init.carch/arm64/kvm/vgic/vgic-mmio-v3.c +0
-0
arch/arm64/kvm/vgic/vgic-mmio-v3.c static bool vgic_mmio_vcpu_rdist_is_last(struct kvm_vcpu *vcpu) · line 263
Quoted 5 lines
arch/arm64/kvm/vgic/vgic-mmio-v3.c +1
-1@@ -260,7 +260,7 @@ static bool vgic_mmio_vcpu_rdist_is_last(struct kvm_vcpu *vcpu)if (!rdreg)return false; -if (!rdreg->count && vgic_cpu->rdreg_index == (rdreg->count -1 )) { +if (rdreg->count && vgic_cpu->rdreg_index == (rdreg->count -1 )) {
I guess this is an accidental change?
Quoted 8 lines
arch/arm64/kvm/vgic/vgic-mmio-v3.c +0
-0/* check whether there is no other contiguous rdist region */ struct list_head *rd_regions = &vgic->rd_regions;struct vgic_redist_region *iter;tools/testing/selftests/kvm/Makefile +0
-0
tools/testing/selftests/kvm/Makefile TEST_GEN_PROGS_x86_64 += steal_time · line 81
Quoted 7 lines
tools/testing/selftests/kvm/Makefile +1
-0@@ -75,6 +75,7 @@ TEST_GEN_PROGS_x86_64 += steal_time TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list-sve +TEST_GEN_PROGS_aarch64 += aarch64/vgic_init TEST_GEN_PROGS_aarch64 += demand_paging_test TEST_GEN_PROGS_aarch64 += dirty_log_test TEST_GEN_PROGS_aarch64 += dirty_log_perf_test
Missing .gitignore change
Quoted 32 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +26
-0@@ -0,0 +1,672 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* vgic init sequence tests +* +* Copyright (C) 2020, Red Hat, Inc. +*/ +#define _GNU_SOURCE +#include <linux/kernel.h> +#include <sys/syscall.h> +#include <asm/kvm.h> +#include <asm/kvm_para.h> + +#include "test_util.h" +#include "kvm_util.h" +#include "processor.h" + +#define NR_VCPUS 4 + +#define REDIST_REGION_ATTR_ADDR (count, base, flags, index) (((uint64_t)(count) << 52) | \ + ((uint64_t)((base) >> 16) << 16) | ((uint64_t)(flags) << 12) | index) +#define REG_OFFSET (vcpu, offset) (((uint64_t)vcpu << 32) | offset) + +#define GICR_TYPER 0x8 + +/* helper to access a redistributor register */ +static int access_redist_reg(int gicv3_fd, int vcpu, int offset,
tools/testing/selftests/kvm/aarch64/vgic_init.c line 36
Quoted 10 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +10
-0+ uint32_t *val, bool write) +{ +uint64_t attr =REG_OFFSET (vcpu, offset); + +return kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_REDIST_REGS , + attr, val, write); +} + +/* dummy guest code */ +static void guest_code (int cpu)
cpu is unused, no need for it
Quoted 5 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +5
-0+{ +GUEST_SYNC (0 ); +GUEST_SYNC (1 ); +GUEST_SYNC (2 ); +GUEST_DONE ();
tools/testing/selftests/kvm/aarch64/vgic_init.c line 51
Quoted 10 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +10
-0+} + +/* we don't want to assert on run execution, hence that helper */ +static int run_vcpu (struct kvm_vm *vm,uint32_t vcpuid) +{ +static int run; +struct ucall uc; +int ret; + +vcpu_args_set (vm, vcpuid,1 , vcpuid);
The cpu index is unused, so you need to pass it in
tools/testing/selftests/kvm/aarch64/vgic_init.c line 53
Quoted 2 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +2
-0+ ret =_vcpu_ioctl (vm, vcpuid,KVM_RUN ,NULL ); +get_ucall (vm, vcpuid, &uc);
uc is unused, so you can pass NULL for it
tools/testing/selftests/kvm/aarch64/vgic_init.c line 54
Quoted 1 line
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +1
-0+ run++;
What good is this counter? Nobody reads it.
tools/testing/selftests/kvm/aarch64/vgic_init.c line 67
Quoted 13 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +13
-0+ +if (ret) +return -errno; +return 0 ; +} + +/** +* Helper routine that performs KVM device tests in general and +* especially ARM_VGIC_V3 ones. Eventually the ARM_VGIC_V3 +* device gets created, a legacy RDIST region is set at @0x0 +* and a DIST region is set @0x60000 +*/ +int fuzz_dist_rdist (struct kvm_vm *vm)
Missing static
Quoted 85 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +85
-0+{ +int ret, gicv3_fd, max_ipa_bits; +uint64_t addr; + + max_ipa_bits =kvm_check_cap (KVM_CAP_ARM_VM_IPA_SIZE ); + +/* check ARM_VGIC_V3 device exists */ + ret =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , true); +if (ret) { +print_skip ("GICv3 not supported" ); +exit (KSFT_SKIP ); + } + +/* try to create a non existing KVM device */ + ret =kvm_create_device (vm,0 , true); +TEST_ASSERT (ret == -ENODEV ,"unsupported device" ); + +/* Create the ARM_VGIC_V3 device */ + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >0 ,"GICv3 device created" ); + +/* Check existing group/attributes */ + ret =kvm_device_check_attr (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_DIST ); +TEST_ASSERT (!ret,"KVM_DEV_ARM_VGIC_GRP_ADDR/KVM_VGIC_V3_ADDR_TYPE_DIST supported" ); + + ret =kvm_device_check_attr (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST ); +TEST_ASSERT (!ret,"KVM_DEV_ARM_VGIC_GRP_ADDR/KVM_VGIC_V3_ADDR_TYPE_REDIST supported" ); + +/* check non existing attribute */ + ret =kvm_device_check_attr (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR ,0 ); +TEST_ASSERT (ret == -ENXIO ,"attribute not supported" ); + +/* misaligned DIST and REDIST address settings */ + addr =0x1000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_DIST , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"GICv3 dist base not 64kB aligned" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"GICv3 redist base not 64kB aligned" ); + +/* out of range address */ +if (max_ipa_bits) { + addr =1ULL << max_ipa_bits; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_DIST , &addr, true); +TEST_ASSERT (ret == -E2BIG ,"dist address beyond IPA limit" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); +TEST_ASSERT (ret == -E2BIG ,"redist address beyond IPA limit" ); + } + +/* set REDIST base address @0x0*/ + addr =0x00000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); +TEST_ASSERT (!ret,"GICv3 redist base set" ); + +/* Attempt to create a second legacy redistributor region */ + addr =0xE0000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); +TEST_ASSERT (ret == -EEXIST ,"GICv3 redist base set again" ); + +/* Attempt to mix legacy and new redistributor regions */ + addr =REDIST_REGION_ATTR_ADDR (NR_VCPUS ,0x100000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"attempt to mix GICv3 REDIST and REDIST_REGION" ); + +/* +* Set overlapping DIST / REDIST, cannot be detected here. Will be detected +* on first vcpu run instead. +*/ + addr =3 *2 *0x10000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR ,KVM_VGIC_V3_ADDR_TYPE_DIST , + &addr, true); +TEST_ASSERT (!ret,"dist overlapping rdist" ); + + ret =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (ret == -EEXIST ,"create GICv3 device twice" );
tools/testing/selftests/kvm/aarch64/vgic_init.c line 162
Quoted 10 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +10
-0+ + ret =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , true); +TEST_ASSERT (!ret,"create GICv3 in test mode while the same already is created" ); + +if (!kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V2 , true)) { + ret =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V2 , true); +TEST_ASSERT (ret == -EINVAL ,"create GICv2 while v3 exists" ); + } + +return gicv3_fd;
I don't like mixing the tests and the creation of the device. How about making this function a void function and closing the fd here and then creating another function that just opens an fd without the tests?
Also, I don't think this is a fuzzer, as the function name indicates. It looks to me more like requirements based tests. A fuzzer would select (possibly randomly) a bunch of inputs, usually NULL pointers, unmapped pointers, and other garbage and then see what happens.
tools/testing/selftests/kvm/aarch64/vgic_init.c line 171
Quoted 9 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +9
-0+} + +/* Test the new REDIST region API */ +static int fuzz_redist_regions (struct kvm_vm *vm) +{ +int ret, max_ipa_bits, gicv3_fd; +uint64_t addr, expected_addr; + + max_ipa_bits =kvm_check_cap (KVM_CAP_ARM_VM_IPA_SIZE );
Could make this global and just set it once in main()
Quoted 96 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +96
-0+ +/* trial mode */ + ret =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , true); +if (ret) { +print_skip ("GICv3 not supported" ); +exit (KSFT_SKIP ); + } + +/* Create the actual gicv3 device */ + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >=0 ,"VGIC_V3 device created" ); + + ret =kvm_device_check_attr (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST ); +TEST_ASSERT (!ret,"Multiple redist regions advertised" ); + + addr =REDIST_REGION_ATTR_ADDR (NR_VCPUS ,0x100000 ,2 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"redist region attr value with flags != 0" ); + + addr =REDIST_REGION_ATTR_ADDR (0 ,0x100000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"redist region attr value with count== 0" ); + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"attempt to register the first rdist region with index != 0" ); + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x201000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"rdist region with misaligned address" ); + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"First valid redist region with 2 rdist @ 0x200000, index 0" ); + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"register an rdist region with already used index" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x210000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"register an rdist region overlapping with another one" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x240000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"register redist region with index not +1" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x240000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"register valid redist region with 1 rdist @ 0x220000, index 1" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,1ULL << max_ipa_bits,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -E2BIG ,"register redist region with base address beyond IPA range" ); + + addr =0x260000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"Mix KVM_VGIC_V3_ADDR_TYPE_REDIST and REDIST_REGION" ); + +/* +* Now there are 2 redist regions: +* region 0 @ 0x200000 2 redists +* region 1 @ 0x240000 1 redist +* now attempt to read their characteristics +*/ + + addr =REDIST_REGION_ATTR_ADDR (0 ,0 ,0 ,0 ); + expected_addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, false); +TEST_ASSERT (!ret && addr == expected_addr,"read characteristics of region #0" ); + + addr =REDIST_REGION_ATTR_ADDR (0 ,0 ,0 ,1 ); + expected_addr =REDIST_REGION_ATTR_ADDR (1 ,0x240000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, false); +TEST_ASSERT (!ret && addr == expected_addr,"read characteristics of region #1" ); + + addr =REDIST_REGION_ATTR_ADDR (0 ,0 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, false); +TEST_ASSERT (ret == -ENOENT ,"read characteristics of non existing region" ); + + addr =0x260000 ;
tools/testing/selftests/kvm/aarch64/vgic_init.c line 277
Quoted 10 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +10
-0+ ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_DIST , &addr, true); +TEST_ASSERT (!ret,"set dist region" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x260000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"register redist region colliding with dist" ); + +return gicv3_fd;
Same comment as above about mixing the fd acquisition with the tests.
Quoted 44 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +44
-0+} + +/* +* VGIC KVM device is created and initialized before the secondary CPUs +* get created +*/ +static void test_vgic_then_vcpus (void ) +{ +int ret, i, gicv3_fd; +struct kvm_vm *vm; + + vm =vm_create_default (0 ,0 , guest_code); + + gicv3_fd =fuzz_dist_rdist (vm); + +/* Add the rest of the VCPUs */ +for (i =1 ; i <NR_VCPUS ; ++i) +vm_vcpu_add_default (vm, i, guest_code); + + ret =run_vcpu (vm,3 ); +TEST_ASSERT (ret == -EINVAL ,"dist/rdist overlap detected on 1st vcpu run" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + + +/* All the VCPUs are created before the VGIC KVM device gets initialized */ +static void test_vcpus_then_vgic (void ) +{ +int ret, i, gicv3_fd; +struct kvm_vm *vm; + + vm =vm_create_default (0 ,0 , guest_code); + +/* Add the rest of the VCPUs */ +for (i =1 ; i <NR_VCPUS ; ++i) +vm_vcpu_add_default (vm, i, guest_code); + + gicv3_fd =fuzz_dist_rdist (vm); + + ret =run_vcpu (vm,3 ); +TEST_ASSERT (ret == -EINVAL ,"dist/rdist overlap detected on 1st vcpu run" ); +
tools/testing/selftests/kvm/aarch64/vgic_init.c line 331
Quoted 10 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +10
-0+close (gicv3_fd); +kvm_vm_free (vm); +} + +static void redist_regions_setup (struct kvm_vm **vm,int *gicv3_fd) +{ +int i; + + *vm =vm_create_default (0 ,0 , guest_code); +ucall_init (*vm,NULL );
It's best to call this last, so it can find an unmapped memory region (in case mappings are being done, like I think fuzz_redist_regions does)
tools/testing/selftests/kvm/aarch64/vgic_init.c line 335
Quoted 4 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +4
-0+ +/* Add the rest of the VCPUs */ +for (i =1 ; i <NR_VCPUS ; ++i) +vm_vcpu_add_default (*vm, i, guest_code);
vm_create_default_with_vcpus(NR_VCPUS, 0, 0, guest_code, NULL)
tools/testing/selftests/kvm/aarch64/vgic_init.c line 338
Quoted 3 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +3
-0+ + *gicv3_fd =fuzz_redist_regions (*vm); +}
How about returning a vm_gic structure instead of taking two pointers as arguments?
struct vm_gic {
struct kvm_vm *vm;
int gic_fd;
};
static struct vm_gic vm_gic_create(void)
{
struct vm_gic v;
v.vm = vm_create_default_with_vcpus(NR_VCPUS, 0, 0, guest_code, NULL); v.gic_fd = gic_create(...); ucall_init(v.vm, NULL);
return v;
}
static void vm_gic_destroy(struct vm_gic *v)
{
kvm_vm_free(v.vm);
close(v.gic_fd);
}
Quoted 149 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +149
-0+ +static void test_new_redist_regions (void ) +{ +int ret, gicv3_fd; +struct kvm_vm *vm; +uint64_t addr; +void *dummy =NULL ; + +redist_regions_setup (&vm, &gicv3_fd); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic" ); + + ret =run_vcpu (vm,3 ); +TEST_ASSERT (ret == -ENXIO ,"running without sufficient number of rdists" ); + +close (gicv3_fd); +kvm_vm_free (vm); + +/* step2 */ + +redist_regions_setup (&vm, &gicv3_fd); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x280000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"register a third region allowing to cover the 4 vcpus" ); + + ret =run_vcpu (vm,3 ); +TEST_ASSERT (ret == -EBUSY ,"running without vgic explicit init" ); + +close (gicv3_fd); +kvm_vm_free (vm); + +/* step 3 */ + +redist_regions_setup (&vm, &gicv3_fd); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , dummy, true); +TEST_ASSERT (ret == -EFAULT ,"register a third region allowing to cover the 4 vcpus" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x280000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"register a third region allowing to cover the 4 vcpus" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic" ); + + ret =run_vcpu (vm,3 ); +TEST_ASSERT (!ret,"vcpu run" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + +static void test_typer_accesses (void ) +{ +int ret, i, gicv3_fd =-1 ; +uint64_t addr; +struct kvm_vm *vm; +uint32_t val; + + vm =vm_create_default (0 ,0 , guest_code); +ucall_init (vm,NULL ); + + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >=0 ,"VGIC_V3 device created" ); + +vm_vcpu_add_default (vm,3 , guest_code); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (ret == -EINVAL ,"attempting to read GICR_TYPER of non created vcpu" ); + +vm_vcpu_add_default (vm,1 , guest_code); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (ret == -EBUSY ,"read GICR_TYPER before GIC initialized" ); + +vm_vcpu_add_default (vm,2 , guest_code); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic after the vcpu creations" ); + +for (i =0 ; i <NR_VCPUS ; i++) { + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && !val,"read GICR_TYPER before rdist region setting" ); + } + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"first rdist region with a capacity of 2 rdists" ); + +/* The 2 first rdists should be put there (vcpu 0 and 3) */ + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && !val,"read typer of rdist #0" ); + + ret =access_redist_reg (gicv3_fd,3 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x310 ,"read typer of rdist #1" ); + + addr =REDIST_REGION_ATTR_ADDR (10 ,0x100000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"collision with previous rdist region" ); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x100 , +"no redist region attached to vcpu #1 yet, last cannot be returned" ); + + ret =access_redist_reg (gicv3_fd,2 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x200 , +"no redist region attached to vcpu #2, last cannot be returned" ); + + addr =REDIST_REGION_ATTR_ADDR (10 ,0x20000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"second rdist region" ); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x100 ,"read typer of rdist #1" ); + + ret =access_redist_reg (gicv3_fd,2 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x210 , +"read typer of rdist #1, last properly returned" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + +/** +* Test GICR_TYPER last bit with new redist regions +* 2 rdist regions that are contiguous +* rdist region #0 @0x200000 3 rdist capacity +* rdists: 0, 2 (Last), 1 +* rdist region #1 @0x260000 10 rdist capacity +* rdists: 3, 5 (Last), 4 (Last) +*/ +static void test_last_bit_1 (void ) +{ +int ret, gicv3_fd =-1 ; +uint64_t addr; +struct kvm_vm *vm; +uint32_t val; + + vm =vm_create_default (0 ,0 , guest_code);
tools/testing/selftests/kvm/aarch64/vgic_init.c line 497
Quoted 10 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +10
-0+ucall_init (vm,NULL ); + + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >=0 ,"VGIC_V3 device created" ); + +vm_vcpu_add_default (vm,2 , guest_code); +vm_vcpu_add_default (vm,1 , guest_code); +vm_vcpu_add_default (vm,3 , guest_code); +vm_vcpu_add_default (vm,5 , guest_code); +vm_vcpu_add_default (vm,4 , guest_code);
You can still use vm_create_default_with_vcpus, just provide a vcpuids array
uint32_t vcpuids[] = { 0, 2, 1, 3, 5, 4 };
vm = vm_create_default_with_vcpus(NR_VCPUS, 0, 0, guest_code, vcpuids);
Quoted 205 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +175
-0+ + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (ret,"read typer of rdist #0 before redist reg creation" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic after the vcpu creations" ); + + addr =REDIST_REGION_ATTR_ADDR (3 ,0x200000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"rdist region #0 with a capacity of 3 rdists" ); + + addr =REDIST_REGION_ATTR_ADDR (10 ,0x260000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"rdist region #1 (1 rdist) contiguous with the 1st one" ); + +/* +* rdist_region #0 should contain rdists 0, 2, 1 +* rdist region #1 should contain rdists 3, 5, 4 +*/ + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && !val,"read typer of rdist #0" ); + + ret =access_redist_reg (gicv3_fd,2 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x210 ,"read typer of rdist #2" ); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x100 ,"read typer of rdist #1" ); + + ret =access_redist_reg (gicv3_fd,3 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x300 ,"read typer of rdist #3" ); + + ret =access_redist_reg (gicv3_fd,5 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x510 ,"read typer of rdist #3" ); + + ret =access_redist_reg (gicv3_fd,4 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x410 ,"read typer of rdist #3" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + +/** +* Test GICR_TYPER last bit with new redist regions +* rdist regions #1 and #2 are contiguous +* rdist region #0 @0x100000 1 rdist capacity +* rdists: 0 (Last) +* rdist region #1 @0x240000 3 rdist capacity +* rdists: 3, 5 (Last), 4 (Last) +* rdist region #2 @0x200000 2 rdist capacity +* rdists: 1, 2 +*/ +static void test_last_bit_2 (void ) +{ +int ret, gicv3_fd; +uint64_t addr; +struct kvm_vm *vm; +uint32_t val; + + vm =vm_create_default (0 ,0 , guest_code); +vm_vcpu_add_default (vm,3 , guest_code); +vm_vcpu_add_default (vm,5 , guest_code); +vm_vcpu_add_default (vm,4 , guest_code); +vm_vcpu_add_default (vm,1 , guest_code); +vm_vcpu_add_default (vm,2 , guest_code); + +ucall_init (vm,NULL ); + + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >=0 ,"VGIC_V3 device created" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic after the vcpu creations" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x100000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"rdist region #0 (1 rdist)" ); + + addr =REDIST_REGION_ATTR_ADDR (3 ,0x240000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"rdist region #1 (1 rdist) contiguous with #2" ); + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"rdist region #2 with a capacity of 3 rdists" ); + + + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x010 ,"read typer of rdist #0" ); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x100 ,"read typer of rdist #1" ); + + ret =access_redist_reg (gicv3_fd,2 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x200 ,"read typer of rdist #2" ); + + ret =access_redist_reg (gicv3_fd,3 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x300 ,"read typer of rdist #3" ); + + ret =access_redist_reg (gicv3_fd,5 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x510 ,"read typer of rdist #3" ); + + ret =access_redist_reg (gicv3_fd,4 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x410 ,"read typer of rdist #3" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + +/* Test last bit with legacy region */ +static void test_last_bit_3 (void ) +{ +int ret, gicv3_fd; +uint64_t addr; +struct kvm_vm *vm; +uint32_t val; + + vm =vm_create_default (0 ,0 , guest_code); +vm_vcpu_add_default (vm,3 , guest_code); +vm_vcpu_add_default (vm,5 , guest_code); +vm_vcpu_add_default (vm,4 , guest_code); +vm_vcpu_add_default (vm,1 , guest_code); +vm_vcpu_add_default (vm,2 , guest_code); + +ucall_init (vm,NULL ); + + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >=0 ,"VGIC_V3 device created" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic after the vcpu creations" ); + + addr =0x10000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); + + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x000 ,"read typer of rdist #0" ); + + ret =access_redist_reg (gicv3_fd,3 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x300 ,"read typer of rdist #1" ); + + ret =access_redist_reg (gicv3_fd,5 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x510 ,"read typer of rdist #2" ); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x100 ,"read typer of rdist #3" ); + + ret =access_redist_reg (gicv3_fd,2 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x210 ,"read typer of rdist #3" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + +int main (int ac,char **av) +{ +test_vcpus_then_vgic (); +test_vgic_then_vcpus (); +test_new_redist_regions (); +test_typer_accesses (); +test_last_bit_1 (); +test_last_bit_2 (); +test_last_bit_3 (); + +return 0 ; +} +tools/testing/selftests/kvm/include/kvm_util.h +5
-0@@ -223,6 +223,11 @@ int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,#endif void *vcpu_map_dirty_ring (struct kvm_vm *vm,uint32_t vcpuid); +int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr); +int kvm_create_device (struct kvm_vm *vm,uint64_t type,bool test); +int kvm_device_access (int dev_fd,uint32_t group,uint64_t attr, +void *val,bool write); +const char *exit_reason_str (unsigned int exit_reason);void virt_pgd_alloc (struct kvm_vm *vm,uint32_t pgd_memslot);tools/testing/selftests/kvm/lib/kvm_util.c +6
-0@@ -1728,6 +1728,57 @@ int _kvm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)return ioctl (vm->kvm_fd, cmd, arg); } +/* +* Device Ioctl +*/ + +int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr) +{
tools/testing/selftests/kvm/lib/kvm_util.c int _kvm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg) · line 1746
Quoted 10 lines
tools/testing/selftests/kvm/lib/kvm_util.c +10
-0+struct kvm_device_attr attribute = { + .group = group, + .attr = attr, + .flags =0 , + }; +int ret; + + ret =ioctl (dev_fd,KVM_HAS_DEVICE_ATTR , &attribute); +if (ret ==-1 ) +return -errno;
This isn't are usual style. We usually assert on error in these helpers and we create an _ variant, like _kvm_device_check_attr, if we want the return value and errno to be returned. Something like
int _kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr)
{
struct kvm_device_attr attribute = {
.group = group,
.attr = attr,
.flags = 0,
};
return ioctl(dev_fd, KVM_HAS_DEVICE_ATTR, &attribute);
} void kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr) {
int ret = _kvm_device_check_attr(dev_fd, group, attr); TEST_ASSERT(ret == 0, ...);
}
Or, if you want the check to be useful for probing, then maybe
bool kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr) {
int ret = _kvm_device_check_attr(dev_fd, group, attr); TEST_ASSERT(ret == 0 || errno == ENXIO, ...);
return !ret;
}
Same comment for the other new device API below.
Quoted 41 lines
tools/testing/selftests/kvm/lib/kvm_util.c +35
-0+return ret; +} + +int kvm_create_device (struct kvm_vm *vm,uint64_t type,bool test) +{ +struct kvm_create_device create_dev; +int ret; + + create_dev.type = type; + create_dev.fd =-1 ; + create_dev.flags = test ?KVM_CREATE_DEVICE_TEST :0 ; + ret =ioctl (vm_get_fd (vm),KVM_CREATE_DEVICE , &create_dev); +if (ret ==-1 ) +return -errno; +return test ?0 : create_dev.fd; +} + +int kvm_device_access (int dev_fd,uint32_t group,uint64_t attr, +void *val,bool write) +{ +struct kvm_device_attr kvmattr = { + .group = group, + .attr = attr, + .flags =0 , + .addr = (uintptr_t )val, + }; +int ret; + + ret =ioctl (dev_fd, write ?KVM_SET_DEVICE_ATTR :KVM_GET_DEVICE_ATTR , + &kvmattr); +if (ret) +return -errno; +return ret; +} +/* * VM Dump * Signature · 1 line
2.26.2
Thanks for the test! I only looked at it from a framework perspective, not from a "how to test the vgic" perspective.
Thanks,
drew
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v3 8/8] KVM: selftests: aarch64/vgic-v3 init sequence tests
Hi Drew,
Quoted 33 lines · Andrew Jones
Quoted 32 lines · Eric Auger
The tests exercise the
VGIC_V3device creation including the associatedKVM_DEV_ARM_VGIC_GRP_ADDRgroup attributes:- KVM_VGIC_V3_ADDR_TYPE_DIST/REDIST
-KVM_VGIC_V3_ADDR_TYPE_REDIST_REGIONSome other tests dedicate to
KVM_DEV_ARM_VGIC_GRP_REDIST_REGSgroup and especially theGICR_TYPERread. The goal was to test the case recently fixed by commit23bde34771f1
("KVM: arm64: vgic-v3: Drop the reporting of GICR_TYPER.Last for userspace").The API under test can be found at
Documentation/virt/kvm/devices/arm-vgic-v3.rstSigned-off-by Eric Auger <[email protected]>--- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +- tools/testing/selftests/kvm/Makefile | 1 + .../testing/selftests/kvm/aarch64/vgic_init.c | 672 ++++++++++++++++++ .../testing/selftests/kvm/include/kvm_util.h | 5 + tools/testing/selftests/kvm/lib/kvm_util.c | 51 ++ 5 files changed, 730 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/kvm/aarch64/vgic_init.carch/arm64/kvm/vgic/vgic-mmio-v3.c +0
-0@@ -260,7 +260,7 @@ static bool vgic_mmio_vcpu_rdist_is_last(struct kvm_vcpu *vcpu)if (!rdreg)return false;
Quoted 4 lines
arch/arm64/kvm/vgic/vgic-mmio-v3.c static bool vgic_mmio_vcpu_rdist_is_last(struct kvm_vcpu *vcpu) · line 263
Quoted 2 lines
arch/arm64/kvm/vgic/vgic-mmio-v3.c +1
-1-if (!rdreg->count && vgic_cpu->rdreg_index == (rdreg->count -1 )) { +if (rdreg->count && vgic_cpu->rdreg_index == (rdreg->count -1 )) {I guess this is an accidental change?
this change should be squashed into the previous patch
Quoted 10 lines
Quoted 10 lines
arch/arm64/kvm/vgic/vgic-mmio-v3.c +0
-0/* check whether there is no other contiguous rdist region */ struct list_head *rd_regions = &vgic->rd_regions;struct vgic_redist_region *iter;tools/testing/selftests/kvm/Makefile +0
-0@@ -75,6 +75,7 @@ TEST_GEN_PROGS_x86_64 += steal_time
Quoted 8 lines
tools/testing/selftests/kvm/Makefile TEST_GEN_PROGS_x86_64 += steal_time · line 81
Quoted 6 lines
tools/testing/selftests/kvm/Makefile +1
-0TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list-sve +TEST_GEN_PROGS_aarch64 += aarch64/vgic_init TEST_GEN_PROGS_aarch64 += demand_paging_test TEST_GEN_PROGS_aarch64 += dirty_log_test TEST_GEN_PROGS_aarch64 += dirty_log_perf_testMissing .gitignore change
OK
Quoted 37 lines
Quoted 37 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +30
-0@@ -0,0 +1,672 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* vgic init sequence tests +* +* Copyright (C) 2020, Red Hat, Inc. +*/ +#define _GNU_SOURCE +#include <linux/kernel.h> +#include <sys/syscall.h> +#include <asm/kvm.h> +#include <asm/kvm_para.h> + +#include "test_util.h" +#include "kvm_util.h" +#include "processor.h" + +#define NR_VCPUS 4 + +#define REDIST_REGION_ATTR_ADDR (count, base, flags, index) (((uint64_t)(count) << 52) | \ + ((uint64_t)((base) >> 16) << 16) | ((uint64_t)(flags) << 12) | index) +#define REG_OFFSET (vcpu, offset) (((uint64_t)vcpu << 32) | offset) + +#define GICR_TYPER 0x8 + +/* helper to access a redistributor register */ +static int access_redist_reg (int gicv3_fd,int vcpu,int offset, +uint32_t *val,bool write) +{ +uint64_t attr =REG_OFFSET (vcpu, offset); +
Quoted 8 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c line 36
Quoted 6 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +6
-0+return kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_REDIST_REGS , + attr, val, write); +} + +/* dummy guest code */ +static void guest_code (int cpu)cpu is unused, no need for it
sure
Quoted 10 lines
Quoted 10 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +9
-0+{ +GUEST_SYNC (0 ); +GUEST_SYNC (1 ); +GUEST_SYNC (2 ); +GUEST_DONE (); +} + +/* we don't want to assert on run execution, hence that helper */ +static int run_vcpu (struct kvm_vm *vm,uint32_t vcpuid)
Quoted 8 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c line 51
Quoted 6 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +6
-0+{ +static int run; +struct ucall uc; +int ret; + +vcpu_args_set (vm, vcpuid,1 , vcpuid);The cpu index is unused, so you need to pass it in
removed
Quoted 5 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c line 53
Quoted 3 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +2
-0+ ret =_vcpu_ioctl (vm, vcpuid,KVM_RUN ,NULL ); +get_ucall (vm, vcpuid, &uc);uc is unused, so you can pass NULL for it
OK
Quoted 4 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c line 54
Quoted 2 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +1
-0+ run++;What good is this counter? Nobody reads it.
removed
Quoted 16 lines
Quoted 4 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +3
-0+ +if (ret) +return -errno;tools/testing/selftests/kvm/aarch64/vgic_init.c line 67
Quoted 10 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +10
-0+return 0 ; +} + +/** +* Helper routine that performs KVM device tests in general and +* especially ARM_VGIC_V3 ones. Eventually the ARM_VGIC_V3 +* device gets created, a legacy RDIST region is set at @0x0 +* and a DIST region is set @0x60000 +*/ +int fuzz_dist_rdist (struct kvm_vm *vm)Missing static
sure
Quoted 92 lines
Quoted 92 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +91
-0+{ +int ret, gicv3_fd, max_ipa_bits; +uint64_t addr; + + max_ipa_bits =kvm_check_cap (KVM_CAP_ARM_VM_IPA_SIZE ); + +/* check ARM_VGIC_V3 device exists */ + ret =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , true); +if (ret) { +print_skip ("GICv3 not supported" ); +exit (KSFT_SKIP ); + } + +/* try to create a non existing KVM device */ + ret =kvm_create_device (vm,0 , true); +TEST_ASSERT (ret == -ENODEV ,"unsupported device" ); + +/* Create the ARM_VGIC_V3 device */ + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >0 ,"GICv3 device created" ); + +/* Check existing group/attributes */ + ret =kvm_device_check_attr (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_DIST ); +TEST_ASSERT (!ret,"KVM_DEV_ARM_VGIC_GRP_ADDR/KVM_VGIC_V3_ADDR_TYPE_DIST supported" ); + + ret =kvm_device_check_attr (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST ); +TEST_ASSERT (!ret,"KVM_DEV_ARM_VGIC_GRP_ADDR/KVM_VGIC_V3_ADDR_TYPE_REDIST supported" ); + +/* check non existing attribute */ + ret =kvm_device_check_attr (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR ,0 ); +TEST_ASSERT (ret == -ENXIO ,"attribute not supported" ); + +/* misaligned DIST and REDIST address settings */ + addr =0x1000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_DIST , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"GICv3 dist base not 64kB aligned" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"GICv3 redist base not 64kB aligned" ); + +/* out of range address */ +if (max_ipa_bits) { + addr =1ULL << max_ipa_bits; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_DIST , &addr, true); +TEST_ASSERT (ret == -E2BIG ,"dist address beyond IPA limit" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); +TEST_ASSERT (ret == -E2BIG ,"redist address beyond IPA limit" ); + } + +/* set REDIST base address @0x0*/ + addr =0x00000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); +TEST_ASSERT (!ret,"GICv3 redist base set" ); + +/* Attempt to create a second legacy redistributor region */ + addr =0xE0000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); +TEST_ASSERT (ret == -EEXIST ,"GICv3 redist base set again" ); + +/* Attempt to mix legacy and new redistributor regions */ + addr =REDIST_REGION_ATTR_ADDR (NR_VCPUS ,0x100000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"attempt to mix GICv3 REDIST and REDIST_REGION" ); + +/* +* Set overlapping DIST / REDIST, cannot be detected here. Will be detected +* on first vcpu run instead. +*/ + addr =3 *2 *0x10000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR ,KVM_VGIC_V3_ADDR_TYPE_DIST , + &addr, true); +TEST_ASSERT (!ret,"dist overlapping rdist" ); + + ret =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (ret == -EEXIST ,"create GICv3 device twice" ); + + ret =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , true); +TEST_ASSERT (!ret,"create GICv3 in test mode while the same already is created" ); + +if (!kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V2 , true)) { + ret =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V2 , true);
Quoted 8 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c line 162
Quoted 4 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +4
-0+TEST_ASSERT (ret == -EINVAL ,"create GICv2 while v3 exists" ); + } + +return gicv3_fd;I don't like mixing the tests and the creation of the device. How about making this function a void function and closing the fd here and then creating another function that just opens an fd without the tests?
OK, I now implement your suggestion below, namely vm_gic vm_gic_create()
Quoted 5 lines
Also, I don't think this is a fuzzer, as the function name indicates. It looks to me more like requirements based tests. A fuzzer would select (possibly randomly) a bunch of inputs, usually NULL pointers, unmapped pointers, and other garbage and then see what happens.
Fair enough, I will rename it
Quoted 12 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c line 171
Quoted 10 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +9
-0+} + +/* Test the new REDIST region API */ +static int fuzz_redist_regions (struct kvm_vm *vm) +{ +int ret, max_ipa_bits, gicv3_fd; +uint64_t addr, expected_addr; + + max_ipa_bits =kvm_check_cap (KVM_CAP_ARM_VM_IPA_SIZE );Could make this global and just set it once in
main()
yep
Quoted 101 lines
Quoted 101 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +100
-0+ +/* trial mode */ + ret =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , true); +if (ret) { +print_skip ("GICv3 not supported" ); +exit (KSFT_SKIP ); + } + +/* Create the actual gicv3 device */ + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >=0 ,"VGIC_V3 device created" ); + + ret =kvm_device_check_attr (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST ); +TEST_ASSERT (!ret,"Multiple redist regions advertised" ); + + addr =REDIST_REGION_ATTR_ADDR (NR_VCPUS ,0x100000 ,2 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"redist region attr value with flags != 0" ); + + addr =REDIST_REGION_ATTR_ADDR (0 ,0x100000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"redist region attr value with count== 0" ); + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"attempt to register the first rdist region with index != 0" ); + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x201000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"rdist region with misaligned address" ); + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"First valid redist region with 2 rdist @ 0x200000, index 0" ); + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"register an rdist region with already used index" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x210000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"register an rdist region overlapping with another one" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x240000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"register redist region with index not +1" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x240000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"register valid redist region with 1 rdist @ 0x220000, index 1" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,1ULL << max_ipa_bits,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -E2BIG ,"register redist region with base address beyond IPA range" ); + + addr =0x260000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"Mix KVM_VGIC_V3_ADDR_TYPE_REDIST and REDIST_REGION" ); + +/* +* Now there are 2 redist regions: +* region 0 @ 0x200000 2 redists +* region 1 @ 0x240000 1 redist +* now attempt to read their characteristics +*/ + + addr =REDIST_REGION_ATTR_ADDR (0 ,0 ,0 ,0 ); + expected_addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, false); +TEST_ASSERT (!ret && addr == expected_addr,"read characteristics of region #0" ); + + addr =REDIST_REGION_ATTR_ADDR (0 ,0 ,0 ,1 ); + expected_addr =REDIST_REGION_ATTR_ADDR (1 ,0x240000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, false); +TEST_ASSERT (!ret && addr == expected_addr,"read characteristics of region #1" ); + + addr =REDIST_REGION_ATTR_ADDR (0 ,0 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, false); +TEST_ASSERT (ret == -ENOENT ,"read characteristics of non existing region" ); + + addr =0x260000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_DIST , &addr, true); +TEST_ASSERT (!ret,"set dist region" ); +
Quoted 8 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c line 277
Quoted 6 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +6
-0+ addr =REDIST_REGION_ATTR_ADDR (1 ,0x260000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"register redist region colliding with dist" ); + +return gicv3_fd;Same comment as above about mixing the fd acquisition with the tests.
ok
Quoted 50 lines
Quoted 50 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +49
-0+} + +/* +* VGIC KVM device is created and initialized before the secondary CPUs +* get created +*/ +static void test_vgic_then_vcpus (void ) +{ +int ret, i, gicv3_fd; +struct kvm_vm *vm; + + vm =vm_create_default (0 ,0 , guest_code); + + gicv3_fd =fuzz_dist_rdist (vm); + +/* Add the rest of the VCPUs */ +for (i =1 ; i <NR_VCPUS ; ++i) +vm_vcpu_add_default (vm, i, guest_code); + + ret =run_vcpu (vm,3 ); +TEST_ASSERT (ret == -EINVAL ,"dist/rdist overlap detected on 1st vcpu run" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + + +/* All the VCPUs are created before the VGIC KVM device gets initialized */ +static void test_vcpus_then_vgic (void ) +{ +int ret, i, gicv3_fd; +struct kvm_vm *vm; + + vm =vm_create_default (0 ,0 , guest_code); + +/* Add the rest of the VCPUs */ +for (i =1 ; i <NR_VCPUS ; ++i) +vm_vcpu_add_default (vm, i, guest_code); + + gicv3_fd =fuzz_dist_rdist (vm); + + ret =run_vcpu (vm,3 ); +TEST_ASSERT (ret == -EINVAL ,"dist/rdist overlap detected on 1st vcpu run" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + +static void redist_regions_setup (struct kvm_vm **vm,int *gicv3_fd)
Quoted 8 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c line 331
Quoted 5 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +5
-0+{ +int i; + + *vm =vm_create_default (0 ,0 , guest_code); +ucall_init (*vm,NULL );It's best to call this last, so it can find an unmapped memory region (in case mappings are being done, like I think
fuzz_redist_regionsdoes)
OK
Quoted 7 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c line 335
Quoted 5 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +4
-0+ +/* Add the rest of the VCPUs */ +for (i =1 ; i <NR_VCPUS ; ++i) +vm_vcpu_add_default (*vm, i, guest_code);
vm_create_default_with_vcpus(NR_VCPUS, 0, 0, guest_code, NULL)
OK
Quoted 7 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c line 338
Quoted 4 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +3
-0+ + *gicv3_fd =fuzz_redist_regions (*vm); +}How about returning a
vm_gicstructure instead of taking two pointers as arguments?
done
Quoted 186 lines
struct
vm_gic{
structkvm_vm*vm;
intgic_fd;
};static struct
vm_gicvm_gic_create(void){ struct vm_gic v; v.vm = vm_create_default_with_vcpus(NR_VCPUS, 0, 0, guest_code, NULL); v.gic_fd = gic_create(...); ucall_init(v.vm, NULL); return v; }static void
vm_gic_destroy(struct vm_gic *v){ kvm_vm_free(v.vm); close(v.gic_fd); }Quoted 149 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +149
-0+ +static void test_new_redist_regions (void ) +{ +int ret, gicv3_fd; +struct kvm_vm *vm; +uint64_t addr; +void *dummy =NULL ; + +redist_regions_setup (&vm, &gicv3_fd); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic" ); + + ret =run_vcpu (vm,3 ); +TEST_ASSERT (ret == -ENXIO ,"running without sufficient number of rdists" ); + +close (gicv3_fd); +kvm_vm_free (vm); + +/* step2 */ + +redist_regions_setup (&vm, &gicv3_fd); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x280000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"register a third region allowing to cover the 4 vcpus" ); + + ret =run_vcpu (vm,3 ); +TEST_ASSERT (ret == -EBUSY ,"running without vgic explicit init" ); + +close (gicv3_fd); +kvm_vm_free (vm); + +/* step 3 */ + +redist_regions_setup (&vm, &gicv3_fd); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , dummy, true); +TEST_ASSERT (ret == -EFAULT ,"register a third region allowing to cover the 4 vcpus" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x280000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"register a third region allowing to cover the 4 vcpus" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic" ); + + ret =run_vcpu (vm,3 ); +TEST_ASSERT (!ret,"vcpu run" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + +static void test_typer_accesses (void ) +{ +int ret, i, gicv3_fd =-1 ; +uint64_t addr; +struct kvm_vm *vm; +uint32_t val; + + vm =vm_create_default (0 ,0 , guest_code); +ucall_init (vm,NULL ); + + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >=0 ,"VGIC_V3 device created" ); + +vm_vcpu_add_default (vm,3 , guest_code); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (ret == -EINVAL ,"attempting to read GICR_TYPER of non created vcpu" ); + +vm_vcpu_add_default (vm,1 , guest_code); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (ret == -EBUSY ,"read GICR_TYPER before GIC initialized" ); + +vm_vcpu_add_default (vm,2 , guest_code); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic after the vcpu creations" ); + +for (i =0 ; i <NR_VCPUS ; i++) { + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && !val,"read GICR_TYPER before rdist region setting" ); + } + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"first rdist region with a capacity of 2 rdists" ); + +/* The 2 first rdists should be put there (vcpu 0 and 3) */ + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && !val,"read typer of rdist #0" ); + + ret =access_redist_reg (gicv3_fd,3 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x310 ,"read typer of rdist #1" ); + + addr =REDIST_REGION_ATTR_ADDR (10 ,0x100000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (ret == -EINVAL ,"collision with previous rdist region" ); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x100 , +"no redist region attached to vcpu #1 yet, last cannot be returned" ); + + ret =access_redist_reg (gicv3_fd,2 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x200 , +"no redist region attached to vcpu #2, last cannot be returned" ); + + addr =REDIST_REGION_ATTR_ADDR (10 ,0x20000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"second rdist region" ); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x100 ,"read typer of rdist #1" ); + + ret =access_redist_reg (gicv3_fd,2 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x210 , +"read typer of rdist #1, last properly returned" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + +/** +* Test GICR_TYPER last bit with new redist regions +* 2 rdist regions that are contiguous +* rdist region #0 @0x200000 3 rdist capacity +* rdists: 0, 2 (Last), 1 +* rdist region #1 @0x260000 10 rdist capacity +* rdists: 3, 5 (Last), 4 (Last) +*/ +static void test_last_bit_1 (void ) +{ +int ret, gicv3_fd =-1 ; +uint64_t addr; +struct kvm_vm *vm; +uint32_t val; + + vm =vm_create_default (0 ,0 , guest_code);tools/testing/selftests/kvm/aarch64/vgic_init.c line 497
Quoted 10 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +10
-0+ucall_init (vm,NULL ); + + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >=0 ,"VGIC_V3 device created" ); + +vm_vcpu_add_default (vm,2 , guest_code); +vm_vcpu_add_default (vm,1 , guest_code); +vm_vcpu_add_default (vm,3 , guest_code); +vm_vcpu_add_default (vm,5 , guest_code); +vm_vcpu_add_default (vm,4 , guest_code);You can still use
vm_create_default_with_vcpus, just provide a vcpuids array
Quoted 2 lines
uint32_tvcpuids[] = { 0, 2, 1, 3, 5, 4 };
vm =vm_create_default_with_vcpus(NR_VCPUS, 0, 0, guest_code, vcpuids);
OK
Quoted 241 lines
Quoted 206 lines
tools/testing/selftests/kvm/aarch64/vgic_init.c new file +175
-0+ + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (ret,"read typer of rdist #0 before redist reg creation" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic after the vcpu creations" ); + + addr =REDIST_REGION_ATTR_ADDR (3 ,0x200000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"rdist region #0 with a capacity of 3 rdists" ); + + addr =REDIST_REGION_ATTR_ADDR (10 ,0x260000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"rdist region #1 (1 rdist) contiguous with the 1st one" ); + +/* +* rdist_region #0 should contain rdists 0, 2, 1 +* rdist region #1 should contain rdists 3, 5, 4 +*/ + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && !val,"read typer of rdist #0" ); + + ret =access_redist_reg (gicv3_fd,2 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x210 ,"read typer of rdist #2" ); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x100 ,"read typer of rdist #1" ); + + ret =access_redist_reg (gicv3_fd,3 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x300 ,"read typer of rdist #3" ); + + ret =access_redist_reg (gicv3_fd,5 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x510 ,"read typer of rdist #3" ); + + ret =access_redist_reg (gicv3_fd,4 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x410 ,"read typer of rdist #3" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + +/** +* Test GICR_TYPER last bit with new redist regions +* rdist regions #1 and #2 are contiguous +* rdist region #0 @0x100000 1 rdist capacity +* rdists: 0 (Last) +* rdist region #1 @0x240000 3 rdist capacity +* rdists: 3, 5 (Last), 4 (Last) +* rdist region #2 @0x200000 2 rdist capacity +* rdists: 1, 2 +*/ +static void test_last_bit_2 (void ) +{ +int ret, gicv3_fd; +uint64_t addr; +struct kvm_vm *vm; +uint32_t val; + + vm =vm_create_default (0 ,0 , guest_code); +vm_vcpu_add_default (vm,3 , guest_code); +vm_vcpu_add_default (vm,5 , guest_code); +vm_vcpu_add_default (vm,4 , guest_code); +vm_vcpu_add_default (vm,1 , guest_code); +vm_vcpu_add_default (vm,2 , guest_code); + +ucall_init (vm,NULL ); + + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >=0 ,"VGIC_V3 device created" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic after the vcpu creations" ); + + addr =REDIST_REGION_ATTR_ADDR (1 ,0x100000 ,0 ,0 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"rdist region #0 (1 rdist)" ); + + addr =REDIST_REGION_ATTR_ADDR (3 ,0x240000 ,0 ,1 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"rdist region #1 (1 rdist) contiguous with #2" ); + + addr =REDIST_REGION_ATTR_ADDR (2 ,0x200000 ,0 ,2 ); + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION , &addr, true); +TEST_ASSERT (!ret,"rdist region #2 with a capacity of 3 rdists" ); + + + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x010 ,"read typer of rdist #0" ); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x100 ,"read typer of rdist #1" ); + + ret =access_redist_reg (gicv3_fd,2 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x200 ,"read typer of rdist #2" ); + + ret =access_redist_reg (gicv3_fd,3 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x300 ,"read typer of rdist #3" ); + + ret =access_redist_reg (gicv3_fd,5 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x510 ,"read typer of rdist #3" ); + + ret =access_redist_reg (gicv3_fd,4 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x410 ,"read typer of rdist #3" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + +/* Test last bit with legacy region */ +static void test_last_bit_3 (void ) +{ +int ret, gicv3_fd; +uint64_t addr; +struct kvm_vm *vm; +uint32_t val; + + vm =vm_create_default (0 ,0 , guest_code); +vm_vcpu_add_default (vm,3 , guest_code); +vm_vcpu_add_default (vm,5 , guest_code); +vm_vcpu_add_default (vm,4 , guest_code); +vm_vcpu_add_default (vm,1 , guest_code); +vm_vcpu_add_default (vm,2 , guest_code); + +ucall_init (vm,NULL ); + + gicv3_fd =kvm_create_device (vm,KVM_DEV_TYPE_ARM_VGIC_V3 , false); +TEST_ASSERT (gicv3_fd >=0 ,"VGIC_V3 device created" ); + + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_CTRL , +KVM_DEV_ARM_VGIC_CTRL_INIT ,NULL , true); +TEST_ASSERT (!ret,"init the vgic after the vcpu creations" ); + + addr =0x10000 ; + ret =kvm_device_access (gicv3_fd,KVM_DEV_ARM_VGIC_GRP_ADDR , +KVM_VGIC_V3_ADDR_TYPE_REDIST , &addr, true); + + ret =access_redist_reg (gicv3_fd,0 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x000 ,"read typer of rdist #0" ); + + ret =access_redist_reg (gicv3_fd,3 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x300 ,"read typer of rdist #1" ); + + ret =access_redist_reg (gicv3_fd,5 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x510 ,"read typer of rdist #2" ); + + ret =access_redist_reg (gicv3_fd,1 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x100 ,"read typer of rdist #3" ); + + ret =access_redist_reg (gicv3_fd,2 ,GICR_TYPER , &val, false); +TEST_ASSERT (!ret && val ==0x210 ,"read typer of rdist #3" ); + +close (gicv3_fd); +kvm_vm_free (vm); +} + +int main (int ac,char **av) +{ +test_vcpus_then_vgic (); +test_vgic_then_vcpus (); +test_new_redist_regions (); +test_typer_accesses (); +test_last_bit_1 (); +test_last_bit_2 (); +test_last_bit_3 (); + +return 0 ; +} +tools/testing/selftests/kvm/include/kvm_util.h +5
-0@@ -223,6 +223,11 @@ int vcpu_nested_state_set(struct kvm_vm *vm, uint32_t vcpuid,#endif void *vcpu_map_dirty_ring (struct kvm_vm *vm,uint32_t vcpuid); +int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr); +int kvm_create_device (struct kvm_vm *vm,uint64_t type,bool test); +int kvm_device_access (int dev_fd,uint32_t group,uint64_t attr, +void *val,bool write); +const char *exit_reason_str (unsigned int exit_reason);void virt_pgd_alloc (struct kvm_vm *vm,uint32_t pgd_memslot);tools/testing/selftests/kvm/lib/kvm_util.c +6
-0@@ -1728,6 +1728,57 @@ int _kvm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg)return ioctl (vm->kvm_fd, cmd, arg); } +/* +* Device Ioctl +*/ + +int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr) +{tools/testing/selftests/kvm/lib/kvm_util.c int _kvm_ioctl(struct kvm_vm *vm, unsigned long cmd, void *arg) · line 1746
Quoted 10 lines
tools/testing/selftests/kvm/lib/kvm_util.c +10
-0+struct kvm_device_attr attribute = { + .group = group, + .attr = attr, + .flags =0 , + }; +int ret; + + ret =ioctl (dev_fd,KVM_HAS_DEVICE_ATTR , &attribute); +if (ret ==-1 ) +return -errno;This isn't are usual style. We usually assert on error in these helpers and we create an _ variant, like
_kvm_device_check_attr, if we want the return value and errno to be returned. Something likeint
_kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr){ struct kvm_device_attr attribute = { .group = group, .attr = attr, .flags = 0, }; return ioctl(dev_fd, KVM_HAS_DEVICE_ATTR, &attribute); }void
kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr){ int ret = _kvm_device_check_attr(dev_fd, group, attr); TEST_ASSERT(ret == 0, ...);}
Or, if you want the check to be useful for probing, then maybe
Quoted 8 lines
bool
kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr){ int ret = _kvm_device_check_attr(dev_fd, group, attr); TEST_ASSERT(ret == 0 || errno == ENXIO, ...); return !ret;}
Same comment for the other new device API below.
OK. However my tests check the errno so I will rather use the "_" variant and return -errno there.
Quoted 37 lines
Quoted 37 lines
tools/testing/selftests/kvm/lib/kvm_util.c +35
-0+return ret; +} + +int kvm_create_device (struct kvm_vm *vm,uint64_t type,bool test) +{ +struct kvm_create_device create_dev; +int ret; + + create_dev.type = type; + create_dev.fd =-1 ; + create_dev.flags = test ?KVM_CREATE_DEVICE_TEST :0 ; + ret =ioctl (vm_get_fd (vm),KVM_CREATE_DEVICE , &create_dev); +if (ret ==-1 ) +return -errno; +return test ?0 : create_dev.fd; +} + +int kvm_device_access (int dev_fd,uint32_t group,uint64_t attr, +void *val,bool write) +{ +struct kvm_device_attr kvmattr = { + .group = group, + .attr = attr, + .flags =0 , + .addr = (uintptr_t )val, + }; +int ret; + + ret =ioctl (dev_fd, write ?KVM_SET_DEVICE_ATTR :KVM_GET_DEVICE_ATTR , + &kvmattr); +if (ret) +return -errno; +return ret; +} +/*
Quoted 8 lines
Quoted 5 lines
tools/testing/selftests/kvm/lib/kvm_util.c +0
-0* VM Dump * Signature · 1 line
2.26.2Thanks for the test! I only looked at it from a framework perspective, not from a "how to test the vgic" perspective.
Thank you for the review!
Thanks
Eric
Quoted 4 lines
Thanks,
drew
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm