Commit 19d031e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: add support for change_pte mmu notifiers
  KVM: MMU: add SPTE_HOST_WRITEABLE flag to the shadow ptes
  KVM: MMU: dont hold pagecount reference for mapped sptes pages
  KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID
  KVM: VMX: flush TLB with INVEPT on cpu migration
  KVM: fix LAPIC timer period overflow
  KVM: s390: fix memsize >= 4G
  KVM: SVM: Handle tsc in svm_get_msr/svm_set_msr correctly
  KVM: SVM: Fix tsc offset adjustment when running nested
parents e8d809c6 3da0dd43

arch/s390/kvm/kvm-s390.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu, 
int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code);

int kvm_s390_inject_sigp_stop(struct kvm_vcpu *vcpu, int action);



static inline int kvm_s390_vcpu_get_memsize(struct kvm_vcpu *vcpu)

static inline long kvm_s390_vcpu_get_memsize(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.sie_block->gmslm

		- vcpu->arch.sie_block->gmsor

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -796,6 +796,7 @@ asmlinkage void kvm_handle_fault_on_reboot(void); 
#define KVM_ARCH_WANT_MMU_NOTIFIER

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

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

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

int cpuid_maxphyaddr(struct kvm_vcpu *vcpu);

int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu);

int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu);

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static void start_apic_timer(struct kvm_lapic *apic) 
{

	ktime_t now = apic->lapic_timer.timer.base->get_time();



	apic->lapic_timer.period = apic_get_reg(apic, APIC_TMICT) *

	apic->lapic_timer.period = (u64)apic_get_reg(apic, APIC_TMICT) *

		    APIC_BUS_CYCLE_NS * apic->divide_count;

	atomic_set(&apic->lapic_timer.pending, 0);

arch/x86/kvm/mmu.c

+66 −18
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ module_param(oos_shadow, bool, 0644); 
#define CREATE_TRACE_POINTS

#include "mmutrace.h"



#define SPTE_HOST_WRITEABLE (1ULL << PT_FIRST_AVAIL_BITS_SHIFT)



#define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)



struct kvm_rmap_desc {
@@ -634,9 +636,7 @@ static void rmap_remove(struct kvm *kvm, u64 *spte) 
	if (*spte & shadow_accessed_mask)

		kvm_set_pfn_accessed(pfn);

	if (is_writeble_pte(*spte))

		kvm_release_pfn_dirty(pfn);

	else

		kvm_release_pfn_clean(pfn);

		kvm_set_pfn_dirty(pfn);

	rmapp = gfn_to_rmap(kvm, sp->gfns[spte - sp->spt], sp->role.level);

	if (!*rmapp) {

		printk(KERN_ERR "rmap_remove: %p %llx 0->BUG\n", spte, *spte);
@@ -748,7 +748,7 @@ static int rmap_write_protect(struct kvm *kvm, u64 gfn) 
	return write_protected;

}



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

static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data)

{

	u64 *spte;

	int need_tlb_flush = 0;
@@ -763,8 +763,45 @@ static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp) 
	return need_tlb_flush;

}



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

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

static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data)

{

	int need_flush = 0;

	u64 *spte, new_spte;

	pte_t *ptep = (pte_t *)data;

	pfn_t new_pfn;



	WARN_ON(pte_huge(*ptep));

	new_pfn = pte_pfn(*ptep);

	spte = rmap_next(kvm, rmapp, NULL);

	while (spte) {

		BUG_ON(!is_shadow_present_pte(*spte));

		rmap_printk("kvm_set_pte_rmapp: spte %p %llx\n", spte, *spte);

		need_flush = 1;

		if (pte_write(*ptep)) {

			rmap_remove(kvm, spte);

			__set_spte(spte, shadow_trap_nonpresent_pte);

			spte = rmap_next(kvm, rmapp, NULL);

		} else {

			new_spte = *spte &~ (PT64_BASE_ADDR_MASK);

			new_spte |= (u64)new_pfn << PAGE_SHIFT;



			new_spte &= ~PT_WRITABLE_MASK;

			new_spte &= ~SPTE_HOST_WRITEABLE;

			if (is_writeble_pte(*spte))

				kvm_set_pfn_dirty(spte_to_pfn(*spte));

			__set_spte(spte, new_spte);

			spte = rmap_next(kvm, rmapp, spte);

		}

	}

	if (need_flush)

		kvm_flush_remote_tlbs(kvm);



	return 0;

}



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

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

					 u64 data))

{

	int i, j;

	int retval = 0;
@@ -786,13 +823,15 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva, 
		if (hva >= start && hva < end) {

			gfn_t gfn_offset = (hva - start) >> PAGE_SHIFT;



			retval |= handler(kvm, &memslot->rmap[gfn_offset]);

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

					  data);



			for (j = 0; j < KVM_NR_PAGE_SIZES - 1; ++j) {

				int idx = gfn_offset;

				idx /= KVM_PAGES_PER_HPAGE(PT_DIRECTORY_LEVEL + j);

				retval |= handler(kvm,

					&memslot->lpage_info[j][idx].rmap_pde);

					&memslot->lpage_info[j][idx].rmap_pde,

					data);

			}

		}

	}
@@ -802,10 +841,15 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva, 


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

{

	return kvm_handle_hva(kvm, hva, kvm_unmap_rmapp);

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

}



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

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

