KVM: arm-vgic: Set base addr through device API
Support setting the distributor and cpu interface base addresses in the VM physical address space through the KVM_{SET,GET}_DEVICE_ATTR API in addition to the ARM specific API. This has the added benefit of being able to share more code in user space and do things in a uniform manner. Also deprecate the older API at the same time, but backwards compatibility will be maintained. Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
This commit is contained in:
parent
7330672bef
commit
ce01e4e887
6 changed files with 96 additions and 15 deletions
|
@ -2391,7 +2391,8 @@ struct kvm_reg_list {
|
||||||
This ioctl returns the guest registers that are supported for the
|
This ioctl returns the guest registers that are supported for the
|
||||||
KVM_GET_ONE_REG/KVM_SET_ONE_REG calls.
|
KVM_GET_ONE_REG/KVM_SET_ONE_REG calls.
|
||||||
|
|
||||||
4.85 KVM_ARM_SET_DEVICE_ADDR
|
|
||||||
|
4.85 KVM_ARM_SET_DEVICE_ADDR (deprecated)
|
||||||
|
|
||||||
Capability: KVM_CAP_ARM_SET_DEVICE_ADDR
|
Capability: KVM_CAP_ARM_SET_DEVICE_ADDR
|
||||||
Architectures: arm, arm64
|
Architectures: arm, arm64
|
||||||
|
@ -2429,6 +2430,10 @@ must be called after calling KVM_CREATE_IRQCHIP, but before calling
|
||||||
KVM_RUN on any of the VCPUs. Calling this ioctl twice for any of the
|
KVM_RUN on any of the VCPUs. Calling this ioctl twice for any of the
|
||||||
base addresses will return -EEXIST.
|
base addresses will return -EEXIST.
|
||||||
|
|
||||||
|
Note, this IOCTL is deprecated and the more flexible SET/GET_DEVICE_ATTR API
|
||||||
|
should be used instead.
|
||||||
|
|
||||||
|
|
||||||
4.86 KVM_PPC_RTAS_DEFINE_TOKEN
|
4.86 KVM_PPC_RTAS_DEFINE_TOKEN
|
||||||
|
|
||||||
Capability: KVM_CAP_PPC_RTAS
|
Capability: KVM_CAP_PPC_RTAS
|
||||||
|
|
|
@ -8,3 +8,14 @@ Only one VGIC instance may be instantiated through either this API or the
|
||||||
legacy KVM_CREATE_IRQCHIP api. The created VGIC will act as the VM interrupt
|
legacy KVM_CREATE_IRQCHIP api. The created VGIC will act as the VM interrupt
|
||||||
controller, requiring emulated user-space devices to inject interrupts to the
|
controller, requiring emulated user-space devices to inject interrupts to the
|
||||||
VGIC instead of directly to CPUs.
|
VGIC instead of directly to CPUs.
|
||||||
|
|
||||||
|
Groups:
|
||||||
|
KVM_DEV_ARM_VGIC_GRP_ADDR
|
||||||
|
Attributes:
|
||||||
|
KVM_VGIC_V2_ADDR_TYPE_DIST (rw, 64-bit)
|
||||||
|
Base address in the guest physical address space of the GIC distributor
|
||||||
|
register mappings.
|
||||||
|
|
||||||
|
KVM_VGIC_V2_ADDR_TYPE_CPU (rw, 64-bit)
|
||||||
|
Base address in the guest physical address space of the GIC virtual cpu
|
||||||
|
interface register mappings.
|
||||||
|
|
|
@ -163,6 +163,8 @@ struct kvm_arch_memory_slot {
|
||||||
#define KVM_REG_ARM_VFP_FPINST 0x1009
|
#define KVM_REG_ARM_VFP_FPINST 0x1009
|
||||||
#define KVM_REG_ARM_VFP_FPINST2 0x100A
|
#define KVM_REG_ARM_VFP_FPINST2 0x100A
|
||||||
|
|
||||||
|
/* Device Control API: ARM VGIC */
|
||||||
|
#define KVM_DEV_ARM_VGIC_GRP_ADDR 0
|
||||||
|
|
||||||
/* KVM_IRQ_LINE irq field index values */
|
/* KVM_IRQ_LINE irq field index values */
|
||||||
#define KVM_ARM_IRQ_TYPE_SHIFT 24
|
#define KVM_ARM_IRQ_TYPE_SHIFT 24
|
||||||
|
|
|
@ -776,7 +776,7 @@ static int kvm_vm_ioctl_set_device_addr(struct kvm *kvm,
|
||||||
case KVM_ARM_DEVICE_VGIC_V2:
|
case KVM_ARM_DEVICE_VGIC_V2:
|
||||||
if (!vgic_present)
|
if (!vgic_present)
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
return kvm_vgic_set_addr(kvm, type, dev_addr->addr);
|
return kvm_vgic_addr(kvm, type, &dev_addr->addr, true);
|
||||||
default:
|
default:
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
|
@ -144,7 +144,7 @@ struct kvm_run;
|
||||||
struct kvm_exit_mmio;
|
struct kvm_exit_mmio;
|
||||||
|
|
||||||
#ifdef CONFIG_KVM_ARM_VGIC
|
#ifdef CONFIG_KVM_ARM_VGIC
|
||||||
int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr);
|
int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write);
|
||||||
int kvm_vgic_hyp_init(void);
|
int kvm_vgic_hyp_init(void);
|
||||||
int kvm_vgic_init(struct kvm *kvm);
|
int kvm_vgic_init(struct kvm *kvm);
|
||||||
int kvm_vgic_create(struct kvm *kvm);
|
int kvm_vgic_create(struct kvm *kvm);
|
||||||
|
|
|
@ -1495,6 +1495,12 @@ static int vgic_ioaddr_assign(struct kvm *kvm, phys_addr_t *ioaddr,
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
if (addr & ~KVM_PHYS_MASK)
|
||||||
|
return -E2BIG;
|
||||||
|
|
||||||
|
if (addr & (SZ_4K - 1))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
if (!IS_VGIC_ADDR_UNDEF(*ioaddr))
|
if (!IS_VGIC_ADDR_UNDEF(*ioaddr))
|
||||||
return -EEXIST;
|
return -EEXIST;
|
||||||
if (addr + size < addr)
|
if (addr + size < addr)
|
||||||
|
@ -1507,26 +1513,41 @@ static int vgic_ioaddr_assign(struct kvm *kvm, phys_addr_t *ioaddr,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr)
|
/**
|
||||||
|
* kvm_vgic_addr - set or get vgic VM base addresses
|
||||||
|
* @kvm: pointer to the vm struct
|
||||||
|
* @type: the VGIC addr type, one of KVM_VGIC_V2_ADDR_TYPE_XXX
|
||||||
|
* @addr: pointer to address value
|
||||||
|
* @write: if true set the address in the VM address space, if false read the
|
||||||
|
* address
|
||||||
|
*
|
||||||
|
* Set or get the vgic base addresses for the distributor and the virtual CPU
|
||||||
|
* interface in the VM physical address space. These addresses are properties
|
||||||
|
* of the emulated core/SoC and therefore user space initially knows this
|
||||||
|
* information.
|
||||||
|
*/
|
||||||
|
int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write)
|
||||||
{
|
{
|
||||||
int r = 0;
|
int r = 0;
|
||||||
struct vgic_dist *vgic = &kvm->arch.vgic;
|
struct vgic_dist *vgic = &kvm->arch.vgic;
|
||||||
|
|
||||||
if (addr & ~KVM_PHYS_MASK)
|
|
||||||
return -E2BIG;
|
|
||||||
|
|
||||||
if (addr & (SZ_4K - 1))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
mutex_lock(&kvm->lock);
|
mutex_lock(&kvm->lock);
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case KVM_VGIC_V2_ADDR_TYPE_DIST:
|
case KVM_VGIC_V2_ADDR_TYPE_DIST:
|
||||||
r = vgic_ioaddr_assign(kvm, &vgic->vgic_dist_base,
|
if (write) {
|
||||||
addr, KVM_VGIC_V2_DIST_SIZE);
|
r = vgic_ioaddr_assign(kvm, &vgic->vgic_dist_base,
|
||||||
|
*addr, KVM_VGIC_V2_DIST_SIZE);
|
||||||
|
} else {
|
||||||
|
*addr = vgic->vgic_dist_base;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case KVM_VGIC_V2_ADDR_TYPE_CPU:
|
case KVM_VGIC_V2_ADDR_TYPE_CPU:
|
||||||
r = vgic_ioaddr_assign(kvm, &vgic->vgic_cpu_base,
|
if (write) {
|
||||||
addr, KVM_VGIC_V2_CPU_SIZE);
|
r = vgic_ioaddr_assign(kvm, &vgic->vgic_cpu_base,
|
||||||
|
*addr, KVM_VGIC_V2_CPU_SIZE);
|
||||||
|
} else {
|
||||||
|
*addr = vgic->vgic_cpu_base;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
r = -ENODEV;
|
r = -ENODEV;
|
||||||
|
@ -1538,16 +1559,58 @@ int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr)
|
||||||
|
|
||||||
static int vgic_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
|
static int vgic_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
|
||||||
{
|
{
|
||||||
|
int r;
|
||||||
|
|
||||||
|
switch (attr->group) {
|
||||||
|
case KVM_DEV_ARM_VGIC_GRP_ADDR: {
|
||||||
|
u64 __user *uaddr = (u64 __user *)(long)attr->addr;
|
||||||
|
u64 addr;
|
||||||
|
unsigned long type = (unsigned long)attr->attr;
|
||||||
|
|
||||||
|
if (copy_from_user(&addr, uaddr, sizeof(addr)))
|
||||||
|
return -EFAULT;
|
||||||
|
|
||||||
|
r = kvm_vgic_addr(dev->kvm, type, &addr, true);
|
||||||
|
return (r == -ENODEV) ? -ENXIO : r;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int vgic_get_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
|
static int vgic_get_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
|
||||||
{
|
{
|
||||||
return -ENXIO;
|
int r = -ENXIO;
|
||||||
|
|
||||||
|
switch (attr->group) {
|
||||||
|
case KVM_DEV_ARM_VGIC_GRP_ADDR: {
|
||||||
|
u64 __user *uaddr = (u64 __user *)(long)attr->addr;
|
||||||
|
u64 addr;
|
||||||
|
unsigned long type = (unsigned long)attr->attr;
|
||||||
|
|
||||||
|
r = kvm_vgic_addr(dev->kvm, type, &addr, false);
|
||||||
|
if (r)
|
||||||
|
return (r == -ENODEV) ? -ENXIO : r;
|
||||||
|
|
||||||
|
if (copy_to_user(uaddr, &addr, sizeof(addr)))
|
||||||
|
return -EFAULT;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int vgic_has_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
|
static int vgic_has_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
|
||||||
{
|
{
|
||||||
|
switch (attr->group) {
|
||||||
|
case KVM_DEV_ARM_VGIC_GRP_ADDR:
|
||||||
|
switch (attr->attr) {
|
||||||
|
case KVM_VGIC_V2_ADDR_TYPE_DIST:
|
||||||
|
case KVM_VGIC_V2_ADDR_TYPE_CPU:
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue