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

Commit 6a29b512 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-arm-for-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm 

KVM/ARM updates for v4.11-rc2

vgic updates:
- Honour disabling the ITS
- Don't deadlock when deactivating own interrupts via MMIO
- Correctly expose the lact of IRQ/FIQ bypass on GICv3

I/O virtualization:
- Make KVM_CAP_NR_MEMSLOTS big enough for large guests with
  many PCIe devices

General bug fixes:
- Gracefully handle exception generated with syndroms that
  the host doesn't understand
- Properly invalidate TLBs on VHE systems
parents 05d8d346 955a3fc6

Documentation/virtual/kvm/api.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -951,6 +951,10 @@ This ioctl allows the user to create or modify a guest physical memory 
slot.  When changing an existing slot, it may be moved in the guest

slot.  When changing an existing slot, it may be moved in the guest

physical memory space, or its flags may be modified.  It may not be

physical memory space, or its flags may be modified.  It may not be

resized.  Slots may not overlap in guest physical address space.

resized.  Slots may not overlap in guest physical address space.

Bits 0-15 of "slot" specifies the slot id and this value should be

less than the maximum number of user memory slots supported per VM.

The maximum allowed slots can be queried using KVM_CAP_NR_MEMSLOTS,

if this capability is supported by the architecture.





If KVM_CAP_MULTI_ADDRESS_SPACE is available, bits 16-31 of "slot"

If KVM_CAP_MULTI_ADDRESS_SPACE is available, bits 16-31 of "slot"

specifies the address space which is being modified.  They must be

specifies the address space which is being modified.  They must be

arch/arm/include/asm/kvm_arm.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -209,6 +209,7 @@ 
#define HSR_EC_IABT_HYP	(0x21)

#define HSR_EC_IABT_HYP	(0x21)

#define HSR_EC_DABT	(0x24)

#define HSR_EC_DABT	(0x24)

#define HSR_EC_DABT_HYP	(0x25)

#define HSR_EC_DABT_HYP	(0x25)

#define HSR_EC_MAX	(0x3f)





#define HSR_WFI_IS_WFE		(_AC(1, UL) << 0)

#define HSR_WFI_IS_WFE		(_AC(1, UL) << 0)

arch/arm/include/asm/kvm_host.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@ 
#define __KVM_HAVE_ARCH_INTC_INITIALIZED

#define __KVM_HAVE_ARCH_INTC_INITIALIZED





#define KVM_USER_MEM_SLOTS 32

#define KVM_USER_MEM_SLOTS 32

#define KVM_PRIVATE_MEM_SLOTS 4

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#define KVM_HAVE_ONE_REG

#define KVM_HAVE_ONE_REG

#define KVM_HALT_POLL_NS_DEFAULT 500000

#define KVM_HALT_POLL_NS_DEFAULT 500000

arch/arm/kvm/arm.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	case KVM_CAP_MAX_VCPUS:

	case KVM_CAP_MAX_VCPUS:

		r = KVM_MAX_VCPUS;

		r = KVM_MAX_VCPUS;

		break;

		break;

	case KVM_CAP_NR_MEMSLOTS:

		r = KVM_USER_MEM_SLOTS;

		break;

	case KVM_CAP_MSI_DEVID:

	case KVM_CAP_MSI_DEVID:

		if (!kvm)

		if (!kvm)

			r = -EINVAL;

			r = -EINVAL;

arch/arm/kvm/handle_exit.c

+12 −7
Original line number Original line Diff line number Diff line
@@ -79,7 +79,19 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	return 1;

	return 1;

}

}





static int kvm_handle_unknown_ec(struct kvm_vcpu *vcpu, struct kvm_run *run)

{

	u32 hsr = kvm_vcpu_get_hsr(vcpu);



	kvm_pr_unimpl("Unknown exception class: hsr: %#08x\n",

		      hsr);



	kvm_inject_undefined(vcpu);

	return 1;

}



static exit_handle_fn arm_exit_handlers[] = {

static exit_handle_fn arm_exit_handlers[] = {

	[0 ... HSR_EC_MAX]	= kvm_handle_unknown_ec,

	[HSR_EC_WFI]		= kvm_handle_wfx,

	[HSR_EC_WFI]		= kvm_handle_wfx,

	[HSR_EC_CP15_32]	= kvm_handle_cp15_32,

	[HSR_EC_CP15_32]	= kvm_handle_cp15_32,

	[HSR_EC_CP15_64]	= kvm_handle_cp15_64,

	[HSR_EC_CP15_64]	= kvm_handle_cp15_64,
@@ -98,13 +110,6 @@ static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu) 
{

{

	u8 hsr_ec = kvm_vcpu_trap_get_class(vcpu);

	u8 hsr_ec = kvm_vcpu_trap_get_class(vcpu);





	if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers) ||

	    !arm_exit_handlers[hsr_ec]) {

		kvm_err("Unknown exception class: hsr: %#08x\n",

			(unsigned int)kvm_vcpu_get_hsr(vcpu));

		BUG();

	}



	return arm_exit_handlers[hsr_ec];

	return arm_exit_handlers[hsr_ec];

}

}