Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 330690cd authored by Christoffer Dall's avatar Christoffer Dall Committed by Marc Zyngier
Browse files

ARM: KVM: VGIC accept vcpu and dist base addresses from user space 



User space defines the model to emulate to a guest and should therefore
decide which addresses are used for both the virtual CPU interface
directly mapped in the guest physical address space and for the emulated
distributor interface, which is mapped in software by the in-kernel VGIC
support.

Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarChristoffer Dall <c.dall@virtualopensystems.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 1a89dd91

Documentation/virtual/kvm/api.txt

+1 −0
Original line number Diff line number Diff line
@@ -2222,6 +2222,7 @@ Errors: 
  ENXIO:  Device not supported on current system

  EEXIST: Address already set

  E2BIG:  Address outside guest physical address space

  EBUSY:  Address overlaps with other device range



struct kvm_arm_device_addr {

	__u64 id;

arch/arm/include/asm/kvm_vgic.h

+9 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#include <linux/irqchip/arm-gic.h>



struct vgic_dist {

	/* Distributor and vcpu interface mapping in the guest */

	phys_addr_t		vgic_dist_base;

	phys_addr_t		vgic_cpu_base;

};



struct vgic_cpu {
@@ -33,6 +36,7 @@ struct kvm_run; 
struct kvm_exit_mmio;



#ifdef CONFIG_KVM_ARM_VGIC

int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr);

bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run,

		      struct kvm_exit_mmio *mmio);
@@ -42,6 +46,11 @@ static inline int kvm_vgic_hyp_init(void) 
	return 0;

}



static inline int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr)

{

	return 0;

}



static inline int kvm_vgic_init(struct kvm *kvm)

{

	return 0;

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

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ struct kvm_regs { 
#define KVM_VGIC_V2_ADDR_TYPE_DIST	0

#define KVM_VGIC_V2_ADDR_TYPE_CPU	1



#define KVM_VGIC_V2_DIST_SIZE		0x1000

#define KVM_VGIC_V2_CPU_SIZE		0x2000



#define KVM_ARM_VCPU_POWER_OFF		0 /* CPU is started in OFF state */



struct kvm_vcpu_init {

arch/arm/kvm/arm.c

+15 −1
Original line number Diff line number Diff line
@@ -880,8 +880,22 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) 
static int kvm_vm_ioctl_set_device_addr(struct kvm *kvm,

					struct kvm_arm_device_addr *dev_addr)

{

	unsigned long dev_id, type;



	dev_id = (dev_addr->id & KVM_ARM_DEVICE_ID_MASK) >>

		KVM_ARM_DEVICE_ID_SHIFT;

	type = (dev_addr->id & KVM_ARM_DEVICE_TYPE_MASK) >>

		KVM_ARM_DEVICE_TYPE_SHIFT;



	switch (dev_id) {

	case KVM_ARM_DEVICE_VGIC_V2:

		if (!vgic_present)

			return -ENXIO;

		return kvm_vgic_set_addr(kvm, type, dev_addr->addr);

	default:

		return -ENODEV;

	}

}



long kvm_arch_vm_ioctl(struct file *filp,

		       unsigned int ioctl, unsigned long arg)

arch/arm/kvm/vgic.c

+62 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#include <linux/io.h>

#include <asm/kvm_emulate.h>



#define VGIC_ADDR_UNDEF		(-1)

#define IS_VGIC_ADDR_UNDEF(_x)  ((_x) == VGIC_ADDR_UNDEF)



#define ACCESS_READ_VALUE	(1 << 0)

#define ACCESS_READ_RAZ		(0 << 0)

#define ACCESS_READ_MASK(x)	((x) & (1 << 0))
@@ -151,3 +154,62 @@ bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run, 
{

	return KVM_EXIT_MMIO;

}



static bool vgic_ioaddr_overlap(struct kvm *kvm)

{

	phys_addr_t dist = kvm->arch.vgic.vgic_dist_base;

	phys_addr_t cpu = kvm->arch.vgic.vgic_cpu_base;



	if (IS_VGIC_ADDR_UNDEF(dist) || IS_VGIC_ADDR_UNDEF(cpu))

		return 0;

	if ((dist <= cpu && dist + KVM_VGIC_V2_DIST_SIZE > cpu) ||

	    (cpu <= dist && cpu + KVM_VGIC_V2_CPU_SIZE > dist))

		return -EBUSY;

	return 0;

}



static int vgic_ioaddr_assign(struct kvm *kvm, phys_addr_t *ioaddr,

			      phys_addr_t addr, phys_addr_t size)

{

	int ret;



	if (!IS_VGIC_ADDR_UNDEF(*ioaddr))

		return -EEXIST;

	if (addr + size < addr)

		return -EINVAL;



	ret = vgic_ioaddr_overlap(kvm);

	if (ret)

		return ret;

	*ioaddr = addr;

	return ret;

}



int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr)

{

	int r = 0;

	struct vgic_dist *vgic = &kvm->arch.vgic;



	if (addr & ~KVM_PHYS_MASK)

		return -E2BIG;



	if (addr & ~PAGE_MASK)

		return -EINVAL;



	mutex_lock(&kvm->lock);

	switch (type) {

	case KVM_VGIC_V2_ADDR_TYPE_DIST:

		r = vgic_ioaddr_assign(kvm, &vgic->vgic_dist_base,

				       addr, KVM_VGIC_V2_DIST_SIZE);

		break;

	case KVM_VGIC_V2_ADDR_TYPE_CPU:

		r = vgic_ioaddr_assign(kvm, &vgic->vgic_cpu_base,

				       addr, KVM_VGIC_V2_CPU_SIZE);

		break;

	default:

		r = -ENODEV;

	}



	mutex_unlock(&kvm->lock);

	return r;

}