KVM: selftests: Split get/set device_attr helpers
Split the get/set device_attr helpers instead of using a boolean param to select between get and set. Duplicating upper level wrappers is a very, very small price to pay for improved readability, and having constant (at compile time) inputs will allow the selftests framework to sanity check ioctl() invocations. Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson
Paolo Bonzini
Родитель
d2752e2eb3
Коммит
4091818426
|
|
@ -349,10 +349,10 @@ static void test_run(struct kvm_vm *vm)
|
|||
static void test_init_timer_irq(struct kvm_vm *vm)
|
||||
{
|
||||
/* Timer initid should be same for all the vCPUs, so query only vCPU-0 */
|
||||
vcpu_access_device_attr(vm, 0, KVM_ARM_VCPU_TIMER_CTRL,
|
||||
KVM_ARM_VCPU_TIMER_IRQ_PTIMER, &ptimer_irq, false);
|
||||
vcpu_access_device_attr(vm, 0, KVM_ARM_VCPU_TIMER_CTRL,
|
||||
KVM_ARM_VCPU_TIMER_IRQ_VTIMER, &vtimer_irq, false);
|
||||
vcpu_device_attr_get(vm, 0, KVM_ARM_VCPU_TIMER_CTRL,
|
||||
KVM_ARM_VCPU_TIMER_IRQ_PTIMER, &ptimer_irq);
|
||||
vcpu_device_attr_get(vm, 0, KVM_ARM_VCPU_TIMER_CTRL,
|
||||
KVM_ARM_VCPU_TIMER_IRQ_VTIMER, &vtimer_irq);
|
||||
|
||||
sync_global_to_guest(vm, ptimer_irq);
|
||||
sync_global_to_guest(vm, vtimer_irq);
|
||||
|
|
|
|||
|
|
@ -33,13 +33,10 @@ struct vm_gic {
|
|||
static uint64_t max_phys_size;
|
||||
|
||||
/* helper to access a redistributor register */
|
||||
static int access_v3_redist_reg(int gicv3_fd, int vcpu, int offset,
|
||||
uint32_t *val, bool write)
|
||||
static int v3_redist_reg_get(int gicv3_fd, int vcpu, int offset, uint32_t *val)
|
||||
{
|
||||
uint64_t attr = REG_OFFSET(vcpu, offset);
|
||||
|
||||
return _kvm_device_access(gicv3_fd, KVM_DEV_ARM_VGIC_GRP_REDIST_REGS,
|
||||
attr, val, write);
|
||||
return __kvm_device_attr_get(gicv3_fd, KVM_DEV_ARM_VGIC_GRP_REDIST_REGS,
|
||||
REG_OFFSET(vcpu, offset), val);
|
||||
}
|
||||
|
||||
/* dummy guest code */
|
||||
|
|
@ -137,41 +134,41 @@ static void subtest_dist_rdist(struct vm_gic *v)
|
|||
|
||||
/* misaligned DIST and REDIST address settings */
|
||||
addr = dist.alignment / 0x10;
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
dist.attr, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
dist.attr, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL, "GIC dist base not aligned");
|
||||
|
||||
addr = rdist.alignment / 0x10;
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
rdist.attr, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
rdist.attr, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL, "GIC redist/cpu base not aligned");
|
||||
|
||||
/* out of range address */
|
||||
addr = max_phys_size;
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
dist.attr, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
dist.attr, &addr);
|
||||
TEST_ASSERT(ret && errno == E2BIG, "dist address beyond IPA limit");
|
||||
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
rdist.attr, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
rdist.attr, &addr);
|
||||
TEST_ASSERT(ret && errno == E2BIG, "redist address beyond IPA limit");
|
||||
|
||||
/* Space for half a rdist (a rdist is: 2 * rdist.alignment). */
|
||||
addr = max_phys_size - dist.alignment;
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
rdist.attr, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
rdist.attr, &addr);
|
||||
TEST_ASSERT(ret && errno == E2BIG,
|
||||
"half of the redist is beyond IPA limit");
|
||||
|
||||
/* set REDIST base address @0x0*/
|
||||
addr = 0x00000;
|
||||
kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
rdist.attr, &addr, true);
|
||||
kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
rdist.attr, &addr);
|
||||
|
||||
/* Attempt to create a second legacy redistributor region */
|
||||
addr = 0xE0000;
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
rdist.attr, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
rdist.attr, &addr);
|
||||
TEST_ASSERT(ret && errno == EEXIST, "GIC redist base set again");
|
||||
|
||||
ret = __kvm_has_device_attr(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
|
|
@ -179,9 +176,8 @@ static void subtest_dist_rdist(struct vm_gic *v)
|
|||
if (!ret) {
|
||||
/* Attempt to mix legacy and new redistributor regions */
|
||||
addr = REDIST_REGION_ATTR_ADDR(NR_VCPUS, 0x100000, 0, 0);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION,
|
||||
&addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL,
|
||||
"attempt to mix GICv3 REDIST and REDIST_REGION");
|
||||
}
|
||||
|
|
@ -191,8 +187,8 @@ static void subtest_dist_rdist(struct vm_gic *v)
|
|||
* on first vcpu run instead.
|
||||
*/
|
||||
addr = rdist.size - rdist.alignment;
|
||||
kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
dist.attr, &addr, true);
|
||||
kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
dist.attr, &addr);
|
||||
}
|
||||
|
||||
/* Test the new REDIST region API */
|
||||
|
|
@ -206,66 +202,66 @@ static void subtest_v3_redist_regions(struct vm_gic *v)
|
|||
TEST_ASSERT(!ret, "Multiple redist regions advertised");
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(NR_VCPUS, 0x100000, 2, 0);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL, "redist region attr value with flags != 0");
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(0, 0x100000, 0, 0);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL, "redist region attr value with count== 0");
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(2, 0x200000, 0, 1);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL,
|
||||
"attempt to register the first rdist region with index != 0");
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(2, 0x201000, 0, 1);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL, "rdist region with misaligned address");
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(2, 0x200000, 0, 0);
|
||||
kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(2, 0x200000, 0, 1);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL, "register an rdist region with already used index");
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(1, 0x210000, 0, 2);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL,
|
||||
"register an rdist region overlapping with another one");
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(1, 0x240000, 0, 2);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL, "register redist region with index not +1");
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(1, 0x240000, 0, 1);
|
||||
kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(1, max_phys_size, 0, 2);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == E2BIG,
|
||||
"register redist region with base address beyond IPA range");
|
||||
|
||||
/* The last redist is above the pa range. */
|
||||
addr = REDIST_REGION_ATTR_ADDR(2, max_phys_size - 0x30000, 0, 2);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == E2BIG,
|
||||
"register redist region with top address beyond IPA range");
|
||||
|
||||
addr = 0x260000;
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL,
|
||||
"Mix KVM_VGIC_V3_ADDR_TYPE_REDIST and REDIST_REGION");
|
||||
|
||||
|
|
@ -278,28 +274,28 @@ static void subtest_v3_redist_regions(struct vm_gic *v)
|
|||
|
||||
addr = REDIST_REGION_ATTR_ADDR(0, 0, 0, 0);
|
||||
expected_addr = REDIST_REGION_ATTR_ADDR(2, 0x200000, 0, 0);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, false);
|
||||
ret = __kvm_device_attr_get(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
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(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, false);
|
||||
ret = __kvm_device_attr_get(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(!ret && addr == expected_addr, "read characteristics of region #1");
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(0, 0, 0, 2);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, false);
|
||||
ret = __kvm_device_attr_get(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == ENOENT, "read characteristics of non existing region");
|
||||
|
||||
addr = 0x260000;
|
||||
kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_DIST, &addr, true);
|
||||
kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_DIST, &addr);
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(1, 0x260000, 0, 2);
|
||||
ret = _kvm_device_access(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
ret = __kvm_device_attr_set(v->gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL, "register redist region colliding with dist");
|
||||
}
|
||||
|
||||
|
|
@ -351,8 +347,8 @@ static void test_v3_new_redist_regions(void)
|
|||
|
||||
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);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);
|
||||
|
||||
ret = run_vcpu(v.vm, 3);
|
||||
TEST_ASSERT(ret == -ENXIO, "running without sufficient number of rdists");
|
||||
|
|
@ -364,8 +360,8 @@ static void test_v3_new_redist_regions(void)
|
|||
subtest_v3_redist_regions(&v);
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(1, 0x280000, 0, 2);
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
|
||||
ret = run_vcpu(v.vm, 3);
|
||||
TEST_ASSERT(ret == -EBUSY, "running without vgic explicit init");
|
||||
|
|
@ -377,17 +373,17 @@ static void test_v3_new_redist_regions(void)
|
|||
v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS);
|
||||
subtest_v3_redist_regions(&v);
|
||||
|
||||
ret = _kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, dummy, true);
|
||||
ret = __kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, dummy);
|
||||
TEST_ASSERT(ret && errno == EFAULT,
|
||||
"register a third region allowing to cover the 4 vcpus");
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(1, 0x280000, 0, 2);
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);
|
||||
|
||||
ret = run_vcpu(v.vm, 3);
|
||||
TEST_ASSERT(!ret, "vcpu run");
|
||||
|
|
@ -408,57 +404,57 @@ static void test_v3_typer_accesses(void)
|
|||
|
||||
vm_vcpu_add_default(v.vm, 3, guest_code);
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 1, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 1, GICR_TYPER, &val);
|
||||
TEST_ASSERT(ret && errno == EINVAL, "attempting to read GICR_TYPER of non created vcpu");
|
||||
|
||||
vm_vcpu_add_default(v.vm, 1, guest_code);
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 1, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 1, GICR_TYPER, &val);
|
||||
TEST_ASSERT(ret && errno == EBUSY, "read GICR_TYPER before GIC initialized");
|
||||
|
||||
vm_vcpu_add_default(v.vm, 2, guest_code);
|
||||
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);
|
||||
|
||||
for (i = 0; i < NR_VCPUS ; i++) {
|
||||
ret = access_v3_redist_reg(v.gic_fd, i, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 0, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == i * 0x100,
|
||||
"read GICR_TYPER before rdist region setting");
|
||||
}
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(2, 0x200000, 0, 0);
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
|
||||
/* The 2 first rdists should be put there (vcpu 0 and 3) */
|
||||
ret = access_v3_redist_reg(v.gic_fd, 0, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 0, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && !val, "read typer of rdist #0");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 3, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 3, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x310, "read typer of rdist #1");
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(10, 0x100000, 0, 1);
|
||||
ret = _kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
ret = __kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL, "collision with previous rdist region");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 1, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 1, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x100,
|
||||
"no redist region attached to vcpu #1 yet, last cannot be returned");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 2, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 2, GICR_TYPER, &val);
|
||||
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);
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 1, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 1, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x100, "read typer of rdist #1");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 2, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 2, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x210,
|
||||
"read typer of rdist #1, last properly returned");
|
||||
|
||||
|
|
@ -487,37 +483,37 @@ static void test_v3_last_bit_redist_regions(void)
|
|||
|
||||
v.gic_fd = kvm_create_device(v.vm, KVM_DEV_TYPE_ARM_VGIC_V3);
|
||||
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(2, 0x100000, 0, 0);
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(2, 0x240000, 0, 1);
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
|
||||
addr = REDIST_REGION_ATTR_ADDR(2, 0x200000, 0, 2);
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr);
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 0, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 0, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x000, "read typer of rdist #0");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 1, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 1, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x100, "read typer of rdist #1");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 2, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 2, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x200, "read typer of rdist #2");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 3, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 3, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x310, "read typer of rdist #3");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 5, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 5, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x500, "read typer of rdist #5");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 4, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 4, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x410, "read typer of rdist #4");
|
||||
|
||||
vm_gic_destroy(&v);
|
||||
|
|
@ -536,26 +532,26 @@ static void test_v3_last_bit_single_rdist(void)
|
|||
|
||||
v.gic_fd = kvm_create_device(v.vm, KVM_DEV_TYPE_ARM_VGIC_V3);
|
||||
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);
|
||||
|
||||
addr = 0x10000;
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST, &addr, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST, &addr);
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 0, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 0, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x000, "read typer of rdist #0");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 3, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 3, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x300, "read typer of rdist #1");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 5, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 5, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x500, "read typer of rdist #2");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 1, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 1, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x100, "read typer of rdist #3");
|
||||
|
||||
ret = access_v3_redist_reg(v.gic_fd, 2, GICR_TYPER, &val, false);
|
||||
ret = v3_redist_reg_get(v.gic_fd, 2, GICR_TYPER, &val);
|
||||
TEST_ASSERT(!ret && val == 0x210, "read typer of rdist #3");
|
||||
|
||||
vm_gic_destroy(&v);
|
||||
|
|
@ -572,19 +568,19 @@ static void test_v3_redist_ipa_range_check_at_vcpu_run(void)
|
|||
|
||||
/* Set space for 3 redists, we have 1 vcpu, so this succeeds. */
|
||||
addr = max_phys_size - (3 * 2 * 0x10000);
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST, &addr, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST, &addr);
|
||||
|
||||
addr = 0x00000;
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_DIST, &addr, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_DIST, &addr);
|
||||
|
||||
/* Add the rest of the VCPUs */
|
||||
for (i = 1; i < NR_VCPUS; ++i)
|
||||
vm_vcpu_add_default(v.vm, i, guest_code);
|
||||
|
||||
kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);
|
||||
kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);
|
||||
|
||||
/* Attempt to run a vcpu without enough redist space. */
|
||||
ret = run_vcpu(v.vm, 2);
|
||||
|
|
@ -604,31 +600,31 @@ static void test_v3_its_region(void)
|
|||
its_fd = kvm_create_device(v.vm, KVM_DEV_TYPE_ARM_VGIC_ITS);
|
||||
|
||||
addr = 0x401000;
|
||||
ret = _kvm_device_access(its_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_ITS_ADDR_TYPE, &addr, true);
|
||||
ret = __kvm_device_attr_set(its_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_ITS_ADDR_TYPE, &addr);
|
||||
TEST_ASSERT(ret && errno == EINVAL,
|
||||
"ITS region with misaligned address");
|
||||
|
||||
addr = max_phys_size;
|
||||
ret = _kvm_device_access(its_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_ITS_ADDR_TYPE, &addr, true);
|
||||
ret = __kvm_device_attr_set(its_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_ITS_ADDR_TYPE, &addr);
|
||||
TEST_ASSERT(ret && errno == E2BIG,
|
||||
"register ITS region with base address beyond IPA range");
|
||||
|
||||
addr = max_phys_size - 0x10000;
|
||||
ret = _kvm_device_access(its_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_ITS_ADDR_TYPE, &addr, true);
|
||||
ret = __kvm_device_attr_set(its_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_ITS_ADDR_TYPE, &addr);
|
||||
TEST_ASSERT(ret && errno == E2BIG,
|
||||
"Half of ITS region is beyond IPA range");
|
||||
|
||||
/* This one succeeds setting the ITS base */
|
||||
addr = 0x400000;
|
||||
kvm_device_access(its_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_ITS_ADDR_TYPE, &addr, true);
|
||||
kvm_device_attr_set(its_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_ITS_ADDR_TYPE, &addr);
|
||||
|
||||
addr = 0x300000;
|
||||
ret = _kvm_device_access(its_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_ITS_ADDR_TYPE, &addr, true);
|
||||
ret = __kvm_device_attr_set(its_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_ITS_ADDR_TYPE, &addr);
|
||||
TEST_ASSERT(ret && errno == EEXIST, "ITS base set again");
|
||||
|
||||
close(its_fd);
|
||||
|
|
|
|||
|
|
@ -460,6 +460,65 @@ static inline int vcpu_get_stats_fd(struct kvm_vm *vm, uint32_t vcpuid)
|
|||
return fd;
|
||||
}
|
||||
|
||||
int __kvm_has_device_attr(int dev_fd, uint32_t group, uint64_t attr);
|
||||
|
||||
static inline void kvm_has_device_attr(int dev_fd, uint32_t group, uint64_t attr)
|
||||
{
|
||||
int ret = __kvm_has_device_attr(dev_fd, group, attr);
|
||||
|
||||
TEST_ASSERT(!ret, "KVM_HAS_DEVICE_ATTR failed, rc: %i errno: %i", ret, errno);
|
||||
}
|
||||
|
||||
int __kvm_device_attr_get(int dev_fd, uint32_t group, uint64_t attr, void *val);
|
||||
|
||||
static inline void kvm_device_attr_get(int dev_fd, uint32_t group,
|
||||
uint64_t attr, void *val)
|
||||
{
|
||||
int ret = __kvm_device_attr_get(dev_fd, group, attr, val);
|
||||
|
||||
TEST_ASSERT(!ret, KVM_IOCTL_ERROR(KVM_GET_DEVICE_ATTR, ret));
|
||||
}
|
||||
|
||||
int __kvm_device_attr_set(int dev_fd, uint32_t group, uint64_t attr, void *val);
|
||||
|
||||
static inline void kvm_device_attr_set(int dev_fd, uint32_t group,
|
||||
uint64_t attr, void *val)
|
||||
{
|
||||
int ret = __kvm_device_attr_set(dev_fd, group, attr, val);
|
||||
|
||||
TEST_ASSERT(!ret, KVM_IOCTL_ERROR(KVM_SET_DEVICE_ATTR, ret));
|
||||
}
|
||||
|
||||
int __vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr);
|
||||
|
||||
static inline void vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid,
|
||||
uint32_t group, uint64_t attr)
|
||||
{
|
||||
int ret = __vcpu_has_device_attr(vm, vcpuid, group, attr);
|
||||
|
||||
TEST_ASSERT(!ret, KVM_IOCTL_ERROR(KVM_HAS_DEVICE_ATTR, ret));
|
||||
}
|
||||
|
||||
int __vcpu_device_attr_get(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val);
|
||||
void vcpu_device_attr_get(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val);
|
||||
int __vcpu_device_attr_set(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val);
|
||||
void vcpu_device_attr_set(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val);
|
||||
int __kvm_test_create_device(struct kvm_vm *vm, uint64_t type);
|
||||
int __kvm_create_device(struct kvm_vm *vm, uint64_t type);
|
||||
|
||||
static inline int kvm_create_device(struct kvm_vm *vm, uint64_t type)
|
||||
{
|
||||
int fd = __kvm_create_device(vm, type);
|
||||
|
||||
TEST_ASSERT(fd >= 0, KVM_IOCTL_ERROR(KVM_CREATE_DEVICE, fd));
|
||||
return fd;
|
||||
}
|
||||
|
||||
void *vcpu_map_dirty_ring(struct kvm_vm *vm, uint32_t vcpuid);
|
||||
|
||||
/*
|
||||
|
|
@ -482,41 +541,9 @@ void *vcpu_map_dirty_ring(struct kvm_vm *vm, uint32_t vcpuid);
|
|||
*/
|
||||
void vcpu_args_set(struct kvm_vm *vm, uint32_t vcpuid, unsigned int num, ...);
|
||||
|
||||
int __kvm_has_device_attr(int dev_fd, uint32_t group, uint64_t attr);
|
||||
|
||||
static inline void kvm_has_device_attr(int dev_fd, uint32_t group, uint64_t attr)
|
||||
{
|
||||
int ret = __kvm_has_device_attr(dev_fd, group, attr);
|
||||
|
||||
TEST_ASSERT(!ret, "KVM_HAS_DEVICE_ATTR failed, rc: %i errno: %i", ret, errno);
|
||||
}
|
||||
|
||||
int __kvm_test_create_device(struct kvm_vm *vm, uint64_t type);
|
||||
int __kvm_create_device(struct kvm_vm *vm, uint64_t type);
|
||||
int kvm_create_device(struct kvm_vm *vm, uint64_t type);
|
||||
int _kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,
|
||||
void *val, bool write);
|
||||
int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,
|
||||
void *val, bool write);
|
||||
void kvm_irq_line(struct kvm_vm *vm, uint32_t irq, int level);
|
||||
int _kvm_irq_line(struct kvm_vm *vm, uint32_t irq, int level);
|
||||
|
||||
int __vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr);
|
||||
|
||||
static inline void vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid,
|
||||
uint32_t group, uint64_t attr)
|
||||
{
|
||||
int ret = __vcpu_has_device_attr(vm, vcpuid, group, attr);
|
||||
|
||||
TEST_ASSERT(!ret, KVM_IOCTL_ERROR(KVM_HAS_DEVICE_ATTR, ret));
|
||||
}
|
||||
|
||||
int _vcpu_access_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val, bool write);
|
||||
int vcpu_access_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val, bool write);
|
||||
|
||||
#define KVM_MAX_IRQ_ROUTES 4096
|
||||
|
||||
struct kvm_irq_routing *kvm_gsi_routing_create(void);
|
||||
|
|
|
|||
|
|
@ -55,27 +55,26 @@ int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, uint32_t nr_irqs,
|
|||
if (gic_fd < 0)
|
||||
return gic_fd;
|
||||
|
||||
kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS,
|
||||
0, &nr_irqs, true);
|
||||
kvm_device_attr_set(gic_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS, 0, &nr_irqs);
|
||||
|
||||
kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);
|
||||
kvm_device_attr_set(gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);
|
||||
|
||||
kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_DIST, &gicd_base_gpa, true);
|
||||
kvm_device_attr_set(gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_DIST, &gicd_base_gpa);
|
||||
nr_gic_pages = vm_calc_num_guest_pages(vm->mode, KVM_VGIC_V3_DIST_SIZE);
|
||||
virt_map(vm, gicd_base_gpa, gicd_base_gpa, nr_gic_pages);
|
||||
|
||||
/* Redistributor setup */
|
||||
redist_attr = REDIST_REGION_ATTR_ADDR(nr_vcpus, gicr_base_gpa, 0, 0);
|
||||
kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &redist_attr, true);
|
||||
kvm_device_attr_set(gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR,
|
||||
KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &redist_attr);
|
||||
nr_gic_pages = vm_calc_num_guest_pages(vm->mode,
|
||||
KVM_VGIC_V3_REDIST_SIZE * nr_vcpus);
|
||||
virt_map(vm, gicr_base_gpa, gicr_base_gpa, nr_gic_pages);
|
||||
|
||||
kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);
|
||||
kvm_device_attr_set(gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,
|
||||
KVM_DEV_ARM_VGIC_CTRL_INIT, NULL);
|
||||
|
||||
return gic_fd;
|
||||
}
|
||||
|
|
@ -88,14 +87,14 @@ int _kvm_irq_set_level_info(int gic_fd, uint32_t intid, int level)
|
|||
uint64_t val;
|
||||
int ret;
|
||||
|
||||
ret = _kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO,
|
||||
attr, &val, false);
|
||||
ret = __kvm_device_attr_get(gic_fd, KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO,
|
||||
attr, &val);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
val |= 1U << index;
|
||||
ret = _kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO,
|
||||
attr, &val, true);
|
||||
ret = __kvm_device_attr_set(gic_fd, KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO,
|
||||
attr, &val);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -155,9 +154,9 @@ static void vgic_poke_irq(int gic_fd, uint32_t intid,
|
|||
* intid will just make the read/writes point to above the intended
|
||||
* register space (i.e., ICPENDR after ISPENDR).
|
||||
*/
|
||||
kvm_device_access(gic_fd, group, attr, &val, false);
|
||||
kvm_device_attr_get(gic_fd, group, attr, &val);
|
||||
val |= 1ULL << index;
|
||||
kvm_device_access(gic_fd, group, attr, &val, true);
|
||||
kvm_device_attr_set(gic_fd, group, attr, &val);
|
||||
}
|
||||
|
||||
void kvm_irq_write_ispendr(int gic_fd, uint32_t intid, uint32_t vcpu)
|
||||
|
|
|
|||
|
|
@ -66,8 +66,8 @@ void guest_modes_append_default(void)
|
|||
|
||||
kvm_fd = open_kvm_dev_path_or_exit();
|
||||
vm_fd = __kvm_ioctl(kvm_fd, KVM_CREATE_VM, 0);
|
||||
kvm_device_access(vm_fd, KVM_S390_VM_CPU_MODEL,
|
||||
KVM_S390_VM_CPU_PROCESSOR, &info, false);
|
||||
kvm_device_attr_get(vm_fd, KVM_S390_VM_CPU_MODEL,
|
||||
KVM_S390_VM_CPU_PROCESSOR, &info);
|
||||
close(vm_fd);
|
||||
close(kvm_fd);
|
||||
/* Starting with z13 we have 47bits of physical address */
|
||||
|
|
|
|||
|
|
@ -1645,16 +1645,7 @@ int __kvm_create_device(struct kvm_vm *vm, uint64_t type)
|
|||
return err ? : create_dev.fd;
|
||||
}
|
||||
|
||||
int kvm_create_device(struct kvm_vm *vm, uint64_t type)
|
||||
{
|
||||
int fd = __kvm_create_device(vm, type);
|
||||
|
||||
TEST_ASSERT(fd >= 0, "KVM_CREATE_DEVICE IOCTL failed, rc: %i errno: %i", fd, errno);
|
||||
return fd;
|
||||
}
|
||||
|
||||
int _kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,
|
||||
void *val, bool write)
|
||||
int __kvm_device_attr_get(int dev_fd, uint32_t group, uint64_t attr, void *val)
|
||||
{
|
||||
struct kvm_device_attr kvmattr = {
|
||||
.group = group,
|
||||
|
|
@ -1662,20 +1653,44 @@ int _kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,
|
|||
.flags = 0,
|
||||
.addr = (uintptr_t)val,
|
||||
};
|
||||
int ret;
|
||||
|
||||
ret = ioctl(dev_fd, write ? KVM_SET_DEVICE_ATTR : KVM_GET_DEVICE_ATTR,
|
||||
&kvmattr);
|
||||
return ret;
|
||||
return __kvm_ioctl(dev_fd, KVM_GET_DEVICE_ATTR, &kvmattr);
|
||||
}
|
||||
|
||||
int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,
|
||||
void *val, bool write)
|
||||
int __kvm_device_attr_set(int dev_fd, uint32_t group, uint64_t attr, void *val)
|
||||
{
|
||||
int ret = _kvm_device_access(dev_fd, group, attr, val, write);
|
||||
struct kvm_device_attr kvmattr = {
|
||||
.group = group,
|
||||
.attr = attr,
|
||||
.flags = 0,
|
||||
.addr = (uintptr_t)val,
|
||||
};
|
||||
|
||||
TEST_ASSERT(!ret, "KVM_SET|GET_DEVICE_ATTR IOCTL failed, rc: %i errno: %i", ret, errno);
|
||||
return ret;
|
||||
return __kvm_ioctl(dev_fd, KVM_SET_DEVICE_ATTR, &kvmattr);
|
||||
}
|
||||
|
||||
int __vcpu_device_attr_get(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val)
|
||||
{
|
||||
return __kvm_device_attr_get(vcpu_get(vm, vcpuid)->fd, group, attr, val);
|
||||
}
|
||||
|
||||
void vcpu_device_attr_get(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val)
|
||||
{
|
||||
kvm_device_attr_get(vcpu_get(vm, vcpuid)->fd, group, attr, val);
|
||||
}
|
||||
|
||||
int __vcpu_device_attr_set(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val)
|
||||
{
|
||||
return __kvm_device_attr_set(vcpu_get(vm, vcpuid)->fd, group, attr, val);
|
||||
}
|
||||
|
||||
void vcpu_device_attr_set(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val)
|
||||
{
|
||||
kvm_device_attr_set(vcpu_get(vm, vcpuid)->fd, group, attr, val);
|
||||
}
|
||||
|
||||
int __vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
|
|
@ -1686,23 +1701,6 @@ int __vcpu_has_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
|||
return __kvm_has_device_attr(vcpu->fd, group, attr);
|
||||
}
|
||||
|
||||
int _vcpu_access_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val, bool write)
|
||||
{
|
||||
struct vcpu *vcpu = vcpu_get(vm, vcpuid);
|
||||
|
||||
return _kvm_device_access(vcpu->fd, group, attr, val, write);
|
||||
}
|
||||
|
||||
int vcpu_access_device_attr(struct kvm_vm *vm, uint32_t vcpuid, uint32_t group,
|
||||
uint64_t attr, void *val, bool write)
|
||||
{
|
||||
int ret = _vcpu_access_device_attr(vm, vcpuid, group, attr, val, write);
|
||||
|
||||
TEST_ASSERT(!ret, "KVM_SET|GET_DEVICE_ATTR IOCTL failed, rc: %i errno: %i", ret, errno);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* IRQ related functions.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ static void check_preconditions(struct kvm_vm *vm)
|
|||
|
||||
static void setup_system_counter(struct kvm_vm *vm, struct test_case *test)
|
||||
{
|
||||
vcpu_access_device_attr(vm, VCPU_ID, KVM_VCPU_TSC_CTRL,
|
||||
KVM_VCPU_TSC_OFFSET, &test->tsc_offset, true);
|
||||
vcpu_device_attr_set(vm, VCPU_ID, KVM_VCPU_TSC_CTRL,
|
||||
KVM_VCPU_TSC_OFFSET, &test->tsc_offset);
|
||||
}
|
||||
|
||||
static uint64_t guest_read_system_counter(struct test_case *test)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче