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

Commit 6f63e81b authored by Bin Lu's avatar Bin Lu Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions 



This patch provides the MMIO load/store emulation for instructions
of 'double & vector unsigned char & vector signed char & vector
unsigned short & vector signed short & vector unsigned int & vector
signed int & vector double '.

The instructions that this adds emulation for are:

- ldx, ldux, lwax,
- lfs, lfsx, lfsu, lfsux, lfd, lfdx, lfdu, lfdux,
- stfs, stfsx, stfsu, stfsux, stfd, stfdx, stfdu, stfdux, stfiwx,
- lxsdx, lxsspx, lxsiwax, lxsiwzx, lxvd2x, lxvw4x, lxvdsx,
- stxsdx, stxsspx, stxsiwx, stxvd2x, stxvw4x

[paulus@ozlabs.org - some cleanups, fixes and rework, make it
 compile for Book E, fix build when PR KVM is built in]

Signed-off-by: default avatarBin Lu <lblulb@linux.vnet.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 307d9279

arch/powerpc/include/asm/disassemble.h

+5 −0
Original line number Diff line number Diff line
@@ -87,6 +87,11 @@ static inline unsigned int get_oc(u32 inst) 
	return (inst >> 11) & 0x7fff;

}



static inline unsigned int get_tx_or_sx(u32 inst)

{

	return (inst) & 0x1;

}



#define IS_XFORM(inst)	(get_op(inst)  == 31)

#define IS_DSFORM(inst)	(get_op(inst) >= 56)

arch/powerpc/include/asm/kvm_host.h

+23 −0
Original line number Diff line number Diff line
@@ -438,6 +438,11 @@ struct mmio_hpte_cache { 
	unsigned int index;

};



#define KVMPPC_VSX_COPY_NONE		0

#define KVMPPC_VSX_COPY_WORD		1

#define KVMPPC_VSX_COPY_DWORD		2

#define KVMPPC_VSX_COPY_DWORD_LOAD_DUMP	3



struct openpic;



