Commit 177dd7e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: MMU: flush remote tlbs when overwriting spte with different pfn
  KVM: VMX: Fix host MSR_KERNEL_GS_BASE corruption
parents 1c5474a6 91546356

arch/x86/kvm/mmu.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1879,6 +1879,8 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, 
			pgprintk("hfn old %lx new %lx\n",

			pgprintk("hfn old %lx new %lx\n",

				 spte_to_pfn(*sptep), pfn);

				 spte_to_pfn(*sptep), pfn);

			rmap_remove(vcpu->kvm, sptep);

			rmap_remove(vcpu->kvm, sptep);

			__set_spte(sptep, shadow_trap_nonpresent_pte);

			kvm_flush_remote_tlbs(vcpu->kvm);

		} else

		} else

			was_rmapped = 1;

			was_rmapped = 1;

	}

	}

arch/x86/kvm/vmx.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -1744,18 +1744,15 @@ static void enter_lmode(struct kvm_vcpu *vcpu) 
			     (guest_tr_ar & ~AR_TYPE_MASK)

			     (guest_tr_ar & ~AR_TYPE_MASK)

			     | AR_TYPE_BUSY_64_TSS);

			     | AR_TYPE_BUSY_64_TSS);

	}

	}

	vcpu->arch.efer |= EFER_LMA;

	vmx_set_efer(vcpu, vcpu->arch.efer | EFER_LMA);

	vmx_set_efer(vcpu, vcpu->arch.efer);

}

}





static void exit_lmode(struct kvm_vcpu *vcpu)

static void exit_lmode(struct kvm_vcpu *vcpu)

{

{

	vcpu->arch.efer &= ~EFER_LMA;



	vmcs_write32(VM_ENTRY_CONTROLS,

	vmcs_write32(VM_ENTRY_CONTROLS,

		     vmcs_read32(VM_ENTRY_CONTROLS)

		     vmcs_read32(VM_ENTRY_CONTROLS)

		     & ~VM_ENTRY_IA32E_MODE);

		     & ~VM_ENTRY_IA32E_MODE);

	vmx_set_efer(vcpu, vcpu->arch.efer);

	vmx_set_efer(vcpu, vcpu->arch.efer & ~EFER_LMA);

}

}





#endif

#endif