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

Commit b697e435 authored by Jason J. Herne's avatar Jason J. Herne Committed by Christian Borntraeger
Browse files

KVM: s390: Support Configuration z/Architecture Mode 



kvm has always supported the concept of starting in z/Arch mode so let's
reflect the feature bit to the guest.

Also, we change sigp set architecture to reject any request to change
architecture modes.

Signed-off-by: default avatarJason J. Herne <jjherne@linux.vnet.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent ccc59f47

arch/s390/kvm/sigp.c

+17 −19
Original line number Original line Diff line number Diff line
@@ -155,29 +155,26 @@ static int __sigp_stop_and_store_status(struct kvm_vcpu *vcpu, 
	return rc;

	return rc;

}

}





static int __sigp_set_arch(struct kvm_vcpu *vcpu, u32 parameter)

static int __sigp_set_arch(struct kvm_vcpu *vcpu, u32 parameter,

			   u64 *status_reg)

{

{

	int rc;

	unsigned int i;

	unsigned int i;

	struct kvm_vcpu *v;

	struct kvm_vcpu *v;

	bool all_stopped = true;





	switch (parameter & 0xff) {

	case 0:

		rc = SIGP_CC_NOT_OPERATIONAL;

		break;

	case 1:

	case 2:

	kvm_for_each_vcpu(i, v, vcpu->kvm) {

	kvm_for_each_vcpu(i, v, vcpu->kvm) {

			v->arch.pfault_token = KVM_S390_PFAULT_TOKEN_INVALID;

		if (v == vcpu)

			kvm_clear_async_pf_completion_queue(v);

			continue;

		if (!is_vcpu_stopped(v))

			all_stopped = false;

	}

	}





		rc = SIGP_CC_ORDER_CODE_ACCEPTED;

	*status_reg &= 0xffffffff00000000UL;

		break;



	default:

	/* Reject set arch order, with czam we're always in z/Arch mode. */

		rc = -EOPNOTSUPP;

	*status_reg |= (all_stopped ? SIGP_STATUS_INVALID_PARAMETER :

	}

					SIGP_STATUS_INCORRECT_STATE);

	return rc;

	return SIGP_CC_STATUS_STORED;

}

}





static int __sigp_set_prefix(struct kvm_vcpu *vcpu, struct kvm_vcpu *dst_vcpu,

static int __sigp_set_prefix(struct kvm_vcpu *vcpu, struct kvm_vcpu *dst_vcpu,
@@ -446,7 +443,8 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu) 
	switch (order_code) {

	switch (order_code) {

	case SIGP_SET_ARCHITECTURE:

	case SIGP_SET_ARCHITECTURE:

		vcpu->stat.instruction_sigp_arch++;

		vcpu->stat.instruction_sigp_arch++;

		rc = __sigp_set_arch(vcpu, parameter);

		rc = __sigp_set_arch(vcpu, parameter,

				     &vcpu->run->s.regs.gprs[r1]);

		break;

		break;

	default:

	default:

		rc = handle_sigp_dst(vcpu, order_code, cpu_addr,

		rc = handle_sigp_dst(vcpu, order_code, cpu_addr,

arch/s390/tools/gen_facilities.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -80,6 +80,7 @@ static struct facility_def facility_defs[] = { 
			78, /* enhanced-DAT 2 */

			78, /* enhanced-DAT 2 */

			130, /* instruction-execution-protection */

			130, /* instruction-execution-protection */

			131, /* enhanced-SOP 2 and side-effect */

			131, /* enhanced-SOP 2 and side-effect */

			138, /* configuration z/architecture mode (czam) */

			146, /* msa extension 8 */

			146, /* msa extension 8 */

			-1  /* END */

			-1  /* END */

		}

		}