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

Commit ac3d3735 authored by Andre Przywara's avatar Andre Przywara Committed by Christoffer Dall
Browse files

arm/arm64: KVM: allow userland to request a virtual GICv3 



With all of the GICv3 code in place now we allow userland to ask the
kernel for using a virtual GICv3 in the guest.
Also we provide the necessary support for guests setting the memory
addresses for the virtual distributor and redistributors.
This requires some userland code to make use of that feature and
explicitly ask for a virtual GICv3.
Document that KVM_CREATE_IRQCHIP only works for GICv2, but is
considered legacy and using KVM_CREATE_DEVICE is preferred.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent b5d84ff6

Documentation/virtual/kvm/api.txt

+8 −5
Original line number Original line Diff line number Diff line
@@ -612,11 +612,14 @@ Type: vm ioctl 
Parameters: none

Parameters: none

Returns: 0 on success, -1 on error

Returns: 0 on success, -1 on error





Creates an interrupt controller model in the kernel.  On x86, creates a virtual

Creates an interrupt controller model in the kernel.

ioapic, a virtual PIC (two PICs, nested), and sets up future vcpus to have a

On x86, creates a virtual ioapic, a virtual PIC (two PICs, nested), and sets up

local APIC.  IRQ routing for GSIs 0-15 is set to both PIC and IOAPIC; GSI 16-23

future vcpus to have a local APIC.  IRQ routing for GSIs 0-15 is set to both

only go to the IOAPIC.  On ARM/arm64, a GIC is

PIC and IOAPIC; GSI 16-23 only go to the IOAPIC.

created. On s390, a dummy irq routing table is created.

On ARM/arm64, a GICv2 is created. Any other GIC versions require the usage of

KVM_CREATE_DEVICE, which also supports creating a GICv2.  Using

KVM_CREATE_DEVICE is preferred over KVM_CREATE_IRQCHIP for GICv2.

On s390, a dummy irq routing table is created.





Note that on s390 the KVM_CAP_S390_IRQCHIP vm capability needs to be enabled

Note that on s390 the KVM_CAP_S390_IRQCHIP vm capability needs to be enabled

before KVM_CREATE_IRQCHIP can be used.

before KVM_CREATE_IRQCHIP can be used.

Documentation/virtual/kvm/devices/arm-vgic.txt

+20 −2
Original line number Original line Diff line number Diff line
@@ -3,22 +3,38 @@ ARM Virtual Generic Interrupt Controller (VGIC) 




Device types supported:

Device types supported:

  KVM_DEV_TYPE_ARM_VGIC_V2     ARM Generic Interrupt Controller v2.0

  KVM_DEV_TYPE_ARM_VGIC_V2     ARM Generic Interrupt Controller v2.0

  KVM_DEV_TYPE_ARM_VGIC_V3     ARM Generic Interrupt Controller v3.0





Only one VGIC instance may be instantiated through either this API or the

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.





Creating a guest GICv3 device requires a host GICv3 as well.

GICv3 implementations with hardware compatibility support allow a guest GICv2

as well.



Groups:

Groups:

  KVM_DEV_ARM_VGIC_GRP_ADDR

  KVM_DEV_ARM_VGIC_GRP_ADDR

  Attributes:

  Attributes:

    KVM_VGIC_V2_ADDR_TYPE_DIST (rw, 64-bit)

    KVM_VGIC_V2_ADDR_TYPE_DIST (rw, 64-bit)

      Base address in the guest physical address space of the GIC distributor

      Base address in the guest physical address space of the GIC distributor

      register mappings.

      register mappings. Only valid for KVM_DEV_TYPE_ARM_VGIC_V2.





    KVM_VGIC_V2_ADDR_TYPE_CPU (rw, 64-bit)

    KVM_VGIC_V2_ADDR_TYPE_CPU (rw, 64-bit)

      Base address in the guest physical address space of the GIC virtual cpu

      Base address in the guest physical address space of the GIC virtual cpu

      interface register mappings.

      interface register mappings. Only valid for KVM_DEV_TYPE_ARM_VGIC_V2.



    KVM_VGIC_V3_ADDR_TYPE_DIST (rw, 64-bit)

      Base address in the guest physical address space of the GICv3 distributor

      register mappings. Only valid for KVM_DEV_TYPE_ARM_VGIC_V3.



    KVM_VGIC_V3_ADDR_TYPE_REDIST (rw, 64-bit)

      Base address in the guest physical address space of the GICv3

      redistributor register mappings. There are two 64K pages for each

      VCPU and all of the redistributor pages are contiguous.

      Only valid for KVM_DEV_TYPE_ARM_VGIC_V3.







  KVM_DEV_ARM_VGIC_GRP_DIST_REGS

  KVM_DEV_ARM_VGIC_GRP_DIST_REGS

  Attributes:

  Attributes:
