Commit 8160a563 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:
 "Bugfixes, and a few cleanups to the newly-introduced assembly language
  vmentry code for AMD"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: PPC: Book3S HV: Handle non-present PTEs in page fault functions
  kvm: Disable objtool frame pointer checking for vmenter.S
  MAINTAINERS: add a reviewer for KVM/s390
  KVM: s390: Fix PV check in deliverable_irqs()
  kvm: Handle reads of SandyBridge RAPL PMU MSRs rather than injecting #GP
  KVM: Remove CREATE_IRQCHIP/SET_PIT2 race
  KVM: SVM: Fix __svm_vcpu_run declaration.
  KVM: SVM: Do not setup frame pointer in __svm_vcpu_run
  KVM: SVM: Fix build error due to missing release_pages() include
  KVM: SVM: Do not mark svm_vcpu_run with STACK_FRAME_NON_STANDARD
  kvm: nVMX: match comment with return type for nested_vmx_exit_reflected
  kvm: nVMX: reflect MTF VM-exits if injected by L1
  KVM: s390: Return last valid slot if approx index is out-of-bounds
  KVM: Check validity of resolved slot when searching memslots
  KVM: VMX: Enable machine check support for 32bit targets
  KVM: SVM: move more vmentry code to assembly
  KVM: SVM: fix compilation with modular PSP and non-modular KVM
parents 189522da 00a6a5ef

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9329,6 +9329,7 @@ M: Christian Borntraeger <borntraeger@de.ibm.com> 
M:	Janosch Frank <frankja@linux.ibm.com>

R:	David Hildenbrand <david@redhat.com>

R:	Cornelia Huck <cohuck@redhat.com>

R:	Claudio Imbrenda <imbrenda@linux.ibm.com>

L:	kvm@vger.kernel.org

S:	Supported

W:	http://www.ibm.com/developerworks/linux/linux390/

arch/powerpc/kvm/book3s_64_mmu_hv.c

+5 −4
Original line number Diff line number Diff line
@@ -604,18 +604,19 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu, 
	 */

	local_irq_disable();

	ptep = __find_linux_pte(vcpu->arch.pgdir, hva, NULL, &shift);

	pte = __pte(0);

	if (ptep)

		pte = *ptep;

	local_irq_enable();

	/*

	 * If the PTE disappeared temporarily due to a THP

	 * collapse, just return and let the guest try again.

	 */

	if (!ptep) {

		local_irq_enable();

	if (!pte_present(pte)) {

		if (page)

			put_page(page);

		return RESUME_GUEST;

	}

	pte = *ptep;

	local_irq_enable();

	hpa = pte_pfn(pte) << PAGE_SHIFT;

	pte_size = PAGE_SIZE;

	if (shift)

arch/powerpc/kvm/book3s_64_mmu_radix.c

+5 −4
Original line number Diff line number Diff line
@@ -815,18 +815,19 @@ int kvmppc_book3s_instantiate_page(struct kvm_vcpu *vcpu, 
	 */

	local_irq_disable();

	ptep = __find_linux_pte(vcpu->arch.pgdir, hva, NULL, &shift);

	pte = __pte(0);

	if (ptep)

		pte = *ptep;

	local_irq_enable();

	/*

	 * If the PTE disappeared temporarily due to a THP

	 * collapse, just return and let the guest try again.

	 */

	if (!ptep) {

		local_irq_enable();

	if (!pte_present(pte)) {

		if (page)

			put_page(page);

		return RESUME_GUEST;

	}

	pte = *ptep;

	local_irq_enable();



	/* If we're logging dirty pages, always map single pages */

	large_enable = !(memslot->flags & KVM_MEM_LOG_DIRTY_PAGES);

arch/s390/kvm/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static unsigned long deliverable_irqs(struct kvm_vcpu *vcpu) 
	if (psw_mchk_disabled(vcpu))

		active_mask &= ~IRQ_PEND_MCHK_MASK;

	/* PV guest cpus can have a single interruption injected at a time. */

	if (kvm_s390_pv_cpu_is_protected(vcpu) &&

	if (kvm_s390_pv_cpu_get_handle(vcpu) &&

	    vcpu->arch.sie_block->iictl != IICTL_CODE_NONE)

		active_mask &= ~(IRQ_PEND_EXT_II_MASK |

				 IRQ_PEND_IO_MASK |

arch/s390/kvm/kvm-s390.c

+3 −0
Original line number Diff line number Diff line
@@ -1939,6 +1939,9 @@ static int gfn_to_memslot_approx(struct kvm_memslots *slots, gfn_t gfn) 
			start = slot + 1;

	}



	if (start >= slots->used_slots)

		return slots->used_slots - 1;



	if (gfn >= memslots[start].base_gfn &&

	    gfn < memslots[start].base_gfn + memslots[start].npages) {

		atomic_set(&slots->lru_slot, start);

CRA Git | Maintained and supported by SUSTech CRA and CCSE