Commit e9bda6f6 authored by Avi Kivity's avatar Avi Kivity
Browse files

Merge branch 'queue' into next 



Merge patches queued during the run-up to the merge window.

* queue: (25 commits)
  KVM: Choose better candidate for directed yield
  KVM: Note down when cpu relax intercepted or pause loop exited
  KVM: Add config to support ple or cpu relax optimzation
  KVM: switch to symbolic name for irq_states size
  KVM: x86: Fix typos in pmu.c
  KVM: x86: Fix typos in lapic.c
  KVM: x86: Fix typos in cpuid.c
  KVM: x86: Fix typos in emulate.c
  KVM: x86: Fix typos in x86.c
  KVM: SVM: Fix typos
  KVM: VMX: Fix typos
  KVM: remove the unused parameter of gfn_to_pfn_memslot
  KVM: remove is_error_hpa
  KVM: make bad_pfn static to kvm_main.c
  KVM: using get_fault_pfn to get the fault pfn
  KVM: MMU: track the refcount when unmap the page
  KVM: x86: remove unnecessary mark_page_dirty
  KVM: MMU: Avoid handling same rmap_pde in kvm_handle_hva_range()
  KVM: MMU: Push trace_kvm_age_page() into kvm_age_rmapp()
  KVM: MMU: Add memslot parameter to hva handlers
  ...

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parents bdc0077a 06e48c51

arch/powerpc/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ 


struct kvm;

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

extern int kvm_unmap_hva_range(struct kvm *kvm,

			       unsigned long start, unsigned long end);

extern int kvm_age_hva(struct kvm *kvm, unsigned long hva);

extern int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

extern void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

arch/powerpc/kvm/book3s_64_mmu_hv.c

+37 −10
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,15 +770,25 @@ 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_offset = (hva - start) >> PAGE_SHIFT;

		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);



			ret = handler(kvm, &memslot->rmap[gfn_offset],

				      memslot->base_gfn + gfn_offset);

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

			gfn_t gfn_offset = gfn - memslot->base_gfn;



			ret = handler(kvm, &memslot->rmap[gfn_offset], gfn);

			retval |= ret;

		}

	}
@@ -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)

{
@@ -850,6 +870,13 @@ int kvm_unmap_hva(struct kvm *kvm, unsigned long hva) 
	return 0;

}



int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end)

{

	if (kvm->arch.using_mmu_notifiers)

		kvm_handle_hva_range(kvm, start, end, kvm_unmap_rmapp);

	return 0;

}



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

			 unsigned long gfn)

{

arch/powerpc/kvm/e500_tlb.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static inline void kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, 


	if (likely(!pfnmap)) {

		unsigned long tsize_pages = 1 << (tsize + 10 - PAGE_SHIFT);

		pfn = gfn_to_pfn_memslot(vcpu_e500->vcpu.kvm, slot, gfn);

		pfn = gfn_to_pfn_memslot(slot, gfn);

		if (is_error_pfn(pfn)) {

			printk(KERN_ERR "Couldn't get real page for gfn %lx!\n",

					(long)gfn);

arch/s390/kvm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config KVM 
	depends on HAVE_KVM && EXPERIMENTAL

	select PREEMPT_NOTIFIERS

	select ANON_INODES

	select HAVE_KVM_CPU_RELAX_INTERCEPT

	---help---

	  Support hosting paravirtualized guest machines using the SIE

	  virtualization capability on the mainframe. This should work

arch/x86/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -500,11 +500,11 @@ struct kvm_vcpu_arch { 
};



struct kvm_lpage_info {

	unsigned long rmap_pde;

	int write_count;

};



struct kvm_arch_memory_slot {

	unsigned long *rmap_pde[KVM_NR_PAGE_SIZES - 1];

	struct kvm_lpage_info *lpage_info[KVM_NR_PAGE_SIZES - 1];

};
@@ -957,6 +957,7 @@ extern bool kvm_rebooting; 


#define KVM_ARCH_WANT_MMU_NOTIFIER

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

int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end);

int kvm_age_hva(struct kvm *kvm, unsigned long hva);

int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

CRA Git | Maintained and supported by SUSTech CRA and CCSE