Commit 40918184 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

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: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d2752e2e

tools/testing/selftests/kvm/aarch64/arch_timer.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

tools/testing/selftests/kvm/aarch64/vgic_init.c

+121 −125

File changed.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/kvm/include/kvm_util_base.h

+59 −32

File changed.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/kvm/lib/aarch64/vgic.c

+15 −16
Original line number Diff line number Diff line
@@ -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)

tools/testing/selftests/kvm/lib/guest_modes.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */