Commit 2d8bcaed authored by Heiko Carstens's avatar Heiko Carstens Committed by Christian Borntraeger
Browse files

KVM: s390: convert handle_lpsw[e]() 



Convert handle_lpsw[e]() to new guest access functions.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 2f32d4ea

arch/s390/kvm/priv.c

+9 −4
Original line number Original line Diff line number Diff line
@@ -381,6 +381,7 @@ int kvm_s390_handle_lpsw(struct kvm_vcpu *vcpu) 
	psw_t *gpsw = &vcpu->arch.sie_block->gpsw;

	psw_t *gpsw = &vcpu->arch.sie_block->gpsw;

	psw_compat_t new_psw;

	psw_compat_t new_psw;

	u64 addr;

	u64 addr;

	int rc;





	if (gpsw->mask & PSW_MASK_PSTATE)

	if (gpsw->mask & PSW_MASK_PSTATE)

		return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);

		return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
@@ -388,8 +389,10 @@ int kvm_s390_handle_lpsw(struct kvm_vcpu *vcpu) 
	addr = kvm_s390_get_base_disp_s(vcpu);

	addr = kvm_s390_get_base_disp_s(vcpu);

	if (addr & 7)

	if (addr & 7)

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

	if (copy_from_guest(vcpu, &new_psw, addr, sizeof(new_psw)))



		return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);

	rc = read_guest(vcpu, addr, &new_psw, sizeof(new_psw));

	if (rc)

		return kvm_s390_inject_prog_cond(vcpu, rc);

	if (!(new_psw.mask & PSW32_MASK_BASE))

	if (!(new_psw.mask & PSW32_MASK_BASE))

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

	gpsw->mask = (new_psw.mask & ~PSW32_MASK_BASE) << 32;

	gpsw->mask = (new_psw.mask & ~PSW32_MASK_BASE) << 32;
@@ -405,6 +408,7 @@ static int handle_lpswe(struct kvm_vcpu *vcpu) 
{

{

	psw_t new_psw;

	psw_t new_psw;

	u64 addr;

	u64 addr;

	int rc;





	if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)

	if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)

		return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);

		return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
@@ -412,8 +416,9 @@ static int handle_lpswe(struct kvm_vcpu *vcpu) 
	addr = kvm_s390_get_base_disp_s(vcpu);

	addr = kvm_s390_get_base_disp_s(vcpu);

	if (addr & 7)

	if (addr & 7)

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

	if (copy_from_guest(vcpu, &new_psw, addr, sizeof(new_psw)))

	rc = read_guest(vcpu, addr, &new_psw, sizeof(new_psw));

		return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);

	if (rc)

		return kvm_s390_inject_prog_cond(vcpu, rc);

	vcpu->arch.sie_block->gpsw = new_psw;

	vcpu->arch.sie_block->gpsw = new_psw;

	if (!is_valid_psw(&vcpu->arch.sie_block->gpsw))

	if (!is_valid_psw(&vcpu->arch.sie_block->gpsw))

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);