{

	kvm_handle_hva(kvm, hva, (u64)&pte, kvm_set_pte_rmapp);

}



static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data)

{

	u64 *spte;

	int young = 0;
@@ -841,13 +885,13 @@ static void rmap_recycle(struct kvm_vcpu *vcpu, u64 *spte, gfn_t gfn) 
	gfn = unalias_gfn(vcpu->kvm, gfn);

	rmapp = gfn_to_rmap(vcpu->kvm, gfn, sp->role.level);



	kvm_unmap_rmapp(vcpu->kvm, rmapp);

	kvm_unmap_rmapp(vcpu->kvm, rmapp, 0);

	kvm_flush_remote_tlbs(vcpu->kvm);

}



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

{

	return kvm_handle_hva(kvm, hva, kvm_age_rmapp);

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

}



#ifdef MMU_DEBUG
@@ -1756,7 +1800,7 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep, 
		    unsigned pte_access, int user_fault,

		    int write_fault, int dirty, int level,

		    gfn_t gfn, pfn_t pfn, bool speculative,

		    bool can_unsync)

		    bool can_unsync, bool reset_host_protection)

{

	u64 spte;

	int ret = 0;
@@ -1783,6 +1827,9 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep, 
		spte |= kvm_x86_ops->get_mt_mask(vcpu, gfn,

			kvm_is_mmio_pfn(pfn));



	if (reset_host_protection)

		spte |= SPTE_HOST_WRITEABLE;



	spte |= (u64)pfn << PAGE_SHIFT;



	if ((pte_access & ACC_WRITE_MASK)
@@ -1828,7 +1875,8 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, 
			 unsigned pt_access, unsigned pte_access,

			 int user_fault, int write_fault, int dirty,

			 int *ptwrite, int level, gfn_t gfn,

			 pfn_t pfn, bool speculative)

			 pfn_t pfn, bool speculative,

			 bool reset_host_protection)

{

	int was_rmapped = 0;

	int was_writeble = is_writeble_pte(*sptep);
@@ -1860,7 +1908,8 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, 
	}



	if (set_spte(vcpu, sptep, pte_access, user_fault, write_fault,

		      dirty, level, gfn, pfn, speculative, true)) {

		      dirty, level, gfn, pfn, speculative, true,

		      reset_host_protection)) {

		if (write_fault)

			*ptwrite = 1;

		kvm_x86_ops->tlb_flush(vcpu);
@@ -1877,7 +1926,6 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, 
	page_header_update_slot(vcpu->kvm, sptep, gfn);

	if (!was_rmapped) {

		rmap_count = rmap_add(vcpu, sptep, gfn);

		if (!is_rmap_spte(*sptep))

		kvm_release_pfn_clean(pfn);

		if (rmap_count > RMAP_RECYCLE_THRESHOLD)

			rmap_recycle(vcpu, sptep, gfn);
@@ -1909,7 +1957,7 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write, 
		if (iterator.level == level) {

			mmu_set_spte(vcpu, iterator.sptep, ACC_ALL, ACC_ALL,

				     0, write, 1, &pt_write,

				     level, gfn, pfn, false);

				     level, gfn, pfn, false, true);

			++vcpu->stat.pf_fixed;

			break;

		}

arch/x86/kvm/paging_tmpl.h

+15 −3
Original line number Diff line number Diff line
@@ -273,9 +273,13 @@ static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *page, 
	if (mmu_notifier_retry(vcpu, vcpu->arch.update_pte.mmu_seq))

		return;

	kvm_get_pfn(pfn);

	/*

	 * we call mmu_set_spte() with reset_host_protection = true beacuse that

	 * vcpu->arch.update_pte.pfn was fetched from get_user_pages(write = 1).

	 */

	mmu_set_spte(vcpu, spte, page->role.access, pte_access, 0, 0,

		     gpte & PT_DIRTY_MASK, NULL, PT_PAGE_TABLE_LEVEL,

		     gpte_to_gfn(gpte), pfn, true);

		     gpte_to_gfn(gpte), pfn, true, true);

}



/*
@@ -308,7 +312,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
				     user_fault, write_fault,

				     gw->ptes[gw->level-1] & PT_DIRTY_MASK,

				     ptwrite, level,

				     gw->gfn, pfn, false);

				     gw->gfn, pfn, false, true);

			break;

		}
@@ -558,6 +562,7 @@ static void FNAME(prefetch_page)(struct kvm_vcpu *vcpu, 
static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)

{

	int i, offset, nr_present;

	bool reset_host_protection;



	offset = nr_present = 0;
@@ -595,9 +600,16 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) 


		nr_present++;

		pte_access = sp->role.access & FNAME(gpte_access)(vcpu, gpte);

		if (!(sp->spt[i] & SPTE_HOST_WRITEABLE)) {

			pte_access &= ~ACC_WRITE_MASK;

			reset_host_protection = 0;

		} else {

			reset_host_protection = 1;

		}

		set_spte(vcpu, &sp->spt[i], pte_access, 0, 0,

			 is_dirty_gpte(gpte), PT_PAGE_TABLE_LEVEL, gfn,

			 spte_to_pfn(sp->spt[i]), true, false);

			 spte_to_pfn(sp->spt[i]), true, false,

			 reset_host_protection);

	}



	return !nr_present;

CRA Git | Maintained and supported by SUSTech CRA and CCSE