mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 10:32:35 +00:00
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: Janosch Frank <frankja@linux.ibm.com> Signed-off-by: Janis 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: Janosch Frank <frankja@linux.ibm.com>
This commit is contained in:
parent
0d6d4d2395
commit
701422b343
@ -5254,6 +5254,7 @@ static long kvm_s390_vcpu_mem_op(struct kvm_vcpu *vcpu,
|
|||||||
struct kvm_s390_mem_op *mop)
|
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;
|
int r;
|
||||||
|
|
||||||
@ -5272,38 +5273,35 @@ static long kvm_s390_vcpu_mem_op(struct kvm_vcpu *vcpu,
|
|||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (mop->op) {
|
acc_mode = mop->op == KVM_S390_MEMOP_LOGICAL_READ ? GACC_FETCH : GACC_STORE;
|
||||||
case KVM_S390_MEMOP_LOGICAL_READ:
|
if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) {
|
||||||
if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) {
|
r = check_gva_range(vcpu, mop->gaddr, mop->ar, mop->size,
|
||||||
r = check_gva_range(vcpu, mop->gaddr, mop->ar, mop->size,
|
acc_mode, mop->key);
|
||||||
GACC_FETCH, mop->key);
|
goto out_inject;
|
||||||
break;
|
}
|
||||||
}
|
if (acc_mode == GACC_FETCH) {
|
||||||
r = read_guest_with_key(vcpu, mop->gaddr, mop->ar, tmpbuf,
|
r = read_guest_with_key(vcpu, mop->gaddr, mop->ar, tmpbuf,
|
||||||
mop->size, mop->key);
|
mop->size, mop->key);
|
||||||
if (r == 0) {
|
if (r)
|
||||||
if (copy_to_user(uaddr, tmpbuf, mop->size))
|
goto out_inject;
|
||||||
r = -EFAULT;
|
if (copy_to_user(uaddr, tmpbuf, mop->size)) {
|
||||||
}
|
r = -EFAULT;
|
||||||
break;
|
goto out_free;
|
||||||
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)) {
|
if (copy_from_user(tmpbuf, uaddr, mop->size)) {
|
||||||
r = -EFAULT;
|
r = -EFAULT;
|
||||||
break;
|
goto out_free;
|
||||||
}
|
}
|
||||||
r = write_guest_with_key(vcpu, mop->gaddr, mop->ar, tmpbuf,
|
r = write_guest_with_key(vcpu, mop->gaddr, mop->ar, tmpbuf,
|
||||||
mop->size, mop->key);
|
mop->size, mop->key);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
out_inject:
|
||||||
if (r > 0 && (mop->flags & KVM_S390_MEMOP_F_INJECT_EXCEPTION) != 0)
|
if (r > 0 && (mop->flags & KVM_S390_MEMOP_F_INJECT_EXCEPTION) != 0)
|
||||||
kvm_s390_inject_prog_irq(vcpu, &vcpu->arch.pgm);
|
kvm_s390_inject_prog_irq(vcpu, &vcpu->arch.pgm);
|
||||||
|
|
||||||
|
out_free:
|
||||||
vfree(tmpbuf);
|
vfree(tmpbuf);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user