From 6f44767aeda52048e7c9ee4b5fcc30353c71cbc1 Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

Date: Fri, 9 Oct 2020 10:08:45 -0400

Subject: [PATCH 09/14] pc-bios/s390-ccw: Do not bail out early if not finding

 a SCSI disk

RH-Author: Thomas Huth <thuth@redhat.com>

Message-id: <20201009100849.264994-6-thuth@redhat.com>

Patchwork-id: 98599

O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 5/9] pc-bios/s390-ccw: Do not bail out early if not finding a SCSI disk

Bugzilla: 1846975

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

In case the user did not specify a boot device, we want to continue

looking for other devices if there are no valid SCSI disks on a virtio-

scsi controller. As a first step, do not panic in this case and let

the control flow carry the error to the upper functions instead.

Message-Id: <20200806105349.632-6-thuth@redhat.com>

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

Signed-off-by: Thomas Huth <thuth@redhat.com>

(cherry picked from commit 605751b5a5334e187761b0b8a8266a216897bf70)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 pc-bios/s390-ccw/main.c          | 14 ++++++++++----

 pc-bios/s390-ccw/s390-ccw.h      |  2 +-

 pc-bios/s390-ccw/virtio-blkdev.c |  7 +++++--

 pc-bios/s390-ccw/virtio-scsi.c   | 28 ++++++++++++++++++++--------

 pc-bios/s390-ccw/virtio-scsi.h   |  2 +-

 5 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c

index d6fd218074..456733fbee 100644

--- a/pc-bios/s390-ccw/main.c

+++ b/pc-bios/s390-ccw/main.c

@@ -227,7 +227,7 @@ static void find_boot_device(void)

     IPL_assert(found, "Boot device not found\n");

 }

-static void virtio_setup(void)

+static int virtio_setup(void)

 {

     VDev *vdev = virtio_get_device();

     QemuIplParameters *early_qipl = (QemuIplParameters *)QIPL_ADDRESS;

@@ -242,9 +242,14 @@ static void virtio_setup(void)

         sclp_print("Network boot device detected\n");

         vdev->netboot_start_addr = qipl.netboot_start_addr;

     } else {

-        virtio_blk_setup_device(blk_schid);

+        int ret = virtio_blk_setup_device(blk_schid);

+        if (ret) {

+            return ret;

+        }

         IPL_assert(virtio_ipl_disk_is_valid(), "No valid IPL device detected");

     }

+

+    return 0;

 }

 static void ipl_boot_device(void)

@@ -255,8 +260,9 @@ static void ipl_boot_device(void)

         dasd_ipl(blk_schid, cutype); /* no return */

         break;

     case CU_TYPE_VIRTIO:

-        virtio_setup();

-        zipl_load(); /* no return */

+        if (virtio_setup() == 0) {

+            zipl_load(); /* no return */

+        }

         break;

     default:

         print_int("Attempting to boot from unexpected device type", cutype);

diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h

index ae432c40b8..e7cf36eb91 100644

--- a/pc-bios/s390-ccw/s390-ccw.h

+++ b/pc-bios/s390-ccw/s390-ccw.h

@@ -70,7 +70,7 @@ int sclp_read(char *str, size_t count);

 unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,

                                  ulong subchan_id, void *load_addr);

 bool virtio_is_supported(SubChannelId schid);

-void virtio_blk_setup_device(SubChannelId schid);

+int virtio_blk_setup_device(SubChannelId schid);

 int virtio_read(ulong sector, void *load_addr);

 u64 get_clock(void);

 ulong get_second(void);

diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.c

index 11c56261ca..7d35050292 100644

--- a/pc-bios/s390-ccw/virtio-blkdev.c

+++ b/pc-bios/s390-ccw/virtio-blkdev.c

@@ -263,9 +263,10 @@ uint64_t virtio_get_blocks(void)

     return 0;

 }

-void virtio_blk_setup_device(SubChannelId schid)

+int virtio_blk_setup_device(SubChannelId schid)

 {

     VDev *vdev = virtio_get_device();

+    int ret = 0;

     vdev->schid = schid;

     virtio_setup_ccw(vdev);

@@ -288,9 +289,11 @@ void virtio_blk_setup_device(SubChannelId schid)

             "Config: CDB size mismatch");

         sclp_print("Using virtio-scsi.\n");

-        virtio_scsi_setup(vdev);

