Commit 58772e9a authored by Steven Price's avatar Steven Price Committed by Marc Zyngier
Browse files

KVM: arm64: Provide VCPU attributes for stolen time 



Allow user space to inform the KVM host where in the physical memory
map the paravirtualized time structures should be located.

User space can set an attribute on the VCPU providing the IPA base
address of the stolen time structure for that VCPU. This must be
repeated for every VCPU in the VM.

The address is given in terms of the physical address visible to
the guest and must be 64 byte aligned. The guest will discover the
address via a hypercall.

Signed-off-by: default avatarSteven Price <steven.price@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 8538cb22

arch/arm64/include/asm/kvm_host.h

+7 −0
Original line number Diff line number Diff line
@@ -490,6 +490,13 @@ long kvm_hypercall_pv_features(struct kvm_vcpu *vcpu); 
gpa_t kvm_init_stolen_time(struct kvm_vcpu *vcpu);

void kvm_update_stolen_time(struct kvm_vcpu *vcpu);



int kvm_arm_pvtime_set_attr(struct kvm_vcpu *vcpu,

			    struct kvm_device_attr *attr);

int kvm_arm_pvtime_get_attr(struct kvm_vcpu *vcpu,

			    struct kvm_device_attr *attr);

int kvm_arm_pvtime_has_attr(struct kvm_vcpu *vcpu,

			    struct kvm_device_attr *attr);



static inline void kvm_arm_pvtime_vcpu_init(struct kvm_vcpu_arch *vcpu_arch)

{

	vcpu_arch->steal.base = GPA_INVALID;

arch/arm64/include/uapi/asm/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -323,6 +323,8 @@ struct kvm_vcpu_events { 
#define KVM_ARM_VCPU_TIMER_CTRL		1

#define   KVM_ARM_VCPU_TIMER_IRQ_VTIMER		0

#define   KVM_ARM_VCPU_TIMER_IRQ_PTIMER		1

#define KVM_ARM_VCPU_PVTIME_CTRL	2

#define   KVM_ARM_VCPU_PVTIME_IPA	0



/* KVM_IRQ_LINE irq field index values */

#define KVM_ARM_IRQ_VCPU2_SHIFT		28

arch/arm64/kvm/guest.c

+9 −0
Original line number Diff line number Diff line
@@ -858,6 +858,9 @@ int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu, 
	case KVM_ARM_VCPU_TIMER_CTRL:

		ret = kvm_arm_timer_set_attr(vcpu, attr);

		break;

	case KVM_ARM_VCPU_PVTIME_CTRL:

		ret = kvm_arm_pvtime_set_attr(vcpu, attr);

		break;

	default:

		ret = -ENXIO;

		break;
@@ -878,6 +881,9 @@ int kvm_arm_vcpu_arch_get_attr(struct kvm_vcpu *vcpu, 
	case KVM_ARM_VCPU_TIMER_CTRL:

		ret = kvm_arm_timer_get_attr(vcpu, attr);

		break;

	case KVM_ARM_VCPU_PVTIME_CTRL:

		ret = kvm_arm_pvtime_get_attr(vcpu, attr);

		break;

	default:

		ret = -ENXIO;

		break;
@@ -898,6 +904,9 @@ int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu, 
	case KVM_ARM_VCPU_TIMER_CTRL:

		ret = kvm_arm_timer_has_attr(vcpu, attr);

		break;

	case KVM_ARM_VCPU_PVTIME_CTRL:

		ret = kvm_arm_pvtime_has_attr(vcpu, attr);

		break;

	default:

		ret = -ENXIO;

		break;

include/uapi/linux/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -1227,6 +1227,8 @@ enum kvm_device_type { 
#define KVM_DEV_TYPE_ARM_VGIC_ITS	KVM_DEV_TYPE_ARM_VGIC_ITS

	KVM_DEV_TYPE_XIVE,

#define KVM_DEV_TYPE_XIVE		KVM_DEV_TYPE_XIVE

	KVM_DEV_TYPE_ARM_PV_TIME,

#define KVM_DEV_TYPE_ARM_PV_TIME	KVM_DEV_TYPE_ARM_PV_TIME

	KVM_DEV_TYPE_MAX,

};

virt/kvm/arm/pvtime.c

+59 −0
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ 
// Copyright (C) 2019 Arm Ltd.



#include <linux/arm-smccc.h>

#include <linux/kvm_host.h>



#include <asm/kvm_mmu.h>

#include <asm/pvclock-abi.h>



#include <kvm/arm_hypercalls.h>
@@ -70,3 +72,60 @@ gpa_t kvm_init_stolen_time(struct kvm_vcpu *vcpu) 


	return base;

}



int kvm_arm_pvtime_set_attr(struct kvm_vcpu *vcpu,

			    struct kvm_device_attr *attr)

{

	u64 __user *user = (u64 __user *)attr->addr;

	struct kvm *kvm = vcpu->kvm;

	u64 ipa;

	int ret = 0;

	int idx;



	if (attr->attr != KVM_ARM_VCPU_PVTIME_IPA)

		return -ENXIO;



	if (get_user(ipa, user))

		return -EFAULT;

	if (!IS_ALIGNED(ipa, 64))

		return -EINVAL;

	if (vcpu->arch.steal.base != GPA_INVALID)

		return -EEXIST;



	/* Check the address is in a valid memslot */

	idx = srcu_read_lock(&kvm->srcu);

	if (kvm_is_error_hva(gfn_to_hva(kvm, ipa >> PAGE_SHIFT)))

		ret = -EINVAL;

	srcu_read_unlock(&kvm->srcu, idx);



	if (!ret)

		vcpu->arch.steal.base = ipa;



	return ret;

}



int kvm_arm_pvtime_get_attr(struct kvm_vcpu *vcpu,

			    struct kvm_device_attr *attr)

{

	u64 __user *user = (u64 __user *)attr->addr;

	u64 ipa;



	if (attr->attr != KVM_ARM_VCPU_PVTIME_IPA)

		return -ENXIO;



	ipa = vcpu->arch.steal.base;



	if (put_user(ipa, user))

		return -EFAULT;

	return 0;

}



int kvm_arm_pvtime_has_attr(struct kvm_vcpu *vcpu,

			    struct kvm_device_attr *attr)

{

	switch (attr->attr) {

	case KVM_ARM_VCPU_PVTIME_IPA:

		return 0;

	}

	return -ENXIO;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE