Commit be48d86f authored by Claudio Imbrenda's avatar Claudio Imbrenda Committed by Janosch Frank
Browse files

KVM: s390: pv: Add kvm_s390_cpus_from_pv to kvm-s390.h and add documentation 



Future changes make it necessary to call this function from pv.c.

While we are at it, let's properly document kvm_s390_cpus_from_pv() and
kvm_s390_cpus_to_pv().

Signed-off-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Link: https://lore.kernel.org/r/20220628135619.32410-9-imbrenda@linux.ibm.com


Message-Id: <20220628135619.32410-9-imbrenda@linux.ibm.com>
Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
parent e40df9ef

arch/s390/kvm/kvm-s390.c

+30 −6
Original line number Diff line number Diff line
@@ -2237,12 +2237,25 @@ static int kvm_s390_set_cmma_bits(struct kvm *kvm, 
	return r;

}



static int kvm_s390_cpus_from_pv(struct kvm *kvm, u16 *rcp, u16 *rrcp)

/**

 * kvm_s390_cpus_from_pv - Convert all protected vCPUs in a protected VM to

 * non protected.

 * @kvm: the VM whose protected vCPUs are to be converted

 * @rc: return value for the RC field of the UVC (in case of error)

 * @rrc: return value for the RRC field of the UVC (in case of error)

 *

 * Does not stop in case of error, tries to convert as many

 * CPUs as possible. In case of error, the RC and RRC of the last error are

 * returned.

 *

 * Return: 0 in case of success, otherwise -EIO

 */

int kvm_s390_cpus_from_pv(struct kvm *kvm, u16 *rc, u16 *rrc)

{

	struct kvm_vcpu *vcpu;

	u16 rc, rrc;

	int ret = 0;

	unsigned long i;

	u16 _rc, _rrc;

	int ret = 0;



	/*

	 * We ignore failures and try to destroy as many CPUs as possible.
@@ -2254,9 +2267,9 @@ static int kvm_s390_cpus_from_pv(struct kvm *kvm, u16 *rcp, u16 *rrcp) 
	 */

	kvm_for_each_vcpu(i, vcpu, kvm) {

		mutex_lock(&vcpu->mutex);

		if (kvm_s390_pv_destroy_cpu(vcpu, &rc, &rrc) && !ret) {

			*rcp = rc;

			*rrcp = rrc;

		if (kvm_s390_pv_destroy_cpu(vcpu, &_rc, &_rrc) && !ret) {

			*rc = _rc;

			*rrc = _rrc;

			ret = -EIO;

		}

		mutex_unlock(&vcpu->mutex);
@@ -2267,6 +2280,17 @@ static int kvm_s390_cpus_from_pv(struct kvm *kvm, u16 *rcp, u16 *rrcp) 
	return ret;

}



/**

 * kvm_s390_cpus_to_pv - Convert all non-protected vCPUs in a protected VM

 * to protected.

 * @kvm: the VM whose protected vCPUs are to be converted

 * @rc: return value for the RC field of the UVC (in case of error)

 * @rrc: return value for the RRC field of the UVC (in case of error)

 *

 * Tries to undo the conversion in case of error.

 *

 * Return: 0 in case of success, otherwise -EIO

 */

static int kvm_s390_cpus_to_pv(struct kvm *kvm, u16 *rc, u16 *rrc)

{

	unsigned long i;

arch/s390/kvm/kvm-s390.h

+1 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ int kvm_s390_vcpu_setup_cmma(struct kvm_vcpu *vcpu); 
void kvm_s390_vcpu_unsetup_cmma(struct kvm_vcpu *vcpu);

void kvm_s390_set_cpu_timer(struct kvm_vcpu *vcpu, __u64 cputm);

__u64 kvm_s390_get_cpu_timer(struct kvm_vcpu *vcpu);

int kvm_s390_cpus_from_pv(struct kvm *kvm, u16 *rc, u16 *rrc);



/* implemented in diag.c */

int kvm_s390_handle_diag(struct kvm_vcpu *vcpu);