Commit 8949170c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull more kvm updates from Paolo Bonzini:
 "Mostly the PPC part of the release, but also switching to Arnd's fix
  for the hyperv config issue and a typo fix.

  Main PPC changes:

   - reimplement the MMIO instruction emulation

   - transactional memory support for PR KVM

   - improve radix page table handling"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (63 commits)
  KVM: x86: VMX: redo fix for link error without CONFIG_HYPERV
  KVM: x86: fix typo at kvm_arch_hardware_setup comment
  KVM: PPC: Book3S PR: Fix failure status setting in tabort. emulation
  KVM: PPC: Book3S PR: Enable use on POWER9 bare-metal hosts in HPT mode
  KVM: PPC: Book3S PR: Don't let PAPR guest set MSR hypervisor bit
  KVM: PPC: Book3S PR: Fix failure status setting in treclaim. emulation
  KVM: PPC: Book3S PR: Fix MSR setting when delivering interrupts
  KVM: PPC: Book3S PR: Handle additional interrupt types
  KVM: PPC: Book3S PR: Enable kvmppc_get/set_one_reg_pr() for HTM registers
  KVM: PPC: Book3S: Remove load/put vcpu for KVM_GET_REGS/KVM_SET_REGS
  KVM: PPC: Remove load/put vcpu for KVM_GET/SET_ONE_REG ioctl
  KVM: PPC: Move vcpu_load/vcpu_put down to each ioctl case in kvm_arch_vcpu_ioctl
  KVM: PPC: Book3S PR: Enable HTM for PR KVM for KVM_CHECK_EXTENSION ioctl
  KVM: PPC: Book3S PR: Support TAR handling for PR KVM HTM
  KVM: PPC: Book3S PR: Add guard code to prevent returning to guest with PR=0 and Transactional state
  KVM: PPC: Book3S PR: Add emulation for tabort. in privileged state
  KVM: PPC: Book3S PR: Add emulation for trechkpt.
  KVM: PPC: Book3S PR: Add emulation for treclaim.
  KVM: PPC: Book3S PR: Restore NV regs after emulating mfspr from TM SPRs
  KVM: PPC: Book3S PR: Always fail transactions in guest privileged state
  ...
parents 2f3f0566 1f008e11

arch/powerpc/include/asm/asm-prototypes.h

+6 −0
Original line number Diff line number Diff line
@@ -134,7 +134,13 @@ unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip); 
void pnv_power9_force_smt4_catch(void);

void pnv_power9_force_smt4_release(void);



/* Transaction memory related */

void tm_enable(void);

void tm_disable(void);

void tm_abort(uint8_t cause);



struct kvm_vcpu;

void _kvmppc_restore_tm_pr(struct kvm_vcpu *vcpu, u64 guest_msr);

void _kvmppc_save_tm_pr(struct kvm_vcpu *vcpu, u64 guest_msr);



#endif /* _ASM_POWERPC_ASM_PROTOTYPES_H */

arch/powerpc/include/asm/kvm_book3s.h

+27 −10
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ struct kvmppc_vcore { 
	ulong vtb;		/* virtual timebase */

	ulong conferring_threads;

	unsigned int halt_poll_ns;

	atomic_t online_count;

};



struct kvmppc_vcpu_book3s {
@@ -209,6 +210,7 @@ extern void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec) 
extern void kvmppc_book3s_dequeue_irqprio(struct kvm_vcpu *vcpu,

					  unsigned int vec);

extern void kvmppc_inject_interrupt(struct kvm_vcpu *vcpu, int vec, u64 flags);

extern void kvmppc_trigger_fac_interrupt(struct kvm_vcpu *vcpu, ulong fac);

extern void kvmppc_set_bat(struct kvm_vcpu *vcpu, struct kvmppc_bat *bat,

			   bool upper, u32 val);

