Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4285bd6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: PPC: BookE: Load the lower half of MSR
  KVM: PPC: BookE: fix sleep with interrupts disabled
  KVM: PPC: e500: Call kvm_vcpu_uninit() before kvmppc_e500_tlb_uninit().
  PPC: KVM: Book E doesn't have __end_interrupts.
  KVM: x86: Issue smp_call_function_many with preemption disabled
  KVM: x86: fix information leak to userland
  KVM: PPC: fix information leak to userland
  KVM: MMU: fix rmap_remove on non present sptes
  KVM: Write protect memory after slot swap
parents c093ee4f df8940ea

arch/powerpc/kernel/kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void kvm_patch_ins_nop(u32 *inst) 


static void kvm_patch_ins_b(u32 *inst, int addr)

{

#ifdef CONFIG_RELOCATABLE

#if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PPC_BOOK3S)

	/* On relocatable kernels interrupts handlers and our code

	   can be in different regions, so we don't patch them */

arch/powerpc/kvm/booke_interrupts.S

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ lightweight_exit: 
	lwz	r3, VCPU_PC(r4)

	mtsrr0	r3

	lwz	r3, VCPU_SHARED(r4)

	lwz	r3, VCPU_SHARED_MSR(r3)

	lwz	r3, (VCPU_SHARED_MSR + 4)(r3)

	oris	r3, r3, KVMPPC_MSR_MASK@h

	ori	r3, r3, KVMPPC_MSR_MASK@l

	mtsrr1	r3

arch/powerpc/kvm/e500.c

+1 −1
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu) 
	struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);



	free_page((unsigned long)vcpu->arch.shared);

	kvmppc_e500_tlb_uninit(vcpu_e500);

	kvm_vcpu_uninit(vcpu);

	kvmppc_e500_tlb_uninit(vcpu_e500);

	kmem_cache_free(kvm_vcpu_cache, vcpu_e500);

}

arch/powerpc/kvm/powerpc.c

+1 −0
Original line number Diff line number Diff line
@@ -617,6 +617,7 @@ long kvm_arch_vm_ioctl(struct file *filp, 
	switch (ioctl) {

	case KVM_PPC_GET_PVINFO: {

		struct kvm_ppc_pvinfo pvinfo;

		memset(&pvinfo, 0, sizeof(pvinfo));

		r = kvm_vm_ioctl_get_pvinfo(&pvinfo);

		if (copy_to_user(argp, &pvinfo, sizeof(pvinfo))) {

			r = -EFAULT;

arch/powerpc/kvm/timing.c

+0 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ void kvmppc_init_timing_stats(struct kvm_vcpu *vcpu) 
	int i;



	/* pause guest execution to avoid concurrent updates */

	local_irq_disable();

	mutex_lock(&vcpu->mutex);



	vcpu->arch.last_exit_type = 0xDEAD;
@@ -51,7 +50,6 @@ void kvmppc_init_timing_stats(struct kvm_vcpu *vcpu) 
	vcpu->arch.timing_last_enter.tv64 = 0;



	mutex_unlock(&vcpu->mutex);

	local_irq_enable();

}



static void add_exit_timing(struct kvm_vcpu *vcpu, u64 duration, int type)