Commit 1ab03c07 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-ppc-next-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

Second PPC KVM update for 4.16

Seven fixes that are either trivial or that address bugs that people
are actually hitting.  The main ones are:

- Drop spinlocks before reading guest memory

- Fix a bug causing corruption of VCPU state in PR KVM with preemption
  enabled

- Make HPT resizing work on POWER9

- Add MMIO emulation for vector loads and stores, because guests now
  use these instructions in memcpy and similar routines.
parents 80132f4c 09f98496

arch/powerpc/include/asm/kvm_book3s.h

+2 −4
Original line number Diff line number Diff line
@@ -249,10 +249,8 @@ extern int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd); 
extern void kvmppc_pr_init_default_hcalls(struct kvm *kvm);

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 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);

extern void kvmppc_copy_to_svcpu(struct kvm_vcpu *vcpu);

extern void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu);

extern int kvm_irq_bypass;



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

arch/powerpc/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -690,6 +690,7 @@ struct kvm_vcpu_arch { 
	u8 mmio_vsx_offset;

	u8 mmio_vsx_copy_type;

	u8 mmio_vsx_tx_sx_enabled;

	u8 mmio_vmx_copy_nums;

	u8 osi_needed;

	u8 osi_enabled;

	u8 papr_enabled;
@@ -804,6 +805,7 @@ struct kvm_vcpu_arch { 
#define KVM_MMIO_REG_QPR	0x0040

#define KVM_MMIO_REG_FQPR	0x0060

#define KVM_MMIO_REG_VSX	0x0080

#define KVM_MMIO_REG_VMX	0x00c0



#define __KVM_HAVE_ARCH_WQP

#define __KVM_HAVE_CREATE_DEVICE

arch/powerpc/include/asm/kvm_ppc.h

+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ extern int kvmppc_handle_loads(struct kvm_run *run, struct kvm_vcpu *vcpu, 
extern int kvmppc_handle_vsx_load(struct kvm_run *run, struct kvm_vcpu *vcpu,

				unsigned int rt, unsigned int bytes,

			int is_default_endian, int mmio_sign_extend);

extern int kvmppc_handle_load128_by2x64(struct kvm_run *run,

		struct kvm_vcpu *vcpu, unsigned int rt, int is_default_endian);

extern int kvmppc_handle_store128_by2x64(struct kvm_run *run,

		struct kvm_vcpu *vcpu, unsigned int rs, int is_default_endian);

extern int kvmppc_handle_store(struct kvm_run *run, struct kvm_vcpu *vcpu,

			       u64 val, unsigned int bytes,

			       int is_default_endian);

arch/powerpc/include/asm/ppc-opcode.h

+6 −0
Original line number Diff line number Diff line
@@ -156,6 +156,12 @@ 
#define OP_31_XOP_LFDX          599

#define OP_31_XOP_LFDUX		631



/* VMX Vector Load Instructions */

#define OP_31_XOP_LVX           103



/* VMX Vector Store Instructions */

#define OP_31_XOP_STVX          231



#define OP_LWZ  32

#define OP_STFS 52

#define OP_STFSU 53

arch/powerpc/kvm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ config KVM_BOOK3S_64 
	select KVM_BOOK3S_64_HANDLER

	select KVM

	select KVM_BOOK3S_PR_POSSIBLE if !KVM_BOOK3S_HV_POSSIBLE

	select SPAPR_TCE_IOMMU if IOMMU_SUPPORT && (PPC_SERIES || PPC_POWERNV)

	select SPAPR_TCE_IOMMU if IOMMU_SUPPORT && (PPC_PSERIES || PPC_POWERNV)

	---help---

	  Support running unmodified book3s_64 and book3s_32 guest kernels

	  in virtual machines on book3s_64 host processors.

CRA Git | Maintained and supported by SUSTech CRA and CCSE