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

Commit b6d980f4 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 Paolo Bonzini:
 "AMD fixes for bugs introduced in the 4.2 merge window, and a few PPC
  bug fixes too"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: disable halt_poll_ns as default for s390x
  KVM: x86: fix off-by-one in reserved bits check
  KVM: x86: use correct page table format to check nested page table reserved bits
  KVM: svm: do not call kvm_set_cr0 from init_vmcb
  KVM: x86: trap AMD MSRs for the TSeg base and mask
  KVM: PPC: Book3S: Take the kvm->srcu lock in kvmppc_h_logical_ci_load/store()
  KVM: PPC: Book3S HV: Pass the correct trap argument to kvmhv_commence_exit
  KVM: PPC: Book3S HV: Fix handling of interrupted VCPUs
  kvm: svm: reset mmu on VCPU reset
parents 57cb635c 920552b2

arch/arm/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#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



#define KVM_VCPU_MAX_FEATURES 2

arch/arm64/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#define KVM_USER_MEM_SLOTS 32

#define KVM_PRIVATE_MEM_SLOTS 4

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#define KVM_HALT_POLL_NS_DEFAULT 500000



#include <kvm/arm_vgic.h>

#include <kvm/arm_arch_timer.h>

arch/mips/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#define KVM_PRIVATE_MEM_SLOTS 	0



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#define KVM_HALT_POLL_NS_DEFAULT 500000

arch/powerpc/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#ifdef CONFIG_KVM_MMIO

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#endif

#define KVM_HALT_POLL_NS_DEFAULT 500000



/* These values are internal and can be increased later */

#define KVM_NR_IRQCHIPS          1

arch/powerpc/kvm/book3s.c

+6 −0
Original line number Diff line number Diff line
@@ -829,12 +829,15 @@ int kvmppc_h_logical_ci_load(struct kvm_vcpu *vcpu) 
	unsigned long size = kvmppc_get_gpr(vcpu, 4);

	unsigned long addr = kvmppc_get_gpr(vcpu, 5);

	u64 buf;

	int srcu_idx;

	int ret;



	if (!is_power_of_2(size) || (size > sizeof(buf)))

		return H_TOO_HARD;



	srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);

	ret = kvm_io_bus_read(vcpu, KVM_MMIO_BUS, addr, size, &buf);

	srcu_read_unlock(&vcpu->kvm->srcu, srcu_idx);

	if (ret != 0)

		return H_TOO_HARD;
@@ -869,6 +872,7 @@ int kvmppc_h_logical_ci_store(struct kvm_vcpu *vcpu) 
	unsigned long addr = kvmppc_get_gpr(vcpu, 5);

	unsigned long val = kvmppc_get_gpr(vcpu, 6);

	u64 buf;

	int srcu_idx;

	int ret;



	switch (size) {
@@ -892,7 +896,9 @@ int kvmppc_h_logical_ci_store(struct kvm_vcpu *vcpu) 
		return H_TOO_HARD;

	}



	srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);

	ret = kvm_io_bus_write(vcpu, KVM_MMIO_BUS, addr, size, &buf);

	srcu_read_unlock(&vcpu->kvm->srcu, srcu_idx);

	if (ret != 0)

		return H_TOO_HARD;