@@ -36,6 +52,7 @@ Groups: 
    the register.

    the register.

  Limitations:

  Limitations:

    - Priorities are not implemented, and registers are RAZ/WI

    - Priorities are not implemented, and registers are RAZ/WI

    - Currently only implemented for KVM_DEV_TYPE_ARM_VGIC_V2.

  Errors:

  Errors:

    -ENODEV: Getting or setting this register is not yet supported

    -ENODEV: Getting or setting this register is not yet supported

    -EBUSY: One or more VCPUs are running

    -EBUSY: One or more VCPUs are running
@@ -68,6 +85,7 @@ Groups: 




  Limitations:

  Limitations:

    - Priorities are not implemented, and registers are RAZ/WI

    - Priorities are not implemented, and registers are RAZ/WI

    - Currently only implemented for KVM_DEV_TYPE_ARM_VGIC_V2.

  Errors:

  Errors:

    -ENODEV: Getting or setting this register is not yet supported

    -ENODEV: Getting or setting this register is not yet supported

    -EBUSY: One or more VCPUs are running

    -EBUSY: One or more VCPUs are running

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -78,6 +78,13 @@ struct kvm_regs { 
#define KVM_VGIC_V2_DIST_SIZE		0x1000

#define KVM_VGIC_V2_DIST_SIZE		0x1000

#define KVM_VGIC_V2_CPU_SIZE		0x2000

#define KVM_VGIC_V2_CPU_SIZE		0x2000





/* Supported VGICv3 address types  */

#define KVM_VGIC_V3_ADDR_TYPE_DIST	2

#define KVM_VGIC_V3_ADDR_TYPE_REDIST	3



#define KVM_VGIC_V3_DIST_SIZE		SZ_64K

#define KVM_VGIC_V3_REDIST_SIZE		(2 * SZ_64K)



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

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

#define KVM_ARM_VCPU_EL1_32BIT		1 /* CPU running a 32bit VM */

#define KVM_ARM_VCPU_EL1_32BIT		1 /* CPU running a 32bit VM */

#define KVM_ARM_VCPU_PSCI_0_2		2 /* CPU uses PSCI v0.2 */

#define KVM_ARM_VCPU_PSCI_0_2		2 /* CPU uses PSCI v0.2 */

include/kvm/arm_vgic.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -36,8 +36,8 @@ 
#define VGIC_V2_MAX_CPUS	8

#define VGIC_V2_MAX_CPUS	8





/* Sanity checks... */

/* Sanity checks... */

#if (KVM_MAX_VCPUS > 8)

#if (KVM_MAX_VCPUS > 255)

#error	Invalid number of CPU interfaces

#error Too many KVM VCPUs, the VGIC only supports up to 255 VCPUs for now

#endif

#endif





#if (VGIC_NR_IRQS_LEGACY & 31)

#if (VGIC_NR_IRQS_LEGACY & 31)

virt/kvm/arm/vgic-v3-emul.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1007,6 +1007,9 @@ static int vgic_v3_has_attr(struct kvm_device *dev, 
		case KVM_VGIC_V2_ADDR_TYPE_DIST:

		case KVM_VGIC_V2_ADDR_TYPE_DIST:

		case KVM_VGIC_V2_ADDR_TYPE_CPU:

		case KVM_VGIC_V2_ADDR_TYPE_CPU:

			return -ENXIO;

			return -ENXIO;

		case KVM_VGIC_V3_ADDR_TYPE_DIST:

		case KVM_VGIC_V3_ADDR_TYPE_REDIST:

			return 0;

		}

		}

		break;

		break;

	case KVM_DEV_ARM_VGIC_GRP_DIST_REGS:

	case KVM_DEV_ARM_VGIC_GRP_DIST_REGS: