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

Commit 00e9e435 authored by Thomas Huth's avatar Thomas Huth Committed by Cornelia Huck
Browse files

KVM: s390: Add SIGP store-status-at-address order 



The STORE STATUS AT ADDRESS order of SIGP was still missing.
Now it is supported, using the common kvm_s390_store_status()
function.

Signed-off-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 743db27c

arch/s390/kvm/sigp.c

+35 −0
Original line number Diff line number Diff line
@@ -275,6 +275,37 @@ static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address, 
	return rc;

}



static int __sigp_store_status_at_addr(struct kvm_vcpu *vcpu, u16 cpu_id,

					u32 addr, u64 *reg)

{

	struct kvm_vcpu *dst_vcpu = NULL;

	int flags;

	int rc;



	if (cpu_id < KVM_MAX_VCPUS)

		dst_vcpu = kvm_get_vcpu(vcpu->kvm, cpu_id);

	if (!dst_vcpu)

		return SIGP_CC_NOT_OPERATIONAL;



	spin_lock_bh(&dst_vcpu->arch.local_int.lock);

	flags = atomic_read(dst_vcpu->arch.local_int.cpuflags);

	spin_unlock_bh(&dst_vcpu->arch.local_int.lock);

	if (!(flags & CPUSTAT_STOPPED)) {

		*reg &= 0xffffffff00000000UL;

		*reg |= SIGP_STATUS_INCORRECT_STATE;

		return SIGP_CC_STATUS_STORED;

	}



	addr &= 0x7ffffe00;

	rc = kvm_s390_store_status_unloaded(dst_vcpu, addr);

	if (rc == -EFAULT) {

		*reg &= 0xffffffff00000000UL;

		*reg |= SIGP_STATUS_INVALID_PARAMETER;

		rc = SIGP_CC_STATUS_STORED;

	}

	return rc;

}



static int __sigp_sense_running(struct kvm_vcpu *vcpu, u16 cpu_addr,

				u64 *reg)

{
@@ -379,6 +410,10 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu) 
		rc = __sigp_stop(vcpu, cpu_addr, ACTION_STORE_ON_STOP |

						 ACTION_STOP_ON_STOP);

		break;

	case SIGP_STORE_STATUS_AT_ADDRESS:

		rc = __sigp_store_status_at_addr(vcpu, cpu_addr, parameter,

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

		break;

	case SIGP_SET_ARCHITECTURE:

		vcpu->stat.instruction_sigp_arch++;

		rc = __sigp_set_arch(vcpu, parameter);

arch/s390/kvm/trace.h

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ TRACE_EVENT(kvm_s390_intercept_validity, 
	{SIGP_STOP_AND_STORE_STATUS, "stop and store status"},	\

	{SIGP_SET_ARCHITECTURE, "set architecture"},		\

	{SIGP_SET_PREFIX, "set prefix"},			\

	{SIGP_STORE_STATUS_AT_ADDRESS, "store status at addr"},	\

	{SIGP_SENSE_RUNNING, "sense running"},			\

	{SIGP_RESTART, "restart"}