struct kvm_vcpu_arch {
@@ -641,6 +646,21 @@ struct kvm_vcpu_arch { 
	u8 io_gpr; /* GPR used as IO source/target */

	u8 mmio_host_swabbed;

	u8 mmio_sign_extend;

	/* conversion between single and double precision */

	u8 mmio_sp64_extend;

	/*

	 * 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.

	 * 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 osi_needed;

	u8 osi_enabled;

	u8 papr_enabled;
@@ -729,6 +749,8 @@ struct kvm_vcpu_arch { 
};



#define VCPU_FPR(vcpu, i)	(vcpu)->arch.fp.fpr[i][TS_FPROFFSET]

#define VCPU_VSX_FPR(vcpu, i, j)	((vcpu)->arch.fp.fpr[i][j])

#define VCPU_VSX_VR(vcpu, i)		((vcpu)->arch.vr.vr[i])



/* Values for vcpu->arch.state */

#define KVMPPC_VCPU_NOTREADY		0
@@ -742,6 +764,7 @@ struct kvm_vcpu_arch { 
#define KVM_MMIO_REG_FPR	0x0020

#define KVM_MMIO_REG_QPR	0x0040

#define KVM_MMIO_REG_FQPR	0x0060

#define KVM_MMIO_REG_VSX	0x0080



#define __KVM_HAVE_ARCH_WQP

#define __KVM_HAVE_CREATE_DEVICE

arch/powerpc/include/asm/kvm_ppc.h

+7 −0
Original line number Diff line number Diff line
@@ -78,9 +78,15 @@ extern int kvmppc_handle_load(struct kvm_run *run, struct kvm_vcpu *vcpu, 
extern int kvmppc_handle_loads(struct kvm_run *run, struct kvm_vcpu *vcpu,

                               unsigned int rt, unsigned int bytes,

			       int is_default_endian);

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_store(struct kvm_run *run, struct kvm_vcpu *vcpu,

			       u64 val, unsigned int bytes,

			       int is_default_endian);

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

				int rs, unsigned int bytes,

				int is_default_endian);



extern int kvmppc_load_last_inst(struct kvm_vcpu *vcpu,

				 enum instruction_type type, u32 *inst);
@@ -243,6 +249,7 @@ union kvmppc_one_reg { 
	u64	dval;

	vector128 vval;

	u64	vsxval[2];

	u32	vsx32val[4];

	struct {

		u64	addr;

		u64	length;

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

+50 −0
Original line number Diff line number Diff line
@@ -86,7 +86,9 @@ 
#define OP_TRAP_64 2



#define OP_31_XOP_TRAP      4

#define OP_31_XOP_LDX       21

#define OP_31_XOP_LWZX      23

#define OP_31_XOP_LDUX      53

#define OP_31_XOP_DCBST     54

#define OP_31_XOP_LWZUX     55

#define OP_31_XOP_TRAP_64   68
@@ -99,6 +101,7 @@ 
#define OP_31_XOP_LHZX      279

#define OP_31_XOP_LHZUX     311

#define OP_31_XOP_MFSPR     339

#define OP_31_XOP_LWAX      341

#define OP_31_XOP_LHAX      343

#define OP_31_XOP_LHAUX     375

#define OP_31_XOP_STHX      407
@@ -108,10 +111,46 @@ 
#define OP_31_XOP_LWBRX     534

#define OP_31_XOP_TLBSYNC   566

#define OP_31_XOP_STWBRX    662

#define OP_31_XOP_STFSX	    663

#define OP_31_XOP_STFSUX    695

#define OP_31_XOP_STFDX     727

#define OP_31_XOP_STFDUX    759

#define OP_31_XOP_LHBRX     790

#define OP_31_XOP_STHBRX    918

#define OP_31_XOP_STFIWX    983



/* VSX Scalar Load Instructions */

#define OP_31_XOP_LXSDX         588

#define OP_31_XOP_LXSSPX        524

#define OP_31_XOP_LXSIWAX       76

#define OP_31_XOP_LXSIWZX       12



/* VSX Scalar Store Instructions */

#define OP_31_XOP_STXSDX        716

#define OP_31_XOP_STXSSPX       652

#define OP_31_XOP_STXSIWX       140



/* VSX Vector Load Instructions */

#define OP_31_XOP_LXVD2X        844

#define OP_31_XOP_LXVW4X        780



/* VSX Vector Load and Splat Instruction */

#define OP_31_XOP_LXVDSX        332



/* VSX Vector Store Instructions */

#define OP_31_XOP_STXVD2X       972

#define OP_31_XOP_STXVW4X       908



#define OP_31_XOP_LFSX          535

#define OP_31_XOP_LFSUX         567

#define OP_31_XOP_LFDX          599

#define OP_31_XOP_LFDUX		631



#define OP_LWZ  32

#define OP_STFS 52

#define OP_STFSU 53

#define OP_STFD 54

#define OP_STFDU 55

#define OP_LD   58

#define OP_LWZU 33

#define OP_LBZ  34
@@ -127,6 +166,17 @@ 
#define OP_LHAU 43

#define OP_STH  44

#define OP_STHU 45

#define OP_LMW  46

#define OP_STMW 47

#define OP_LFS  48

#define OP_LFSU 49

#define OP_LFD  50

#define OP_LFDU 51

#define OP_STFS 52

#define OP_STFSU 53

#define OP_STFD  54

#define OP_STFDU 55

#define OP_LQ    56



/* sorted alphabetically */

#define PPC_INST_BHRBE			0x7c00025c

arch/powerpc/kvm/emulate_loadstore.c

+334 −1
Original line number Diff line number Diff line
@@ -34,6 +34,30 @@ 
#include "timing.h"

#include "trace.h"



#ifdef CONFIG_PPC_FPU

static bool kvmppc_check_fp_disabled(struct kvm_vcpu *vcpu)

{

	if (!(kvmppc_get_msr(vcpu) & MSR_FP)) {

		kvmppc_core_queue_fpunavail(vcpu);

		return true;

	}



	return false;

}

#endif /* CONFIG_PPC_FPU */



#ifdef CONFIG_VSX

static bool kvmppc_check_vsx_disabled(struct kvm_vcpu *vcpu)

{

	if (!(kvmppc_get_msr(vcpu) & MSR_VSX)) {

		kvmppc_core_queue_vsx_unavail(vcpu);

		return true;

	}



	return false;

}

#endif /* CONFIG_VSX */



/* XXX to do:

 * lhax

 * lhaux
@@ -66,6 +90,19 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) 
	rs = get_rs(inst);

	rt = get_rt(inst);



	/*

	 * if mmio_vsx_tx_sx_enabled == 0, copy data between

	 * VSR[0..31] and memory

	 * if mmio_vsx_tx_sx_enabled == 1, copy data between

	 * VSR[32..63] and memory

	 */

	vcpu->arch.mmio_vsx_tx_sx_enabled = get_tx_or_sx(inst);

	vcpu->arch.mmio_vsx_copy_nums = 0;

	vcpu->arch.mmio_vsx_offset = 0;

	vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_NONE;

	vcpu->arch.mmio_sp64_extend = 0;

	vcpu->arch.mmio_sign_extend = 0;



	switch (get_op(inst)) {

	case 31:

		switch (get_xop(inst)) {
@@ -157,6 +194,230 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) 
			                               2, 0);

			break;



		case OP_31_XOP_LDX:

			emulated = kvmppc_handle_load(run, vcpu, rt, 8, 1);

			break;



		case OP_31_XOP_LDUX:

			emulated = kvmppc_handle_load(run, vcpu, rt, 8, 1);

			kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);

			break;



		case OP_31_XOP_LWAX:

			emulated = kvmppc_handle_loads(run, vcpu, rt, 4, 1);

			break;



#ifdef CONFIG_PPC_FPU

		case OP_31_XOP_LFSX:

			if (kvmppc_check_fp_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_sp64_extend = 1;

			emulated = kvmppc_handle_load(run, vcpu,

				KVM_MMIO_REG_FPR|rt, 4, 1);

			break;



		case OP_31_XOP_LFSUX:

			if (kvmppc_check_fp_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_sp64_extend = 1;

			emulated = kvmppc_handle_load(run, vcpu,

				KVM_MMIO_REG_FPR|rt, 4, 1);

			kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);

			break;



		case OP_31_XOP_LFDX:

			if (kvmppc_check_fp_disabled(vcpu))

				return EMULATE_DONE;

			emulated = kvmppc_handle_load(run, vcpu,

				KVM_MMIO_REG_FPR|rt, 8, 1);

			break;



		case OP_31_XOP_LFDUX:

			if (kvmppc_check_fp_disabled(vcpu))

				return EMULATE_DONE;

			emulated = kvmppc_handle_load(run, vcpu,

				KVM_MMIO_REG_FPR|rt, 8, 1);

			kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);

			break;



		case OP_31_XOP_STFSX:

			if (kvmppc_check_fp_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_sp64_extend = 1;

			emulated = kvmppc_handle_store(run, vcpu,

				VCPU_FPR(vcpu, rs), 4, 1);

			break;



		case OP_31_XOP_STFSUX:

			if (kvmppc_check_fp_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_sp64_extend = 1;

			emulated = kvmppc_handle_store(run, vcpu,

				VCPU_FPR(vcpu, rs), 4, 1);

			kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);

			break;



		case OP_31_XOP_STFDX:

			if (kvmppc_check_fp_disabled(vcpu))

				return EMULATE_DONE;

			emulated = kvmppc_handle_store(run, vcpu,

				VCPU_FPR(vcpu, rs),

		                               8, 1);

			break;



		case OP_31_XOP_STFDUX:

			if (kvmppc_check_fp_disabled(vcpu))

				return EMULATE_DONE;

			emulated = kvmppc_handle_store(run, vcpu,

				VCPU_FPR(vcpu, rs),

		                               8, 1);

			kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);

			break;



		case OP_31_XOP_STFIWX:

			if (kvmppc_check_fp_disabled(vcpu))

				return EMULATE_DONE;

			emulated = kvmppc_handle_store(run, vcpu,

				VCPU_FPR(vcpu, rs),

		                               4, 1);

			break;

#endif



#ifdef CONFIG_VSX

		case OP_31_XOP_LXSDX:

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_copy_nums = 1;

			vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_DWORD;

			emulated = kvmppc_handle_vsx_load(run, vcpu,

				KVM_MMIO_REG_VSX|rt, 8, 1, 0);

			break;



		case OP_31_XOP_LXSSPX:

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_copy_nums = 1;

			vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_DWORD;

			vcpu->arch.mmio_sp64_extend = 1;

			emulated = kvmppc_handle_vsx_load(run, vcpu,

				KVM_MMIO_REG_VSX|rt, 4, 1, 0);

			break;



		case OP_31_XOP_LXSIWAX:

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_copy_nums = 1;

			vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_DWORD;

			emulated = kvmppc_handle_vsx_load(run, vcpu,

				KVM_MMIO_REG_VSX|rt, 4, 1, 1);

			break;



		case OP_31_XOP_LXSIWZX:

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_copy_nums = 1;

			vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_DWORD;

			emulated = kvmppc_handle_vsx_load(run, vcpu,

				KVM_MMIO_REG_VSX|rt, 4, 1, 0);

			break;



		case OP_31_XOP_LXVD2X:

		/*

		 * In this case, the official load/store process is like this:

		 * Step1, exit from vm by page fault isr, then kvm save vsr.

		 * Please see guest_exit_cont->store_fp_state->SAVE_32VSRS

		 * as reference.

		 *

		 * Step2, copy data between memory and VCPU

		 * Notice: for LXVD2X/STXVD2X/LXVW4X/STXVW4X, we use

		 * 2copies*8bytes or 4copies*4bytes

		 * to simulate one copy of 16bytes.

		 * Also there is an endian issue here, we should notice the

		 * layout of memory.

		 * Please see MARCO of LXVD2X_ROT/STXVD2X_ROT as more reference.

		 * If host is little-endian, kvm will call XXSWAPD for

		 * LXVD2X_ROT/STXVD2X_ROT.

		 * So, if host is little-endian,

		 * the postion of memeory should be swapped.

		 *

		 * Step3, return to guest, kvm reset register.

		 * Please see kvmppc_hv_entry->load_fp_state->REST_32VSRS

		 * as reference.

		 */

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_copy_nums = 2;

			vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_DWORD;

			emulated = kvmppc_handle_vsx_load(run, vcpu,

				KVM_MMIO_REG_VSX|rt, 8, 1, 0);

			break;



		case OP_31_XOP_LXVW4X:

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_copy_nums = 4;

			vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_WORD;

			emulated = kvmppc_handle_vsx_load(run, vcpu,

				KVM_MMIO_REG_VSX|rt, 4, 1, 0);

			break;



		case OP_31_XOP_LXVDSX:

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_copy_nums = 1;

			vcpu->arch.mmio_vsx_copy_type =

				 KVMPPC_VSX_COPY_DWORD_LOAD_DUMP;

			emulated = kvmppc_handle_vsx_load(run, vcpu,

				KVM_MMIO_REG_VSX|rt, 8, 1, 0);

			break;



		case OP_31_XOP_STXSDX:

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_copy_nums = 1;

			vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_DWORD;

			emulated = kvmppc_handle_vsx_store(run, vcpu,

						 rs, 8, 1);

			break;



		case OP_31_XOP_STXSSPX:

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_copy_nums = 1;

			vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_DWORD;

			vcpu->arch.mmio_sp64_extend = 1;

			emulated = kvmppc_handle_vsx_store(run, vcpu,

						 rs, 4, 1);

			break;



		case OP_31_XOP_STXSIWX:

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_offset = 1;

			vcpu->arch.mmio_vsx_copy_nums = 1;

			vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_WORD;

			emulated = kvmppc_handle_vsx_store(run, vcpu,

							 rs, 4, 1);

			break;



		case OP_31_XOP_STXVD2X:

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_copy_nums = 2;

			vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_DWORD;

			emulated = kvmppc_handle_vsx_store(run, vcpu,

							 rs, 8, 1);

			break;



		case OP_31_XOP_STXVW4X:

			if (kvmppc_check_vsx_disabled(vcpu))

				return EMULATE_DONE;

			vcpu->arch.mmio_vsx_copy_nums = 4;

			vcpu->arch.mmio_vsx_copy_type = KVMPPC_VSX_COPY_WORD;

			emulated = kvmppc_handle_vsx_store(run, vcpu,

							 rs, 4, 1);

			break;

#endif /* CONFIG_VSX */

		default:

			emulated = EMULATE_FAIL;

			break;
@@ -167,7 +428,45 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) 
		emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);

		break;



	/* TBD: Add support for other 64 bit load variants like ldu, ldux, ldx etc. */

#ifdef CONFIG_PPC_FPU

	case OP_STFS:

		if (kvmppc_check_fp_disabled(vcpu))

			return EMULATE_DONE;

		vcpu->arch.mmio_sp64_extend = 1;

		emulated = kvmppc_handle_store(run, vcpu,

			VCPU_FPR(vcpu, rs),

			4, 1);

		break;



	case OP_STFSU:

		if (kvmppc_check_fp_disabled(vcpu))

			return EMULATE_DONE;

		vcpu->arch.mmio_sp64_extend = 1;

		emulated = kvmppc_handle_store(run, vcpu,

			VCPU_FPR(vcpu, rs),

			4, 1);

		kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);

