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

Commit 106e4da6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Radim Krčmář:
 "ARM updates from Marc Zyngier:
   - 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

  x86:
   - improvements in emulation of VMCLEAR, VMX MSR bitmaps, and VCPU
     reset

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: nVMX: do not warn when MSR bitmap address is not backed
  KVM: arm64: Increase number of user memslots to 512
  KVM: arm/arm64: Remove KVM_PRIVATE_MEM_SLOTS definition that are unused
  KVM: arm/arm64: Enable KVM_CAP_NR_MEMSLOTS on arm/arm64
  KVM: Add documentation for KVM_CAP_NR_MEMSLOTS
  KVM: arm/arm64: VGIC: Fix command handling while ITS being disabled
  arm64: KVM: Survive unknown traps from guests
  arm: KVM: Survive unknown traps from guests
  KVM: arm/arm64: Let vcpu thread modify its own active state
  KVM: nVMX: reset nested_run_pending if the vCPU is going to be reset
  kvm: nVMX: VMCLEAR should not cause the vCPU to shut down
  KVM: arm/arm64: vgic-v3: Don't pretend to support IRQ/FIQ bypass
  arm64: KVM: VHE: Clear HCR_TGE when invalidating guest TLBs
parents 4b050f22 6a29b512

Documentation/virtual/kvm/api.txt

+4 −0
Original line number 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

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

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"

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

arch/arm/include/asm/kvm_arm.h

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

#define HSR_EC_DABT	(0x24)

#define HSR_EC_DABT_HYP	(0x25)

#define HSR_EC_MAX	(0x3f)



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

arch/arm/include/asm/kvm_host.h

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



#define KVM_USER_MEM_SLOTS 32

#define KVM_PRIVATE_MEM_SLOTS 4

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#define KVM_HAVE_ONE_REG

#define KVM_HALT_POLL_NS_DEFAULT 500000

arch/arm/kvm/arm.c

+3 −0
Original line number 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:

		r = KVM_MAX_VCPUS;

		break;

	case KVM_CAP_NR_MEMSLOTS:

		r = KVM_USER_MEM_SLOTS;

		break;

	case KVM_CAP_MSI_DEVID:

		if (!kvm)

			r = -EINVAL;

arch/arm/kvm/handle_exit.c

+12 −7
Original line number Diff line number Diff line
@@ -79,7 +79,19 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	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[] = {

	[0 ... HSR_EC_MAX]	= kvm_handle_unknown_ec,

	[HSR_EC_WFI]		= kvm_handle_wfx,

	[HSR_EC_CP15_32]	= kvm_handle_cp15_32,

	[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);



	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];

}