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

Commit 6852d7b6 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: introduce kvm_s390_vcpu_{start,stop} 



This patch introduces two new functions to set/clear the CPUSTAT_STOPPED bit and
makes use of it at all applicable places. These functions prepare the additional
execution of code when starting/stopping a vcpu.

The CPUSTAT_STOPPED bit should not be touched outside of these functions.

Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent e45efa28

arch/s390/kvm/diag.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int __diag_ipl_functions(struct kvm_vcpu *vcpu) 
		return -EOPNOTSUPP;

	}



	atomic_set_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);

	kvm_s390_vcpu_stop(vcpu);

	vcpu->run->s390_reset_flags |= KVM_S390_RESET_SUBSYSTEM;

	vcpu->run->s390_reset_flags |= KVM_S390_RESET_IPL;

	vcpu->run->s390_reset_flags |= KVM_S390_RESET_CPU_INIT;

arch/s390/kvm/intercept.c

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ static int handle_stop(struct kvm_vcpu *vcpu) 
	trace_kvm_s390_stop_request(vcpu->arch.local_int.action_bits);



	if (vcpu->arch.local_int.action_bits & ACTION_STOP_ON_STOP) {

		atomic_set_mask(CPUSTAT_STOPPED,

				&vcpu->arch.sie_block->cpuflags);

		kvm_s390_vcpu_stop(vcpu);

		vcpu->arch.local_int.action_bits &= ~ACTION_STOP_ON_STOP;

		VCPU_EVENT(vcpu, 3, "%s", "cpu stopped");

		rc = -EOPNOTSUPP;

arch/s390/kvm/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu, 
		rc |= read_guest_lc(vcpu, offsetof(struct _lowcore, restart_psw),

				    &vcpu->arch.sie_block->gpsw,

				    sizeof(psw_t));

		atomic_clear_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);

		kvm_s390_vcpu_start(vcpu);

		break;

	case KVM_S390_PROGRAM_INT:

		VCPU_EVENT(vcpu, 4, "interrupt: pgm check code:%x, ilc:%x",

arch/s390/kvm/kvm-s390.c

+14 −2
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu) 
	vcpu->arch.sie_block->pp = 0;

	vcpu->arch.pfault_token = KVM_S390_PFAULT_TOKEN_INVALID;

	kvm_clear_async_pf_completion_queue(vcpu);

	atomic_set_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);

	kvm_s390_vcpu_stop(vcpu);

	kvm_s390_clear_local_irqs(vcpu);

}
@@ -1235,7 +1235,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);



	atomic_clear_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);

	kvm_s390_vcpu_start(vcpu);



	switch (kvm_run->exit_reason) {

	case KVM_EXIT_S390_SIEIC:
@@ -1362,6 +1362,18 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr) 
	return kvm_s390_store_status_unloaded(vcpu, addr);

}



void kvm_s390_vcpu_start(struct kvm_vcpu *vcpu)

{

	trace_kvm_s390_vcpu_start_stop(vcpu->vcpu_id, 1);

	atomic_clear_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);

}



void kvm_s390_vcpu_stop(struct kvm_vcpu *vcpu)

{

	trace_kvm_s390_vcpu_start_stop(vcpu->vcpu_id, 0);

	atomic_set_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);

}



static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,

				     struct kvm_enable_cap *cap)

{

arch/s390/kvm/kvm-s390.h

+2 −0
Original line number Diff line number Diff line
@@ -157,6 +157,8 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu); 
/* implemented in kvm-s390.c */

int kvm_s390_store_status_unloaded(struct kvm_vcpu *vcpu, unsigned long addr);

int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr);

void kvm_s390_vcpu_start(struct kvm_vcpu *vcpu);

void kvm_s390_vcpu_stop(struct kvm_vcpu *vcpu);

void s390_vcpu_block(struct kvm_vcpu *vcpu);

void s390_vcpu_unblock(struct kvm_vcpu *vcpu);

void exit_sie(struct kvm_vcpu *vcpu);