		break;



	case OP_STFD:

		if (kvmppc_check_fp_disabled(vcpu))

			return EMULATE_DONE;

		emulated = kvmppc_handle_store(run, vcpu,

			VCPU_FPR(vcpu, rs),

	                               8, 1);

		break;



	case OP_STFDU:

		if (kvmppc_check_fp_disabled(vcpu))

			return EMULATE_DONE;

		emulated = kvmppc_handle_store(run, vcpu,

			VCPU_FPR(vcpu, rs),

	                               8, 1);

		kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);

		break;

#endif



	/* TBD: Add support for other 64 bit load variants like ldu etc. */

	case OP_LD:

		rt = get_rt(inst);

		emulated = kvmppc_handle_load(run, vcpu, rt, 8, 1);
@@ -252,6 +551,40 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) 
		kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);

		break;



#ifdef CONFIG_PPC_FPU

	case OP_LFS:

		if (kvmppc_check_fp_disabled(vcpu))

			return EMULATE_DONE;

		vcpu->arch.mmio_sp64_extend = 1;

		emulated = kvmppc_handle_load(run, vcpu,

			KVM_MMIO_REG_FPR|rt, 4, 1);

		break;



	case OP_LFSU:

		if (kvmppc_check_fp_disabled(vcpu))

			return EMULATE_DONE;

		vcpu->arch.mmio_sp64_extend = 1;

		emulated = kvmppc_handle_load(run, vcpu,

			KVM_MMIO_REG_FPR|rt, 4, 1);

		kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);

		break;



	case OP_LFD:

		if (kvmppc_check_fp_disabled(vcpu))

			return EMULATE_DONE;

		emulated = kvmppc_handle_load(run, vcpu,

			KVM_MMIO_REG_FPR|rt, 8, 1);

		break;



	case OP_LFDU:

		if (kvmppc_check_fp_disabled(vcpu))

			return EMULATE_DONE;

		emulated = kvmppc_handle_load(run, vcpu,

			KVM_MMIO_REG_FPR|rt, 8, 1);

		kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);

		break;

#endif



	default:

		emulated = EMULATE_FAIL;

		break;