Commit 84504ef3 authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Marcelo Tosatti
Browse files

KVM: MMU: Make kvm_handle_hva() handle range of addresses 



When guest's memory is backed by THP pages, MMU notifier needs to call
kvm_unmap_hva(), which in turn leads to kvm_handle_hva(), in a loop to
invalidate a range of pages which constitute one huge page:

  for each page
    for each memslot
      if page is in memslot
        unmap using rmap

This means although every page in that range is expected to be found in
the same memslot, we are forced to check unrelated memslots many times.
If the guest has more memslots, the situation will become worse.

Furthermore, if the range does not include any pages in the guest's
memory, the loop over the pages will just consume extra time.

This patch, together with the following patches, solves this problem by
introducing kvm_handle_hva_range() which makes the loop look like this:

  for each memslot
    for each page in memslot
      unmap using rmap

In this new processing, the actual work is converted to a loop over rmap
which is much more cache friendly than before.

Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Cc: Alexander Graf <agraf@suse.de>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent d19a748b

arch/powerpc/kvm/book3s_64_mmu_hv.c

+28 −8
Original line number Diff line number Diff line
@@ -756,8 +756,11 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu, 
	goto out_put;

}



static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,

			  int (*handler)(struct kvm *kvm, unsigned long *rmapp,

static int kvm_handle_hva_range(struct kvm *kvm,

				unsigned long start,

				unsigned long end,

				int (*handler)(struct kvm *kvm,

					       unsigned long *rmapp,

					       unsigned long gfn))

{

	int ret;
@@ -767,12 +770,22 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva, 


	slots = kvm_memslots(kvm);

	kvm_for_each_memslot(memslot, slots) {

		unsigned long start = memslot->userspace_addr;

		unsigned long end;

		unsigned long hva_start, hva_end;

		gfn_t gfn, gfn_end;



		hva_start = max(start, memslot->userspace_addr);

		hva_end = min(end, memslot->userspace_addr +

					(memslot->npages << PAGE_SHIFT));

		if (hva_start >= hva_end)

			continue;

		/*

		 * {gfn(page) | page intersects with [hva_start, hva_end)} =

		 * {gfn, gfn+1, ..., gfn_end-1}.

		 */

		gfn = hva_to_gfn_memslot(hva_start, memslot);

		gfn_end = hva_to_gfn_memslot(hva_end + PAGE_SIZE - 1, memslot);



		end = start + (memslot->npages << PAGE_SHIFT);

		if (hva >= start && hva < end) {

			gfn_t gfn = hva_to_gfn_memslot(hva, memslot);

		for (; gfn < gfn_end; ++gfn) {

			gfn_t gfn_offset = gfn - memslot->base_gfn;



			ret = handler(kvm, &memslot->rmap[gfn_offset], gfn);
@@ -783,6 +796,13 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva, 
	return retval;

}



static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,

			  int (*handler)(struct kvm *kvm, unsigned long *rmapp,

					 unsigned long gfn))

{

	return kvm_handle_hva_range(kvm, hva, hva + 1, handler);

}



static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,

			   unsigned long gfn)

{

arch/x86/kvm/mmu.c

+32 −10
Original line number Diff line number Diff line
@@ -1259,9 +1259,12 @@ static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp, 
	return 0;

}



static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,

static int kvm_handle_hva_range(struct kvm *kvm,

				unsigned long start,

				unsigned long end,

				unsigned long data,

			  int (*handler)(struct kvm *kvm, unsigned long *rmapp,

				int (*handler)(struct kvm *kvm,

					       unsigned long *rmapp,

					       unsigned long data))

{

	int j;
@@ -1273,13 +1276,22 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva, 
	slots = kvm_memslots(kvm);



	kvm_for_each_memslot(memslot, slots) {

		unsigned long start = memslot->userspace_addr;

		unsigned long end;

		unsigned long hva_start, hva_end;

		gfn_t gfn, gfn_end;



		end = start + (memslot->npages << PAGE_SHIFT);

		if (hva >= start && hva < end) {

			gfn_t gfn = hva_to_gfn_memslot(hva, memslot);

		hva_start = max(start, memslot->userspace_addr);

		hva_end = min(end, memslot->userspace_addr +

					(memslot->npages << PAGE_SHIFT));

		if (hva_start >= hva_end)

			continue;

		/*

		 * {gfn(page) | page intersects with [hva_start, hva_end)} =

		 * {gfn, gfn+1, ..., gfn_end-1}.

		 */

		gfn = hva_to_gfn_memslot(hva_start, memslot);

		gfn_end = hva_to_gfn_memslot(hva_end + PAGE_SIZE - 1, memslot);



		for (; gfn < gfn_end; ++gfn) {

			ret = 0;



			for (j = PT_PAGE_TABLE_LEVEL;
@@ -1289,7 +1301,9 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva, 
				rmapp = __gfn_to_rmap(gfn, j, memslot);

				ret |= handler(kvm, rmapp, data);

			}

			trace_kvm_age_page(hva, memslot, ret);

			trace_kvm_age_page(memslot->userspace_addr +

					(gfn - memslot->base_gfn) * PAGE_SIZE,

					memslot, ret);

			retval |= ret;

		}

	}
@@ -1297,6 +1311,14 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva, 
	return retval;

}



static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,

			  unsigned long data,

			  int (*handler)(struct kvm *kvm, unsigned long *rmapp,

					 unsigned long data))

{

	return kvm_handle_hva_range(kvm, hva, hva + 1, data, handler);

}



int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)

{

	return kvm_handle_hva(kvm, hva, 0, kvm_unmap_rmapp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE