Commit 701422b3 authored by Janis Schoetterl-Glausch's avatar Janis Schoetterl-Glausch Committed by Janosch Frank
Browse files

KVM: s390: Refactor vcpu mem_op function 



Remove code duplication with regards to the CHECK_ONLY flag.
Decrease the number of indents.
No functional change indented.

Suggested-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Signed-off-by: default avatarJanis Schoetterl-Glausch <scgl@linux.ibm.com>
Link: https://lore.kernel.org/r/20230206164602.138068-12-scgl@linux.ibm.com


Message-Id: <20230206164602.138068-12-scgl@linux.ibm.com>
Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
parent 0d6d4d23

arch/s390/kvm/kvm-s390.c

+17 −19
Original line number Diff line number Diff line
@@ -5254,6 +5254,7 @@ static long kvm_s390_vcpu_mem_op(struct kvm_vcpu *vcpu, 
				 struct kvm_s390_mem_op *mop)

{

	void __user *uaddr = (void __user *)mop->buf;

	enum gacc_mode acc_mode;

	void *tmpbuf = NULL;

	int r;
@@ -5272,38 +5273,35 @@ static long kvm_s390_vcpu_mem_op(struct kvm_vcpu *vcpu, 
			return -ENOMEM;

	}



	switch (mop->op) {

	case KVM_S390_MEMOP_LOGICAL_READ:

	acc_mode = mop->op == KVM_S390_MEMOP_LOGICAL_READ ? GACC_FETCH : GACC_STORE;

	if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) {

		r = check_gva_range(vcpu, mop->gaddr, mop->ar, mop->size,

					    GACC_FETCH, mop->key);

			break;

				    acc_mode, mop->key);

		goto out_inject;

	}

	if (acc_mode == GACC_FETCH) {

		r = read_guest_with_key(vcpu, mop->gaddr, mop->ar, tmpbuf,

					mop->size, mop->key);

		if (r == 0) {

			if (copy_to_user(uaddr, tmpbuf, mop->size))

		if (r)

			goto out_inject;

		if (copy_to_user(uaddr, tmpbuf, mop->size)) {

			r = -EFAULT;

			goto out_free;

		}

		break;

	case KVM_S390_MEMOP_LOGICAL_WRITE:

		if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) {

			r = check_gva_range(vcpu, mop->gaddr, mop->ar, mop->size,

					    GACC_STORE, mop->key);

			break;

		}

	} else {

		if (copy_from_user(tmpbuf, uaddr, mop->size)) {

			r = -EFAULT;

			break;

			goto out_free;

		}

		r = write_guest_with_key(vcpu, mop->gaddr, mop->ar, tmpbuf,

					 mop->size, mop->key);

		break;

	}



out_inject:

	if (r > 0 && (mop->flags & KVM_S390_MEMOP_F_INJECT_EXCEPTION) != 0)

		kvm_s390_inject_prog_irq(vcpu, &vcpu->arch.pgm);



out_free:

	vfree(tmpbuf);

	return r;

}