Commit f577f6c2 authored by Shannon Zhao's avatar Shannon Zhao Committed by Marc Zyngier
Browse files

arm64: KVM: Introduce per-vcpu kvm device controls 



In some cases it needs to get/set attributes specific to a vcpu and so
needs something else than ONE_REG.

Let's copy the KVM_DEVICE approach, and define the respective ioctls
for the vcpu file descriptor.

Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Acked-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 808e7381

Documentation/virtual/kvm/api.txt

+6 −4
Original line number Diff line number Diff line
@@ -2507,8 +2507,9 @@ struct kvm_create_device { 


4.80 KVM_SET_DEVICE_ATTR/KVM_GET_DEVICE_ATTR



Capability: KVM_CAP_DEVICE_CTRL, KVM_CAP_VM_ATTRIBUTES for vm device

Type: device ioctl, vm ioctl

Capability: KVM_CAP_DEVICE_CTRL, KVM_CAP_VM_ATTRIBUTES for vm device,

  KVM_CAP_VCPU_ATTRIBUTES for vcpu device

Type: device ioctl, vm ioctl, vcpu ioctl

Parameters: struct kvm_device_attr

Returns: 0 on success, -1 on error

Errors:
@@ -2533,8 +2534,9 @@ struct kvm_device_attr { 


4.81 KVM_HAS_DEVICE_ATTR



Capability: KVM_CAP_DEVICE_CTRL, KVM_CAP_VM_ATTRIBUTES for vm device

Type: device ioctl, vm ioctl

Capability: KVM_CAP_DEVICE_CTRL, KVM_CAP_VM_ATTRIBUTES for vm device,

  KVM_CAP_VCPU_ATTRIBUTES for vcpu device

Type: device ioctl, vm ioctl, vcpu ioctl

Parameters: struct kvm_device_attr

Returns: 0 on success, -1 on error

Errors:

Documentation/virtual/kvm/devices/vcpu.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Generic vcpu interface

====================================



The virtual cpu "device" also accepts the ioctls KVM_SET_DEVICE_ATTR,

KVM_GET_DEVICE_ATTR, and KVM_HAS_DEVICE_ATTR. The interface uses the same struct

kvm_device_attr as other devices, but targets VCPU-wide settings and controls.



The groups and attributes per virtual cpu, if any, are architecture specific.

arch/arm/kvm/arm.c

+55 −0
Original line number Diff line number Diff line
@@ -828,11 +828,51 @@ static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu, 
	return 0;

}



static int kvm_arm_vcpu_set_attr(struct kvm_vcpu *vcpu,

				 struct kvm_device_attr *attr)

{

	int ret = -ENXIO;



	switch (attr->group) {

	default:

		break;

	}



	return ret;

}



static int kvm_arm_vcpu_get_attr(struct kvm_vcpu *vcpu,

				 struct kvm_device_attr *attr)

{

	int ret = -ENXIO;



	switch (attr->group) {

	default:

		break;

	}



	return ret;

}



static int kvm_arm_vcpu_has_attr(struct kvm_vcpu *vcpu,

				 struct kvm_device_attr *attr)

{

	int ret = -ENXIO;



	switch (attr->group) {

	default:

		break;

	}



	return ret;

}



long kvm_arch_vcpu_ioctl(struct file *filp,

			 unsigned int ioctl, unsigned long arg)

{

	struct kvm_vcpu *vcpu = filp->private_data;

	void __user *argp = (void __user *)arg;

	struct kvm_device_attr attr;



	switch (ioctl) {

	case KVM_ARM_VCPU_INIT: {
@@ -875,6 +915,21 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
			return -E2BIG;

		return kvm_arm_copy_reg_indices(vcpu, user_list->reg);

	}

	case KVM_SET_DEVICE_ATTR: {

		if (copy_from_user(&attr, argp, sizeof(attr)))

			return -EFAULT;

		return kvm_arm_vcpu_set_attr(vcpu, &attr);

	}

	case KVM_GET_DEVICE_ATTR: {

		if (copy_from_user(&attr, argp, sizeof(attr)))

			return -EFAULT;

		return kvm_arm_vcpu_get_attr(vcpu, &attr);

	}

	case KVM_HAS_DEVICE_ATTR: {

		if (copy_from_user(&attr, argp, sizeof(attr)))

			return -EFAULT;

		return kvm_arm_vcpu_has_attr(vcpu, &attr);

	}

	default:

		return -EINVAL;

	}

arch/arm64/kvm/reset.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ int kvm_arch_dev_ioctl_check_extension(long ext) 
		r = kvm_arm_support_pmu_v3();

		break;

	case KVM_CAP_SET_GUEST_DEBUG:

	case KVM_CAP_VCPU_ATTRIBUTES:

		r = 1;

		break;

	default:

include/uapi/linux/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -851,6 +851,7 @@ struct kvm_ppc_smmu_info { 
#define KVM_CAP_HYPERV_SYNIC 123

#define KVM_CAP_S390_RI 124

#define KVM_CAP_ARM_PMU_V3 125

#define KVM_CAP_VCPU_ATTRIBUTES 126



#ifdef KVM_CAP_IRQ_ROUTING

CRA Git | Maintained and supported by SUSTech CRA and CCSE