Commit e8d12a55 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Cornelia Huck
Browse files

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: c3347ed0 ("s390x: protvirt: Support unpack facility")
Reported-by: default avatarMarc Hartmayer <mhartmay@linux.ibm.com>
Acked-by: default avatarJanosch Frank <frankja@linux.vnet.ibm.com>
Tested-by: default avatarMarc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <20200327124616.34866-1-borntraeger@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 7152c9ec

hw/s390x/pv.c

+5 −1
Original line number Diff line number Diff line
@@ -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 "