Commit f9b84e19 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: Use vcpu-specific gva->hva translation when querying host page size 



Use kvm_vcpu_gfn_to_hva() when retrieving the host page size so that the
correct set of memslots is used when handling x86 page faults in SMM.

Fixes: 54bf36aa ("KVM: x86: use vcpu-specific functions to read/write/translate GFNs")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 005ba37c

arch/powerpc/kvm/book3s_xive_native.c

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static int kvmppc_xive_native_set_queue_config(struct kvmppc_xive *xive, 
	srcu_idx = srcu_read_lock(&kvm->srcu);

	gfn = gpa_to_gfn(kvm_eq.qaddr);



	page_size = kvm_host_page_size(kvm, gfn);

	page_size = kvm_host_page_size(vcpu, gfn);

	if (1ull << kvm_eq.qshift > page_size) {

		srcu_read_unlock(&kvm->srcu, srcu_idx);

		pr_warn("Incompatible host page size %lx!\n", page_size);

arch/x86/kvm/mmu/mmu.c

+3 −3
Original line number Diff line number Diff line
@@ -1286,12 +1286,12 @@ static bool mmu_gfn_lpage_is_disallowed(struct kvm_vcpu *vcpu, gfn_t gfn, 
	return __mmu_gfn_lpage_is_disallowed(gfn, level, slot);

}



static int host_mapping_level(struct kvm *kvm, gfn_t gfn)

static int host_mapping_level(struct kvm_vcpu *vcpu, gfn_t gfn)

{

	unsigned long page_size;

	int i, ret = 0;



	page_size = kvm_host_page_size(kvm, gfn);

	page_size = kvm_host_page_size(vcpu, gfn);



	for (i = PT_PAGE_TABLE_LEVEL; i <= PT_MAX_HUGEPAGE_LEVEL; ++i) {

		if (page_size >= KVM_HPAGE_SIZE(i))
@@ -1362,7 +1362,7 @@ static int mapping_level(struct kvm_vcpu *vcpu, gfn_t large_gfn, 
	 * So, do not propagate host_mapping_level() to max_level as KVM can

	 * still promote the guest mapping to a huge page in the THP case.

	 */

	host_level = host_mapping_level(vcpu->kvm, large_gfn);

	host_level = host_mapping_level(vcpu, large_gfn);

	return min(host_level, max_level);

}

include/linux/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len); 
int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);

struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);

bool kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);

unsigned long kvm_host_page_size(struct kvm *kvm, gfn_t gfn);

unsigned long kvm_host_page_size(struct kvm_vcpu *vcpu, gfn_t gfn);

void mark_page_dirty(struct kvm *kvm, gfn_t gfn);



struct kvm_memslots *kvm_vcpu_memslots(struct kvm_vcpu *vcpu);

virt/kvm/kvm_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1402,14 +1402,14 @@ bool kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn) 
}

EXPORT_SYMBOL_GPL(kvm_is_visible_gfn);



unsigned long kvm_host_page_size(struct kvm *kvm, gfn_t gfn)

unsigned long kvm_host_page_size(struct kvm_vcpu *vcpu, gfn_t gfn)

{

	struct vm_area_struct *vma;

	unsigned long addr, size;



	size = PAGE_SIZE;



	addr = gfn_to_hva(kvm, gfn);

	addr = kvm_vcpu_gfn_to_hva(vcpu, gfn);

	if (kvm_is_error_hva(addr))

		return PAGE_SIZE;