From nobody Wed Oct 23 01:20:58 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=1729129867; cv=none; d=zohomail.com; s=zohoarc; b=Cf0DzDi896tCtWpQgTh5xLFAtSiu8suWumuNGZ98cFdNuJ+noVcagCHzvNEf2/VQ3aBwVauJGsBxxufO/ruBwpFx+kzkS8M+wIPbaBWkiR9sZs2W8nprX/dmizH83rjz/iFop6Tw5MK63yqCMMVbsvEbVYVuUiOc4x1iT8Tn3vk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729129867; 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=OQsuYXv2qz5/LZ405eog/JWoflSz7xHbAtK9V1FIXFM=; b=V23Suo2zTLwXCRlm62ifFJIYQva6doCAvGT11eIS6gJgsB9RLRTDEi3ZilNRlTTp5EycDR9Qg+xviAkeyr5hmbfG8AeK9aQveGVLdZYeTeBM0Dwar1Me+0xNvyoxIOjzuy0zxyn77qvGpRQGaCWUW4En0VCp25xU1RYyafu3MTY= 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 1729129867399538.4541936561907; Wed, 16 Oct 2024 18:51:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1Fcj-0004Ti-FN; Wed, 16 Oct 2024 21:48:21 -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 1t1Fcc-0004RV-A0; Wed, 16 Oct 2024 21:48:15 -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 1t1FcX-00031j-E7; Wed, 16 Oct 2024 21:48:12 -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 49GNtfxK027866; Thu, 17 Oct 2024 01:48:08 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42aqk2gbhd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2024 01:48:07 +0000 (GMT) Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 49H1m7CK006067; Thu, 17 Oct 2024 01:48:07 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42aqk2gbh9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2024 01:48:07 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 49H1MpEf006789; Thu, 17 Oct 2024 01:48:05 GMT Received: from smtprelay07.wdc07v.mail.ibm.com ([172.16.1.74]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4284xkc9f3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2024 01:48:05 +0000 Received: from smtpav04.dal12v.mail.ibm.com (smtpav04.dal12v.mail.ibm.com [10.241.53.103]) by smtprelay07.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 49H1m4gV25166352 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Oct 2024 01:48:04 GMT Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 79F4F5805E; Thu, 17 Oct 2024 01:48:04 +0000 (GMT) Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ED99B58052; Thu, 17 Oct 2024 01:48:03 +0000 (GMT) Received: from localhost.localdomain (unknown [9.61.153.16]) by smtpav04.dal12v.mail.ibm.com (Postfix) with ESMTP; Thu, 17 Oct 2024 01:48:03 +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=OQsuYXv2qz5/LZ405 eog/JWoflSz7xHbAtK9V1FIXFM=; b=fXHpNfBURaJWRQu9gQE2HzOYPwDdd7Nbv G0fpW/QHp76LS/hGtipkYACqTRBZoaZC6gcMkOt5kYj7fEeEUVtvB8dYC2WkijLA ivkivQ6GhP0kCuDCT7iS35nflFRCRmRjtJeQZ53ScThTuUuuaRObqMbVV8YhH/g/ MeV2laJ0rEm8iaq8Milu33MGAm+imorhH/KEyxn2Fna/DoGxY8LI2HnzHKKakmd7 7bkjvjMcJFDZ9Pa9iqzkR7WehD5jW/W5DCiU/+7YJ/mgOgo7MIRiKAb6c60d/xr2 vjSElTDze+2ElcrxEpy85bF8PwU8/6Uj22cXArkzBAWxuKGp5mzjw== 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 v4 09/19] pc-bios/s390-ccw: Remove panics from SCSI IPL path Date: Wed, 16 Oct 2024 21:47:38 -0400 Message-ID: <20241017014748.829029-10-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20241017014748.829029-1-jrossi@linux.ibm.com> References: <20241017014748.829029-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: P8BcRs0a0i_-b9nFOGFJ39W3K2Toj62R X-Proofpoint-ORIG-GUID: 4zxecSA7vTTGmkWjNgM0FvJf8Q0xrHW9 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 adultscore=0 mlxscore=0 spamscore=0 priorityscore=1501 phishscore=0 clxscore=1015 mlxlogscore=999 impostorscore=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410170008 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: 1729129869599116600 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Remove panic-on-error from virtio-scsi IPL specific functions so that error recovery may be possible in the future. Functions that would previously panic now provide a return code. Signed-off-by: Jared Rossi --- pc-bios/s390-ccw/iplb.h | 2 + pc-bios/s390-ccw/bootmap.c | 88 +++++++++++++----- pc-bios/s390-ccw/jump2ipl.c | 1 + pc-bios/s390-ccw/main.c | 2 +- pc-bios/s390-ccw/virtio-blkdev.c | 4 +- pc-bios/s390-ccw/virtio-scsi.c | 147 +++++++++++++++++++++---------- 6 files changed, 172 insertions(+), 72 deletions(-) diff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h index 3758698468..639fa34919 100644 --- a/pc-bios/s390-ccw/iplb.h +++ b/pc-bios/s390-ccw/iplb.h @@ -94,6 +94,8 @@ struct QemuIplParameters { typedef struct QemuIplParameters QemuIplParameters; =20 extern QemuIplParameters qipl; +extern IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); +extern bool have_iplb; =20 #define S390_IPL_TYPE_FCP 0x00 #define S390_IPL_TYPE_CCW 0x02 diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c index dd04bb3384..a277fc3431 100644 --- a/pc-bios/s390-ccw/bootmap.c +++ b/pc-bios/s390-ccw/bootmap.c @@ -596,7 +596,7 @@ static int ipl_eckd(void) * IPL a SCSI disk */ =20 -static void zipl_load_segment(ComponentEntry *entry) +static int zipl_load_segment(ComponentEntry *entry) { const int max_entries =3D (MAX_SECTOR_SIZE / sizeof(ScsiBlockPtr)); ScsiBlockPtr *bprs =3D (void *)sec; @@ -616,7 +616,10 @@ static void zipl_load_segment(ComponentEntry *entry) do { memset(bprs, FREE_SPACE_FILLER, bprs_size); fill_hex_val(blk_no, &blockno, sizeof(blockno)); - read_block(blockno, bprs, err_msg); + if (virtio_read(blockno, bprs)) { + puts(err_msg); + return -EIO; + } =20 for (i =3D 0;; i++) { uint64_t *cur_desc =3D (void *)&bprs[i]; @@ -644,23 +647,37 @@ static void zipl_load_segment(ComponentEntry *entry) } address =3D virtio_load_direct(cur_desc[0], cur_desc[1], 0, (void *)address); - IPL_assert(address !=3D -1, "zIPL load segment failed"); + if (!address) { + puts("zIPL load segment failed"); + return -EIO; + } } } while (blockno); + + return 0; } =20 /* Run a zipl program */ -static void zipl_run(ScsiBlockPtr *pte) +static int zipl_run(ScsiBlockPtr *pte) { ComponentHeader *header; ComponentEntry *entry; uint8_t tmp_sec[MAX_SECTOR_SIZE]; =20 - read_block(pte->blockno, tmp_sec, "Cannot read header"); + if (virtio_read(pte->blockno, tmp_sec)) { + puts("Cannot read header"); + return -EIO; + } header =3D (ComponentHeader *)tmp_sec; =20 - IPL_assert(magic_match(tmp_sec, ZIPL_MAGIC), "No zIPL magic in header"= ); - IPL_assert(header->type =3D=3D ZIPL_COMP_HEADER_IPL, "Bad header type"= ); + if (!magic_match(tmp_sec, ZIPL_MAGIC)) { + puts("No zIPL magic in header"); + return -EINVAL; + } + if (header->type !=3D ZIPL_COMP_HEADER_IPL) { + puts("Bad header type"); + return -EINVAL; + } =20 dputs("start loading images\n"); =20 @@ -675,22 +692,30 @@ static void zipl_run(ScsiBlockPtr *pte) continue; } =20 - zipl_load_segment(entry); + if (zipl_load_segment(entry)) { + return 1; + } =20 entry++; =20 - IPL_assert((uint8_t *)(&entry[1]) <=3D (tmp_sec + MAX_SECTOR_SIZE), - "Wrong entry value"); + if ((uint8_t *)(&entry[1]) > (tmp_sec + MAX_SECTOR_SIZE)) { + puts("Wrong entry value"); + return -EINVAL; + } } =20 - IPL_assert(entry->component_type =3D=3D ZIPL_COMP_ENTRY_EXEC, "No EXEC= entry"); + if (entry->component_type !=3D ZIPL_COMP_ENTRY_EXEC) { + puts("No EXEC entry"); + return -EINVAL; + } =20 /* should not return */ write_reset_psw(entry->compdat.load_psw); jump_to_IPL_code(0); + return 1; } =20 -static void ipl_scsi(void) +static int ipl_scsi(void) { ScsiMbr *mbr =3D (void *)sec; int program_table_entries =3D 0; @@ -701,10 +726,13 @@ static void ipl_scsi(void) =20 /* Grab the MBR */ memset(sec, FREE_SPACE_FILLER, sizeof(sec)); - read_block(0, mbr, "Cannot read block 0"); + if (virtio_read(0, mbr)) { + puts("Cannot read block 0"); + return -EIO; + } =20 if (!magic_match(mbr->magic, ZIPL_MAGIC)) { - return; + return 0; } =20 puts("Using SCSI scheme."); @@ -712,11 +740,20 @@ static void ipl_scsi(void) IPL_check(mbr->version_id =3D=3D 1, "Unknown MBR layout version, assuming version 1"); debug_print_int("program table", mbr->pt.blockno); - IPL_assert(mbr->pt.blockno, "No Program Table"); + if (!mbr->pt.blockno) { + puts("No Program Table"); + return -EINVAL; + } =20 /* Parse the program table */ - read_block(mbr->pt.blockno, sec, "Error reading Program Table"); - IPL_assert(magic_match(sec, ZIPL_MAGIC), "No zIPL magic in PT"); + if (virtio_read(mbr->pt.blockno, sec)) { + puts("Error reading Program Table"); + return -EIO; + } + if (!magic_match(sec, ZIPL_MAGIC)) { + puts("No zIPL magic in Program Table"); + return -EINVAL; + } =20 for (i =3D 0; i < MAX_BOOT_ENTRIES; i++) { if (prog_table->entry[i].scsi.blockno) { @@ -726,17 +763,22 @@ static void ipl_scsi(void) } =20 debug_print_int("program table entries", program_table_entries); - IPL_assert(program_table_entries !=3D 0, "Empty Program Table"); + if (program_table_entries =3D=3D 0) { + puts("Empty Program Table"); + return -EINVAL; + } =20 if (menu_is_enabled_enum()) { loadparm =3D menu_get_enum_boot_index(valid_entries); } =20 debug_print_int("loadparm", loadparm); - IPL_assert(loadparm < MAX_BOOT_ENTRIES, "loadparm value greater than" - " maximum number of boot entries allowed"); + if (loadparm >=3D MAX_BOOT_ENTRIES) { + puts("loadparm value greater than max number of boot entries allow= ed"); + return -EINVAL; + } =20 - zipl_run(&prog_table->entry[loadparm].scsi); /* no return */ + return zipl_run(&prog_table->entry[loadparm].scsi); } =20 /*********************************************************************** @@ -1033,7 +1075,9 @@ void zipl_load(void) netmain(); } =20 - ipl_scsi(); + if (ipl_scsi()) { + panic("\n! Cannot IPL this SCSI device !\n"); + } =20 switch (virtio_get_device_type()) { case VIRTIO_ID_BLOCK: diff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c index 80b7f6a1f3..0826c16787 100644 --- a/pc-bios/s390-ccw/jump2ipl.c +++ b/pc-bios/s390-ccw/jump2ipl.c @@ -10,6 +10,7 @@ #include #include "s390-ccw.h" #include "s390-arch.h" +#include "iplb.h" =20 #define KERN_IMAGE_START 0x010000UL #define RESET_PSW_MASK (PSW_MASK_SHORTPSW | PSW_MASK_64) diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index fc44da3161..ed72f87962 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -23,7 +23,7 @@ static SubChannelId blk_schid =3D { .one =3D 1 }; static char loadparm_str[LOADPARM_LEN + 1]; QemuIplParameters qipl; IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); -static bool have_iplb; +bool have_iplb; static uint16_t cutype; LowCore *lowcore; /* Yes, this *is* a pointer to address 0 */ =20 diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blk= dev.c index 2666326801..1c585f034b 100644 --- a/pc-bios/s390-ccw/virtio-blkdev.c +++ b/pc-bios/s390-ccw/virtio-blkdev.c @@ -73,13 +73,13 @@ unsigned long virtio_load_direct(unsigned long rec_list= 1, unsigned long rec_list unsigned long addr =3D (unsigned long)load_addr; =20 if (sec_len !=3D virtio_get_block_size()) { - return -1; + return 0; } =20 printf("."); status =3D virtio_read_many(sec, (void *)addr, sec_num); if (status) { - panic("I/O Error"); + return 0; } addr +=3D sec_num * virtio_get_block_size(); =20 diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c index 6b4a1caf8a..32fa81a247 100644 --- a/pc-bios/s390-ccw/virtio-scsi.c +++ b/pc-bios/s390-ccw/virtio-scsi.c @@ -26,7 +26,7 @@ static uint8_t scsi_inquiry_std_response[256]; static ScsiInquiryEvpdPages scsi_inquiry_evpd_pages_response; static ScsiInquiryEvpdBl scsi_inquiry_evpd_bl_response; =20 -static inline void vs_assert(bool term, const char **msgs) +static inline bool vs_assert(bool term, const char **msgs) { if (!term) { int i =3D 0; @@ -35,11 +35,13 @@ static inline void vs_assert(bool term, const char **ms= gs) while (msgs[i]) { printf("%s", msgs[i++]); } - panic(" !\n"); + puts(" !"); } + + return term; } =20 -static void virtio_scsi_verify_response(VirtioScsiCmdResp *resp, +static bool virtio_scsi_verify_response(VirtioScsiCmdResp *resp, const char *title) { const char *mr[] =3D { @@ -56,8 +58,12 @@ static void virtio_scsi_verify_response(VirtioScsiCmdRes= p *resp, 0 }; =20 - vs_assert(resp->response =3D=3D VIRTIO_SCSI_S_OK, mr); - vs_assert(resp->status =3D=3D CDB_STATUS_GOOD, ms); + if (!vs_assert(resp->response =3D=3D VIRTIO_SCSI_S_OK, mr) || + !vs_assert(resp->status =3D=3D CDB_STATUS_GOOD, ms)) { + return false; + } + + return true; } =20 static void prepare_request(VDev *vdev, const void *cdb, int cdb_size, @@ -78,24 +84,31 @@ static void prepare_request(VDev *vdev, const void *cdb= , int cdb_size, } } =20 -static inline void vs_io_assert(bool term, const char *msg) +static inline bool vs_io_assert(bool term, const char *msg) { - if (!term) { - virtio_scsi_verify_response(&resp, msg); + if (!term && !virtio_scsi_verify_response(&resp, msg)) { + return false; } + + return true; } =20 -static void vs_run(const char *title, VirtioCmd *cmd, VDev *vdev, +static int vs_run(const char *title, VirtioCmd *cmd, VDev *vdev, const void *cdb, int cdb_size, void *data, uint32_t data_size) { prepare_request(vdev, cdb, cdb_size, data, data_size); - vs_io_assert(virtio_run(vdev, VR_REQUEST, cmd) =3D=3D 0, title); + if (!vs_io_assert(virtio_run(vdev, VR_REQUEST, cmd) =3D=3D 0, title)) { + puts(title); + return -EIO; + } + + return 0; } =20 /* SCSI protocol implementation routines */ =20 -static bool scsi_inquiry(VDev *vdev, uint8_t evpd, uint8_t page, +static int scsi_inquiry(VDev *vdev, uint8_t evpd, uint8_t page, void *data, uint32_t data_size) { ScsiCdbInquiry cdb =3D { @@ -110,12 +123,13 @@ static bool scsi_inquiry(VDev *vdev, uint8_t evpd, ui= nt8_t page, { data, data_size, VRING_DESC_F_WRITE }, }; =20 - vs_run("inquiry", inquiry, vdev, &cdb, sizeof(cdb), data, data_size); + int ret =3D vs_run("inquiry", inquiry, + vdev, &cdb, sizeof(cdb), data, data_size); =20 - return virtio_scsi_response_ok(&resp); + return ret ? ret : virtio_scsi_response_ok(&resp); } =20 -static bool scsi_test_unit_ready(VDev *vdev) +static int scsi_test_unit_ready(VDev *vdev) { ScsiCdbTestUnitReady cdb =3D { .command =3D 0x00, @@ -131,7 +145,7 @@ static bool scsi_test_unit_ready(VDev *vdev) return virtio_scsi_response_ok(&resp); } =20 -static bool scsi_report_luns(VDev *vdev, void *data, uint32_t data_size) +static int scsi_report_luns(VDev *vdev, void *data, uint32_t data_size) { ScsiCdbReportLuns cdb =3D { .command =3D 0xa0, @@ -144,13 +158,13 @@ static bool scsi_report_luns(VDev *vdev, void *data, = uint32_t data_size) { data, data_size, VRING_DESC_F_WRITE }, }; =20 - vs_run("report luns", report_luns, + int ret =3D vs_run("report luns", report_luns, vdev, &cdb, sizeof(cdb), data, data_size); =20 - return virtio_scsi_response_ok(&resp); + return ret ? ret : virtio_scsi_response_ok(&resp); } =20 -static bool scsi_read_10(VDev *vdev, +static int scsi_read_10(VDev *vdev, unsigned long sector, int sectors, void *data, unsigned int data_size) { @@ -168,12 +182,13 @@ static bool scsi_read_10(VDev *vdev, debug_print_int("read_10 sector", sector); debug_print_int("read_10 sectors", sectors); =20 - vs_run("read(10)", read_10, vdev, &cdb, sizeof(cdb), data, data_size); + int ret =3D vs_run("read(10)", read_10, + vdev, &cdb, sizeof(cdb), data, data_size); =20 - return virtio_scsi_response_ok(&resp); + return ret ? ret : virtio_scsi_response_ok(&resp); } =20 -static bool scsi_read_capacity(VDev *vdev, +static int scsi_read_capacity(VDev *vdev, void *data, uint32_t data_size) { ScsiCdbReadCapacity16 cdb =3D { @@ -187,10 +202,10 @@ static bool scsi_read_capacity(VDev *vdev, { data, data_size, VRING_DESC_F_WRITE }, }; =20 - vs_run("read capacity", read_capacity_16, + int ret =3D vs_run("read capacity", read_capacity_16, vdev, &cdb, sizeof(cdb), data, data_size); =20 - return virtio_scsi_response_ok(&resp); + return ret ? ret : virtio_scsi_response_ok(&resp); } =20 /* virtio-scsi routines */ @@ -207,7 +222,7 @@ static int virtio_scsi_locate_device(VDev *vdev) static uint8_t data[16 + 8 * 63]; ScsiLunReport *r =3D (void *) data; ScsiDevice *sdev =3D vdev->scsi_device; - int i, luns; + int i, ret, luns; =20 /* QEMU has hardcoded channel #0 in many places. * If this hardcoded value is ever changed, we'll need to add code for @@ -233,13 +248,21 @@ static int virtio_scsi_locate_device(VDev *vdev) sdev->channel =3D channel; sdev->target =3D target; sdev->lun =3D 0; /* LUN has to be 0 for REPORT LUNS */ - if (!scsi_report_luns(vdev, data, sizeof(data))) { + ret =3D scsi_report_luns(vdev, data, sizeof(data)); + if (ret < 0) { + return ret; + } + + else if (ret =3D=3D 0) { if (resp.response =3D=3D VIRTIO_SCSI_S_BAD_TARGET) { continue; } printf("target 0x%X\n", target); - virtio_scsi_verify_response(&resp, "SCSI cannot report LUNs"); + if (!virtio_scsi_verify_response(&resp, "SCSI cannot report LU= Ns")) { + return -EIO; + } } + if (r->lun_list_len =3D=3D 0) { printf("no LUNs for target 0x%X\n", target); continue; @@ -283,7 +306,9 @@ int virtio_scsi_read_many(VDev *vdev, data_size =3D sector_count * virtio_get_block_size() * f; if (!scsi_read_10(vdev, sector * f, sector_count * f, load_addr, data_size)) { - virtio_scsi_verify_response(&resp, "virtio-scsi:read_many"); + if (!virtio_scsi_verify_response(&resp, "virtio-scsi:read_many= ")) { + return 1; + } } load_addr +=3D data_size; sector +=3D sector_count; @@ -352,11 +377,16 @@ static int virtio_scsi_setup(VDev *vdev) uint8_t code =3D resp.sense[0] & SCSI_SENSE_CODE_MASK; uint8_t sense_key =3D resp.sense[2] & SCSI_SENSE_KEY_MASK; =20 - IPL_assert(resp.sense_len !=3D 0, "virtio-scsi:setup: no SENSE= data"); + if (resp.sense_len =3D=3D 0) { + puts("virtio-scsi: setup: no SENSE data"); + return -EINVAL; + } =20 - IPL_assert(retry_test_unit_ready && code =3D=3D 0x70 && - sense_key =3D=3D SCSI_SENSE_KEY_UNIT_ATTENTION, - "virtio-scsi:setup: cannot retry"); + if (!retry_test_unit_ready || code !=3D 0x70 || + sense_key !=3D SCSI_SENSE_KEY_UNIT_ATTENTION) { + puts("virtio-scsi:setup: cannot retry"); + return -EIO; + } =20 /* retry on CHECK_CONDITION/UNIT_ATTENTION as it * may not designate a real error, but it may be @@ -367,16 +397,22 @@ static int virtio_scsi_setup(VDev *vdev) continue; } =20 - virtio_scsi_verify_response(&resp, "virtio-scsi:setup"); + if (!virtio_scsi_verify_response(&resp, "virtio-scsi:setup")) { + return 1; + } } =20 /* read and cache SCSI INQUIRY response */ - if (!scsi_inquiry(vdev, + ret =3D scsi_inquiry(vdev, SCSI_INQUIRY_STANDARD, SCSI_INQUIRY_STANDARD_NONE, scsi_inquiry_std_response, - sizeof(scsi_inquiry_std_response))) { - virtio_scsi_verify_response(&resp, "virtio-scsi:setup:inquiry"); + sizeof(scsi_inquiry_std_response)); + if (ret < 1) { + if (ret !=3D 0 || !virtio_scsi_verify_response(&resp, + "virtio-scsi:setup:inquiry")) { + return 1; + } } =20 if (virtio_scsi_inquiry_response_is_cdrom(scsi_inquiry_std_response)) { @@ -385,12 +421,16 @@ static int virtio_scsi_setup(VDev *vdev) vdev->scsi_block_size =3D VIRTIO_ISO_BLOCK_SIZE; } =20 - if (!scsi_inquiry(vdev, + ret =3D scsi_inquiry(vdev, SCSI_INQUIRY_EVPD, SCSI_INQUIRY_EVPD_SUPPORTED_PAGES, evpd, - sizeof(*evpd))) { - virtio_scsi_verify_response(&resp, "virtio-scsi:setup:supported_pa= ges"); + sizeof(*evpd)); + if (ret < 1) { + if (ret !=3D 0 || !virtio_scsi_verify_response(&resp, + "virtio-scsi:setup:supported_pages")) { + return 1; + } } =20 debug_print_int("EVPD length", evpd->page_length); @@ -402,12 +442,16 @@ static int virtio_scsi_setup(VDev *vdev) continue; } =20 - if (!scsi_inquiry(vdev, + ret =3D scsi_inquiry(vdev, SCSI_INQUIRY_EVPD, SCSI_INQUIRY_EVPD_BLOCK_LIMITS, evpd_bl, - sizeof(*evpd_bl))) { - virtio_scsi_verify_response(&resp, "virtio-scsi:setup:blocklim= its"); + sizeof(*evpd_bl)); + if (ret < 1) { + if (ret !=3D 0 || !virtio_scsi_verify_response(&resp, + "virtio-scsi:setup:blocklimits")) { + return 1; + } } =20 debug_print_int("max transfer", evpd_bl->max_transfer); @@ -423,8 +467,12 @@ static int virtio_scsi_setup(VDev *vdev) vdev->max_transfer =3D MIN_NON_ZERO(VIRTIO_SCSI_MAX_SECTORS, vdev->max_transfer); =20 - if (!scsi_read_capacity(vdev, data, data_size)) { - virtio_scsi_verify_response(&resp, "virtio-scsi:setup:read_capacit= y"); + ret =3D scsi_read_capacity(vdev, data, data_size); + if (ret < 1) { + if (ret !=3D 0 || !virtio_scsi_verify_response(&resp, + "virtio-scsi:setup:read_capacity")) { + return 1; + } } scsi_parse_capacity_report(data, &vdev->scsi_last_block, (uint32_t *) &vdev->scsi_block_size); @@ -439,10 +487,15 @@ int virtio_scsi_setup_device(SubChannelId schid) vdev->schid =3D schid; virtio_setup_ccw(vdev); =20 - IPL_assert(vdev->config.scsi.sense_size =3D=3D VIRTIO_SCSI_SENSE_SIZE, - "Config: sense size mismatch"); - IPL_assert(vdev->config.scsi.cdb_size =3D=3D VIRTIO_SCSI_CDB_SIZE, - "Config: CDB size mismatch"); + if (vdev->config.scsi.sense_size !=3D VIRTIO_SCSI_SENSE_SIZE) { + puts("Config: sense size mismatch"); + return -EINVAL; + } + + if (vdev->config.scsi.cdb_size !=3D VIRTIO_SCSI_CDB_SIZE) { + puts("Config: CDB size mismatch"); + return -EINVAL; + } =20 puts("Using virtio-scsi."); =20 --=20 2.45.1