extern void kvmppc_giveup_ext(struct kvm_vcpu *vcpu, ulong msr);
@@ -256,6 +258,21 @@ extern int kvmppc_hcall_impl_pr(unsigned long cmd); 
extern int kvmppc_hcall_impl_hv_realmode(unsigned long cmd);

extern void kvmppc_copy_to_svcpu(struct kvm_vcpu *vcpu);

extern void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu);



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

void kvmppc_save_tm_pr(struct kvm_vcpu *vcpu);

void kvmppc_restore_tm_pr(struct kvm_vcpu *vcpu);

void kvmppc_save_tm_sprs(struct kvm_vcpu *vcpu);

void kvmppc_restore_tm_sprs(struct kvm_vcpu *vcpu);

#else

static inline void kvmppc_save_tm_pr(struct kvm_vcpu *vcpu) {}

static inline void kvmppc_restore_tm_pr(struct kvm_vcpu *vcpu) {}

static inline void kvmppc_save_tm_sprs(struct kvm_vcpu *vcpu) {}

static inline void kvmppc_restore_tm_sprs(struct kvm_vcpu *vcpu) {}

#endif



void kvmppc_giveup_fac(struct kvm_vcpu *vcpu, ulong fac);



extern int kvm_irq_bypass;



static inline struct kvmppc_vcpu_book3s *to_book3s(struct kvm_vcpu *vcpu)
@@ -274,12 +291,12 @@ static inline struct kvmppc_vcpu_book3s *to_book3s(struct kvm_vcpu *vcpu) 


static inline void kvmppc_set_gpr(struct kvm_vcpu *vcpu, int num, ulong val)

{

	vcpu->arch.gpr[num] = val;

	vcpu->arch.regs.gpr[num] = val;

}



static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num)

{

	return vcpu->arch.gpr[num];

	return vcpu->arch.regs.gpr[num];

}



static inline void kvmppc_set_cr(struct kvm_vcpu *vcpu, u32 val)
@@ -294,42 +311,42 @@ static inline u32 kvmppc_get_cr(struct kvm_vcpu *vcpu) 


static inline void kvmppc_set_xer(struct kvm_vcpu *vcpu, ulong val)

{

	vcpu->arch.xer = val;

	vcpu->arch.regs.xer = val;

}



static inline ulong kvmppc_get_xer(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.xer;

	return vcpu->arch.regs.xer;

}



static inline void kvmppc_set_ctr(struct kvm_vcpu *vcpu, ulong val)

{

	vcpu->arch.ctr = val;

	vcpu->arch.regs.ctr = val;

}



static inline ulong kvmppc_get_ctr(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.ctr;

	return vcpu->arch.regs.ctr;

}



static inline void kvmppc_set_lr(struct kvm_vcpu *vcpu, ulong val)

{

	vcpu->arch.lr = val;

	vcpu->arch.regs.link = val;

}



static inline ulong kvmppc_get_lr(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.lr;

	return vcpu->arch.regs.link;

}



static inline void kvmppc_set_pc(struct kvm_vcpu *vcpu, ulong val)

{

	vcpu->arch.pc = val;

	vcpu->arch.regs.nip = val;

}



static inline ulong kvmppc_get_pc(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.pc;

	return vcpu->arch.regs.nip;

}



static inline u64 kvmppc_get_msr(struct kvm_vcpu *vcpu);

arch/powerpc/include/asm/kvm_book3s_64.h

+10 −10
Original line number Diff line number Diff line
@@ -483,15 +483,15 @@ static inline u64 sanitize_msr(u64 msr) 
static inline void copy_from_checkpoint(struct kvm_vcpu *vcpu)

