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

Commit 5e6d26cf authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'signed-for-3.13' of git://github.com/agraf/linux-2.6 into kvm-master 

Patch queue for 3.13 - 2013-12-18

This fixes some grave issues we've only found after 3.13-rc1:

  - Make the modularized HV/PR book3s kvm work well as modules
  - Fix some race conditions
  - Fix compilation with certain compilers (booke)
  - Fix THP for book3s_hv
  - Fix preemption for book3s_pr

Alexander Graf (4):
      KVM: PPC: Book3S: PR: Don't clobber our exit handler id
      KVM: PPC: Book3S: PR: Export kvmppc_copy_to|from_svcpu
      KVM: PPC: Book3S: PR: Make svcpu -> vcpu store preempt savvy
      KVM: PPC: Book3S: PR: Enable interrupts earlier

Aneesh Kumar K.V (1):
      powerpc: book3s: kvm: Don't abuse host r2 in exit path

Paul Mackerras (5):
      KVM: PPC: Book3S HV: Fix physical address calculations
      KVM: PPC: Book3S HV: Refine barriers in guest entry/exit
      KVM: PPC: Book3S HV: Make tbacct_lock irq-safe
      KVM: PPC: Book3S HV: Take SRCU read lock around kvm_read_guest() call
      KVM: PPC: Book3S HV: Don't drop low-order page address bits

Scott Wood (1):
      powerpc/kvm/booke: Fix build break due to stack frame size warning

pingfan liu (1):
      powerpc: kvm: fix rare but potential deadlock scene
parents 319e2e3f df9059bb

arch/powerpc/include/asm/kvm_book3s.h

+4 −0
Original line number Diff line number Diff line
@@ -192,6 +192,10 @@ extern void kvmppc_load_up_vsx(void); 
extern u32 kvmppc_alignment_dsisr(struct kvm_vcpu *vcpu, unsigned int inst);

extern ulong kvmppc_alignment_dar(struct kvm_vcpu *vcpu, unsigned int inst);

extern int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd);

extern void kvmppc_copy_to_svcpu(struct kvmppc_book3s_shadow_vcpu *svcpu,

				 struct kvm_vcpu *vcpu);

extern void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu,

				   struct kvmppc_book3s_shadow_vcpu *svcpu);



static inline struct kvmppc_vcpu_book3s *to_book3s(struct kvm_vcpu *vcpu)

{

arch/powerpc/include/asm/kvm_book3s_asm.h

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ struct kvmppc_host_state { 
	ulong vmhandler;

	ulong scratch0;

	ulong scratch1;

	ulong scratch2;

	u8 in_guest;

	u8 restore_hid5;

	u8 napping;
@@ -106,6 +107,7 @@ struct kvmppc_host_state { 
};



struct kvmppc_book3s_shadow_vcpu {

	bool in_use;

	ulong gpr[14];

	u32 cr;

	u32 xer;

arch/powerpc/include/asm/switch_to.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ extern void giveup_vsx(struct task_struct *); 
extern void enable_kernel_spe(void);

extern void giveup_spe(struct task_struct *);

extern void load_up_spe(struct task_struct *);

extern void switch_booke_debug_regs(struct thread_struct *new_thread);

extern void switch_booke_debug_regs(struct debug_reg *new_debug);



#ifndef CONFIG_SMP

extern void discard_lazy_cpu_state(void);

arch/powerpc/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ int main(void) 
	HSTATE_FIELD(HSTATE_VMHANDLER, vmhandler);

	HSTATE_FIELD(HSTATE_SCRATCH0, scratch0);

	HSTATE_FIELD(HSTATE_SCRATCH1, scratch1);

	HSTATE_FIELD(HSTATE_SCRATCH2, scratch2);

	HSTATE_FIELD(HSTATE_IN_GUEST, in_guest);

	HSTATE_FIELD(HSTATE_RESTORE_HID5, restore_hid5);

	HSTATE_FIELD(HSTATE_NAPPING, napping);

arch/powerpc/kernel/process.c

+16 −16
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static void set_debug_reg_defaults(struct thread_struct *thread) 
#endif

}



static void prime_debug_regs(struct thread_struct *thread)

static void prime_debug_regs(struct debug_reg *debug)

{

	/*

	 * We could have inherited MSR_DE from userspace, since
@@ -348,22 +348,22 @@ static void prime_debug_regs(struct thread_struct *thread) 
	 */

	mtmsr(mfmsr() & ~MSR_DE);



	mtspr(SPRN_IAC1, thread->debug.iac1);

	mtspr(SPRN_IAC2, thread->debug.iac2);

	mtspr(SPRN_IAC1, debug->iac1);

	mtspr(SPRN_IAC2, debug->iac2);

#if CONFIG_PPC_ADV_DEBUG_IACS > 2

	mtspr(SPRN_IAC3, thread->debug.iac3);

	mtspr(SPRN_IAC4, thread->debug.iac4);

	mtspr(SPRN_IAC3, debug->iac3);

	mtspr(SPRN_IAC4, debug->iac4);

#endif

	mtspr(SPRN_DAC1, thread->debug.dac1);

	mtspr(SPRN_DAC2, thread->debug.dac2);

	mtspr(SPRN_DAC1, debug->dac1);

	mtspr(SPRN_DAC2, debug->dac2);

#if CONFIG_PPC_ADV_DEBUG_DVCS > 0

	mtspr(SPRN_DVC1, thread->debug.dvc1);

	mtspr(SPRN_DVC2, thread->debug.dvc2);

	mtspr(SPRN_DVC1, debug->dvc1);

	mtspr(SPRN_DVC2, debug->dvc2);

#endif

	mtspr(SPRN_DBCR0, thread->debug.dbcr0);

	mtspr(SPRN_DBCR1, thread->debug.dbcr1);

	mtspr(SPRN_DBCR0, debug->dbcr0);

	mtspr(SPRN_DBCR1, debug->dbcr1);

#ifdef CONFIG_BOOKE

	mtspr(SPRN_DBCR2, thread->debug.dbcr2);

	mtspr(SPRN_DBCR2, debug->dbcr2);

#endif

}

/*
@@ -371,11 +371,11 @@ static void prime_debug_regs(struct thread_struct *thread) 
 * debug registers, set the debug registers from the values

 * stored in the new thread.

 */

void switch_booke_debug_regs(struct thread_struct *new_thread)

void switch_booke_debug_regs(struct debug_reg *new_debug)

{

	if ((current->thread.debug.dbcr0 & DBCR0_IDM)

		|| (new_thread->debug.dbcr0 & DBCR0_IDM))

			prime_debug_regs(new_thread);

		|| (new_debug->dbcr0 & DBCR0_IDM))

			prime_debug_regs(new_debug);

}

EXPORT_SYMBOL_GPL(switch_booke_debug_regs);

#else	/* !CONFIG_PPC_ADV_DEBUG_REGS */
@@ -683,7 +683,7 @@ struct task_struct *__switch_to(struct task_struct *prev, 
#endif /* CONFIG_SMP */



#ifdef CONFIG_PPC_ADV_DEBUG_REGS

	switch_booke_debug_regs(&new->thread);

	switch_booke_debug_regs(&new->thread.debug);

#else

/*

 * For PPC_BOOK3S_64, we use the hw-breakpoint interfaces that would