+        ret = virtio_scsi_setup(vdev);

         break;

     default:

         panic("\n! No IPL device available !\n");

     }

+

+    return ret;

 }

diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c

index 4fe4b9d261..88691edb89 100644

--- a/pc-bios/s390-ccw/virtio-scsi.c

+++ b/pc-bios/s390-ccw/virtio-scsi.c

@@ -192,7 +192,12 @@ static bool scsi_read_capacity(VDev *vdev,

 /* virtio-scsi routines */

-static void virtio_scsi_locate_device(VDev *vdev)

+/*

+ * Tries to locate a SCSI device and and adds the information for the found

+ * device to the vdev->scsi_device structure.

+ * Returns 0 if SCSI device could be located, or a error code < 0 otherwise

+ */

+static int virtio_scsi_locate_device(VDev *vdev)

 {

     const uint16_t channel = 0; /* again, it's what QEMU does */

     uint16_t target;

@@ -218,7 +223,7 @@ static void virtio_scsi_locate_device(VDev *vdev)

         IPL_check(sdev->channel == 0, "non-zero channel requested");

         IPL_check(sdev->target <= vdev->config.scsi.max_target, "target# high");

         IPL_check(sdev->lun <= vdev->config.scsi.max_lun, "LUN# high");

-        return;

+        return 0;

     }

     for (target = 0; target <= vdev->config.scsi.max_target; target++) {

@@ -245,18 +250,20 @@ static void virtio_scsi_locate_device(VDev *vdev)

              */

             sdev->lun = r->lun[0].v16[0]; /* it's returned this way */

             debug_print_int("Have to use LUN", sdev->lun);

-            return; /* we have to use this device */

+            return 0; /* we have to use this device */

         }

         for (i = 0; i < luns; i++) {

             if (r->lun[i].v64) {

                 /* Look for non-zero LUN - we have where to choose from */

                 sdev->lun = r->lun[i].v16[0];

                 debug_print_int("Will use LUN", sdev->lun);

-                return; /* we have found a device */

+                return 0; /* we have found a device */

             }

         }

     }

-    panic("\n! Cannot locate virtio-scsi device !\n");

+

+    sclp_print("Warning: Could not locate a usable virtio-scsi device\n");

+    return -ENODEV;

 }

 int virtio_scsi_read_many(VDev *vdev,

@@ -320,17 +327,20 @@ static void scsi_parse_capacity_report(void *data,

     }

 }

-void virtio_scsi_setup(VDev *vdev)

+int virtio_scsi_setup(VDev *vdev)

 {

     int retry_test_unit_ready = 3;

     uint8_t data[256];

     uint32_t data_size = sizeof(data);

     ScsiInquiryEvpdPages *evpd = &scsi_inquiry_evpd_pages_response;

     ScsiInquiryEvpdBl *evpd_bl = &scsi_inquiry_evpd_bl_response;

-    int i;

+    int i, ret;

     vdev->scsi_device = &default_scsi_device;

-    virtio_scsi_locate_device(vdev);

+    ret = virtio_scsi_locate_device(vdev);

+    if (ret < 0) {

+        return ret;

+    }

     /* We have to "ping" the device before it becomes readable */

     while (!scsi_test_unit_ready(vdev)) {

@@ -415,4 +425,6 @@ void virtio_scsi_setup(VDev *vdev)

     }

     scsi_parse_capacity_report(data, &vdev->scsi_last_block,

                                (uint32_t *) &vdev->scsi_block_size);

+

+    return 0;

 }

diff --git a/pc-bios/s390-ccw/virtio-scsi.h b/pc-bios/s390-ccw/virtio-scsi.h

index 4c4f4bbc31..4b14c2c2f9 100644

--- a/pc-bios/s390-ccw/virtio-scsi.h

+++ b/pc-bios/s390-ccw/virtio-scsi.h

@@ -67,7 +67,7 @@ static inline bool virtio_scsi_response_ok(const VirtioScsiCmdResp *r)

         return r->response == VIRTIO_SCSI_S_OK && r->status == CDB_STATUS_GOOD;

 }

-void virtio_scsi_setup(VDev *vdev);

+int virtio_scsi_setup(VDev *vdev);

 int virtio_scsi_read_many(VDev *vdev,

                           ulong sector, void *load_addr, int sec_num);

-- 

2.27.0