{

	vcpu->arch.cr  = vcpu->arch.cr_tm;

	vcpu->arch.xer = vcpu->arch.xer_tm;

	vcpu->arch.lr  = vcpu->arch.lr_tm;

	vcpu->arch.ctr = vcpu->arch.ctr_tm;

	vcpu->arch.regs.xer = vcpu->arch.xer_tm;

	vcpu->arch.regs.link  = vcpu->arch.lr_tm;

	vcpu->arch.regs.ctr = vcpu->arch.ctr_tm;

	vcpu->arch.amr = vcpu->arch.amr_tm;

	vcpu->arch.ppr = vcpu->arch.ppr_tm;

	vcpu->arch.dscr = vcpu->arch.dscr_tm;

	vcpu->arch.tar = vcpu->arch.tar_tm;

	memcpy(vcpu->arch.gpr, vcpu->arch.gpr_tm,

	       sizeof(vcpu->arch.gpr));

	memcpy(vcpu->arch.regs.gpr, vcpu->arch.gpr_tm,

	       sizeof(vcpu->arch.regs.gpr));

	vcpu->arch.fp  = vcpu->arch.fp_tm;

	vcpu->arch.vr  = vcpu->arch.vr_tm;

	vcpu->arch.vrsave = vcpu->arch.vrsave_tm;
@@ -500,15 +500,15 @@ static inline void copy_from_checkpoint(struct kvm_vcpu *vcpu) 
static inline void copy_to_checkpoint(struct kvm_vcpu *vcpu)

{

	vcpu->arch.cr_tm  = vcpu->arch.cr;

	vcpu->arch.xer_tm = vcpu->arch.xer;

	vcpu->arch.lr_tm  = vcpu->arch.lr;

	vcpu->arch.ctr_tm = vcpu->arch.ctr;

	vcpu->arch.xer_tm = vcpu->arch.regs.xer;

	vcpu->arch.lr_tm  = vcpu->arch.regs.link;

	vcpu->arch.ctr_tm = vcpu->arch.regs.ctr;

	vcpu->arch.amr_tm = vcpu->arch.amr;

	vcpu->arch.ppr_tm = vcpu->arch.ppr;

	vcpu->arch.dscr_tm = vcpu->arch.dscr;

	vcpu->arch.tar_tm = vcpu->arch.tar;

	memcpy(vcpu->arch.gpr_tm, vcpu->arch.gpr,

	       sizeof(vcpu->arch.gpr));

	memcpy(vcpu->arch.gpr_tm, vcpu->arch.regs.gpr,

	       sizeof(vcpu->arch.regs.gpr));

	vcpu->arch.fp_tm  = vcpu->arch.fp;

	vcpu->arch.vr_tm  = vcpu->arch.vr;

	vcpu->arch.vrsave_tm = vcpu->arch.vrsave;

arch/powerpc/include/asm/kvm_booke.h

+10 −10
Original line number Diff line number Diff line
@@ -36,12 +36,12 @@ 


static inline void kvmppc_set_gpr(struct kvm_vcpu *vcpu, int num, ulong val)

{

	vcpu->arch.gpr[num] = val;

	vcpu->arch.regs.gpr[num] = val;

}



static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num)

{

	return vcpu->arch.gpr[num];

	return vcpu->arch.regs.gpr[num];

}



static inline void kvmppc_set_cr(struct kvm_vcpu *vcpu, u32 val)
@@ -56,12 +56,12 @@ static inline u32 kvmppc_get_cr(struct kvm_vcpu *vcpu) 


static inline void kvmppc_set_xer(struct kvm_vcpu *vcpu, ulong val)

{

	vcpu->arch.xer = val;

	vcpu->arch.regs.xer = val;

}



static inline ulong kvmppc_get_xer(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.xer;

	return vcpu->arch.regs.xer;

}



static inline bool kvmppc_need_byteswap(struct kvm_vcpu *vcpu)
@@ -72,32 +72,32 @@ static inline bool kvmppc_need_byteswap(struct kvm_vcpu *vcpu) 


static inline void kvmppc_set_ctr(struct kvm_vcpu *vcpu, ulong val)

{

	vcpu->arch.ctr = val;

	vcpu->arch.regs.ctr = val;

}



static inline ulong kvmppc_get_ctr(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.ctr;

	return vcpu->arch.regs.ctr;

}



static inline void kvmppc_set_lr(struct kvm_vcpu *vcpu, ulong val)

{

	vcpu->arch.lr = val;

	vcpu->arch.regs.link = val;

}



static inline ulong kvmppc_get_lr(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.lr;

	return vcpu->arch.regs.link;

}



static inline void kvmppc_set_pc(struct kvm_vcpu *vcpu, ulong val)

{

	vcpu->arch.pc = val;

	vcpu->arch.regs.nip = val;

}



static inline ulong kvmppc_get_pc(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.pc;

	return vcpu->arch.regs.nip;

}



static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu)

