summary refs log tree commit diff stats
path: root/hw/s390x
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2020-03-27 08:46:16 -0400
committerCornelia Huck <cohuck@redhat.com>2020-04-29 14:35:22 +0200
commite8d12a55f6d3e577455b02f15907c460578c689b (patch)
tree7239f14b45a44ee4af88a15f9adf8b11751ee324 /hw/s390x
parent7152c9ecc6530ea145c122b0a58cc28802f630c6 (diff)
downloadfocaccia-qemu-e8d12a55f6d3e577455b02f15907c460578c689b.tar.gz
focaccia-qemu-e8d12a55f6d3e577455b02f15907c460578c689b.zip
s390x/pv: Retry ioctls on -EINTR
PV_ENABLE (and maybe others) might return -EINTR when a signal is
pending. See the Linux kernel patch "s390/gmap: return proper error code
on ksm unsharing" for details. Let us retry the ioctl in that case.

Fixes: c3347ed0d2ee ("s390x: protvirt: Support unpack facility")
Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Acked-by: Janosch Frank <frankja@linux.vnet.ibm.com>
Tested-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <20200327124616.34866-1-borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw/s390x')
-rw-r--r--hw/s390x/pv.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c
index a40a844806..cb0dce4a4f 100644
--- a/hw/s390x/pv.c
+++ b/hw/s390x/pv.c
@@ -23,7 +23,11 @@ static int __s390_pv_cmd(uint32_t cmd, const char *cmdname, void *data)
         .cmd = cmd,
         .data = (uint64_t)data,
     };
-    int rc = kvm_vm_ioctl(kvm_state, KVM_S390_PV_COMMAND, &pv_cmd);
+    int rc;
+
+    do {
+        rc = kvm_vm_ioctl(kvm_state, KVM_S390_PV_COMMAND, &pv_cmd);
+    } while (rc == -EINTR);
 
     if (rc) {
         error_report("KVM PV command %d (%s) failed: header rc %x rrc %x "