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

Commit 54771e62 authored by Alexander Graf's avatar Alexander Graf
Browse files

KVM: PPC: Emulator: clean up SPR reads and writes 



When reading and writing SPRs, every SPR emulation piece had to read
or write the respective GPR the value was read from or stored in itself.

This approach is pretty prone to failure. What if we accidentally
implement mfspr emulation where we just do "break" and nothing else?
Suddenly we would get a random value in the return register - which is
always a bad idea.

So let's consolidate the generic code paths and only give the core
specific SPR handling code readily made variables to read/write from/to.

Functionally, this patch doesn't change anything, but it increases the
readability of the code and makes is less prone to bugs.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent c46dc9a8

arch/powerpc/include/asm/kvm_ppc.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -107,8 +107,10 @@ extern void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu, 




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

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

                                  unsigned int op, int *advance);

                                  unsigned int op, int *advance);

extern int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs);

extern int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn,

extern int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt);

				     ulong val);

extern int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn,

				     ulong *val);





extern int kvmppc_booke_init(void);

extern int kvmppc_booke_init(void);

extern void kvmppc_booke_exit(void);

extern void kvmppc_booke_exit(void);

arch/powerpc/kvm/44x_emulate.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -128,41 +128,41 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu, 
	return emulated;

	return emulated;

}

}





int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)

int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val)

{

{

	int emulated = EMULATE_DONE;

	int emulated = EMULATE_DONE;





	switch (sprn) {

	switch (sprn) {

	case SPRN_PID:

	case SPRN_PID:

		kvmppc_set_pid(vcpu, kvmppc_get_gpr(vcpu, rs)); break;

		kvmppc_set_pid(vcpu, spr_val); break;

	case SPRN_MMUCR:

	case SPRN_MMUCR:

		vcpu->arch.mmucr = kvmppc_get_gpr(vcpu, rs); break;

		vcpu->arch.mmucr = spr_val; break;

	case SPRN_CCR0:

	case SPRN_CCR0:

		vcpu->arch.ccr0 = kvmppc_get_gpr(vcpu, rs); break;

		vcpu->arch.ccr0 = spr_val; break;

	case SPRN_CCR1:

	case SPRN_CCR1:

		vcpu->arch.ccr1 = kvmppc_get_gpr(vcpu, rs); break;

		vcpu->arch.ccr1 = spr_val; break;

	default:

	default:

		emulated = kvmppc_booke_emulate_mtspr(vcpu, sprn, rs);

		emulated = kvmppc_booke_emulate_mtspr(vcpu, sprn, spr_val);

	}

	}





	return emulated;

	return emulated;

}

}





int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)

int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val)

{

{

	int emulated = EMULATE_DONE;

	int emulated = EMULATE_DONE;





	switch (sprn) {

	switch (sprn) {

	case SPRN_PID:

	case SPRN_PID:

		kvmppc_set_gpr(vcpu, rt, vcpu->arch.pid); break;

		*spr_val = vcpu->arch.pid; break;

	case SPRN_MMUCR:

	case SPRN_MMUCR:

		kvmppc_set_gpr(vcpu, rt, vcpu->arch.mmucr); break;

		*spr_val = vcpu->arch.mmucr; break;

	case SPRN_CCR0:

	case SPRN_CCR0:

		kvmppc_set_gpr(vcpu, rt, vcpu->arch.ccr0); break;

		*spr_val = vcpu->arch.ccr0; break;

	case SPRN_CCR1:

	case SPRN_CCR1:

		kvmppc_set_gpr(vcpu, rt, vcpu->arch.ccr1); break;

		*spr_val = vcpu->arch.ccr1; break;

	default:

	default:

		emulated = kvmppc_booke_emulate_mfspr(vcpu, sprn, rt);

		emulated = kvmppc_booke_emulate_mfspr(vcpu, sprn, spr_val);

	}

	}





	return emulated;

	return emulated;

arch/powerpc/kvm/book3s_emulate.c

+16 −18
Original line number Original line Diff line number Diff line
@@ -318,10 +318,9 @@ static struct kvmppc_bat *kvmppc_find_bat(struct kvm_vcpu *vcpu, int sprn) 
	return bat;

	return bat;

}

}





int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)

int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val)

{

{

	int emulated = EMULATE_DONE;

	int emulated = EMULATE_DONE;

	ulong spr_val = kvmppc_get_gpr(vcpu, rs);





	switch (sprn) {

	switch (sprn) {

	case SPRN_SDR1:

	case SPRN_SDR1:
@@ -433,7 +432,7 @@ unprivileged: 
	return emulated;

	return emulated;

}

}





int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)

int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val)

