diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2021-09-23 08:46:08 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 08:46:08 -0300 |
| commit | 5e2f889a8a3a0b326eb96497906bc7bcb6bcb743 (patch) | |
| tree | c4f34a09bc0d9b8fabb9b9dbb2082ce8fee9b524 /virt | |
| parent | aad410850445424f566e57a419527b6e2d3ab42d (diff) | |
| parent | 8b231e0e8ea0c43d791f6429089dbf0530c0125b (diff) | |
Merge pull request #452 from zandrey/5.4-2.3.x-imx
Update 5.4-2.3.x-imx up to v5.4.148
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/arm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 4af85605730e..f7150fbeeb55 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -1141,6 +1141,14 @@ long kvm_arch_vcpu_ioctl(struct file *filp, if (copy_from_user(®, argp, sizeof(reg))) break; + /* + * We could owe a reset due to PSCI. Handle the pending reset + * here to ensure userspace register accesses are ordered after + * the reset. + */ + if (kvm_check_request(KVM_REQ_VCPU_RESET, vcpu)) + kvm_reset_vcpu(vcpu); + if (ioctl == KVM_SET_ONE_REG) r = kvm_arm_set_reg(vcpu, ®); else |