arch/powerpc/include/asm/kvm_host.h

+12 −9
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ struct kvm_arch { 
	unsigned long host_lpcr;

	unsigned long sdr1;

	unsigned long host_sdr1;

	int tlbie_lock;

	unsigned long lpcr;

	unsigned long vrma_slb_v;

	int mmu_ready;
@@ -454,6 +453,12 @@ struct mmio_hpte_cache { 
#define KVMPPC_VSX_COPY_WORD		1

#define KVMPPC_VSX_COPY_DWORD		2

#define KVMPPC_VSX_COPY_DWORD_LOAD_DUMP	3

#define KVMPPC_VSX_COPY_WORD_LOAD_DUMP	4



#define KVMPPC_VMX_COPY_BYTE		8

#define KVMPPC_VMX_COPY_HWORD		9

#define KVMPPC_VMX_COPY_WORD		10

#define KVMPPC_VMX_COPY_DWORD		11



struct openpic;
@@ -486,7 +491,7 @@ struct kvm_vcpu_arch { 
	struct kvmppc_book3s_shadow_vcpu *shadow_vcpu;

#endif



	ulong gpr[32];

	struct pt_regs regs;



	struct thread_fp_state fp;
@@ -521,14 +526,10 @@ struct kvm_vcpu_arch { 
	u32 qpr[32];

#endif



	ulong pc;

	ulong ctr;

	ulong lr;

#ifdef CONFIG_PPC_BOOK3S

	ulong tar;

#endif



	ulong xer;

	u32 cr;



#ifdef CONFIG_PPC_BOOK3S
@@ -626,7 +627,6 @@ struct kvm_vcpu_arch { 


	struct thread_vr_state vr_tm;

	u32 vrsave_tm; /* also USPRG0 */



#endif



#ifdef CONFIG_KVM_EXIT_TIMING
@@ -681,16 +681,17 @@ struct kvm_vcpu_arch { 
	 * Number of simulations for vsx.

	 * If we use 2*8bytes to simulate 1*16bytes,

	 * then the number should be 2 and

	 * mmio_vsx_copy_type=KVMPPC_VSX_COPY_DWORD.

	 * mmio_copy_type=KVMPPC_VSX_COPY_DWORD.

	 * If we use 4*4bytes to simulate 1*16bytes,

	 * the number should be 4 and

	 * mmio_vsx_copy_type=KVMPPC_VSX_COPY_WORD.

	 */

	u8 mmio_vsx_copy_nums;

	u8 mmio_vsx_offset;

	u8 mmio_vsx_copy_type;

	u8 mmio_vsx_tx_sx_enabled;

	u8 mmio_vmx_copy_nums;

	u8 mmio_vmx_offset;

	u8 mmio_copy_type;

	u8 osi_needed;

	u8 osi_enabled;

	u8 papr_enabled;
@@ -772,6 +773,8 @@ struct kvm_vcpu_arch { 
	u64 busy_preempt;



	u32 emul_inst;



	u32 online;

#endif



#ifdef CONFIG_KVM_BOOK3S_HV_EXIT_TIMING

CRA Git | Maintained and supported by SUSTech CRA and CCSE