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

Commit 1c6007d5 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-for-3.20' of... 

Merge tag 'kvm-arm-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next

KVM/ARM changes for v3.20 including GICv3 emulation, dirty page logging, added
trace symbols, and adding an explicit VGIC init device control IOCTL.

Conflicts:
	arch/arm64/include/asm/kvm_arm.h
	arch/arm64/kvm/handle_exit.c
parents c6156df9 4b990589

Documentation/virtual/kvm/api.txt

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

Returns: 0 on success, -1 on error



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

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

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

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

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

Creates an interrupt controller model in the kernel.

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

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

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

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

before KVM_CREATE_IRQCHIP can be used.

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

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


Device types supported:

  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

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

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:

  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.

      register mappings. Only valid for KVM_DEV_TYPE_ARM_VGIC_V2.

      This address needs to be 4K aligned and the region covers 4 KByte.



    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.

      interface register mappings. Only valid for KVM_DEV_TYPE_ARM_VGIC_V2.

      This address needs to be 4K aligned and the region covers 4 KByte.



    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.

      This address needs to be 64K aligned and the region covers 64 KByte.



    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.

      This address needs to be 64K aligned.





  KVM_DEV_ARM_VGIC_GRP_DIST_REGS

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

  Limitations:

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

    - Currently only implemented for KVM_DEV_TYPE_ARM_VGIC_V2.

  Errors:

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

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


  Limitations:

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

    - Currently only implemented for KVM_DEV_TYPE_ARM_VGIC_V2.

  Errors:

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

    -EBUSY: One or more VCPUs are running
@@ -81,3 +103,14 @@ Groups: 
    -EINVAL: Value set is out of the expected range

    -EBUSY: Value has already be set, or GIC has already been initialized

            with default values.



  KVM_DEV_ARM_VGIC_GRP_CTRL

  Attributes:

    KVM_DEV_ARM_VGIC_CTRL_INIT

      request the initialization of the VGIC, no additional parameter in

      kvm_device_attr.addr.

  Errors:

    -ENXIO: VGIC not properly configured as required prior to calling

     this attribute

    -ENODEV: no online VCPU

    -ENOMEM: memory shortage when allocating vgic internal data

arch/arm/include/asm/kvm_asm.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ extern char __kvm_hyp_code_end[]; 


extern void __kvm_flush_vm_context(void);

extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa);

extern void __kvm_tlb_flush_vmid(struct kvm *kvm);



extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);

#endif

arch/arm/include/asm/kvm_emulate.h

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/kvm_asm.h>

#include <asm/kvm_mmio.h>

#include <asm/kvm_arm.h>

#include <asm/cputype.h>



unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num);

unsigned long *vcpu_spsr(struct kvm_vcpu *vcpu);
@@ -167,9 +168,9 @@ static inline u32 kvm_vcpu_hvc_get_imm(struct kvm_vcpu *vcpu) 
	return kvm_vcpu_get_hsr(vcpu) & HSR_HVC_IMM_MASK;

}



static inline unsigned long kvm_vcpu_get_mpidr(struct kvm_vcpu *vcpu)

static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.cp15[c0_MPIDR];

	return vcpu->arch.cp15[c0_MPIDR] & MPIDR_HWID_BITMASK;

}



static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)

arch/arm/include/asm/kvm_host.h

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ struct kvm_arch { 


	/* Interrupt controller */

	struct vgic_dist	vgic;

	int max_vcpus;

};



#define KVM_NR_MEM_OBJS     40
@@ -234,6 +235,10 @@ static inline void vgic_arch_setup(const struct vgic_params *vgic) 
int kvm_perf_init(void);

int kvm_perf_teardown(void);



void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot);



struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr);



static inline void kvm_arch_hardware_disable(void) {}

static inline void kvm_arch_hardware_unsetup(void) {}

static inline void kvm_arch_sync_events(struct kvm *kvm) {}