hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

arm64: KVM: Fix system register enumeration 

The introduction of the SVE registers to userspace started with a
refactoring of the way we expose any register via the ONE_REG
interface.

Unfortunately, this change doesn't exactly behave as expected
if the number of registers is non-zero and consider everything
to be an error. The visible result is that QEMU barfs very early
when creating vcpus.

Make sure we only exit early in case there is an actual error, rather
than a positive number of registers...

Fixes: be25bbb392 ("KVM: arm64: Factor out core register ID enumeration")
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Marc Zyngier 2019-04-02 03:28:39 +01:00
parent 50036ad06b
commit 5d8d4af244
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm64/kvm/guest.c
View File

@ -604,22 +604,22 @@ int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices)
int ret; int ret;
ret = copy_core_reg_indices(vcpu, uindices); ret = copy_core_reg_indices(vcpu, uindices);
if (ret) if (ret < 0)
return ret; return ret;
uindices += ret; uindices += ret;
ret = copy_sve_reg_indices(vcpu, uindices); ret = copy_sve_reg_indices(vcpu, uindices);
if (ret) if (ret < 0)
return ret; return ret;
uindices += ret; uindices += ret;
ret = kvm_arm_copy_fw_reg_indices(vcpu, uindices); ret = kvm_arm_copy_fw_reg_indices(vcpu, uindices);
if (ret) if (ret < 0)
return ret; return ret;
uindices += kvm_arm_get_fw_num_regs(vcpu); uindices += kvm_arm_get_fw_num_regs(vcpu);
ret = copy_timer_indices(vcpu, uindices); ret = copy_timer_indices(vcpu, uindices);
if (ret) if (ret < 0)
return ret; return ret;
uindices += NUM_TIMER_REGS; uindices += NUM_TIMER_REGS;