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

Commit bf0fb67c authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

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

KVM/ARM changes for v4.1:

- fixes for live migration
- irqfd support
- kvm-io-bus & vgic rework to enable ioeventfd
- page ageing for stage-2 translation
- various cleanups
parents 8999602d d44758c0

Documentation/virtual/kvm/api.txt

+17 −5
Original line number Diff line number Diff line
@@ -997,7 +997,7 @@ for vm-wide capabilities. 
4.38 KVM_GET_MP_STATE



Capability: KVM_CAP_MP_STATE

Architectures: x86, s390

Architectures: x86, s390, arm, arm64

Type: vcpu ioctl

Parameters: struct kvm_mp_state (out)

Returns: 0 on success; -1 on error
@@ -1011,7 +1011,7 @@ uniprocessor guests). 


Possible values are:



 - KVM_MP_STATE_RUNNABLE:        the vcpu is currently running [x86]

 - KVM_MP_STATE_RUNNABLE:        the vcpu is currently running [x86,arm/arm64]

 - KVM_MP_STATE_UNINITIALIZED:   the vcpu is an application processor (AP)

                                 which has not yet received an INIT signal [x86]

 - KVM_MP_STATE_INIT_RECEIVED:   the vcpu has received an INIT signal, and is
@@ -1020,7 +1020,7 @@ Possible values are: 
                                 is waiting for an interrupt [x86]

 - KVM_MP_STATE_SIPI_RECEIVED:   the vcpu has just received a SIPI (vector

                                 accessible via KVM_GET_VCPU_EVENTS) [x86]

 - KVM_MP_STATE_STOPPED:         the vcpu is stopped [s390]

 - KVM_MP_STATE_STOPPED:         the vcpu is stopped [s390,arm/arm64]

 - KVM_MP_STATE_CHECK_STOP:      the vcpu is in a special error state [s390]

 - KVM_MP_STATE_OPERATING:       the vcpu is operating (running or halted)

                                 [s390]
@@ -1031,11 +1031,15 @@ On x86, this ioctl is only useful after KVM_CREATE_IRQCHIP. Without an 
in-kernel irqchip, the multiprocessing state must be maintained by userspace on

these architectures.



For arm/arm64:



The only states that are valid are KVM_MP_STATE_STOPPED and

KVM_MP_STATE_RUNNABLE which reflect if the vcpu is paused or not.



4.39 KVM_SET_MP_STATE



Capability: KVM_CAP_MP_STATE

Architectures: x86, s390

Architectures: x86, s390, arm, arm64

Type: vcpu ioctl

Parameters: struct kvm_mp_state (in)

Returns: 0 on success; -1 on error
@@ -1047,6 +1051,10 @@ On x86, this ioctl is only useful after KVM_CREATE_IRQCHIP. Without an 
in-kernel irqchip, the multiprocessing state must be maintained by userspace on

these architectures.



For arm/arm64:



The only states that are valid are KVM_MP_STATE_STOPPED and

KVM_MP_STATE_RUNNABLE which reflect if the vcpu should be paused or not.



4.40 KVM_SET_IDENTITY_MAP_ADDR
@@ -2263,7 +2271,7 @@ into the hash PTE second double word). 
4.75 KVM_IRQFD



Capability: KVM_CAP_IRQFD

Architectures: x86 s390

Architectures: x86 s390 arm arm64

Type: vm ioctl

Parameters: struct kvm_irqfd (in)

Returns: 0 on success, -1 on error
@@ -2289,6 +2297,10 @@ Note that closing the resamplefd is not sufficient to disable the 
irqfd.  The KVM_IRQFD_FLAG_RESAMPLE is only necessary on assignment

and need not be specified with KVM_IRQFD_FLAG_DEASSIGN.



On ARM/ARM64, the gsi field in the kvm_irqfd struct specifies the Shared

Peripheral Interrupt (SPI) index, such that the GIC interrupt ID is

given by gsi + 32.



4.76 KVM_PPC_ALLOCATE_HTAB



Capability: KVM_CAP_PPC_ALLOC_HTAB

arch/arm/include/asm/kvm_arm.h

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ 
#define HSR_COND	(0xfU << HSR_COND_SHIFT)



#define FSC_FAULT	(0x04)

#define FSC_ACCESS	(0x08)

#define FSC_PERM	(0x0c)



/* Hyp Prefetch Fault Address Register (HPFAR/HDFAR) */

arch/arm/include/asm/kvm_host.h

+4 −11
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <asm/fpstate.h>

#include <kvm/arm_arch_timer.h>



#define __KVM_HAVE_ARCH_INTC_INITIALIZED



#if defined(CONFIG_KVM_ARM_MAX_VCPUS)

#define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS

#else
@@ -165,19 +167,10 @@ void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte); 


unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu);

int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);

int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);

int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);



/* We do not have shadow page tables, hence the empty hooks */

static inline int kvm_age_hva(struct kvm *kvm, unsigned long start,

			      unsigned long end)

{

	return 0;

}



static inline int kvm_test_age_hva(struct kvm *kvm, unsigned long hva)

{

	return 0;

}



static inline void kvm_arch_mmu_notifier_invalidate_page(struct kvm *kvm,

							 unsigned long address)

{

arch/arm/include/asm/kvm_mmio.h

+0 −22
Original line number Diff line number Diff line
@@ -28,28 +28,6 @@ struct kvm_decode { 
	bool sign_extend;

};



/*

 * The in-kernel MMIO emulation code wants to use a copy of run->mmio,

 * which is an anonymous type. Use our own type instead.

 */

struct kvm_exit_mmio {

	phys_addr_t	phys_addr;

	u8		data[8];

	u32		len;

	bool		is_write;

	void		*private;

};



static inline void kvm_prepare_mmio(struct kvm_run *run,

				    struct kvm_exit_mmio *mmio)

{

	run->mmio.phys_addr	= mmio->phys_addr;

	run->mmio.len		= mmio->len;

	run->mmio.is_write	= mmio->is_write;

	memcpy(run->mmio.data, mmio->data, mmio->len);

	run->exit_reason	= KVM_EXIT_MMIO;

}



int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run);

int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,

		 phys_addr_t fault_ipa);

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

+3 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ struct kvm_arch_memory_slot { 
/* Highest supported SPI, from VGIC_NR_IRQS */

#define KVM_ARM_IRQ_GIC_MAX		127



/* One single KVM irqchip, ie. the VGIC */

#define KVM_NR_IRQCHIPS          1



/* PSCI interface */

#define KVM_PSCI_FN_BASE		0x95c1ba5e

#define KVM_PSCI_FN(n)			(KVM_PSCI_FN_BASE + (n))