Commit 0d6d4d23 authored by Janis Schoetterl-Glausch's avatar Janis Schoetterl-Glausch Committed by Janosch Frank

KVM: s390: Refactor absolute vm 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>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Link: https://lore.kernel.org/r/20230206164602.138068-11-scgl@linux.ibm.com
Message-Id: <20230206164602.138068-11-scgl@linux.ibm.com>
Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
parent 8550bcb7
...@@ -2782,6 +2782,7 @@ static int mem_op_validate_common(struct kvm_s390_mem_op *mop, u64 supported_fla ...@@ -2782,6 +2782,7 @@ static int mem_op_validate_common(struct kvm_s390_mem_op *mop, u64 supported_fla
static int kvm_s390_vm_mem_op_abs(struct kvm *kvm, struct kvm_s390_mem_op *mop) static int kvm_s390_vm_mem_op_abs(struct kvm *kvm, struct kvm_s390_mem_op *mop)
{ {
void __user *uaddr = (void __user *)mop->buf; void __user *uaddr = (void __user *)mop->buf;
enum gacc_mode acc_mode;
void *tmpbuf = NULL; void *tmpbuf = NULL;
int r, srcu_idx; int r, srcu_idx;
...@@ -2803,33 +2804,25 @@ static int kvm_s390_vm_mem_op_abs(struct kvm *kvm, struct kvm_s390_mem_op *mop) ...@@ -2803,33 +2804,25 @@ static int kvm_s390_vm_mem_op_abs(struct kvm *kvm, struct kvm_s390_mem_op *mop)
goto out_unlock; goto out_unlock;
} }
switch (mop->op) { acc_mode = mop->op == KVM_S390_MEMOP_ABSOLUTE_READ ? GACC_FETCH : GACC_STORE;
case KVM_S390_MEMOP_ABSOLUTE_READ: { if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) {
if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) { r = check_gpa_range(kvm, mop->gaddr, mop->size, acc_mode, mop->key);
r = check_gpa_range(kvm, mop->gaddr, mop->size, GACC_FETCH, mop->key); goto out_unlock;
} else {
r = access_guest_abs_with_key(kvm, mop->gaddr, tmpbuf,
mop->size, GACC_FETCH, mop->key);
if (r == 0) {
if (copy_to_user(uaddr, tmpbuf, mop->size))
r = -EFAULT;
}
}
break;
} }
case KVM_S390_MEMOP_ABSOLUTE_WRITE: { if (acc_mode == GACC_FETCH) {
if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) { r = access_guest_abs_with_key(kvm, mop->gaddr, tmpbuf,
r = check_gpa_range(kvm, mop->gaddr, mop->size, GACC_STORE, mop->key); mop->size, GACC_FETCH, mop->key);
} else { if (r)
if (copy_from_user(tmpbuf, uaddr, mop->size)) { goto out_unlock;
r = -EFAULT; if (copy_to_user(uaddr, tmpbuf, mop->size))
break; r = -EFAULT;
} } else {
r = access_guest_abs_with_key(kvm, mop->gaddr, tmpbuf, if (copy_from_user(tmpbuf, uaddr, mop->size)) {
mop->size, GACC_STORE, mop->key); r = -EFAULT;
goto out_unlock;
} }
break; r = access_guest_abs_with_key(kvm, mop->gaddr, tmpbuf,
} mop->size, GACC_STORE, mop->key);
} }
out_unlock: out_unlock:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment