58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
|
From 1678288d945906d83d7adae109b842080aebaf19 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Fri, 29 May 2020 05:54:18 -0400
|
||
|
|
Subject: [PATCH 36/42] s390x/pv: Retry ioctls on -EINTR
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-id: <20200529055420.16855-37-thuth@redhat.com>
|
||
|
|
Patchwork-id: 97055
|
||
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 36/38] s390x/pv: Retry ioctls on -EINTR
|
||
|
|
Bugzilla: 1828317
|
||
|
|
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||
|
|
|
||
|
|
From: Christian Borntraeger <borntraeger@de.ibm.com>
|
||
|
|
|
||
|
|
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>
|
||
|
|
(cherry picked from commit e8d12a55f6d3e577455b02f15907c460578c689b)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/s390x/pv.c | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
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 "
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|