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

Commit 4469942b 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:
 "Just two very small & simple patches"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: MTRR: Use default type for non-MTRR-covered gfn before WARN_ON
  KVM: s390: Fix hang VCPU hang/loop regression
parents 4e6b6ee2 fc1a8126

arch/s390/kvm/kvm-s390.c

+2 −2
Original line number Diff line number Diff line
@@ -1742,10 +1742,10 @@ static bool ibs_enabled(struct kvm_vcpu *vcpu) 


static int kvm_s390_handle_requests(struct kvm_vcpu *vcpu)

{

	if (!vcpu->requests)

		return 0;

retry:

	kvm_s390_vcpu_request_handled(vcpu);

	if (!vcpu->requests)

		return 0;

	/*

	 * We use MMU_RELOAD just to re-arm the ipte notifier for the

	 * guest prefix page. gmap_ipte_notify will wait on the ptl lock.

arch/x86/kvm/mtrr.c

+4 −4
Original line number Diff line number Diff line
@@ -672,16 +672,16 @@ u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn) 
	if (iter.mtrr_disabled)

		return mtrr_disabled_type();



	/* not contained in any MTRRs. */

	if (type == -1)

		return mtrr_default_type(mtrr_state);



	/*

	 * We just check one page, partially covered by MTRRs is

	 * impossible.

	 */

	WARN_ON(iter.partial_map);



	/* not contained in any MTRRs. */

	if (type == -1)

		return mtrr_default_type(mtrr_state);



	return type;

}

EXPORT_SYMBOL_GPL(kvm_mtrr_get_guest_memory_type);