{

{

	int emulated = EMULATE_DONE;

	int emulated = EMULATE_DONE;
@@ -446,46 +445,46 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt) 
		struct kvmppc_bat *bat = kvmppc_find_bat(vcpu, sprn);

		struct kvmppc_bat *bat = kvmppc_find_bat(vcpu, sprn);





		if (sprn % 2)

		if (sprn % 2)

			kvmppc_set_gpr(vcpu, rt, bat->raw >> 32);

			*spr_val = bat->raw >> 32;

		else

		else

			kvmppc_set_gpr(vcpu, rt, bat->raw);

			*spr_val = bat->raw;





		break;

		break;

	}

	}

	case SPRN_SDR1:

	case SPRN_SDR1:

		if (!spr_allowed(vcpu, PRIV_HYPER))

		if (!spr_allowed(vcpu, PRIV_HYPER))

			goto unprivileged;

			goto unprivileged;

		kvmppc_set_gpr(vcpu, rt, to_book3s(vcpu)->sdr1);

		*spr_val = to_book3s(vcpu)->sdr1;

		break;

		break;

	case SPRN_DSISR:

	case SPRN_DSISR:

		kvmppc_set_gpr(vcpu, rt, vcpu->arch.shared->dsisr);

		*spr_val = vcpu->arch.shared->dsisr;

		break;

		break;

	case SPRN_DAR:

	case SPRN_DAR:

		kvmppc_set_gpr(vcpu, rt, vcpu->arch.shared->dar);

		*spr_val = vcpu->arch.shared->dar;

		break;

		break;

	case SPRN_HIOR:

	case SPRN_HIOR:

		kvmppc_set_gpr(vcpu, rt, to_book3s(vcpu)->hior);

		*spr_val = to_book3s(vcpu)->hior;

		break;

		break;

	case SPRN_HID0:

	case SPRN_HID0:

		kvmppc_set_gpr(vcpu, rt, to_book3s(vcpu)->hid[0]);

		*spr_val = to_book3s(vcpu)->hid[0];

		break;

		break;

	case SPRN_HID1:

	case SPRN_HID1:

		kvmppc_set_gpr(vcpu, rt, to_book3s(vcpu)->hid[1]);

		*spr_val = to_book3s(vcpu)->hid[1];

		break;

		break;

	case SPRN_HID2:

	case SPRN_HID2:

	case SPRN_HID2_GEKKO:

	case SPRN_HID2_GEKKO:

		kvmppc_set_gpr(vcpu, rt, to_book3s(vcpu)->hid[2]);

		*spr_val = to_book3s(vcpu)->hid[2];

		break;

		break;

	case SPRN_HID4:

	case SPRN_HID4:

	case SPRN_HID4_GEKKO:

	case SPRN_HID4_GEKKO:

		kvmppc_set_gpr(vcpu, rt, to_book3s(vcpu)->hid[4]);

		*spr_val = to_book3s(vcpu)->hid[4];

		break;

		break;

	case SPRN_HID5:

	case SPRN_HID5:

		kvmppc_set_gpr(vcpu, rt, to_book3s(vcpu)->hid[5]);

		*spr_val = to_book3s(vcpu)->hid[5];

		break;

		break;

	case SPRN_CFAR:

	case SPRN_CFAR:

	case SPRN_PURR:

	case SPRN_PURR:

		kvmppc_set_gpr(vcpu, rt, 0);

		*spr_val = 0;

		break;

		break;

	case SPRN_GQR0:

	case SPRN_GQR0:

	case SPRN_GQR1:

	case SPRN_GQR1:
@@ -495,8 +494,7 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt) 
	case SPRN_GQR5:

	case SPRN_GQR5:

	case SPRN_GQR6:

	case SPRN_GQR6:

	case SPRN_GQR7:

	case SPRN_GQR7:

		kvmppc_set_gpr(vcpu, rt,

		*spr_val = to_book3s(vcpu)->gqr[sprn - SPRN_GQR0];

			       to_book3s(vcpu)->gqr[sprn - SPRN_GQR0]);

		break;

		break;

	case SPRN_THRM1:

	case SPRN_THRM1:

	case SPRN_THRM2:

	case SPRN_THRM2:
@@ -511,7 +509,7 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt) 
	case SPRN_PMC3_GEKKO:

	case SPRN_PMC3_GEKKO:

	case SPRN_PMC4_GEKKO:

	case SPRN_PMC4_GEKKO:

	case SPRN_WPAR_GEKKO:

	case SPRN_WPAR_GEKKO:

		kvmppc_set_gpr(vcpu, rt, 0);

		*spr_val = 0;

		break;

		break;

	default:

	default:

unprivileged:

unprivileged:

arch/powerpc/kvm/book3s_hv.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1505,12 +1505,12 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu, 
	return EMULATE_FAIL;

	return EMULATE_FAIL;

}

}





int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)

int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val)

{

{

	return EMULATE_FAIL;

	return EMULATE_FAIL;

}

}





int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)

int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val)

{

{

	return EMULATE_FAIL;

	return EMULATE_FAIL;

}

}

arch/powerpc/kvm/booke.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -75,8 +75,8 @@ void kvmppc_clr_tsr_bits(struct kvm_vcpu *vcpu, u32 tsr_bits); 




int kvmppc_booke_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,

int kvmppc_booke_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,

                            unsigned int inst, int *advance);

                            unsigned int inst, int *advance);

int kvmppc_booke_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt);

int kvmppc_booke_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val);

int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs);

int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val);





/* low-level asm code to transfer guest state */

/* low-level asm code to transfer guest state */

void kvmppc_load_guest_spe(struct kvm_vcpu *vcpu);

void kvmppc_load_guest_spe(struct kvm_vcpu *vcpu);