mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc-bios/s390-ccw: Remove panics from SCSI IPL path

Browse Source 
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 <jrossi@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20241020012953.1380075-10-jrossi@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Jared Rossi 2024-10-19 21:29:43 -04:00 committed by Thomas Huth
parent 806315279d
commit facd91ac1a
3 changed files with 164 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
pc-bios/s390-ccw/bootmap.c
View File

@ -595,7 +595,7 @@ static int ipl_eckd(void)
* IPL a SCSI disk
*/
static void zipl_load_segment(ComponentEntry *entry)
static int zipl_load_segment(ComponentEntry *entry)
{
const int max_entries = (MAX_SECTOR_SIZE / sizeof(ScsiBlockPtr));
ScsiBlockPtr *bprs = (void *)sec;
@ -615,7 +615,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;
}
for (i = 0;; i++) {
uint64_t *cur_desc = (void *)&bprs[i];
@ -643,23 +646,37 @@ static void zipl_load_segment(ComponentEntry *entry)
}
address = virtio_load_direct(cur_desc[0], cur_desc[1], 0,
(void *)address);
IPL_assert(address != -1, "zIPL load segment failed");
if (!address) {
puts("zIPL load segment failed");
return -EIO;
}
}
} while (blockno);
return 0;
}
/* 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];
read_block(pte->blockno, tmp_sec, "Cannot read header");
if (virtio_read(pte->blockno, tmp_sec)) {
puts("Cannot read header");
return -EIO;
}
header = (ComponentHeader *)tmp_sec;
IPL_assert(magic_match(tmp_sec, ZIPL_MAGIC), "No zIPL magic in header");
IPL_assert(header->type == 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 != ZIPL_COMP_HEADER_IPL) {
puts("Bad header type");
return -EINVAL;
}
dputs("start loading images\n");
@ -674,22 +691,30 @@ static void zipl_run(ScsiBlockPtr *pte)
continue;
}
zipl_load_segment(entry);
if (zipl_load_segment(entry)) {
return -1;
}
entry++;
IPL_assert((uint8_t *)(&entry[1]) <= (tmp_sec + MAX_SECTOR_SIZE),
"Wrong entry value");
if ((uint8_t *)(&entry[1]) > (tmp_sec + MAX_SECTOR_SIZE)) {
puts("Wrong entry value");
return -EINVAL;
}
}
IPL_assert(entry->component_type == ZIPL_COMP_ENTRY_EXEC, "No EXEC entry");
if (entry->component_type != ZIPL_COMP_ENTRY_EXEC) {
puts("No EXEC entry");
return -EINVAL;
}
/* should not return */
write_reset_psw(entry->compdat.load_psw);
jump_to_IPL_code(0);
return -1;
}
static void ipl_scsi(void)
static int ipl_scsi(void)
{
ScsiMbr *mbr = (void *)sec;
int program_table_entries = 0;
@ -700,10 +725,13 @@ static void ipl_scsi(void)
/* 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;
}
if (!magic_match(mbr->magic, ZIPL_MAGIC)) {
return;
return 0;
}
puts("Using SCSI scheme.");
@ -711,11 +739,20 @@ static void ipl_scsi(void)
IPL_check(mbr->version_id == 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;
}
/* 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;
}
for (i = 0; i < MAX_BOOT_ENTRIES; i++) {
if (prog_table->entry[i].scsi.blockno) {
@ -725,17 +762,22 @@ static void ipl_scsi(void)
}
debug_print_int("program table entries", program_table_entries);
IPL_assert(program_table_entries != 0, "Empty Program Table");
if (program_table_entries == 0) {
puts("Empty Program Table");
return -EINVAL;
}
if (menu_is_enabled_enum()) {
loadparm = menu_get_enum_boot_index(valid_entries);
}
debug_print_int("loadparm", loadparm);
IPL_assert(loadparm < MAX_BOOT_ENTRIES, "loadparm value greater than"
" maximum number of boot entries allowed");
if (loadparm >= MAX_BOOT_ENTRIES) {
puts("loadparm value greater than max number of boot entries allowed");
return -EINVAL;
}
zipl_run(&prog_table->entry[loadparm].scsi); /* no return */
return zipl_run(&prog_table->entry[loadparm].scsi);
}
/***********************************************************************
@ -1032,7 +1074,9 @@ void zipl_load(void)
netmain();
}
ipl_scsi();
if (ipl_scsi()) {
panic("\n! Cannot IPL this SCSI device !\n");
}
switch (virtio_get_device_type()) {
case VIRTIO_ID_BLOCK:

4
pc-bios/s390-ccw/virtio-blkdev.c
View File

@ -73,13 +73,13 @@ unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long rec_list
unsigned long addr = (unsigned long)load_addr;
if (sec_len != virtio_get_block_size()) {
return -1;
return 0;
}
printf(".");
status = virtio_read_many(sec, (void *)addr, sec_num);
if (status) {
panic("I/O Error");
return 0;
}
addr += sec_num * virtio_get_block_size();

143
pc-bios/s390-ccw/virtio-scsi.c
View File

@ -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;
static inline void vs_assert(bool term, const char **msgs)
static inline bool vs_assert(bool term, const char **msgs)
{
if (!term) {
int i = 0;
@ -35,11 +35,13 @@ static inline void vs_assert(bool term, const char **msgs)
while (msgs[i]) {
printf("%s", msgs[i++]);
}
panic(" !\n");
puts(" !");
}
return term;
}
static void virtio_scsi_verify_response(VirtioScsiCmdResp *resp,
static bool virtio_scsi_verify_response(VirtioScsiCmdResp *resp,
const char *title)
{
const char *mr[] = {
@ -56,8 +58,8 @@ static void virtio_scsi_verify_response(VirtioScsiCmdResp *resp,
0
};
vs_assert(resp->response == VIRTIO_SCSI_S_OK, mr);
vs_assert(resp->status == CDB_STATUS_GOOD, ms);
return vs_assert(resp->response == VIRTIO_SCSI_S_OK, mr) &&
vs_assert(resp->status == CDB_STATUS_GOOD, ms);
}
static void prepare_request(VDev *vdev, const void *cdb, int cdb_size,
@ -78,24 +80,31 @@ static void prepare_request(VDev *vdev, const void *cdb, int cdb_size,
}
}
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;
}
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) == 0, title);
if (!vs_io_assert(virtio_run(vdev, VR_REQUEST, cmd) == 0, title)) {
puts(title);
return -EIO;
}
return 0;
}
/* SCSI protocol implementation routines */
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 = {
@ -110,12 +119,13 @@ static bool scsi_inquiry(VDev *vdev, uint8_t evpd, uint8_t page,
{ data, data_size, VRING_DESC_F_WRITE },
};
vs_run("inquiry", inquiry, vdev, &cdb, sizeof(cdb), data, data_size);
int ret = vs_run("inquiry", inquiry,
vdev, &cdb, sizeof(cdb), data, data_size);
return virtio_scsi_response_ok(&resp);
return ret ? ret : virtio_scsi_response_ok(&resp);
}
static bool scsi_test_unit_ready(VDev *vdev)
static int scsi_test_unit_ready(VDev *vdev)
{
ScsiCdbTestUnitReady cdb = {
.command = 0x00,
@ -131,7 +141,7 @@ static bool scsi_test_unit_ready(VDev *vdev)
return virtio_scsi_response_ok(&resp);
}
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 = {
.command = 0xa0,
@ -144,13 +154,13 @@ static bool scsi_report_luns(VDev *vdev, void *data, uint32_t data_size)
{ data, data_size, VRING_DESC_F_WRITE },
};
vs_run("report luns", report_luns,
int ret = vs_run("report luns", report_luns,
vdev, &cdb, sizeof(cdb), data, data_size);
return virtio_scsi_response_ok(&resp);
return ret ? ret : virtio_scsi_response_ok(&resp);
}
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 +178,13 @@ static bool scsi_read_10(VDev *vdev,
debug_print_int("read_10 sector", sector);
debug_print_int("read_10 sectors", sectors);
vs_run("read(10)", read_10, vdev, &cdb, sizeof(cdb), data, data_size);
int ret = vs_run("read(10)", read_10,
vdev, &cdb, sizeof(cdb), data, data_size);
return virtio_scsi_response_ok(&resp);
return ret ? ret : virtio_scsi_response_ok(&resp);
}
static bool scsi_read_capacity(VDev *vdev,
static int scsi_read_capacity(VDev *vdev,
void *data, uint32_t data_size)
{
ScsiCdbReadCapacity16 cdb = {
@ -187,10 +198,10 @@ static bool scsi_read_capacity(VDev *vdev,
{ data, data_size, VRING_DESC_F_WRITE },
};
vs_run("read capacity", read_capacity_16,
int ret = vs_run("read capacity", read_capacity_16,
vdev, &cdb, sizeof(cdb), data, data_size);
return virtio_scsi_response_ok(&resp);
return ret ? ret : virtio_scsi_response_ok(&resp);
}
/* virtio-scsi routines */
@ -207,7 +218,7 @@ static int virtio_scsi_locate_device(VDev *vdev)
static uint8_t data[16 + 8 * 63];
ScsiLunReport *r = (void *) data;
ScsiDevice *sdev = vdev->scsi_device;
int i, luns;
int i, ret, luns;
/* QEMU has hardcoded channel #0 in many places.
* If this hardcoded value is ever changed, we'll need to add code for
@ -233,13 +244,21 @@ static int virtio_scsi_locate_device(VDev *vdev)
sdev->channel = channel;
sdev->target = target;
sdev->lun = 0; /* LUN has to be 0 for REPORT LUNS */
if (!scsi_report_luns(vdev, data, sizeof(data))) {
ret = scsi_report_luns(vdev, data, sizeof(data));
if (ret < 0) {
return ret;
}
else if (ret == 0) {
if (resp.response == 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 LUNs")) {
return -EIO;
}
}
if (r->lun_list_len == 0) {
printf("no LUNs for target 0x%X\n", target);
continue;
@ -283,7 +302,9 @@ int virtio_scsi_read_many(VDev *vdev,
data_size = 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 += data_size;
sector += sector_count;
@ -352,11 +373,16 @@ static int virtio_scsi_setup(VDev *vdev)
uint8_t code = resp.sense[0] & SCSI_SENSE_CODE_MASK;
uint8_t sense_key = resp.sense[2] & SCSI_SENSE_KEY_MASK;
IPL_assert(resp.sense_len != 0, "virtio-scsi:setup: no SENSE data");
if (resp.sense_len == 0) {
puts("virtio-scsi: setup: no SENSE data");
return -EINVAL;
}
IPL_assert(retry_test_unit_ready && code == 0x70 &&
sense_key == SCSI_SENSE_KEY_UNIT_ATTENTION,
"virtio-scsi:setup: cannot retry");
if (!retry_test_unit_ready || code != 0x70 ||
sense_key != SCSI_SENSE_KEY_UNIT_ATTENTION) {
puts("virtio-scsi:setup: cannot retry");
return -EIO;
}
/* retry on CHECK_CONDITION/UNIT_ATTENTION as it
* may not designate a real error, but it may be
@ -367,16 +393,22 @@ static int virtio_scsi_setup(VDev *vdev)
continue;
}
virtio_scsi_verify_response(&resp, "virtio-scsi:setup");
if (!virtio_scsi_verify_response(&resp, "virtio-scsi:setup")) {
return -1;
}
}
/* read and cache SCSI INQUIRY response */
if (!scsi_inquiry(vdev,
ret = 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 != 0 || !virtio_scsi_verify_response(&resp,
"virtio-scsi:setup:inquiry")) {
return -1;
}
}
if (virtio_scsi_inquiry_response_is_cdrom(scsi_inquiry_std_response)) {
@ -385,12 +417,16 @@ static int virtio_scsi_setup(VDev *vdev)
vdev->scsi_block_size = VIRTIO_ISO_BLOCK_SIZE;
}
if (!scsi_inquiry(vdev,
ret = scsi_inquiry(vdev,
SCSI_INQUIRY_EVPD,
SCSI_INQUIRY_EVPD_SUPPORTED_PAGES,
evpd,
sizeof(*evpd))) {
virtio_scsi_verify_response(&resp, "virtio-scsi:setup:supported_pages");
sizeof(*evpd));
if (ret < 1) {
if (ret != 0 || !virtio_scsi_verify_response(&resp,
"virtio-scsi:setup:supported_pages")) {
return -1;
}
}
debug_print_int("EVPD length", evpd->page_length);
@ -402,12 +438,16 @@ static int virtio_scsi_setup(VDev *vdev)
continue;
}
if (!scsi_inquiry(vdev,
ret = scsi_inquiry(vdev,
SCSI_INQUIRY_EVPD,
SCSI_INQUIRY_EVPD_BLOCK_LIMITS,
evpd_bl,
sizeof(*evpd_bl))) {
virtio_scsi_verify_response(&resp, "virtio-scsi:setup:blocklimits");
sizeof(*evpd_bl));
if (ret < 1) {
if (ret != 0 || !virtio_scsi_verify_response(&resp,
"virtio-scsi:setup:blocklimits")) {
return -1;
}
}
debug_print_int("max transfer", evpd_bl->max_transfer);
@ -423,8 +463,12 @@ static int virtio_scsi_setup(VDev *vdev)
vdev->max_transfer = MIN_NON_ZERO(VIRTIO_SCSI_MAX_SECTORS,
vdev->max_transfer);
if (!scsi_read_capacity(vdev, data, data_size)) {
virtio_scsi_verify_response(&resp, "virtio-scsi:setup:read_capacity");
ret = scsi_read_capacity(vdev, data, data_size);
if (ret < 1) {
if (ret != 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 +483,15 @@ int virtio_scsi_setup_device(SubChannelId schid)
vdev->schid = schid;
virtio_setup_ccw(vdev);
IPL_assert(vdev->config.scsi.sense_size == VIRTIO_SCSI_SENSE_SIZE,
"Config: sense size mismatch");
IPL_assert(vdev->config.scsi.cdb_size == VIRTIO_SCSI_CDB_SIZE,
"Config: CDB size mismatch");
if (vdev->config.scsi.sense_size != VIRTIO_SCSI_SENSE_SIZE) {
puts("Config: sense size mismatch");
return -EINVAL;
}
if (vdev->config.scsi.cdb_size != VIRTIO_SCSI_CDB_SIZE) {
puts("Config: CDB size mismatch");
return -EINVAL;
}
puts("Using virtio-scsi.");