From nobody Wed Oct 23 00:30:56 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1729388078; cv=none; d=zohomail.com; s=zohoarc; b=d9H+DiOkZXD6+HQKs7OgNeiRq/9D6WtYz1N0zvtID1miimb3gUS62bkEZjbEasM2tpDwDFp4Kk+KO2pakFgH7uIx7ldEnDWRmMy7u2rEkDGk+ggdJe5WxU0MusDDUGdDu2Y6UtR4/X+LajN7lcYbYBhyi1N47Bmf9uKuEopsuKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729388078; 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=eFmqnFXnvrc0cV7wbNrCoh/lWeqHjrMafgELnZt1vS8=; b=VCMXzcB/i2iI3+ntl3HB800rU2WZkGajnQ6VmJ5UQHOhNTDASFUKUhdsqtNsYUgZx5Gp8cClGJapIxQio6pQXJH/ZEySabfSwwcUTBa1FTKkN328jCKrTyALcVXWlME3aXiT8+aJgx9f1ImaNVRi4sAGTXb6/F0WB6Rj32aVOdo= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729388078987279.0473731290059; Sat, 19 Oct 2024 18:34:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2Klr-0008QC-VG; Sat, 19 Oct 2024 21:30:16 -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 1t2Klq-0008Ow-Hj; Sat, 19 Oct 2024 21:30:14 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t2Klo-0005Oa-IW; Sat, 19 Oct 2024 21:30:14 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49K1H4QB017592; Sun, 20 Oct 2024 01:30:10 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42c5h2u6j0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 20 Oct 2024 01:30:10 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 49K0bIVk028879; Sun, 20 Oct 2024 01:30:09 GMT Received: from smtprelay04.dal12v.mail.ibm.com ([172.16.1.6]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 42cqfx84wr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 20 Oct 2024 01:30:09 +0000 Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay04.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 49K1U7qY52822512 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 20 Oct 2024 01:30:08 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B152D58064; Sun, 20 Oct 2024 01:30:07 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 044795805C; Sun, 20 Oct 2024 01:30:07 +0000 (GMT) Received: from localhost.localdomain (unknown [9.61.54.50]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Sun, 20 Oct 2024 01:30:06 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=eFmqnFXnvrc0cV7wb NrCoh/lWeqHjrMafgELnZt1vS8=; b=izJu511c3za7dyXhk4Eb/NAAol1jgbg2p bDZ8yTX/huKqOpvnn4cdeufeMj9TEHnwLDrAXNhHHNMnpFlU0jd0UObNh589SsQv yhvUQZjAjU6PxXudDYveIpaFMcWeEISHFoUslSxLCkOfPZ6VXsQ769d0uiIEq+GJ 4jBYLRbAnbfYbZ0sbfnZf2gl0yiFcrvzXaqo6M5/YQIMv7EQ/Qb5A64f6nTt33ts ywKCxXxFnQUYkbImqe5wJq6ptakONReRWRLeY050a8QnDiziqGqQUFxgTdzTsJvw IwMVHhu7YyK0iYnzDjNH/S37I/E6hENilwj68jLfllzTiKJ7D7RhA== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, thuth@redhat.com Cc: frankja@linux.ibm.com, jrossi@linux.ibm.com Subject: [PATCH v5 07/19] pc-bios/s390-ccw: Remove panics from ISO IPL path Date: Sat, 19 Oct 2024 21:29:41 -0400 Message-ID: <20241020012953.1380075-8-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241020012953.1380075-1-jrossi@linux.ibm.com> References: <20241020012953.1380075-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: sH_gkzeU5CZzHf13tfyJ5VXG3mKYBxm- X-Proofpoint-ORIG-GUID: sH_gkzeU5CZzHf13tfyJ5VXG3mKYBxm- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 adultscore=0 clxscore=1015 phishscore=0 spamscore=0 suspectscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410200009 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=148.163.156.1; envelope-from=jrossi@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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 @ibm.com) X-ZM-MESSAGEID: 1729388081118116600 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Remove panic-on-error from IPL ISO El Torito specific functions so that err= or recovery may be possible in the future. Functions that would previously panic now provide a return code. Signed-off-by: Jared Rossi Reviewed-by: Thomas Huth --- pc-bios/s390-ccw/bootmap.h | 15 +++---- pc-bios/s390-ccw/s390-ccw.h | 1 + pc-bios/s390-ccw/bootmap.c | 87 ++++++++++++++++++++++++------------- 3 files changed, 65 insertions(+), 38 deletions(-) diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h index 4a7d8a91f1..3cb573b86b 100644 --- a/pc-bios/s390-ccw/bootmap.h +++ b/pc-bios/s390-ccw/bootmap.h @@ -385,17 +385,14 @@ static inline uint32_t iso_733_to_u32(uint64_t x) =20 #define ISO_PRIMARY_VD_SECTOR 16 =20 -static inline void read_iso_sector(uint32_t block_offset, void *buf, - const char *errmsg) -{ - IPL_assert(virtio_read_many(block_offset, buf, 1) =3D=3D 0, errmsg); -} - -static inline void read_iso_boot_image(uint32_t block_offset, void *load_a= ddr, +static inline int read_iso_boot_image(uint32_t block_offset, void *load_ad= dr, uint32_t blks_to_load) { - IPL_assert(virtio_read_many(block_offset, load_addr, blks_to_load) =3D= =3D 0, - "Failed to read boot image!"); + if (virtio_read_many(block_offset, load_addr, blks_to_load)) { + puts("Failed to read boot image!"); + return -1; + } + return 0; } =20 #define ISO9660_MAX_DIR_DEPTH 8 diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h index 6abb34e563..3e844abd71 100644 --- a/pc-bios/s390-ccw/s390-ccw.h +++ b/pc-bios/s390-ccw/s390-ccw.h @@ -30,6 +30,7 @@ typedef unsigned long long u64; #define EIO 1 #define EBUSY 2 #define ENODEV 3 +#define EINVAL 4 =20 #ifndef MIN #define MIN(a, b) (((a) < (b)) ? (a) : (b)) diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c index 414c3f1b47..af73254acb 100644 --- a/pc-bios/s390-ccw/bootmap.c +++ b/pc-bios/s390-ccw/bootmap.c @@ -678,8 +678,10 @@ static bool is_iso_bc_entry_compatible(IsoBcSection *s) if (s->unused || !s->sector_count) { return false; } - read_iso_sector(bswap32(s->load_rba), magic_sec, - "Failed to read image sector 0"); + if (virtio_read(bswap32(s->load_rba), magic_sec)) { + puts("Failed to read image sector 0"); + return false; + } =20 /* Checking bytes 8 - 32 for S390 Linux magic */ return !memcmp(magic_sec + 8, linux_s390_magic, 24); @@ -692,28 +694,35 @@ static uint32_t sec_offset[ISO9660_MAX_DIR_DEPTH]; /* Remained directory space in bytes */ static uint32_t dir_rem[ISO9660_MAX_DIR_DEPTH]; =20 -static inline uint32_t iso_get_file_size(uint32_t load_rba) +static inline long iso_get_file_size(uint32_t load_rba) { IsoVolDesc *vd =3D (IsoVolDesc *)sec; IsoDirHdr *cur_record =3D &vd->vd.primary.rootdir; uint8_t *temp =3D sec + ISO_SECTOR_SIZE; int level =3D 0; =20 - read_iso_sector(ISO_PRIMARY_VD_SECTOR, sec, - "Failed to read ISO primary descriptor"); + if (virtio_read(ISO_PRIMARY_VD_SECTOR, sec)) { + puts("Failed to read ISO primary descriptor"); + return -EIO; + } + sec_loc[0] =3D iso_733_to_u32(cur_record->ext_loc); dir_rem[0] =3D 0; sec_offset[0] =3D 0; =20 while (level >=3D 0) { - IPL_assert(sec_offset[level] <=3D ISO_SECTOR_SIZE, - "Directory tree structure violation"); + if (sec_offset[level] > ISO_SECTOR_SIZE) { + puts("Directory tree structure violation"); + return -EIO; + } =20 cur_record =3D (IsoDirHdr *)(temp + sec_offset[level]); =20 if (sec_offset[level] =3D=3D 0) { - read_iso_sector(sec_loc[level], temp, - "Failed to read ISO directory"); + if (virtio_read(sec_loc[level], temp)) { + puts("Failed to read ISO directory"); + return -EIO; + } if (dir_rem[level] =3D=3D 0) { /* Skip self and parent records */ dir_rem[level] =3D iso_733_to_u32(cur_record->data_len) - @@ -758,8 +767,10 @@ static inline uint32_t iso_get_file_size(uint32_t load= _rba) if (dir_rem[level] =3D=3D 0) { /* Nothing remaining */ level--; - read_iso_sector(sec_loc[level], temp, - "Failed to read ISO directory"); + if (virtio_read(sec_loc[level], temp)) { + puts("Failed to read ISO directory"); + return -EIO; + } } } =20 @@ -774,19 +785,24 @@ static void load_iso_bc_entry(IsoBcSection *load) * is padded and ISO_SECTOR_SIZE bytes aligned */ uint32_t blks_to_load =3D bswap16(s.sector_count) >> ET_SECTOR_SHIFT; - uint32_t real_size =3D iso_get_file_size(bswap32(s.load_rba)); + long real_size =3D iso_get_file_size(bswap32(s.load_rba)); =20 - if (real_size) { + if (real_size > 0) { /* Round up blocks to load */ blks_to_load =3D (real_size + ISO_SECTOR_SIZE - 1) / ISO_SECTOR_SI= ZE; puts("ISO boot image size verified"); } else { puts("ISO boot image size could not be verified"); + if (real_size < 0) { + return; + } } =20 - read_iso_boot_image(bswap32(s.load_rba), + if (read_iso_boot_image(bswap32(s.load_rba), (void *)((uint64_t)bswap16(s.load_segment)), - blks_to_load); + blks_to_load)) { + return; + } =20 jump_to_low_kernel(); } @@ -809,17 +825,18 @@ static uint32_t find_iso_bc(void) return bswap32(et->bc_offset); } } - read_iso_sector(block_num++, sec, - "Failed to read ISO volume descriptor"); + if (virtio_read(block_num++, sec)) { + puts("Failed to read ISO volume descriptor"); + return 0; + } } =20 return 0; } =20 -static IsoBcSection *find_iso_bc_entry(void) +static IsoBcSection *find_iso_bc_entry(uint32_t offset) { IsoBcEntry *e =3D (IsoBcEntry *)sec; - uint32_t offset =3D find_iso_bc(); int i; unsigned int loadparm =3D get_loadparm_index(); =20 @@ -827,11 +844,13 @@ static IsoBcSection *find_iso_bc_entry(void) return NULL; } =20 - read_iso_sector(offset, sec, "Failed to read El Torito boot catalog"); + if (virtio_read(offset, sec)) { + puts("Failed to read El Torito boot catalog"); + return NULL; + } =20 if (!is_iso_bc_valid(e)) { /* The validation entry is mandatory */ - panic("No valid boot catalog found!\n"); return NULL; } =20 @@ -851,19 +870,25 @@ static IsoBcSection *find_iso_bc_entry(void) } } =20 - panic("No suitable boot entry found on ISO-9660 media!\n"); - return NULL; } =20 -static void ipl_iso_el_torito(void) +static int ipl_iso_el_torito(void) { - IsoBcSection *s =3D find_iso_bc_entry(); + uint32_t offset =3D find_iso_bc(); + if (!offset) { + return 0; + } + + IsoBcSection *s =3D find_iso_bc_entry(offset); =20 if (s) { - load_iso_bc_entry(s); - /* no return */ + load_iso_bc_entry(s); /* only return in error */ + return -1; } + + puts("No suitable boot entry found on ISO-9660 media!"); + return -EIO; } =20 /** @@ -893,7 +918,9 @@ static void zipl_load_vblk(void) if (blksize !=3D VIRTIO_ISO_BLOCK_SIZE) { virtio_assume_iso9660(); } - ipl_iso_el_torito(); + if (ipl_iso_el_torito()) { + return; + } } =20 if (blksize !=3D VIRTIO_DASD_DEFAULT_BLOCK_SIZE) { @@ -907,7 +934,9 @@ static void zipl_load_vscsi(void) { if (virtio_get_block_size() =3D=3D VIRTIO_ISO_BLOCK_SIZE) { /* Is it an ISO image in non-CD drive? */ - ipl_iso_el_torito(); + if (ipl_iso_el_torito()) { + return; + } } =20 puts("Using guessed DASD geometry."); --=20 2.45.1