From nobody Sat Nov 23 22:29:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1729689524; cv=none; d=zohomail.com; s=zohoarc; b=c0EVnPnq9RlaR5Vk8LHERjOSGWq81XQpC83RqH44EBWVx40G8yoLb7mGpXlWIymll0jh+jAEHQa2va8gZ9wo/X3ZZSEaixODK8N/5S6ZZIz2nMIkDNyB18fYA4Q8XtvF/0nQomnRZnCHogV804G/AY4mlfu8ni4wqSPrWPThPfc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729689524; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aaLsTOgiA5nsTX4XwxcbdIi94AOwlg9hOaI6QUaTCyE=; b=WGDWZ38hzWmNy6Ty+73mgOT6rnMltk+X4/ZUcLU3PMNZwd8z0jZjl5jqQupmPGxveIw7NoHaO1Flh5bLdciHT+Wi3a4j2E7A7y9AKAVKzBoD5uOvA37HlAKfcCq/SQXttHxKmCu4eH3jq257LTy+i01XuImX3SRhx2+QuHzG58c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729689524922862.6007957873113; Wed, 23 Oct 2024 06:18:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3bFV-0006rV-MW; Wed, 23 Oct 2024 09:18:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3bFJ-0006Fo-NV for qemu-devel@nongnu.org; Wed, 23 Oct 2024 09:17:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3bFG-0002Bv-7v for qemu-devel@nongnu.org; Wed, 23 Oct 2024 09:17:53 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-300-9ErbVbkTNGmY0omDqd6K1A-1; Wed, 23 Oct 2024 09:17:45 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9E8C71955D99; Wed, 23 Oct 2024 13:17:44 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.43]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6757A19560AE; Wed, 23 Oct 2024 13:17:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729689469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aaLsTOgiA5nsTX4XwxcbdIi94AOwlg9hOaI6QUaTCyE=; b=VTylzn95jlr/DcsrKhDBqG/Zq+L1neKayBB2h0Jm7GcClDjGqOX6KMt4xmtNOHZ7HT5PL2 FqGzwKOREBwqvDjKMwRblroMbbx8eeWOeX2miMDG77hTWuHYJKLFyx7h8xcbjbmvFCvfts x0LTw0c8S8bVtBMlDzF0Esmqo5vARF4= X-MC-Unique: 9ErbVbkTNGmY0omDqd6K1A-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Jared Rossi Subject: [PULL 12/23] pc-bios/s390-ccw: Enable failed IPL to return after error Date: Wed, 23 Oct 2024 15:16:59 +0200 Message-ID: <20241023131710.906748-13-thuth@redhat.com> In-Reply-To: <20241023131710.906748-1-thuth@redhat.com> References: <20241023131710.906748-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.263, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1729689528580116600 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Remove panic-on-error from IPL functions such that a return code is propaga= ted back to the main IPL calling function (rather than terminating immediately), which facilitates possible error recovery in the future. A select few panics remain, which indicate fatal non-devices errors that mu= st result in termination. Signed-off-by: Jared Rossi Reviewed-by: Thomas Huth Message-ID: <20241020012953.1380075-13-jrossi@linux.ibm.com> Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/s390-ccw.h | 2 +- pc-bios/s390-ccw/virtio.h | 2 +- pc-bios/s390-ccw/bootmap.c | 53 ++++++++++++++++++-------- pc-bios/s390-ccw/cio.c | 3 +- pc-bios/s390-ccw/jump2ipl.c | 5 ++- pc-bios/s390-ccw/main.c | 32 +++++++++------- pc-bios/s390-ccw/virtio-blkdev.c | 2 +- pc-bios/s390-ccw/virtio.c | 65 +++++++++++++++++++++----------- 8 files changed, 108 insertions(+), 56 deletions(-) diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h index 344ad15655..6cdce3e5e5 100644 --- a/pc-bios/s390-ccw/s390-ccw.h +++ b/pc-bios/s390-ccw/s390-ccw.h @@ -78,7 +78,7 @@ void zipl_load(void); =20 /* jump2ipl.c */ void write_reset_psw(uint64_t psw); -void jump_to_IPL_code(uint64_t address); +int jump_to_IPL_code(uint64_t address); void jump_to_low_kernel(void); =20 /* menu.c */ diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h index 6f9a558ff5..9faf3986b1 100644 --- a/pc-bios/s390-ccw/virtio.h +++ b/pc-bios/s390-ccw/virtio.h @@ -274,7 +274,7 @@ void vring_send_buf(VRing *vr, void *p, int len, int fl= ags); int vr_poll(VRing *vr); int vring_wait_reply(void); int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd); -void virtio_setup_ccw(VDev *vdev); +int virtio_setup_ccw(VDev *vdev); =20 int virtio_net_init(void *mac_addr); =20 diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c index 95ef9104d0..56f2f75640 100644 --- a/pc-bios/s390-ccw/bootmap.c +++ b/pc-bios/s390-ccw/bootmap.c @@ -62,15 +62,34 @@ static void *s2_prev_blk =3D _s2; static void *s2_cur_blk =3D _s2 + MAX_SECTOR_SIZE; static void *s2_next_blk =3D _s2 + MAX_SECTOR_SIZE * 2; =20 -static inline void verify_boot_info(BootInfo *bip) +static inline int verify_boot_info(BootInfo *bip) { - IPL_assert(magic_match(bip->magic, ZIPL_MAGIC), "No zIPL sig in BootIn= fo"); - IPL_assert(bip->version =3D=3D BOOT_INFO_VERSION, "Wrong zIPL version"= ); - IPL_assert(bip->bp_type =3D=3D BOOT_INFO_BP_TYPE_IPL, "DASD is not for= IPL"); - IPL_assert(bip->dev_type =3D=3D BOOT_INFO_DEV_TYPE_ECKD, "DASD is not = ECKD"); - IPL_assert(bip->flags =3D=3D BOOT_INFO_FLAGS_ARCH, "Not for this arch"= ); - IPL_assert(block_size_ok(bip->bp.ipl.bm_ptr.eckd.bptr.size), - "Bad block size in zIPL section of the 1st record."); + if (!magic_match(bip->magic, ZIPL_MAGIC)) { + puts("No zIPL sig in BootInfo"); + return -EINVAL; + } + if (bip->version !=3D BOOT_INFO_VERSION) { + puts("Wrong zIPL version"); + return -EINVAL; + } + if (bip->bp_type !=3D BOOT_INFO_BP_TYPE_IPL) { + puts("DASD is not for IPL"); + return -ENODEV; + } + if (bip->dev_type !=3D BOOT_INFO_DEV_TYPE_ECKD) { + puts("DASD is not ECKD"); + return -ENODEV; + } + if (bip->flags !=3D BOOT_INFO_FLAGS_ARCH) { + puts("Not for this arch"); + return -EINVAL; + } + if (!block_size_ok(bip->bp.ipl.bm_ptr.eckd.bptr.size)) { + puts("Bad block size in zIPL section of 1st record"); + return -EINVAL; + } + + return 0; } =20 static void eckd_format_chs(ExtEckdBlockPtr *ptr, bool ldipl, @@ -367,8 +386,8 @@ static int run_eckd_boot_script(block_number_t bmt_bloc= k_nr, puts("Unknown script entry type"); return -EINVAL; } - write_reset_psw(bms->entry[i].address.load_address); /* no return */ - jump_to_IPL_code(0); /* no return */ + write_reset_psw(bms->entry[i].address.load_address); + jump_to_IPL_code(0); return -1; } =20 @@ -1067,16 +1086,19 @@ void zipl_load(void) =20 if (vdev->is_cdrom) { ipl_iso_el_torito(); - panic("\n! Cannot IPL this ISO image !\n"); + puts("Failed to IPL this ISO image!"); + return; } =20 if (virtio_get_device_type() =3D=3D VIRTIO_ID_NET) { netmain(); - panic("\n! Cannot IPL from this network !\n"); + puts("Failed to IPL from this network!"); + return; } =20 if (ipl_scsi()) { - panic("\n! Cannot IPL this SCSI device !\n"); + puts("Failed to IPL from this SCSI device!"); + return; } =20 switch (virtio_get_device_type()) { @@ -1087,8 +1109,9 @@ void zipl_load(void) zipl_load_vscsi(); break; default: - panic("\n! Unknown IPL device type !\n"); + puts("Unknown IPL device type!"); + return; } =20 - puts("zIPL load failed."); + puts("zIPL load failed!"); } diff --git a/pc-bios/s390-ccw/cio.c b/pc-bios/s390-ccw/cio.c index 7b09a38c96..5d543da73f 100644 --- a/pc-bios/s390-ccw/cio.c +++ b/pc-bios/s390-ccw/cio.c @@ -59,7 +59,8 @@ uint16_t cu_type(SubChannelId schid) }; =20 if (do_cio(schid, CU_TYPE_UNKNOWN, ptr2u32(&sense_id_ccw), CCW_FMT1)) { - panic("Failed to run SenseID CCw\n"); + puts("Failed to run SenseID CCW"); + return CU_TYPE_UNKNOWN; } =20 return sense_data.cu_type; diff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c index 80b7f6a1f3..8db1764ff3 100644 --- a/pc-bios/s390-ccw/jump2ipl.c +++ b/pc-bios/s390-ccw/jump2ipl.c @@ -33,7 +33,7 @@ static void jump_to_IPL_addr(void) /* should not return */ } =20 -void jump_to_IPL_code(uint64_t address) +int jump_to_IPL_code(uint64_t address) { /* store the subsystem information _after_ the bootmap was loaded */ write_subsystem_identification(); @@ -68,7 +68,8 @@ void jump_to_IPL_code(uint64_t address) asm volatile("lghi %%r1,1\n\t" "diag %%r1,%%r1,0x308\n\t" : : : "1", "memory"); - panic("\n! IPL returns !\n"); + puts("IPL code jump failed"); + return -1; } =20 void jump_to_low_kernel(void) diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index fc44da3161..34ef27d7a6 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -77,6 +77,9 @@ static int is_dev_possibly_bootable(int dev_no, int sch_n= o) =20 enable_subchannel(blk_schid); cutype =3D cu_type(blk_schid); + if (cutype =3D=3D CU_TYPE_UNKNOWN) { + return -EIO; + } =20 /* * Note: we always have to run virtio_is_supported() here to make @@ -194,10 +197,10 @@ static void boot_setup(void) have_iplb =3D store_iplb(&iplb); } =20 -static void find_boot_device(void) +static bool find_boot_device(void) { VDev *vdev =3D virtio_get_device(); - bool found; + bool found =3D false; =20 switch (iplb.pbt) { case S390_IPL_TYPE_CCW: @@ -215,10 +218,10 @@ static void find_boot_device(void) found =3D find_subch(iplb.scsi.devno); break; default: - panic("List-directed IPL not supported yet!\n"); + puts("Unsupported IPLB"); } =20 - IPL_assert(found, "Boot device not found\n"); + return found; } =20 static int virtio_setup(void) @@ -244,11 +247,13 @@ static int virtio_setup(void) ret =3D virtio_scsi_setup_device(blk_schid); break; default: - panic("\n! No IPL device available !\n"); + puts("\n! No IPL device available !\n"); + return -1; } =20 - if (!ret) { - IPL_assert(virtio_ipl_disk_is_valid(), "No valid IPL device detect= ed"); + if (!ret && !virtio_ipl_disk_is_valid()) { + puts("No valid IPL device detected"); + return -ENODEV; } =20 return ret; @@ -259,16 +264,16 @@ static void ipl_boot_device(void) switch (cutype) { case CU_TYPE_DASD_3990: case CU_TYPE_DASD_2107: - dasd_ipl(blk_schid, cutype); /* no return */ + dasd_ipl(blk_schid, cutype); break; case CU_TYPE_VIRTIO: - if (virtio_setup() =3D=3D 0) { - zipl_load(); /* Only returns in case of errors */ + if (virtio_setup()) { + return; /* Only returns in case of errors */ } + zipl_load(); break; default: printf("Attempting to boot from unexpected device type 0x%X\n", cu= type); - panic("\nBoot failed.\n"); } } =20 @@ -301,12 +306,11 @@ void main(void) sclp_setup(); css_setup(); boot_setup(); - if (have_iplb) { - find_boot_device(); + if (have_iplb && find_boot_device()) { ipl_boot_device(); } else { probe_boot_device(); } =20 - panic("Failed to load OS from hard disk\n"); + panic("Failed to IPL. Halting..."); } diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blk= dev.c index 1c585f034b..7b2d1e20f4 100644 --- a/pc-bios/s390-ccw/virtio-blkdev.c +++ b/pc-bios/s390-ccw/virtio-blkdev.c @@ -59,7 +59,7 @@ int virtio_read_many(unsigned long sector, void *load_add= r, int sec_num) case VIRTIO_ID_SCSI: return virtio_scsi_read_many(vdev, sector, load_addr, sec_num); } - panic("\n! No readable IPL device !\n"); + return -1; } =20 diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index 8c6b0a8a92..8b5a370bb3 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -217,16 +217,19 @@ int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd) return 0; } =20 -void virtio_setup_ccw(VDev *vdev) +int virtio_setup_ccw(VDev *vdev) { - int i, rc, cfg_size =3D 0; + int i, cfg_size =3D 0; uint8_t status; struct VirtioFeatureDesc { uint32_t features; uint8_t index; } __attribute__((packed)) feats; =20 - IPL_assert(virtio_is_supported(vdev->schid), "PE"); + if (!virtio_is_supported(vdev->schid)) { + puts("Virtio unsupported for this device ID"); + return -ENODEV; + } /* device ID has been established now */ =20 vdev->config.blk.blk_size =3D 0; /* mark "illegal" - setup started... = */ @@ -235,8 +238,10 @@ void virtio_setup_ccw(VDev *vdev) run_ccw(vdev, CCW_CMD_VDEV_RESET, NULL, 0, false); =20 status =3D VIRTIO_CONFIG_S_ACKNOWLEDGE; - rc =3D run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), fa= lse); - IPL_assert(rc =3D=3D 0, "Could not write ACKNOWLEDGE status to host"); + if (run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), false= )) { + puts("Could not write ACKNOWLEDGE status to host"); + return -EIO; + } =20 switch (vdev->senseid.cu_model) { case VIRTIO_ID_NET: @@ -255,27 +260,37 @@ void virtio_setup_ccw(VDev *vdev) cfg_size =3D sizeof(vdev->config.scsi); break; default: - panic("Unsupported virtio device\n"); + puts("Unsupported virtio device"); + return -ENODEV; } =20 status |=3D VIRTIO_CONFIG_S_DRIVER; - rc =3D run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), fa= lse); - IPL_assert(rc =3D=3D 0, "Could not write DRIVER status to host"); + if (run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), false= )) { + puts("Could not write DRIVER status to host"); + return -EIO; + } =20 /* Feature negotiation */ for (i =3D 0; i < ARRAY_SIZE(vdev->guest_features); i++) { feats.features =3D 0; feats.index =3D i; - rc =3D run_ccw(vdev, CCW_CMD_READ_FEAT, &feats, sizeof(feats), fal= se); - IPL_assert(rc =3D=3D 0, "Could not get features bits"); + if (run_ccw(vdev, CCW_CMD_READ_FEAT, &feats, sizeof(feats), false)= ) { + puts("Could not get features bits"); + return -EIO; + } + vdev->guest_features[i] &=3D bswap32(feats.features); feats.features =3D bswap32(vdev->guest_features[i]); - rc =3D run_ccw(vdev, CCW_CMD_WRITE_FEAT, &feats, sizeof(feats), fa= lse); - IPL_assert(rc =3D=3D 0, "Could not set features bits"); + if (run_ccw(vdev, CCW_CMD_WRITE_FEAT, &feats, sizeof(feats), false= )) { + puts("Could not set features bits"); + return -EIO; + } } =20 - rc =3D run_ccw(vdev, CCW_CMD_READ_CONF, &vdev->config, cfg_size, false= ); - IPL_assert(rc =3D=3D 0, "Could not get virtio device configuration"); + if (run_ccw(vdev, CCW_CMD_READ_CONF, &vdev->config, cfg_size, false)) { + puts("Could not get virtio device configuration"); + return -EIO; + } =20 for (i =3D 0; i < vdev->nr_vqs; i++) { VqInfo info =3D { @@ -289,19 +304,27 @@ void virtio_setup_ccw(VDev *vdev) .num =3D 0, }; =20 - rc =3D run_ccw(vdev, CCW_CMD_READ_VQ_CONF, &config, sizeof(config)= , false); - IPL_assert(rc =3D=3D 0, "Could not get virtio device VQ configurat= ion"); + if (run_ccw(vdev, CCW_CMD_READ_VQ_CONF, &config, sizeof(config), + false)) { + puts("Could not get virtio device VQ config"); + return -EIO; + } info.num =3D config.num; vring_init(&vdev->vrings[i], &info); vdev->vrings[i].schid =3D vdev->schid; - IPL_assert( - run_ccw(vdev, CCW_CMD_SET_VQ, &info, sizeof(info), false) =3D= =3D 0, - "Cannot set VQ info"); + if (run_ccw(vdev, CCW_CMD_SET_VQ, &info, sizeof(info), false)) { + puts("Cannot set VQ info"); + return -EIO; + } } =20 status |=3D VIRTIO_CONFIG_S_DRIVER_OK; - rc =3D run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), fa= lse); - IPL_assert(rc =3D=3D 0, "Could not write DRIVER_OK status to host"); + if (run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), false= )) { + puts("Could not write DRIVER_OK status to host"); + return -EIO; + } + + return 0; } =20 bool virtio_is_supported(SubChannelId schid) --=20 2.47.0