* [PATCH v3 01/19] hw/s390x/ipl: Provide more memory to the s390-ccw.img firmware
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-08 1:15 ` [PATCH v3 02/19] pc-bios/s390-ccw: Use the libc from SLOF and remove sclp prints jrossi
` (17 subsequent siblings)
18 siblings, 0 replies; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
We are going to link the SLOF libc into the s390-ccw.img, and this
libc needs more memory for providing space for malloc() and friends.
Thus bump the memory size that we reserve for the bios to 3 MiB
instead of only 2 MiB. While we're at it, add a proper check that
there is really enough memory assigned to the machine before blindly
using it.
Co-authored by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
hw/s390x/ipl.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 5ab7433908..5f60977ceb 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -45,6 +45,7 @@
#define INITRD_PARM_START 0x010408UL
#define PARMFILE_START 0x001000UL
#define ZIPL_IMAGE_START 0x009000UL
+#define BIOS_MAX_SIZE 0x300000UL
#define IPL_PSW_MASK (PSW_MASK_32 | PSW_MASK_64)
static bool iplb_extended_needed(void *opaque)
@@ -144,7 +145,14 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
* even if an external kernel has been defined.
*/
if (!ipl->kernel || ipl->enforce_bios) {
- uint64_t fwbase = (MIN(ms->ram_size, 0x80000000U) - 0x200000) & ~0xffffUL;
+ uint64_t fwbase;
+
+ if (ms->ram_size < BIOS_MAX_SIZE) {
+ error_setg(errp, "not enough RAM to load the BIOS file");
+ return;
+ }
+
+ fwbase = (MIN(ms->ram_size, 0x80000000U) - BIOS_MAX_SIZE) & ~0xffffUL;
bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, ipl->firmware);
if (bios_filename == NULL) {
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 02/19] pc-bios/s390-ccw: Use the libc from SLOF and remove sclp prints
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
2024-10-08 1:15 ` [PATCH v3 01/19] hw/s390x/ipl: Provide more memory to the s390-ccw.img firmware jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-08 1:15 ` [PATCH v3 03/19] pc-bios/s390-ccw: Link the netboot code into the main s390-ccw.img binary jrossi
` (16 subsequent siblings)
18 siblings, 0 replies; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
We are already using the libc from SLOF for the s390-netboot.img, and
this libc implementation is way more complete and accurate than the
simple implementation that we currently use for the s390-ccw.img binary.
Since we are now always assuming that the SLOF submodule is available
when building the s390-ccw bios (see commit bf6903f6944f), we can drop
the simple implementation and use the SLOF libc for the s390-ccw.img
binary, too.
Additionally replace sclp_print calls with puts/printf now that it is avaliable.
Co-authored by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
pc-bios/s390-ccw/netboot.mak | 3 --
pc-bios/s390-ccw/bootmap.h | 4 +-
pc-bios/s390-ccw/libc.h | 89 --------------------------------
pc-bios/s390-ccw/s390-ccw.h | 30 ++++-------
pc-bios/s390-ccw/bootmap.c | 47 ++++++++---------
pc-bios/s390-ccw/cio.c | 78 +++++++++++++---------------
pc-bios/s390-ccw/dasd-ipl.c | 5 +-
pc-bios/s390-ccw/jump2ipl.c | 5 +-
pc-bios/s390-ccw/libc.c | 88 -------------------------------
pc-bios/s390-ccw/main.c | 14 ++---
| 51 +++++++++---------
pc-bios/s390-ccw/netmain.c | 10 ++--
pc-bios/s390-ccw/sclp.c | 7 +--
pc-bios/s390-ccw/virtio-blkdev.c | 6 +--
pc-bios/s390-ccw/virtio-scsi.c | 17 +++---
pc-bios/s390-ccw/virtio.c | 2 +-
pc-bios/s390-ccw/Makefile | 15 ++++--
17 files changed, 136 insertions(+), 335 deletions(-)
delete mode 100644 pc-bios/s390-ccw/libc.h
delete mode 100644 pc-bios/s390-ccw/libc.c
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
index 046aa35587..d2b3d8ee74 100644
--- a/pc-bios/s390-ccw/netboot.mak
+++ b/pc-bios/s390-ccw/netboot.mak
@@ -1,9 +1,6 @@
-SLOF_DIR := $(SRC_PATH)/../../roms/SLOF
-
NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o
-LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include
LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
NETLDFLAGS := $(LDFLAGS) -Wl,-Ttext=0x7800000
diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h
index d4690a88c2..bbe2c132aa 100644
--- a/pc-bios/s390-ccw/bootmap.h
+++ b/pc-bios/s390-ccw/bootmap.h
@@ -336,9 +336,7 @@ static inline void print_volser(const void *volser)
ebcdic_to_ascii((char *)volser, ascii, 6);
ascii[6] = '\0';
- sclp_print("VOLSER=[");
- sclp_print(ascii);
- sclp_print("]\n");
+ printf("VOLSER=[%s]", ascii);
}
static inline bool unused_space(const void *p, size_t size)
diff --git a/pc-bios/s390-ccw/libc.h b/pc-bios/s390-ccw/libc.h
deleted file mode 100644
index bcdc45732d..0000000000
--- a/pc-bios/s390-ccw/libc.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * libc-style definitions and functions
- *
- * Copyright (c) 2013 Alexander Graf <agraf@suse.de>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-
-#ifndef S390_CCW_LIBC_H
-#define S390_CCW_LIBC_H
-
-typedef unsigned long size_t;
-typedef int bool;
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-
-static inline void *memset(void *s, int c, size_t n)
-{
- size_t i;
- unsigned char *p = s;
-
- for (i = 0; i < n; i++) {
- p[i] = c;
- }
-
- return s;
-}
-
-static inline void *memcpy(void *s1, const void *s2, size_t n)
-{
- uint8_t *dest = s1;
- const uint8_t *src = s2;
- size_t i;
-
- for (i = 0; i < n; i++) {
- dest[i] = src[i];
- }
-
- return s1;
-}
-
-static inline int memcmp(const void *s1, const void *s2, size_t n)
-{
- size_t i;
- const uint8_t *p1 = s1, *p2 = s2;
-
- for (i = 0; i < n; i++) {
- if (p1[i] != p2[i]) {
- return p1[i] > p2[i] ? 1 : -1;
- }
- }
-
- return 0;
-}
-
-static inline size_t strlen(const char *str)
-{
- size_t i;
- for (i = 0; *str; i++) {
- str++;
- }
- return i;
-}
-
-static inline char *strcat(char *dest, const char *src)
-{
- int i;
- char *dest_end = dest + strlen(dest);
-
- for (i = 0; i <= strlen(src); i++) {
- dest_end[i] = src[i];
- }
- return dest;
-}
-
-static inline int isdigit(int c)
-{
- return (c >= '0') && (c <= '9');
-}
-
-uint64_t atoui(const char *str);
-char *uitoa(uint64_t num, char *str, size_t len);
-
-#endif
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index c977a52b50..9b622e616a 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -13,6 +13,11 @@
/* #define DEBUG */
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
@@ -26,9 +31,6 @@ typedef unsigned long long u64;
#define EBUSY 2
#define ENODEV 3
-#ifndef NULL
-#define NULL 0
-#endif
#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
@@ -87,7 +89,7 @@ bool menu_is_enabled_enum(void);
__attribute__ ((__noreturn__))
static inline void panic(const char *string)
{
- sclp_print(string);
+ printf("ERROR: %s\n ", string);
disabled_wait();
}
@@ -109,20 +111,10 @@ static inline void fill_hex_val(char *out, void *ptr, unsigned size)
}
}
-static inline void print_int(const char *desc, u64 addr)
-{
- char out[] = ": 0xffffffffffffffff\n";
-
- fill_hex_val(&out[4], &addr, sizeof(addr));
-
- sclp_print(desc);
- sclp_print(out);
-}
-
static inline void debug_print_int(const char *desc, u64 addr)
{
#ifdef DEBUG
- print_int(desc, addr);
+ printf("%s 0x%X", desc, addr);
#endif
}
@@ -147,18 +139,14 @@ static inline void debug_print_addr(const char *desc, void *p)
static inline void IPL_assert(bool term, const char *message)
{
if (!term) {
- sclp_print("\n! ");
- sclp_print(message);
- panic(" !\n"); /* no return */
+ panic(message); /* no return */
}
}
static inline void IPL_check(bool term, const char *message)
{
if (!term) {
- sclp_print("\n! WARNING: ");
- sclp_print(message);
- sclp_print(" !\n");
+ printf("WARNING: %s\n", message);
}
}
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index a2137449dc..3cc79706be 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -8,7 +8,8 @@
* directory.
*/
-#include "libc.h"
+#include <string.h>
+#include <stdio.h>
#include "s390-ccw.h"
#include "s390-arch.h"
#include "bootmap.h"
@@ -21,7 +22,7 @@
#ifdef DEBUG_FALLBACK
#define dputs(txt) \
- do { sclp_print("zipl: " txt); } while (0)
+ do { printf("zipl: " txt); } while (0)
#else
#define dputs(fmt, ...) \
do { } while (0)
@@ -270,7 +271,7 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr)
prev_block_nr = cur_block_nr;
}
- sclp_print("No zipl boot menu data found. Booting default entry.");
+ printf("No zipl boot menu data found. Booting default entry.");
return 0;
}
@@ -338,22 +339,22 @@ static void ipl_eckd_cdl(void)
block_number_t bmt_block_nr, s1b_block_nr;
/* we have just read the block #0 and recognized it as "IPL1" */
- sclp_print("CDL\n");
+ puts("CDL");
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
read_block(1, ipl2, "Cannot read IPL2 record at block 1");
mbr = &ipl2->mbr;
if (!magic_match(mbr, ZIPL_MAGIC)) {
- sclp_print("No zIPL section in IPL2 record.\n");
+ puts("No zIPL section in IPL2 record.");
return;
}
if (!block_size_ok(mbr->blockptr.xeckd.bptr.size)) {
- sclp_print("Bad block size in zIPL section of IPL2 record.\n");
+ puts("Bad block size in zIPL section of IPL2 record.");
return;
}
if (mbr->dev_type != DEV_TYPE_ECKD) {
- sclp_print("Non-ECKD device type in zIPL section of IPL2 record.\n");
+ puts("Non-ECKD device type in zIPL section of IPL2 record.");
return;
}
@@ -366,11 +367,11 @@ static void ipl_eckd_cdl(void)
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
read_block(2, vlbl, "Cannot read Volume Label at block 2");
if (!magic_match(vlbl->key, VOL1_MAGIC)) {
- sclp_print("Invalid magic of volume label block.\n");
+ puts("Invalid magic of volume label block.");
return;
}
if (!magic_match(vlbl->f.key, VOL1_MAGIC)) {
- sclp_print("Invalid magic of volser block.\n");
+ puts("Invalid magic of volser block.");
return;
}
print_volser(vlbl->f.volser);
@@ -384,8 +385,8 @@ static void print_eckd_ldl_msg(ECKD_IPL_mode_t mode)
LDL_VTOC *vlbl = (void *)sec; /* already read, 3rd block */
char msg[4] = { '?', '.', '\n', '\0' };
- sclp_print((mode == ECKD_CMS) ? "CMS" : "LDL");
- sclp_print(" version ");
+ printf((mode == ECKD_CMS) ? "CMS" : "LDL");
+ printf(" version ");
switch (vlbl->LDL_version) {
case LDL1_VERSION:
msg[0] = '1';
@@ -398,7 +399,7 @@ static void print_eckd_ldl_msg(ECKD_IPL_mode_t mode)
msg[1] = '?';
break;
}
- sclp_print(msg);
+ printf("%s", msg);
print_volser(vlbl->volser);
}
@@ -419,7 +420,7 @@ static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
if (!magic_match(ipl1->bip.magic, ZIPL_MAGIC)) {
return; /* not applicable layout */
}
- sclp_print("unlabeled LDL.\n");
+ puts("unlabeled LDL.");
}
verify_boot_info(&ipl1->bip);
@@ -466,7 +467,7 @@ static void print_eckd_msg(void)
*p-- = ' ';
}
}
- sclp_print(msg);
+ printf("%s", msg);
}
static void ipl_eckd(void)
@@ -488,11 +489,11 @@ static void ipl_eckd(void)
if (eckd_valid_address((ExtEckdBlockPtr *)&vlbl->f.br, 0)) {
ldipl_bmt = eckd_find_bmt((ExtEckdBlockPtr *)&vlbl->f.br);
if (ldipl_bmt) {
- sclp_print("List-Directed\n");
+ puts("List-Directed");
/* LD-IPL does not use the S1B bock, just make it NULL */
run_eckd_boot_script(ldipl_bmt, NULL_BLOCK_NR);
/* Only return in error, retry as CCW-IPL */
- sclp_print("Retrying IPL ");
+ printf("Retrying IPL ");
print_eckd_msg();
}
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
@@ -634,7 +635,7 @@ static void ipl_scsi(void)
return;
}
- sclp_print("Using SCSI scheme.\n");
+ puts("Using SCSI scheme.");
debug_print_int("MBR Version", mbr->version_id);
IPL_check(mbr->version_id == 1,
"Unknown MBR layout version, assuming version 1");
@@ -743,7 +744,7 @@ static inline uint32_t iso_get_file_size(uint32_t load_rba)
if (cur_record->file_flags & 0x2) {
/* Subdirectory */
if (level == ISO9660_MAX_DIR_DEPTH - 1) {
- sclp_print("ISO-9660 directory depth limit exceeded\n");
+ puts("ISO-9660 directory depth limit exceeded");
} else {
level++;
sec_loc[level] = iso_733_to_u32(cur_record->ext_loc);
@@ -778,9 +779,9 @@ static void load_iso_bc_entry(IsoBcSection *load)
if (real_size) {
/* Round up blocks to load */
blks_to_load = (real_size + ISO_SECTOR_SIZE - 1) / ISO_SECTOR_SIZE;
- sclp_print("ISO boot image size verified\n");
+ puts("ISO boot image size verified");
} else {
- sclp_print("ISO boot image size could not be verified\n");
+ puts("ISO boot image size could not be verified");
}
read_iso_boot_image(bswap32(s.load_rba),
@@ -896,7 +897,7 @@ static void zipl_load_vblk(void)
}
if (blksize != VIRTIO_DASD_DEFAULT_BLOCK_SIZE) {
- sclp_print("Using guessed DASD geometry.\n");
+ puts("Using guessed DASD geometry.");
virtio_assume_eckd();
}
ipl_eckd();
@@ -909,7 +910,7 @@ static void zipl_load_vscsi(void)
ipl_iso_el_torito();
}
- sclp_print("Using guessed DASD geometry.\n");
+ puts("Using guessed DASD geometry.");
virtio_assume_eckd();
ipl_eckd();
}
@@ -944,5 +945,5 @@ void zipl_load(void)
panic("\n! Unknown IPL device type !\n");
}
- sclp_print("zIPL load failed.\n");
+ puts("zIPL load failed.");
}
diff --git a/pc-bios/s390-ccw/cio.c b/pc-bios/s390-ccw/cio.c
index 83ca27ab41..758e74965e 100644
--- a/pc-bios/s390-ccw/cio.c
+++ b/pc-bios/s390-ccw/cio.c
@@ -11,7 +11,8 @@
* directory.
*/
-#include "libc.h"
+#include <string.h>
+#include <stdio.h>
#include "s390-ccw.h"
#include "s390-arch.h"
#include "helper.h"
@@ -90,9 +91,9 @@ static void print_eckd_dasd_sense_data(SenseDataEckdDasd *sd)
char msgline[512];
if (sd->config_info & 0x8000) {
- sclp_print("Eckd Dasd Sense Data (fmt 24-bytes):\n");
+ puts("Eckd Dasd Sense Data (fmt 24-bytes):");
} else {
- sclp_print("Eckd Dasd Sense Data (fmt 32-bytes):\n");
+ puts("Eckd Dasd Sense Data (fmt 32-bytes):");
}
strcat(msgline, " Sense Condition Flags :");
@@ -158,22 +159,21 @@ static void print_eckd_dasd_sense_data(SenseDataEckdDasd *sd)
if (sd->status[1] & SNS_STAT2_IMPRECISE_END) {
strcat(msgline, " [Imprecise-End]");
}
- strcat(msgline, "\n");
- sclp_print(msgline);
-
- print_int(" Residual Count =", sd->res_count);
- print_int(" Phys Drive ID =", sd->phys_drive_id);
- print_int(" low cyl address =", sd->low_cyl_addr);
- print_int(" head addr & hi cyl =", sd->head_high_cyl_addr);
- print_int(" format/message =", sd->fmt_msg);
- print_int(" fmt-dependent[0-7] =", sd->fmt_dependent_info[0]);
- print_int(" fmt-dependent[8-15]=", sd->fmt_dependent_info[1]);
- print_int(" prog action code =", sd->program_action_code);
- print_int(" Configuration info =", sd->config_info);
- print_int(" mcode / hi-cyl =", sd->mcode_hicyl);
- print_int(" cyl & head addr [0]=", sd->cyl_head_addr[0]);
- print_int(" cyl & head addr [1]=", sd->cyl_head_addr[1]);
- print_int(" cyl & head addr [2]=", sd->cyl_head_addr[2]);
+ puts(msgline);
+
+ printf(" Residual Count = 0x%X", sd->res_count);
+ printf(" Phys Drive ID = 0x%X", sd->phys_drive_id);
+ printf(" low cyl address = 0x%X", sd->low_cyl_addr);
+ printf(" head addr & hi cyl = 0x%X", sd->head_high_cyl_addr);
+ printf(" format/message = 0x%X", sd->fmt_msg);
+ printf(" fmt-dependent[0-7] = 0x%llX", sd->fmt_dependent_info[0]);
+ printf(" fmt-dependent[8-15]= 0x%llX", sd->fmt_dependent_info[1]);
+ printf(" prog action code = 0x%X", sd->program_action_code);
+ printf(" Configuration info = 0x%X", sd->config_info);
+ printf(" mcode / hi-cyl = 0x%X", sd->mcode_hicyl);
+ printf(" cyl & head addr [0]= 0x%X", sd->cyl_head_addr[0]);
+ printf(" cyl & head addr [1]= 0x%X", sd->cyl_head_addr[1]);
+ printf(" cyl & head addr [2]= 0x%X", sd->cyl_head_addr[2]);
}
static void print_irb_err(Irb *irb)
@@ -182,7 +182,7 @@ static void print_irb_err(Irb *irb)
uint64_t prev_ccw = *(uint64_t *)u32toptr(irb->scsw.cpa - 8);
char msgline[256];
- sclp_print("Interrupt Response Block Data:\n");
+ puts("Interrupt Response Block Data:");
strcat(msgline, " Function Ctrl :");
if (irb->scsw.ctrl & SCSW_FCTL_START_FUNC) {
@@ -194,8 +194,7 @@ static void print_irb_err(Irb *irb)
if (irb->scsw.ctrl & SCSW_FCTL_CLEAR_FUNC) {
strcat(msgline, " [Clear]");
}
- strcat(msgline, "\n");
- sclp_print(msgline);
+ puts(msgline);
msgline[0] = '\0';
strcat(msgline, " Activity Ctrl :");
@@ -220,8 +219,7 @@ static void print_irb_err(Irb *irb)
if (irb->scsw.ctrl & SCSW_ACTL_SUSPENDED) {
strcat(msgline, " [Suspended]");
}
- strcat(msgline, "\n");
- sclp_print(msgline);
+ puts(msgline);
msgline[0] = '\0';
strcat(msgline, " Status Ctrl :");
@@ -240,9 +238,7 @@ static void print_irb_err(Irb *irb)
if (irb->scsw.ctrl & SCSW_SCTL_STATUS_PEND) {
strcat(msgline, " [Status-Pending]");
}
-
- strcat(msgline, "\n");
- sclp_print(msgline);
+ puts(msgline);
msgline[0] = '\0';
strcat(msgline, " Device Status :");
@@ -270,8 +266,7 @@ static void print_irb_err(Irb *irb)
if (irb->scsw.dstat & SCSW_DSTAT_UEXCP) {
strcat(msgline, " [Unit-Exception]");
}
- strcat(msgline, "\n");
- sclp_print(msgline);
+ puts(msgline);
msgline[0] = '\0';
strcat(msgline, " Channel Status :");
@@ -299,12 +294,11 @@ static void print_irb_err(Irb *irb)
if (irb->scsw.cstat & SCSW_CSTAT_CHAINCHK) {
strcat(msgline, " [Chaining-Check]");
}
- strcat(msgline, "\n");
- sclp_print(msgline);
+ puts(msgline);
- print_int(" cpa=", irb->scsw.cpa);
- print_int(" prev_ccw=", prev_ccw);
- print_int(" this_ccw=", this_ccw);
+ printf(" cpa= 0x%X", irb->scsw.cpa);
+ printf(" prev_ccw= 0x%llX", prev_ccw);
+ printf(" this_ccw= 0x%llX", this_ccw);
}
/*
@@ -341,7 +335,7 @@ static int __do_cio(SubChannelId schid, uint32_t ccw_addr, int fmt, Irb *irb)
return -1;
}
if (rc) {
- print_int("ssch failed with cc=", rc);
+ printf("ssch failed with cc= 0x%x", rc);
return rc;
}
@@ -350,7 +344,7 @@ static int __do_cio(SubChannelId schid, uint32_t ccw_addr, int fmt, Irb *irb)
/* collect status */
rc = tsch(schid, irb);
if (rc) {
- print_int("tsch failed with cc=", rc);
+ printf("tsch failed with cc= 0x%X", rc);
}
return rc;
@@ -406,12 +400,12 @@ int do_cio(SubChannelId schid, uint16_t cutype, uint32_t ccw_addr, int fmt)
continue;
}
- sclp_print("cio device error\n");
- print_int(" ssid ", schid.ssid);
- print_int(" cssid ", schid.cssid);
- print_int(" sch_no", schid.sch_no);
- print_int(" ctrl-unit type", cutype);
- sclp_print("\n");
+ printf("cio device error\n");
+ printf(" ssid 0x%X", schid.ssid);
+ printf(" cssid 0x%X", schid.cssid);
+ printf(" sch_no 0x%X", schid.sch_no);
+ printf(" ctrl-unit type 0x%X", cutype);
+ printf("\n");
print_irb_err(&irb);
if (cutype == CU_TYPE_DASD_3990 || cutype == CU_TYPE_DASD_2107 ||
cutype == CU_TYPE_UNKNOWN) {
diff --git a/pc-bios/s390-ccw/dasd-ipl.c b/pc-bios/s390-ccw/dasd-ipl.c
index 254bb1a15e..99c0b93083 100644
--- a/pc-bios/s390-ccw/dasd-ipl.c
+++ b/pc-bios/s390-ccw/dasd-ipl.c
@@ -8,7 +8,8 @@
* directory.
*/
-#include "libc.h"
+#include <string.h>
+#include <stdio.h>
#include "s390-ccw.h"
#include "s390-arch.h"
#include "dasd-ipl.h"
@@ -82,7 +83,7 @@ static int run_dynamic_ccw_program(SubChannelId schid, uint16_t cutype,
do {
has_next = dynamic_cp_fixup(cpa, &next_cpa);
- print_int("executing ccw chain at ", cpa);
+ printf("executing ccw chain at 0x%X", cpa);
enable_prefixing();
rc = do_cio(schid, cutype, cpa, CCW_FMT0);
disable_prefixing();
diff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c
index 78f5f46533..80b7f6a1f3 100644
--- a/pc-bios/s390-ccw/jump2ipl.c
+++ b/pc-bios/s390-ccw/jump2ipl.c
@@ -6,7 +6,8 @@
* directory.
*/
-#include "libc.h"
+#include <string.h>
+#include <stdio.h>
#include "s390-ccw.h"
#include "s390-arch.h"
@@ -57,7 +58,7 @@ void jump_to_IPL_code(uint64_t address)
debug_print_int("set IPL addr to", address ?: *reset_psw & PSW_MASK_SHORT_ADDR);
/* Ensure the guest output starts fresh */
- sclp_print("\n");
+ printf("\n");
/*
* HACK ALERT.
diff --git a/pc-bios/s390-ccw/libc.c b/pc-bios/s390-ccw/libc.c
deleted file mode 100644
index 3187923950..0000000000
--- a/pc-bios/s390-ccw/libc.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * libc-style definitions and functions
- *
- * Copyright 2018 IBM Corp.
- * Author(s): Collin L. Walling <walling@linux.vnet.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-
-#include "libc.h"
-#include "s390-ccw.h"
-
-/**
- * atoui:
- * @str: the string to be converted.
- *
- * Given a string @str, convert it to an integer. Leading spaces are
- * ignored. Any other non-numerical value will terminate the conversion
- * and return 0. This function only handles numbers between 0 and
- * UINT64_MAX inclusive.
- *
- * Returns: an integer converted from the string @str, or the number 0
- * if an error occurred.
- */
-uint64_t atoui(const char *str)
-{
- int val = 0;
-
- if (!str || !str[0]) {
- return 0;
- }
-
- while (*str == ' ') {
- str++;
- }
-
- while (*str) {
- if (!isdigit(*(unsigned char *)str)) {
- break;
- }
- val = val * 10 + *str - '0';
- str++;
- }
-
- return val;
-}
-
-/**
- * uitoa:
- * @num: an integer (base 10) to be converted.
- * @str: a pointer to a string to store the conversion.
- * @len: the length of the passed string.
- *
- * Given an integer @num, convert it to a string. The string @str must be
- * allocated beforehand. The resulting string will be null terminated and
- * returned. This function only handles numbers between 0 and UINT64_MAX
- * inclusive.
- *
- * Returns: the string @str of the converted integer @num
- */
-char *uitoa(uint64_t num, char *str, size_t len)
-{
- long num_idx = 1; /* account for NUL */
- uint64_t tmp = num;
-
- IPL_assert(str != NULL, "uitoa: no space allocated to store string");
-
- /* Count indices of num */
- while ((tmp /= 10) != 0) {
- num_idx++;
- }
-
- /* Check if we have enough space for num and NUL */
- IPL_assert(len > num_idx, "uitoa: array too small for conversion");
-
- str[num_idx--] = '\0';
-
- /* Convert int to string */
- while (num_idx >= 0) {
- str[num_idx--] = num % 10 + '0';
- num /= 10;
- }
-
- return str;
-}
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 5506798098..73093d3f14 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -8,7 +8,9 @@
* directory.
*/
-#include "libc.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
#include "helper.h"
#include "s390-arch.h"
#include "s390-ccw.h"
@@ -50,7 +52,7 @@ void write_iplb_location(void)
unsigned int get_loadparm_index(void)
{
- return atoui(loadparm_str);
+ return atoi(loadparm_str);
}
static int is_dev_possibly_bootable(int dev_no, int sch_no)
@@ -176,7 +178,7 @@ static void boot_setup(void)
sclp_get_loadparm_ascii(loadparm_str);
memcpy(lpmsg + 10, loadparm_str, 8);
- sclp_print(lpmsg);
+ puts(lpmsg);
/*
* Clear out any potential S390EP magic (see jump_to_low_kernel()),
@@ -228,7 +230,7 @@ static int virtio_setup(void)
switch (vdev->senseid.cu_model) {
case VIRTIO_ID_NET:
- sclp_print("Network boot device detected\n");
+ puts("Network boot device detected");
vdev->netboot_start_addr = qipl.netboot_start_addr;
return 0;
case VIRTIO_ID_BLOCK:
@@ -261,7 +263,7 @@ static void ipl_boot_device(void)
}
break;
default:
- print_int("Attempting to boot from unexpected device type", cutype);
+ printf("Attempting to boot from unexpected device type 0x%X", cutype);
panic("\nBoot failed.\n");
}
}
@@ -287,7 +289,7 @@ static void probe_boot_device(void)
}
}
- sclp_print("Could not find a suitable boot device (none specified)\n");
+ puts("Could not find a suitable boot device (none specified)");
}
void main(void)
--git a/pc-bios/s390-ccw/menu.c b/pc-bios/s390-ccw/menu.c
index d601952d3e..84062e94af 100644
--- a/pc-bios/s390-ccw/menu.c
+++ b/pc-bios/s390-ccw/menu.c
@@ -9,7 +9,10 @@
* directory.
*/
-#include "libc.h"
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include "s390-ccw.h"
#include "sclp.h"
#include "s390-time.h"
@@ -93,7 +96,7 @@ static int read_prompt(char *buf, size_t len)
case KEYCODE_BACKSP:
if (idx > 0) {
buf[--idx] = 0;
- sclp_print("\b \b");
+ printf("\b \b");
}
continue;
case KEYCODE_ENTER:
@@ -103,7 +106,7 @@ static int read_prompt(char *buf, size_t len)
/* Echo input and add to buffer */
if (idx < len) {
buf[idx++] = inp[0];
- sclp_print(inp);
+ printf("%s", inp);
}
}
}
@@ -140,22 +143,19 @@ static int get_index(void)
}
}
- return atoui(buf);
+ return atoi(buf);
}
static void boot_menu_prompt(bool retry)
{
- char tmp[11];
-
if (retry) {
- sclp_print("\nError: undefined configuration"
+ printf("\nError: undefined configuration"
"\nPlease choose:\n");
} else if (timeout > 0) {
- sclp_print("Please choose (default will boot in ");
- sclp_print(uitoa(timeout / 1000, tmp, sizeof(tmp)));
- sclp_print(" seconds):\n");
+ printf("Please choose (default will boot in %d seconds):\n",
+ (int)(timeout / 1000));
} else {
- sclp_print("Please choose:\n");
+ puts("Please choose:");
}
}
@@ -163,7 +163,6 @@ static int get_boot_index(bool *valid_entries)
{
int boot_index;
bool retry = false;
- char tmp[5];
do {
boot_menu_prompt(retry);
@@ -172,8 +171,7 @@ static int get_boot_index(bool *valid_entries)
} while (boot_index < 0 || boot_index >= MAX_BOOT_ENTRIES ||
!valid_entries[boot_index]);
- sclp_print("\nBooting entry #");
- sclp_print(uitoa(boot_index, tmp, sizeof(tmp)));
+ printf("\nBooting entry #%d", boot_index);
return boot_index;
}
@@ -187,9 +185,9 @@ static int zipl_print_entry(const char *data, size_t len)
buf[len] = '\n';
buf[len + 1] = '\0';
- sclp_print(buf);
+ printf("%s", buf);
- return buf[0] == ' ' ? atoui(buf + 1) : atoui(buf);
+ return buf[0] == ' ' ? atoi(buf + 1) : atoi(buf);
}
int menu_get_zipl_boot_index(const char *menu_data)
@@ -209,7 +207,7 @@ int menu_get_zipl_boot_index(const char *menu_data)
}
/* Print banner */
- sclp_print("s390-ccw zIPL Boot Menu\n\n");
+ puts("s390-ccw zIPL Boot Menu\n");
menu_data += strlen(menu_data) + 1;
/* Print entries */
@@ -221,37 +219,34 @@ int menu_get_zipl_boot_index(const char *menu_data)
valid_entries[entry] = true;
if (entry == 0) {
- sclp_print("\n");
+ printf("\n");
}
}
- sclp_print("\n");
+ printf("\n");
return get_boot_index(valid_entries);
}
int menu_get_enum_boot_index(bool *valid_entries)
{
- char tmp[3];
int i;
- sclp_print("s390-ccw Enumerated Boot Menu.\n\n");
+ puts("s390-ccw Enumerated Boot Menu.\n");
for (i = 0; i < MAX_BOOT_ENTRIES; i++) {
if (valid_entries[i]) {
if (i < 10) {
- sclp_print(" ");
+ printf(" ");
}
- sclp_print("[");
- sclp_print(uitoa(i, tmp, sizeof(tmp)));
- sclp_print("]");
+ printf("[%d]", i);
if (i == 0) {
- sclp_print(" default\n");
+ printf(" default\n");
}
- sclp_print("\n");
+ printf("\n");
}
}
- sclp_print("\n");
+ printf("\n");
return get_boot_index(valid_entries);
}
diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
index 5cd619b2d6..509119be15 100644
--- a/pc-bios/s390-ccw/netmain.c
+++ b/pc-bios/s390-ccw/netmain.c
@@ -293,7 +293,7 @@ static int load_kernel_with_initrd(filename_ip_t *fn_ip,
printf("Loading pxelinux.cfg entry '%s'\n", entry->label);
if (!entry->kernel) {
- printf("Kernel entry is missing!\n");
+ puts("Kernel entry is missing!\n");
return -1;
}
@@ -515,13 +515,13 @@ void main(void)
int rc, fnlen;
sclp_setup();
- sclp_print("Network boot starting...\n");
+ puts("Network boot starting...");
virtio_setup();
rc = net_init(&fn_ip);
if (rc) {
- panic("Network initialization failed. Halting.\n");
+ panic("Network initialization failed. Halting.");
}
fnlen = strlen(fn_ip.filename);
@@ -535,9 +535,9 @@ void main(void)
net_release(&fn_ip);
if (rc > 0) {
- sclp_print("Network loading done, starting kernel...\n");
+ puts("Network loading done, starting kernel...");
jump_to_low_kernel();
}
- panic("Failed to load OS from network\n");
+ panic("Failed to load OS from network.");
}
diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
index 7251f9af4d..4a07de018d 100644
--- a/pc-bios/s390-ccw/sclp.c
+++ b/pc-bios/s390-ccw/sclp.c
@@ -8,7 +8,7 @@
* directory.
*/
-#include "libc.h"
+#include <string.h>
#include "s390-ccw.h"
#include "sclp.h"
@@ -101,11 +101,6 @@ long write(int fd, const void *str, size_t len)
return len;
}
-void sclp_print(const char *str)
-{
- write(1, str, strlen(str));
-}
-
void sclp_get_loadparm_ascii(char *loadparm)
{
diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.c
index a81207b52e..2666326801 100644
--- a/pc-bios/s390-ccw/virtio-blkdev.c
+++ b/pc-bios/s390-ccw/virtio-blkdev.c
@@ -8,7 +8,7 @@
* directory.
*/
-#include "libc.h"
+#include <stdio.h>
#include "s390-ccw.h"
#include "virtio.h"
#include "virtio-scsi.h"
@@ -76,7 +76,7 @@ unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long rec_list
return -1;
}
- sclp_print(".");
+ printf(".");
status = virtio_read_many(sec, (void *)addr, sec_num);
if (status) {
panic("I/O Error");
@@ -230,7 +230,7 @@ int virtio_blk_setup_device(SubChannelId schid)
vdev->schid = schid;
virtio_setup_ccw(vdev);
- sclp_print("Using virtio-blk.\n");
+ puts("Using virtio-blk.");
return 0;
}
diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c
index d1a84b937c..0e274d0c38 100644
--- a/pc-bios/s390-ccw/virtio-scsi.c
+++ b/pc-bios/s390-ccw/virtio-scsi.c
@@ -9,7 +9,8 @@
* directory.
*/
-#include "libc.h"
+#include <string.h>
+#include <stdio.h>
#include "s390-ccw.h"
#include "virtio.h"
#include "scsi.h"
@@ -30,9 +31,9 @@ static inline void vs_assert(bool term, const char **msgs)
if (!term) {
int i = 0;
- sclp_print("\n! ");
+ printf("\n! ");
while (msgs[i]) {
- sclp_print(msgs[i++]);
+ printf("%s", msgs[i++]);
}
panic(" !\n");
}
@@ -236,11 +237,11 @@ static int virtio_scsi_locate_device(VDev *vdev)
if (resp.response == VIRTIO_SCSI_S_BAD_TARGET) {
continue;
}
- print_int("target", target);
+ printf("target 0x%X", target);
virtio_scsi_verify_response(&resp, "SCSI cannot report LUNs");
}
if (r->lun_list_len == 0) {
- print_int("no LUNs for target", target);
+ printf("no LUNs for target 0x%X", target);
continue;
}
luns = r->lun_list_len / 8;
@@ -264,7 +265,7 @@ static int virtio_scsi_locate_device(VDev *vdev)
}
}
- sclp_print("Warning: Could not locate a usable virtio-scsi device\n");
+ puts("Warning: Could not locate a usable virtio-scsi device");
return -ENODEV;
}
@@ -379,7 +380,7 @@ static int virtio_scsi_setup(VDev *vdev)
}
if (virtio_scsi_inquiry_response_is_cdrom(scsi_inquiry_std_response)) {
- sclp_print("SCSI CD-ROM detected.\n");
+ puts("SCSI CD-ROM detected.");
vdev->is_cdrom = true;
vdev->scsi_block_size = VIRTIO_ISO_BLOCK_SIZE;
}
@@ -443,7 +444,7 @@ int virtio_scsi_setup_device(SubChannelId schid)
IPL_assert(vdev->config.scsi.cdb_size == VIRTIO_SCSI_CDB_SIZE,
"Config: CDB size mismatch");
- sclp_print("Using virtio-scsi.\n");
+ puts("Using virtio-scsi.");
return virtio_scsi_setup(vdev);
}
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 5edd058d88..8c6b0a8a92 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -8,7 +8,7 @@
* directory.
*/
-#include "libc.h"
+#include <string.h>
#include "s390-ccw.h"
#include "cio.h"
#include "virtio.h"
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 6207911b53..3f4232636e 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -33,13 +33,18 @@ QEMU_DGFLAGS = -MMD -MP -MT $@ -MF $(@D)/$(*F).d
.PHONY : all clean build-all distclean
OBJECTS = start.o main.o bootmap.o jump2ipl.o sclp.o menu.o \
- virtio.o virtio-scsi.o virtio-blkdev.o libc.o cio.o dasd-ipl.o
+ virtio.o virtio-scsi.o virtio-blkdev.o cio.o dasd-ipl.o
+
+SLOF_DIR := $(SRC_PATH)/../../roms/SLOF
+
+LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include
EXTRA_CFLAGS += -Wall
EXTRA_CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -fno-common -fPIE
EXTRA_CFLAGS += -fwrapv -fno-strict-aliasing -fno-asynchronous-unwind-tables
EXTRA_CFLAGS += -msoft-float
EXTRA_CFLAGS += -std=gnu99
+EXTRA_CFLAGS += $(LIBC_INC)
LDFLAGS += -Wl,-pie -nostdlib -z noexecstack
cc-test = $(CC) -Werror $1 -c -o /dev/null -xc /dev/null >/dev/null 2>/dev/null
@@ -55,18 +60,18 @@ config-cc.mak: Makefile
$(call cc-option,-march=z900,-march=z10)) 3> config-cc.mak
-include config-cc.mak
+include $(SRC_PATH)/netboot.mak
+
build-all: s390-ccw.img s390-netboot.img
-s390-ccw.elf: $(OBJECTS)
- $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),Linking)
+s390-ccw.elf: $(OBJECTS) libc.a
+ $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^,Linking)
s390-ccw.img: s390-ccw.elf
$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,Stripping $< into)
$(OBJECTS): Makefile
-include $(SRC_PATH)/netboot.mak
-
ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS))
-include $(ALL_OBJS:%.o=%.d)
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 03/19] pc-bios/s390-ccw: Link the netboot code into the main s390-ccw.img binary
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
2024-10-08 1:15 ` [PATCH v3 01/19] hw/s390x/ipl: Provide more memory to the s390-ccw.img firmware jrossi
2024-10-08 1:15 ` [PATCH v3 02/19] pc-bios/s390-ccw: Use the libc from SLOF and remove sclp prints jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-08 1:15 ` [PATCH v3 04/19] hw/s390x: Remove the possibility to load the s390-netboot.img binary jrossi
` (15 subsequent siblings)
18 siblings, 0 replies; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
We originally built a separate binary for the netboot code since it
was considered as experimental and we could not be sure that the
necessary SLOF module had been checked out. Time passed, the code
proved its usefulness, and the build system nowadays makes sure that
the SLOF module is checked out if you have a s390x compiler available
for building the s390-ccw bios. So there is no real compelling reason
anymore to keep the netboot code in a separate binary. Linking the
code together with the main s390-ccw.img will make future enhancements
much easier, like supporting more than one boot device.
Co-authored by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
pc-bios/s390-ccw/netboot.mak | 14 --------------
pc-bios/s390-ccw/cio.h | 2 ++
pc-bios/s390-ccw/iplb.h | 4 ++--
pc-bios/s390-ccw/s390-ccw.h | 3 +++
pc-bios/s390-ccw/virtio.h | 1 -
pc-bios/s390-ccw/bootmap.c | 2 +-
pc-bios/s390-ccw/main.c | 10 +++++++---
pc-bios/s390-ccw/netmain.c | 15 ++-------------
pc-bios/s390-ccw/Makefile | 13 +++++++------
9 files changed, 24 insertions(+), 40 deletions(-)
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
index d2b3d8ee74..0a24257ff4 100644
--- a/pc-bios/s390-ccw/netboot.mak
+++ b/pc-bios/s390-ccw/netboot.mak
@@ -1,18 +1,4 @@
-NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o
-
-LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
-
-NETLDFLAGS := $(LDFLAGS) -Wl,-Ttext=0x7800000
-
-$(NETOBJS): EXTRA_CFLAGS += $(LIBC_INC) $(LIBNET_INC)
-
-s390-netboot.elf: $(NETOBJS) libnet.a libc.a
- $(call quiet-command,$(CC) $(NETLDFLAGS) -o $@ $^,Linking)
-
-s390-netboot.img: s390-netboot.elf
- $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,Stripping $< into)
-
# libc files:
LIBC_CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
diff --git a/pc-bios/s390-ccw/cio.h b/pc-bios/s390-ccw/cio.h
index 8b18153deb..6a5e86ba01 100644
--- a/pc-bios/s390-ccw/cio.h
+++ b/pc-bios/s390-ccw/cio.h
@@ -361,6 +361,8 @@ typedef struct CcwSearchIdData {
uint8_t record;
} __attribute__((packed)) CcwSearchIdData;
+extern SubChannelId net_schid;
+
int enable_mss_facility(void);
void enable_subchannel(SubChannelId schid);
uint16_t cu_type(SubChannelId schid);
diff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h
index cb6ac8a880..3758698468 100644
--- a/pc-bios/s390-ccw/iplb.h
+++ b/pc-bios/s390-ccw/iplb.h
@@ -87,9 +87,9 @@ extern IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
struct QemuIplParameters {
uint8_t qipl_flags;
uint8_t reserved1[3];
- uint64_t netboot_start_addr;
+ uint64_t reserved2;
uint32_t boot_menu_timeout;
- uint8_t reserved2[12];
+ uint8_t reserved3[12];
} __attribute__ ((packed));
typedef struct QemuIplParameters QemuIplParameters;
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 9b622e616a..0ed7eb8ade 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -55,6 +55,9 @@ void write_iplb_location(void);
unsigned int get_loadparm_index(void);
void main(void);
+/* netmain.c */
+void netmain(void);
+
/* sclp.c */
void sclp_print(const char *string);
void sclp_set_write_mask(uint32_t receive_mask, uint32_t send_mask);
diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
index 85bd9d1695..6f9a558ff5 100644
--- a/pc-bios/s390-ccw/virtio.h
+++ b/pc-bios/s390-ccw/virtio.h
@@ -253,7 +253,6 @@ struct VDev {
uint8_t scsi_dev_heads;
bool scsi_device_selected;
ScsiDevice selected_scsi_device;
- uint64_t netboot_start_addr;
uint32_t max_transfer;
uint32_t guest_features[2];
};
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index 3cc79706be..414c3f1b47 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -929,7 +929,7 @@ void zipl_load(void)
}
if (virtio_get_device_type() == VIRTIO_ID_NET) {
- jump_to_IPL_code(vdev->netboot_start_addr);
+ netmain();
}
ipl_scsi();
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 73093d3f14..2345432abb 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -38,8 +38,13 @@ LowCore *lowcore; /* Yes, this *is* a pointer to address 0 */
*/
void write_subsystem_identification(void)
{
- lowcore->subchannel_id = blk_schid.sch_id;
- lowcore->subchannel_nr = blk_schid.sch_no;
+ if (cutype == CU_TYPE_VIRTIO && virtio_get_device_type() == VIRTIO_ID_NET) {
+ lowcore->subchannel_id = net_schid.sch_id;
+ lowcore->subchannel_nr = net_schid.sch_no;
+ } else {
+ lowcore->subchannel_id = blk_schid.sch_id;
+ lowcore->subchannel_nr = blk_schid.sch_no;
+ }
lowcore->io_int_parm = 0;
}
@@ -231,7 +236,6 @@ static int virtio_setup(void)
switch (vdev->senseid.cu_model) {
case VIRTIO_ID_NET:
puts("Network boot device detected");
- vdev->netboot_start_addr = qipl.netboot_start_addr;
return 0;
case VIRTIO_ID_BLOCK:
ret = virtio_blk_setup_device(blk_schid);
diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
index 509119be15..bc6ad8695f 100644
--- a/pc-bios/s390-ccw/netmain.c
+++ b/pc-bios/s390-ccw/netmain.c
@@ -41,7 +41,6 @@
#define DEFAULT_TFTP_RETRIES 20
extern char _start[];
-void write_iplb_location(void) {}
#define KERNEL_ADDR ((void *)0L)
#define KERNEL_MAX_SIZE ((long)_start)
@@ -50,10 +49,9 @@ void write_iplb_location(void) {}
/* STSI 3.2.2 offset of first vmdb + offset of uuid inside vmdb */
#define STSI322_VMDB_UUID_OFFSET ((8 + 12) * 4)
-IplParameterBlock iplb __attribute__((aligned(PAGE_SIZE)));
static char cfgbuf[2048];
-static SubChannelId net_schid = { .one = 1 };
+SubChannelId net_schid = { .one = 1 };
static uint8_t mac[6];
static uint64_t dest_timer;
@@ -438,15 +436,6 @@ static int net_try_direct_tftp_load(filename_ip_t *fn_ip)
return rc;
}
-void write_subsystem_identification(void)
-{
- SubChannelId *schid = (SubChannelId *) 184;
- uint32_t *zeroes = (uint32_t *) 188;
-
- *schid = net_schid;
- *zeroes = 0;
-}
-
static bool find_net_dev(Schib *schib, int dev_no)
{
int i, r;
@@ -509,7 +498,7 @@ static void virtio_setup(void)
IPL_assert(found, "No virtio net device found");
}
-void main(void)
+void netmain(void)
{
filename_ip_t fn_ip;
int rc, fnlen;
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 3f4232636e..cf6859823a 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -32,19 +32,20 @@ QEMU_DGFLAGS = -MMD -MP -MT $@ -MF $(@D)/$(*F).d
.PHONY : all clean build-all distclean
-OBJECTS = start.o main.o bootmap.o jump2ipl.o sclp.o menu.o \
- virtio.o virtio-scsi.o virtio-blkdev.o cio.o dasd-ipl.o
+OBJECTS = start.o main.o bootmap.o jump2ipl.o sclp.o menu.o netmain.o \
+ virtio.o virtio-net.o virtio-scsi.o virtio-blkdev.o cio.o dasd-ipl.o
SLOF_DIR := $(SRC_PATH)/../../roms/SLOF
LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include
+LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
EXTRA_CFLAGS += -Wall
EXTRA_CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -fno-common -fPIE
EXTRA_CFLAGS += -fwrapv -fno-strict-aliasing -fno-asynchronous-unwind-tables
EXTRA_CFLAGS += -msoft-float
EXTRA_CFLAGS += -std=gnu99
-EXTRA_CFLAGS += $(LIBC_INC)
+EXTRA_CFLAGS += $(LIBC_INC) $(LIBNET_INC)
LDFLAGS += -Wl,-pie -nostdlib -z noexecstack
cc-test = $(CC) -Werror $1 -c -o /dev/null -xc /dev/null >/dev/null 2>/dev/null
@@ -62,9 +63,9 @@ config-cc.mak: Makefile
include $(SRC_PATH)/netboot.mak
-build-all: s390-ccw.img s390-netboot.img
+build-all: s390-ccw.img
-s390-ccw.elf: $(OBJECTS) libc.a
+s390-ccw.elf: $(OBJECTS) libnet.a libc.a
$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^,Linking)
s390-ccw.img: s390-ccw.elf
@@ -72,7 +73,7 @@ s390-ccw.img: s390-ccw.elf
$(OBJECTS): Makefile
-ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS))
+ALL_OBJS = $(sort $(OBJECTS) $(LIBCOBJS) $(LIBNETOBJS))
-include $(ALL_OBJS:%.o=%.d)
clean:
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 04/19] hw/s390x: Remove the possibility to load the s390-netboot.img binary
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (2 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 03/19] pc-bios/s390-ccw: Link the netboot code into the main s390-ccw.img binary jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-08 1:15 ` [PATCH v3 05/19] pc-bios/s390-ccw: Merge netboot.mak into the main Makefile jrossi
` (14 subsequent siblings)
18 siblings, 0 replies; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Since the netboot code has now been merged into the main s390-ccw.img
binary, we don't need the separate s390-netboot.img anymore. Remove
it and the code that was responsible for loading it.
Co-authored by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
hw/s390x/ipl.h | 12 +++------
hw/s390x/ipl.c | 55 --------------------------------------
hw/s390x/s390-virtio-ccw.c | 10 ++-----
pc-bios/meson.build | 1 -
4 files changed, 6 insertions(+), 72 deletions(-)
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index 57cd125769..b2105b616a 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -134,11 +134,8 @@ void s390_ipl_clear_reset_request(void);
/*
* The QEMU IPL Parameters will be stored at absolute address
* 204 (0xcc) which means it is 32-bit word aligned but not
- * double-word aligned.
- * Placement of data fields in this area must account for
- * their alignment needs. E.g., netboot_start_address must
- * have an offset of 4 + n * 8 bytes within the struct in order
- * to keep it double-word aligned.
+ * double-word aligned. Placement of 64-bit data fields in this
+ * area must account for their alignment needs.
* The total size of the struct must never exceed 28 bytes.
* This definition must be kept in sync with the definition
* in pc-bios/s390-ccw/iplb.h.
@@ -146,9 +143,9 @@ void s390_ipl_clear_reset_request(void);
struct QemuIplParameters {
uint8_t qipl_flags;
uint8_t reserved1[3];
- uint64_t netboot_start_addr;
+ uint64_t reserved2;
uint32_t boot_menu_timeout;
- uint8_t reserved2[12];
+ uint8_t reserved3[12];
} QEMU_PACKED;
typedef struct QemuIplParameters QemuIplParameters;
@@ -178,7 +175,6 @@ struct S390IPLState {
char *initrd;
char *cmdline;
char *firmware;
- char *netboot_fw;
uint8_t cssid;
uint8_t ssid;
uint16_t devno;
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 5f60977ceb..8c490eeb52 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -288,7 +288,6 @@ static Property s390_ipl_properties[] = {
DEFINE_PROP_STRING("initrd", S390IPLState, initrd),
DEFINE_PROP_STRING("cmdline", S390IPLState, cmdline),
DEFINE_PROP_STRING("firmware", S390IPLState, firmware),
- DEFINE_PROP_STRING("netboot_fw", S390IPLState, netboot_fw),
DEFINE_PROP_BOOL("enforce_bios", S390IPLState, enforce_bios, false),
DEFINE_PROP_BOOL("iplbext_migration", S390IPLState, iplbext_migration,
true),
@@ -480,56 +479,6 @@ int s390_ipl_set_loadparm(uint8_t *loadparm)
return -1;
}
-static int load_netboot_image(Error **errp)
-{
- MachineState *ms = MACHINE(qdev_get_machine());
- S390IPLState *ipl = get_ipl_device();
- char *netboot_filename;
- MemoryRegion *sysmem = get_system_memory();
- MemoryRegion *mr = NULL;
- void *ram_ptr = NULL;
- int img_size = -1;
-
- mr = memory_region_find(sysmem, 0, 1).mr;
- if (!mr) {
- error_setg(errp, "Failed to find memory region at address 0");
- return -1;
- }
-
- ram_ptr = memory_region_get_ram_ptr(mr);
- if (!ram_ptr) {
- error_setg(errp, "No RAM found");
- goto unref_mr;
- }
-
- netboot_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, ipl->netboot_fw);
- if (netboot_filename == NULL) {
- error_setg(errp, "Could not find network bootloader '%s'",
- ipl->netboot_fw);
- goto unref_mr;
- }
-
- img_size = load_elf_ram(netboot_filename, NULL, NULL, NULL,
- &ipl->start_addr,
- NULL, NULL, NULL, 1, EM_S390, 0, 0, NULL,
- false);
-
- if (img_size < 0) {
- img_size = load_image_size(netboot_filename, ram_ptr, ms->ram_size);
- ipl->start_addr = KERN_IMAGE_START;
- }
-
- if (img_size < 0) {
- error_setg(errp, "Failed to load network bootloader");
- }
-
- g_free(netboot_filename);
-
-unref_mr:
- memory_region_unref(mr);
- return img_size;
-}
-
static bool is_virtio_ccw_device_of_type(IplParameterBlock *iplb,
int virtio_id)
{
@@ -754,10 +703,6 @@ void s390_ipl_prepare_cpu(S390CPU *cpu)
ipl->iplb_valid = s390_gen_initial_iplb(ipl);
}
}
- if (ipl->netboot) {
- load_netboot_image(&error_fatal);
- ipl->qipl.netboot_start_addr = cpu_to_be64(ipl->start_addr);
- }
s390_ipl_set_boot_menu(ipl);
s390_ipl_prepare_qipl(cpu);
}
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 5aa8d207a3..529e53f308 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -197,11 +197,10 @@ static void s390_memory_init(MemoryRegion *ram)
static void s390_init_ipl_dev(const char *kernel_filename,
const char *kernel_cmdline,
const char *initrd_filename, const char *firmware,
- const char *netboot_fw, bool enforce_bios)
+ bool enforce_bios)
{
Object *new = object_new(TYPE_S390_IPL);
DeviceState *dev = DEVICE(new);
- char *netboot_fw_prop;
if (kernel_filename) {
qdev_prop_set_string(dev, "kernel", kernel_filename);
@@ -212,11 +211,6 @@ static void s390_init_ipl_dev(const char *kernel_filename,
qdev_prop_set_string(dev, "cmdline", kernel_cmdline);
qdev_prop_set_string(dev, "firmware", firmware);
qdev_prop_set_bit(dev, "enforce_bios", enforce_bios);
- netboot_fw_prop = object_property_get_str(new, "netboot_fw", &error_abort);
- if (!strlen(netboot_fw_prop)) {
- qdev_prop_set_string(dev, "netboot_fw", netboot_fw);
- }
- g_free(netboot_fw_prop);
object_property_add_child(qdev_get_machine(), TYPE_S390_IPL,
new);
object_unref(new);
@@ -284,7 +278,7 @@ static void ccw_init(MachineState *machine)
s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline,
machine->initrd_filename,
machine->firmware ?: "s390-ccw.img",
- "s390-netboot.img", true);
+ true);
dev = qdev_new(TYPE_S390_PCI_HOST_BRIDGE);
object_property_add_child(qdev_get_machine(), TYPE_S390_PCI_HOST_BRIDGE,
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 090379763e..4823dff189 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -68,7 +68,6 @@ blobs = [
'kvmvapic.bin',
'pvh.bin',
's390-ccw.img',
- 's390-netboot.img',
'slof.bin',
'skiboot.lid',
'palcode-clipper',
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 05/19] pc-bios/s390-ccw: Merge netboot.mak into the main Makefile
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (3 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 04/19] hw/s390x: Remove the possibility to load the s390-netboot.img binary jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-08 1:15 ` [PATCH v3 06/19] docs/system/s390x/bootdevices: Update the documentation about network booting jrossi
` (13 subsequent siblings)
18 siblings, 0 replies; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Now that the netboot code has been merged into the main s390-ccw.img,
it also does not make sense to keep the build rules in a separate
file. Thus let's merge netboot.mak into the main Makefile.
Co-authored by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
pc-bios/s390-ccw/netboot.mak | 45 ---------------------------------
pc-bios/s390-ccw/Makefile | 47 ++++++++++++++++++++++++++++++++++-
pc-bios/s390-netboot.img | Bin 67232 -> 0 bytes
3 files changed, 46 insertions(+), 46 deletions(-)
delete mode 100644 pc-bios/s390-ccw/netboot.mak
delete mode 100644 pc-bios/s390-netboot.img
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
deleted file mode 100644
index 0a24257ff4..0000000000
--- a/pc-bios/s390-ccw/netboot.mak
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# libc files:
-
-LIBC_CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
- -MMD -MP -MT $@ -MF $(@:%.o=%.d)
-
-CTYPE_OBJS = isdigit.o isxdigit.o toupper.o
-%.o : $(SLOF_DIR)/lib/libc/ctype/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
-
-STRING_OBJS = strcat.o strchr.o strrchr.o strcpy.o strlen.o strncpy.o \
- strcmp.o strncmp.o strcasecmp.o strncasecmp.o strstr.o \
- memset.o memcpy.o memmove.o memcmp.o
-%.o : $(SLOF_DIR)/lib/libc/string/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
-
-STDLIB_OBJS = atoi.o atol.o strtoul.o strtol.o rand.o malloc.o free.o
-%.o : $(SLOF_DIR)/lib/libc/stdlib/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
-
-STDIO_OBJS = sprintf.o snprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \
- printf.o putc.o puts.o putchar.o stdchnls.o fileno.o
-%.o : $(SLOF_DIR)/lib/libc/stdio/%.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
-
-sbrk.o: $(SLOF_DIR)/slof/sbrk.c
- $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
-
-LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS) sbrk.o
-
-libc.a: $(LIBCOBJS)
- $(call quiet-command,$(AR) -rc $@ $^,Creating static library)
-
-# libnet files:
-
-LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \
- dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o
-LIBNETCFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
- -DDHCPARCH=0x1F -MMD -MP -MT $@ -MF $(@:%.o=%.d)
-
-%.o : $(SLOF_DIR)/lib/libnet/%.c
- $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,Compiling)
-
-libnet.a: $(LIBNETOBJS)
- $(call quiet-command,$(AR) -rc $@ $^,Creating static library)
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index cf6859823a..27cbb354af 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -61,7 +61,52 @@ config-cc.mak: Makefile
$(call cc-option,-march=z900,-march=z10)) 3> config-cc.mak
-include config-cc.mak
-include $(SRC_PATH)/netboot.mak
+# libc files:
+
+LIBC_CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
+ -MMD -MP -MT $@ -MF $(@:%.o=%.d)
+
+CTYPE_OBJS = isdigit.o isxdigit.o toupper.o
+%.o : $(SLOF_DIR)/lib/libc/ctype/%.c
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
+
+STRING_OBJS = strcat.o strchr.o strrchr.o strcpy.o strlen.o strncpy.o \
+ strcmp.o strncmp.o strcasecmp.o strncasecmp.o strstr.o \
+ memset.o memcpy.o memmove.o memcmp.o
+%.o : $(SLOF_DIR)/lib/libc/string/%.c
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
+
+STDLIB_OBJS = atoi.o atol.o strtoul.o strtol.o rand.o malloc.o free.o
+%.o : $(SLOF_DIR)/lib/libc/stdlib/%.c
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
+
+STDIO_OBJS = sprintf.o snprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \
+ printf.o putc.o puts.o putchar.o stdchnls.o fileno.o
+%.o : $(SLOF_DIR)/lib/libc/stdio/%.c
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
+
+sbrk.o: $(SLOF_DIR)/slof/sbrk.c
+ $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling)
+
+LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS) sbrk.o
+
+libc.a: $(LIBCOBJS)
+ $(call quiet-command,$(AR) -rc $@ $^,Creating static library)
+
+# libnet files:
+
+LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \
+ dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o
+LIBNETCFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
+ -DDHCPARCH=0x1F -MMD -MP -MT $@ -MF $(@:%.o=%.d)
+
+%.o : $(SLOF_DIR)/lib/libnet/%.c
+ $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,Compiling)
+
+libnet.a: $(LIBNETOBJS)
+ $(call quiet-command,$(AR) -rc $@ $^,Creating static library)
+
+# Main targets:
build-all: s390-ccw.img
diff --git a/pc-bios/s390-netboot.img b/pc-bios/s390-netboot.img
deleted file mode 100644
index 6908e49f06801808b826d3a01f88132cf1b2f57c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 67232
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
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 06/19] docs/system/s390x/bootdevices: Update the documentation about network booting
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (4 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 05/19] pc-bios/s390-ccw: Merge netboot.mak into the main Makefile jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-08 1:15 ` [PATCH v3 07/19] pc-bios/s390-ccw: Remove panics from ISO IPL path jrossi
` (12 subsequent siblings)
18 siblings, 0 replies; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Remove the information about the separate s390-netboot.img from
the documentation.
Co-authored by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
docs/system/s390x/bootdevices.rst | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/docs/system/s390x/bootdevices.rst b/docs/system/s390x/bootdevices.rst
index 1a7a18b43b..c97efb8fc0 100644
--- a/docs/system/s390x/bootdevices.rst
+++ b/docs/system/s390x/bootdevices.rst
@@ -82,23 +82,17 @@ Note that ``0`` can be used to boot the default entry.
Booting from a network device
-----------------------------
-Beside the normal guest firmware (which is loaded from the file ``s390-ccw.img``
-in the data directory of QEMU, or via the ``-bios`` option), QEMU ships with
-a small TFTP network bootloader firmware for virtio-net-ccw devices, too. This
-firmware is loaded from a file called ``s390-netboot.img`` in the QEMU data
-directory. In case you want to load it from a different filename instead,
-you can specify it via the ``-global s390-ipl.netboot_fw=filename``
-command line option.
-
-The ``bootindex`` property is especially important for booting via the network.
-If you don't specify the ``bootindex`` property here, the network bootloader
-firmware code won't get loaded into the guest memory so that the network boot
-will fail. For a successful network boot, try something like this::
+The firmware that ships with QEMU includes a small TFTP network bootloader
+for virtio-net-ccw devices. The ``bootindex`` property is especially
+important for booting via the network. If you don't specify the ``bootindex``
+property here, the network bootloader won't be taken into consideration and
+the network boot will fail. For a successful network boot, try something
+like this::
qemu-system-s390x -netdev user,id=n1,tftp=...,bootfile=... \
-device virtio-net-ccw,netdev=n1,bootindex=1
-The network bootloader firmware also has basic support for pxelinux.cfg-style
+The network bootloader also has basic support for pxelinux.cfg-style
configuration files. See the `PXELINUX Configuration page
<https://wiki.syslinux.org/wiki/index.php?title=PXELINUX#Configuration>`__
for details how to set up the configuration file on your TFTP server.
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 07/19] pc-bios/s390-ccw: Remove panics from ISO IPL path
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (5 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 06/19] docs/system/s390x/bootdevices: Update the documentation about network booting jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-09 9:46 ` Thomas Huth
2024-10-08 1:15 ` [PATCH v3 08/19] pc-bios/s390-ccw: Remove panics from ECKD " jrossi
` (11 subsequent siblings)
18 siblings, 1 reply; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Remove panic-on-error from IPL ISO El Torito 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>
---
pc-bios/s390-ccw/bootmap.h | 15 +++----
pc-bios/s390-ccw/s390-ccw.h | 1 +
pc-bios/s390-ccw/bootmap.c | 78 ++++++++++++++++++++++++-------------
3 files changed, 59 insertions(+), 35 deletions(-)
diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h
index bbe2c132aa..d639258eca 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)
#define ISO_PRIMARY_VD_SECTOR 16
-static inline void read_iso_sector(uint32_t block_offset, void *buf,
- const char *errmsg)
-{
- IPL_assert(virtio_read_many(block_offset, buf, 1) == 0, errmsg);
-}
-
-static inline void read_iso_boot_image(uint32_t block_offset, void *load_addr,
+static inline int read_iso_boot_image(uint32_t block_offset, void *load_addr,
uint32_t blks_to_load)
{
- IPL_assert(virtio_read_many(block_offset, load_addr, blks_to_load) == 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;
}
#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 0ed7eb8ade..cbd92f3671 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
#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..7984de62fe 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;
+ }
/* Checking bytes 8 - 32 for S390 Linux magic */
return !memcmp(magic_sec + 8, linux_s390_magic, 24);
@@ -699,21 +701,28 @@ static inline uint32_t iso_get_file_size(uint32_t load_rba)
uint8_t *temp = sec + ISO_SECTOR_SIZE;
int level = 0;
- 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] = iso_733_to_u32(cur_record->ext_loc);
dir_rem[0] = 0;
sec_offset[0] = 0;
while (level >= 0) {
- IPL_assert(sec_offset[level] <= ISO_SECTOR_SIZE,
- "Directory tree structure violation");
+ if (sec_offset[level] > ISO_SECTOR_SIZE) {
+ puts("Directory tree structure violation");
+ return -EIO;
+ }
cur_record = (IsoDirHdr *)(temp + sec_offset[level]);
if (sec_offset[level] == 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] == 0) {
/* Skip self and parent records */
dir_rem[level] = 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] == 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;
+ }
}
}
@@ -784,9 +795,11 @@ static void load_iso_bc_entry(IsoBcSection *load)
puts("ISO boot image size could not be verified");
}
- 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;
+ }
jump_to_low_kernel();
}
@@ -809,17 +822,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;
+ }
}
return 0;
}
-static IsoBcSection *find_iso_bc_entry(void)
+static IsoBcSection *find_iso_bc_entry(uint32_t offset)
{
IsoBcEntry *e = (IsoBcEntry *)sec;
- uint32_t offset = find_iso_bc();
int i;
unsigned int loadparm = get_loadparm_index();
@@ -827,11 +841,13 @@ static IsoBcSection *find_iso_bc_entry(void)
return NULL;
}
- 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;
+ }
if (!is_iso_bc_valid(e)) {
/* The validation entry is mandatory */
- panic("No valid boot catalog found!\n");
return NULL;
}
@@ -851,19 +867,25 @@ static IsoBcSection *find_iso_bc_entry(void)
}
}
- panic("No suitable boot entry found on ISO-9660 media!\n");
-
return NULL;
}
-static void ipl_iso_el_torito(void)
+static int ipl_iso_el_torito(void)
{
- IsoBcSection *s = find_iso_bc_entry();
+ uint32_t offset = find_iso_bc();
+ if (!offset) {
+ return 0;
+ }
+
+ IsoBcSection *s = find_iso_bc_entry(offset);
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;
}
/**
@@ -893,7 +915,9 @@ static void zipl_load_vblk(void)
if (blksize != VIRTIO_ISO_BLOCK_SIZE) {
virtio_assume_iso9660();
}
- ipl_iso_el_torito();
+ if (ipl_iso_el_torito()) {
+ return;
+ }
}
if (blksize != VIRTIO_DASD_DEFAULT_BLOCK_SIZE) {
@@ -907,7 +931,9 @@ static void zipl_load_vscsi(void)
{
if (virtio_get_block_size() == VIRTIO_ISO_BLOCK_SIZE) {
/* Is it an ISO image in non-CD drive? */
- ipl_iso_el_torito();
+ if (ipl_iso_el_torito()) {
+ return;
+ }
}
puts("Using guessed DASD geometry.");
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH v3 07/19] pc-bios/s390-ccw: Remove panics from ISO IPL path
2024-10-08 1:15 ` [PATCH v3 07/19] pc-bios/s390-ccw: Remove panics from ISO IPL path jrossi
@ 2024-10-09 9:46 ` Thomas Huth
2024-10-10 1:38 ` Jared Rossi
0 siblings, 1 reply; 36+ messages in thread
From: Thomas Huth @ 2024-10-09 9:46 UTC (permalink / raw)
To: jrossi, qemu-devel, qemu-s390x; +Cc: frankja
On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
> From: Jared Rossi <jrossi@linux.ibm.com>
>
> Remove panic-on-error from IPL ISO El Torito 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>
> ---
...
> diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
> index 414c3f1b47..7984de62fe 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;
> + }
>
> /* Checking bytes 8 - 32 for S390 Linux magic */
> return !memcmp(magic_sec + 8, linux_s390_magic, 24);
> @@ -699,21 +701,28 @@ static inline uint32_t iso_get_file_size(uint32_t load_rba)
> uint8_t *temp = sec + ISO_SECTOR_SIZE;
> int level = 0;
>
> - 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;
> + }
iso_get_file_size() seems to return an uint32_t value, so returning a
negative error code won't work here. I think you either have to change the
return type to signed "long" and fix the caller site, too, or return 0 for
errors here?
Thomas
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v3 07/19] pc-bios/s390-ccw: Remove panics from ISO IPL path
2024-10-09 9:46 ` Thomas Huth
@ 2024-10-10 1:38 ` Jared Rossi
0 siblings, 0 replies; 36+ messages in thread
From: Jared Rossi @ 2024-10-10 1:38 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, qemu-s390x; +Cc: frankja
On 10/9/24 5:46 AM, Thomas Huth wrote:
> On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
>> From: Jared Rossi <jrossi@linux.ibm.com>
>>
>> Remove panic-on-error from IPL ISO El Torito 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>
>> ---
> ...
>> diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
>> index 414c3f1b47..7984de62fe 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;
>> + }
>> /* Checking bytes 8 - 32 for S390 Linux magic */
>> return !memcmp(magic_sec + 8, linux_s390_magic, 24);
>> @@ -699,21 +701,28 @@ static inline uint32_t
>> iso_get_file_size(uint32_t load_rba)
>> uint8_t *temp = sec + ISO_SECTOR_SIZE;
>> int level = 0;
>> - 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;
>> + }
>
> iso_get_file_size() seems to return an uint32_t value, so returning a
> negative error code won't work here. I think you either have to change
> the return type to signed "long" and fix the caller site, too, or
> return 0 for errors here?
>
> Thomas
>
Fixed by using "long" as suggested. Also found and fixed an error with
real_size < 0 not being handled correctly in a later part of the code
that used "if (real_size)"
Jared
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 08/19] pc-bios/s390-ccw: Remove panics from ECKD IPL path
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (6 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 07/19] pc-bios/s390-ccw: Remove panics from ISO IPL path jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-09 10:53 ` Thomas Huth
2024-10-08 1:15 ` [PATCH v3 09/19] pc-bios/s390-ccw: Remove panics from SCSI " jrossi
` (10 subsequent siblings)
18 siblings, 1 reply; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Remove panic-on-error from ECKD block device 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>
---
pc-bios/s390-ccw/s390-ccw.h | 1 +
pc-bios/s390-ccw/bootmap.c | 183 ++++++++++++++++++++++++------------
2 files changed, 126 insertions(+), 58 deletions(-)
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index cbd92f3671..7516e96a14 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -31,6 +31,7 @@ typedef unsigned long long u64;
#define EBUSY 2
#define ENODEV 3
#define EINVAL 4
+#define ENOENT 5
#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 7984de62fe..266b38c034 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -145,14 +145,17 @@ static block_number_t load_eckd_segments(block_number_t blk, bool ldipl,
bool more_data;
memset(_bprs, FREE_SPACE_FILLER, sizeof(_bprs));
- read_block(blk, bprs, "BPRS read failed");
+ if (virtio_read(blk, bprs)) {
+ puts("BPRS read failed");
+ return -EIO;
+ }
do {
more_data = false;
for (j = 0;; j++) {
block_nr = gen_eckd_block_num(&bprs[j].xeckd, ldipl);
if (is_null_block_number(block_nr)) { /* end of chunk */
- break;
+ return -ENOENT;
}
/* we need the updated blockno for the next indirect entry
@@ -163,15 +166,20 @@ static block_number_t load_eckd_segments(block_number_t blk, bool ldipl,
}
/* List directed pointer does not store block size */
- IPL_assert(ldipl || block_size_ok(bprs[j].xeckd.bptr.size),
- "bad chunk block size");
+ if (!ldipl && !block_size_ok(bprs[j].xeckd.bptr.size)) {
+ puts("Bad chunk block size");
+ return -EIO;
+ }
if (!eckd_valid_address(&bprs[j].xeckd, ldipl)) {
/*
* If an invalid address is found during LD-IPL then break and
- * retry as CCW
+ * retry as CCW-IPL, otherwise abort on error
*/
- IPL_assert(ldipl, "bad chunk ECKD addr");
+ if (!ldipl) {
+ puts("Bad chunk ECKD address");
+ return -EIO;
+ }
break;
}
@@ -189,7 +197,10 @@ static block_number_t load_eckd_segments(block_number_t blk, bool ldipl,
* I.e. the next ptr must point to the unused memory area
*/
memset(_bprs, FREE_SPACE_FILLER, sizeof(_bprs));
- read_block(block_nr, bprs, "BPRS continuation read failed");
+ if (virtio_read(block_nr, bprs)) {
+ puts("BPRS continuation read failed");
+ return -EIO;
+ }
more_data = true;
break;
}
@@ -198,7 +209,10 @@ static block_number_t load_eckd_segments(block_number_t blk, bool ldipl,
* to memory (address).
*/
rc = virtio_read_many(block_nr, (void *)(*address), count + 1);
- IPL_assert(rc == 0, "code chunk read failed");
+ if (rc != 0) {
+ puts("Code chunk read failed");
+ return -EIO;
+ }
*address += (count + 1) * virtio_get_block_size();
}
@@ -232,7 +246,10 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr)
/* Get Stage1b data */
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
- read_block(s1b_block_nr, s1b, "Cannot read stage1b boot loader");
+ if (virtio_read(s1b_block_nr, s1b)) {
+ puts("Cannot read stage1b boot loader");
+ return -EIO;
+ }
memset(_s2, FREE_SPACE_FILLER, sizeof(_s2));
@@ -244,7 +261,10 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr)
break;
}
- read_block(cur_block_nr, s2_cur_blk, "Cannot read stage2 boot loader");
+ if (virtio_read(cur_block_nr, s2_cur_blk)) {
+ puts("Cannot read stage2 boot loader");
+ return -EIO;
+ }
if (find_zipl_boot_menu_banner(&banner_offset)) {
/*
@@ -252,8 +272,10 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr)
* possibility of menu data spanning multiple blocks.
*/
if (prev_block_nr) {
- read_block(prev_block_nr, s2_prev_blk,
- "Cannot read stage2 boot loader");
+ if (virtio_read(prev_block_nr, s2_prev_blk)) {
+ puts("Cannot read stage2 boot loader");
+ return -EIO;
+ }
}
if (i + 1 < STAGE2_BLK_CNT_MAX) {
@@ -261,8 +283,10 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr)
}
if (next_block_nr && !is_null_block_number(next_block_nr)) {
- read_block(next_block_nr, s2_next_blk,
- "Cannot read stage2 boot loader");
+ if (virtio_read(next_block_nr, s2_next_blk)) {
+ puts("Cannot read stage2 boot loader");
+ return -EIO;
+ }
}
return menu_get_zipl_boot_index(s2_cur_blk + banner_offset);
@@ -275,7 +299,7 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr)
return 0;
}
-static void run_eckd_boot_script(block_number_t bmt_block_nr,
+static int run_eckd_boot_script(block_number_t bmt_block_nr,
block_number_t s1b_block_nr)
{
int i;
@@ -292,17 +316,28 @@ static void run_eckd_boot_script(block_number_t bmt_block_nr,
}
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;
+ }
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
- read_block(bmt_block_nr, sec, "Cannot read Boot Map Table");
+ if (virtio_read(bmt_block_nr, sec)) {
+ puts("Cannot read Boot Map Table");
+ return -EIO;
+ }
block_nr = gen_eckd_block_num(&bmt->entry[loadparm].xeckd, ldipl);
- IPL_assert(block_nr != -1, "Cannot find Boot Map Table Entry");
+ if (block_nr == NULL_BLOCK_NR) {
+ puts("Cannot find Boot Map Table Entry");
+ return -EIO;
+ }
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
- read_block(block_nr, sec, "Cannot read Boot Map Script");
+ if (virtio_read(block_nr, sec)) {
+ puts("Cannot read Boot Map Script");
+ return -EIO;
+ }
for (i = 0; bms->entry[i].type == BOOT_SCRIPT_LOAD ||
bms->entry[i].type == BOOT_SCRIPT_SIGNATURE; i++) {
@@ -317,21 +352,28 @@ static void run_eckd_boot_script(block_number_t bmt_block_nr,
do {
block_nr = load_eckd_segments(block_nr, ldipl, &address);
- } while (block_nr != -1);
+ } while (block_nr >= 0);
+
+ if (block_nr != -ENOENT && block_nr < 0) {
+ return ldipl ? 0 : -EIO;
+ }
}
if (ldipl && bms->entry[i].type != BOOT_SCRIPT_EXEC) {
/* Abort LD-IPL and retry as CCW-IPL */
- return;
+ return 0;
}
- IPL_assert(bms->entry[i].type == BOOT_SCRIPT_EXEC,
- "Unknown script entry type");
+ if (bms->entry[i].type != BOOT_SCRIPT_EXEC) {
+ 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 */
+ return 1;
}
-static void ipl_eckd_cdl(void)
+static int ipl_eckd_cdl(void)
{
XEckdMbr *mbr;
EckdCdlIpl2 *ipl2 = (void *)sec;
@@ -342,20 +384,23 @@ static void ipl_eckd_cdl(void)
puts("CDL");
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
- read_block(1, ipl2, "Cannot read IPL2 record at block 1");
+ if (virtio_read(1, ipl2)) {
+ puts("Cannot read IPL2 record at block 1");
+ return -EIO;
+ }
mbr = &ipl2->mbr;
if (!magic_match(mbr, ZIPL_MAGIC)) {
puts("No zIPL section in IPL2 record.");
- return;
+ return 0;
}
if (!block_size_ok(mbr->blockptr.xeckd.bptr.size)) {
puts("Bad block size in zIPL section of IPL2 record.");
- return;
+ return 0;
}
if (mbr->dev_type != DEV_TYPE_ECKD) {
puts("Non-ECKD device type in zIPL section of IPL2 record.");
- return;
+ return 0;
}
/* save pointer to Boot Map Table */
@@ -365,19 +410,21 @@ static void ipl_eckd_cdl(void)
s1b_block_nr = eckd_block_num(&ipl2->stage1.seek[0].chs);
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
- read_block(2, vlbl, "Cannot read Volume Label at block 2");
+ if (virtio_read(2, vlbl)) {
+ puts("Cannot read Volume Label at block 2");
+ return -EIO;
+ }
if (!magic_match(vlbl->key, VOL1_MAGIC)) {
puts("Invalid magic of volume label block.");
- return;
+ return 0;
}
if (!magic_match(vlbl->f.key, VOL1_MAGIC)) {
puts("Invalid magic of volser block.");
- return;
+ return 0;
}
print_volser(vlbl->f.volser);
- run_eckd_boot_script(bmt_block_nr, s1b_block_nr);
- /* no return */
+ return run_eckd_boot_script(bmt_block_nr, s1b_block_nr);
}
static void print_eckd_ldl_msg(ECKD_IPL_mode_t mode)
@@ -403,7 +450,7 @@ static void print_eckd_ldl_msg(ECKD_IPL_mode_t mode)
print_volser(vlbl->volser);
}
-static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
+static int ipl_eckd_ldl(ECKD_IPL_mode_t mode)
{
block_number_t bmt_block_nr, s1b_block_nr;
EckdLdlIpl1 *ipl1 = (void *)sec;
@@ -415,10 +462,13 @@ static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
/* DO NOT read BootMap pointer (only one, xECKD) at block #2 */
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
- read_block(0, sec, "Cannot read block 0 to grab boot info.");
+ if (virtio_read(0, sec)) {
+ puts("Cannot read block 0 to grab boot info.");
+ return -EIO;
+ }
if (mode == ECKD_LDL_UNLABELED) {
if (!magic_match(ipl1->bip.magic, ZIPL_MAGIC)) {
- return; /* not applicable layout */
+ return 0; /* not applicable layout */
}
puts("unlabeled LDL.");
}
@@ -430,8 +480,7 @@ static void ipl_eckd_ldl(ECKD_IPL_mode_t mode)
/* save pointer to Stage1b Data */
s1b_block_nr = eckd_block_num(&ipl1->stage1.seek[0].chs);
- run_eckd_boot_script(bmt_block_nr, s1b_block_nr);
- /* no return */
+ return run_eckd_boot_script(bmt_block_nr, s1b_block_nr);
}
static block_number_t eckd_find_bmt(ExtEckdBlockPtr *ptr)
@@ -441,11 +490,14 @@ static block_number_t eckd_find_bmt(ExtEckdBlockPtr *ptr)
BootRecord *br;
blockno = gen_eckd_block_num(ptr, 0);
- read_block(blockno, tmp_sec, "Cannot read boot record");
+ if (virtio_read(blockno, tmp_sec)) {
+ puts("Cannot read boot record");
+ return -EIO;
+ }
br = (BootRecord *)tmp_sec;
if (!magic_match(br->magic, ZIPL_MAGIC)) {
/* If the boot record is invalid, return and try CCW-IPL instead */
- return NULL_BLOCK_NR;
+ return 0;
}
return gen_eckd_block_num(&br->pgt.xeckd, 1);
@@ -470,7 +522,7 @@ static void print_eckd_msg(void)
printf("%s", msg);
}
-static void ipl_eckd(void)
+static int ipl_eckd(void)
{
IplVolumeLabel *vlbl = (void *)sec;
LDL_VTOC *vtoc = (void *)sec;
@@ -480,7 +532,10 @@ static void ipl_eckd(void)
/* Block 2 can contain either the CDL VOL1 label or the LDL VTOC */
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
- read_block(2, vlbl, "Cannot read block 2");
+ if (virtio_read(2, vlbl)) {
+ puts("Cannot read block 2");
+ return -EIO;
+ }
/*
* First check for a list-directed-format pointer which would
@@ -490,34 +545,46 @@ static void ipl_eckd(void)
ldipl_bmt = eckd_find_bmt((ExtEckdBlockPtr *)&vlbl->f.br);
if (ldipl_bmt) {
puts("List-Directed");
- /* LD-IPL does not use the S1B bock, just make it NULL */
- run_eckd_boot_script(ldipl_bmt, NULL_BLOCK_NR);
- /* Only return in error, retry as CCW-IPL */
+ /*
+ * LD-IPL does not use the S1B bock, just make it NULL_BLOCK_NR.
+ * In some failure cases retry IPL before aborting.
+ */
+ if (run_eckd_boot_script(ldipl_bmt, NULL_BLOCK_NR)) {
+ return -EIO;
+ }
+ /* Non-fatal error, retry as CCW-IPL */
printf("Retrying IPL ");
print_eckd_msg();
}
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
- read_block(2, vtoc, "Cannot read block 2");
+ if (virtio_read(2, vtoc)) {
+ puts("Cannot read block 2");
+ return -EIO;
+ }
}
/* Not list-directed */
if (magic_match(vtoc->magic, VOL1_MAGIC)) {
- ipl_eckd_cdl(); /* may return in error */
+ if (ipl_eckd_cdl()) {
+ return 1;
+ }
}
if (magic_match(vtoc->magic, CMS1_MAGIC)) {
- ipl_eckd_ldl(ECKD_CMS); /* no return */
+ return ipl_eckd_ldl(ECKD_CMS);
}
if (magic_match(vtoc->magic, LNX1_MAGIC)) {
- ipl_eckd_ldl(ECKD_LDL); /* no return */
+ return ipl_eckd_ldl(ECKD_LDL);
}
- ipl_eckd_ldl(ECKD_LDL_UNLABELED); /* it still may return */
+ if (ipl_eckd_ldl(ECKD_LDL_UNLABELED)) {
+ return 1;
+ }
/*
* Ok, it is not a LDL by any means.
* It still might be a CDL with zero record keys for IPL1 and IPL2
*/
- ipl_eckd_cdl();
+ return ipl_eckd_cdl();
}
/***********************************************************************
@@ -907,7 +974,7 @@ static bool has_iso_signature(void)
* Bus specific IPL sequences
*/
-static void zipl_load_vblk(void)
+static int zipl_load_vblk(void)
{
int blksize = virtio_get_block_size();
@@ -916,7 +983,7 @@ static void zipl_load_vblk(void)
virtio_assume_iso9660();
}
if (ipl_iso_el_torito()) {
- return;
+ return 0;
}
}
@@ -924,21 +991,21 @@ static void zipl_load_vblk(void)
puts("Using guessed DASD geometry.");
virtio_assume_eckd();
}
- ipl_eckd();
+ return ipl_eckd();
}
-static void zipl_load_vscsi(void)
+static int zipl_load_vscsi(void)
{
if (virtio_get_block_size() == VIRTIO_ISO_BLOCK_SIZE) {
/* Is it an ISO image in non-CD drive? */
if (ipl_iso_el_torito()) {
- return;
+ return 0;
}
}
puts("Using guessed DASD geometry.");
virtio_assume_eckd();
- ipl_eckd();
+ return ipl_eckd();
}
/***********************************************************************
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH v3 08/19] pc-bios/s390-ccw: Remove panics from ECKD IPL path
2024-10-08 1:15 ` [PATCH v3 08/19] pc-bios/s390-ccw: Remove panics from ECKD " jrossi
@ 2024-10-09 10:53 ` Thomas Huth
2024-10-10 1:37 ` Jared Rossi
0 siblings, 1 reply; 36+ messages in thread
From: Thomas Huth @ 2024-10-09 10:53 UTC (permalink / raw)
To: jrossi, qemu-devel, qemu-s390x; +Cc: frankja
On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
> From: Jared Rossi <jrossi@linux.ibm.com>
>
> Remove panic-on-error from ECKD block device 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>
> ---
> pc-bios/s390-ccw/s390-ccw.h | 1 +
> pc-bios/s390-ccw/bootmap.c | 183 ++++++++++++++++++++++++------------
> 2 files changed, 126 insertions(+), 58 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
> index cbd92f3671..7516e96a14 100644
> --- a/pc-bios/s390-ccw/s390-ccw.h
> +++ b/pc-bios/s390-ccw/s390-ccw.h
> @@ -31,6 +31,7 @@ typedef unsigned long long u64;
> #define EBUSY 2
> #define ENODEV 3
> #define EINVAL 4
> +#define ENOENT 5
>
> #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 7984de62fe..266b38c034 100644
> --- a/pc-bios/s390-ccw/bootmap.c
> +++ b/pc-bios/s390-ccw/bootmap.c
> @@ -145,14 +145,17 @@ static block_number_t load_eckd_segments(block_number_t blk, bool ldipl,
> bool more_data;
>
> memset(_bprs, FREE_SPACE_FILLER, sizeof(_bprs));
> - read_block(blk, bprs, "BPRS read failed");
> + if (virtio_read(blk, bprs)) {
> + puts("BPRS read failed");
> + return -EIO;
> + }
load_eckd_segments() returns a value of type block_number_t which is an
unsigned type, so returning a negative error value will likely not work as
expected...
...
> @@ -317,21 +352,28 @@ static void run_eckd_boot_script(block_number_t bmt_block_nr,
>
> do {
> block_nr = load_eckd_segments(block_nr, ldipl, &address);
> - } while (block_nr != -1);
> + } while (block_nr >= 0);
... for example here: block_nr is also of type block_number_t, so the while
condition is also true for "negative" error codes.
> + if (block_nr != -ENOENT && block_nr < 0) {
"block_nr < 0" likely also always evaluates to "false".
> + return ldipl ? 0 : -EIO;
> + }
> }
>
> if (ldipl && bms->entry[i].type != BOOT_SCRIPT_EXEC) {
> /* Abort LD-IPL and retry as CCW-IPL */
> - return;
> + return 0;
> }
>
> - IPL_assert(bms->entry[i].type == BOOT_SCRIPT_EXEC,
> - "Unknown script entry type");
> + if (bms->entry[i].type != BOOT_SCRIPT_EXEC) {
> + 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 */
> + return 1;
> }
...
> @@ -441,11 +490,14 @@ static block_number_t eckd_find_bmt(ExtEckdBlockPtr *ptr)
> BootRecord *br;
>
> blockno = gen_eckd_block_num(ptr, 0);
> - read_block(blockno, tmp_sec, "Cannot read boot record");
> + if (virtio_read(blockno, tmp_sec)) {
> + puts("Cannot read boot record");
> + return -EIO;
Same problem here: Returning a negative error code via unsigned
block_number_t ....
...
> @@ -490,34 +545,46 @@ static void ipl_eckd(void)
> ldipl_bmt = eckd_find_bmt((ExtEckdBlockPtr *)&vlbl->f.br);
> if (ldipl_bmt) {
... will cause trouble here.
> puts("List-Directed");
> - /* LD-IPL does not use the S1B bock, just make it NULL */
> - run_eckd_boot_script(ldipl_bmt, NULL_BLOCK_NR);
> - /* Only return in error, retry as CCW-IPL */
> + /*
> + * LD-IPL does not use the S1B bock, just make it NULL_BLOCK_NR.
> + * In some failure cases retry IPL before aborting.
> + */
> + if (run_eckd_boot_script(ldipl_bmt, NULL_BLOCK_NR)) {
> + return -EIO;
> + }
> + /* Non-fatal error, retry as CCW-IPL */
> printf("Retrying IPL ");
> print_eckd_msg();
> }
> memset(sec, FREE_SPACE_FILLER, sizeof(sec));
> - read_block(2, vtoc, "Cannot read block 2");
> + if (virtio_read(2, vtoc)) {
> + puts("Cannot read block 2");
> + return -EIO;
> + }
> }
>
> /* Not list-directed */
> if (magic_match(vtoc->magic, VOL1_MAGIC)) {
> - ipl_eckd_cdl(); /* may return in error */
> + if (ipl_eckd_cdl()) {
> + return 1;
> + }
> }
>
> if (magic_match(vtoc->magic, CMS1_MAGIC)) {
> - ipl_eckd_ldl(ECKD_CMS); /* no return */
> + return ipl_eckd_ldl(ECKD_CMS);
> }
> if (magic_match(vtoc->magic, LNX1_MAGIC)) {
> - ipl_eckd_ldl(ECKD_LDL); /* no return */
> + return ipl_eckd_ldl(ECKD_LDL);
> }
>
> - ipl_eckd_ldl(ECKD_LDL_UNLABELED); /* it still may return */
> + if (ipl_eckd_ldl(ECKD_LDL_UNLABELED)) {
> + return 1;
> + }
> /*
> * Ok, it is not a LDL by any means.
> * It still might be a CDL with zero record keys for IPL1 and IPL2
> */
> - ipl_eckd_cdl();
> + return ipl_eckd_cdl();
> }
Thomas
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v3 08/19] pc-bios/s390-ccw: Remove panics from ECKD IPL path
2024-10-09 10:53 ` Thomas Huth
@ 2024-10-10 1:37 ` Jared Rossi
2024-10-10 5:45 ` Thomas Huth
0 siblings, 1 reply; 36+ messages in thread
From: Jared Rossi @ 2024-10-10 1:37 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, qemu-s390x; +Cc: frankja
On 10/9/24 6:53 AM, Thomas Huth wrote:
> On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
>> [snip...]
>
> load_eckd_segments() returns a value of type block_number_t which is
> an unsigned type, so returning a negative error value will likely not
> work as expected...
>
> ...
>> @@ -317,21 +352,28 @@ static void run_eckd_boot_script(block_number_t
>> bmt_block_nr,
>> do {
>> block_nr = load_eckd_segments(block_nr, ldipl, &address);
>> - } while (block_nr != -1);
>> + } while (block_nr >= 0);
> [snip...]
There already exists a special block number defined in bootmap.h,
NULL_BLOCK_NR 0xffffffffffffffffULL. Therefore I would propose simply
adding another as ERROR_BLOCK_NR 0xfffffffffffffffeULL.
ERROR_BLOCK_NR would replace the negative error codes and NULL_BLOCK_NR
would represent expected end of chunk. Does this seem reasonable?
Jared
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v3 08/19] pc-bios/s390-ccw: Remove panics from ECKD IPL path
2024-10-10 1:37 ` Jared Rossi
@ 2024-10-10 5:45 ` Thomas Huth
0 siblings, 0 replies; 36+ messages in thread
From: Thomas Huth @ 2024-10-10 5:45 UTC (permalink / raw)
To: Jared Rossi, qemu-devel, qemu-s390x; +Cc: frankja
On 10/10/2024 03.37, Jared Rossi wrote:
>
>
> On 10/9/24 6:53 AM, Thomas Huth wrote:
>> On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
>>> [snip...]
>>
>> load_eckd_segments() returns a value of type block_number_t which is an
>> unsigned type, so returning a negative error value will likely not work as
>> expected...
>>
>> ...
>>> @@ -317,21 +352,28 @@ static void run_eckd_boot_script(block_number_t
>>> bmt_block_nr,
>>> do {
>>> block_nr = load_eckd_segments(block_nr, ldipl, &address);
>>> - } while (block_nr != -1);
>>> + } while (block_nr >= 0);
>> [snip...]
>
> There already exists a special block number defined in bootmap.h,
> NULL_BLOCK_NR 0xffffffffffffffffULL. Therefore I would propose simply adding
> another as ERROR_BLOCK_NR 0xfffffffffffffffeULL.
>
> ERROR_BLOCK_NR would replace the negative error codes and NULL_BLOCK_NR
> would represent expected end of chunk. Does this seem reasonable?
Sounds like a good idea.
Alternatively, you could do casting to signed long here and there, but
that's ugly, too.
Thomas
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 09/19] pc-bios/s390-ccw: Remove panics from SCSI IPL path
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (7 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 08/19] pc-bios/s390-ccw: Remove panics from ECKD " jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-09 11:18 ` Thomas Huth
2024-10-08 1:15 ` [PATCH v3 10/19] pc-bios/s390-ccw: Remove panics from DASD " jrossi
` (9 subsequent siblings)
18 siblings, 1 reply; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
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>
---
pc-bios/s390-ccw/bootmap.c | 88 +++++++++++++-----
pc-bios/s390-ccw/jump2ipl.c | 1 +
pc-bios/s390-ccw/virtio-blkdev.c | 4 +-
pc-bios/s390-ccw/virtio-scsi.c | 148 +++++++++++++++++++++----------
4 files changed, 169 insertions(+), 72 deletions(-)
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index 266b38c034..534d900f9e 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -591,7 +591,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;
@@ -611,7 +611,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];
@@ -639,23 +642,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");
@@ -670,22 +687,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;
@@ -696,10 +721,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.");
@@ -707,11 +735,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) {
@@ -721,17 +758,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);
}
/***********************************************************************
@@ -1025,7 +1067,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:
diff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c
index 80b7f6a1f3..6671e4fe5c 100644
--- a/pc-bios/s390-ccw/jump2ipl.c
+++ b/pc-bios/s390-ccw/jump2ipl.c
@@ -16,6 +16,7 @@
#define RESET_PSW ((uint64_t)&jump_to_IPL_addr | RESET_PSW_MASK)
static uint64_t *reset_psw = 0, save_psw, ipl_continue;
+extern bool have_iplb;
void write_reset_psw(uint64_t psw)
{
diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.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_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();
diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c
index 0e274d0c38..60bc6fcbfa 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;
-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,12 @@ 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);
+ if (!vs_assert(resp->response == VIRTIO_SCSI_S_OK, mr) ||
+ !vs_assert(resp->status == CDB_STATUS_GOOD, ms)) {
+ return false;
+ }
+
+ return true;
}
static void prepare_request(VDev *vdev, const void *cdb, int cdb_size,
@@ -78,24 +84,30 @@ 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 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 +122,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 cc = vs_run("inquiry", inquiry,
+ vdev, &cdb, sizeof(cdb), data, data_size);
- return virtio_scsi_response_ok(&resp);
+ return cc ? cc : 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 +144,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 +157,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 cc = vs_run("report luns", report_luns,
vdev, &cdb, sizeof(cdb), data, data_size);
- return virtio_scsi_response_ok(&resp);
+ return cc ? cc : 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 +181,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 cc = vs_run("read(10)", read_10,
+ vdev, &cdb, sizeof(cdb), data, data_size);
- return virtio_scsi_response_ok(&resp);
+ return cc ? cc : 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 +201,10 @@ static bool scsi_read_capacity(VDev *vdev,
{ data, data_size, VRING_DESC_F_WRITE },
};
- vs_run("read capacity", read_capacity_16,
+ int cc = vs_run("read capacity", read_capacity_16,
vdev, &cdb, sizeof(cdb), data, data_size);
- return virtio_scsi_response_ok(&resp);
+ return cc ? cc : virtio_scsi_response_ok(&resp);
}
/* virtio-scsi routines */
@@ -207,7 +221,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, cc, 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 +247,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))) {
+ cc = scsi_report_luns(vdev, data, sizeof(data));
+ if (cc < 0) {
+ return cc;
+ }
+
+ else if (cc == 0) {
if (resp.response == VIRTIO_SCSI_S_BAD_TARGET) {
continue;
}
printf("target 0x%X", 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", target);
continue;
@@ -283,7 +305,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;
@@ -337,7 +361,7 @@ static int virtio_scsi_setup(VDev *vdev)
uint32_t data_size = sizeof(data);
ScsiInquiryEvpdPages *evpd = &scsi_inquiry_evpd_pages_response;
ScsiInquiryEvpdBl *evpd_bl = &scsi_inquiry_evpd_bl_response;
- int i, ret;
+ int i, cc, ret;
vdev->scsi_device = &default_scsi_device;
ret = virtio_scsi_locate_device(vdev);
@@ -352,11 +376,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 +396,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,
+ cc = 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 (cc < 1) {
+ if (cc != 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 +420,16 @@ static int virtio_scsi_setup(VDev *vdev)
vdev->scsi_block_size = VIRTIO_ISO_BLOCK_SIZE;
}
- if (!scsi_inquiry(vdev,
+ cc = 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 (cc < 1) {
+ if (cc != 0 || !virtio_scsi_verify_response(&resp,
+ "virtio-scsi:setup:supported_pages")) {
+ return 1;
+ }
}
debug_print_int("EVPD length", evpd->page_length);
@@ -402,12 +441,16 @@ static int virtio_scsi_setup(VDev *vdev)
continue;
}
- if (!scsi_inquiry(vdev,
+ cc = 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 (cc < 1) {
+ if (cc != 0 || !virtio_scsi_verify_response(&resp,
+ "virtio-scsi:setup:blocklimits")) {
+ return 1;
+ }
}
debug_print_int("max transfer", evpd_bl->max_transfer);
@@ -423,8 +466,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");
+ cc = scsi_read_capacity(vdev, data, data_size);
+ if (cc < 1) {
+ if (cc != 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 +486,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.");
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH v3 09/19] pc-bios/s390-ccw: Remove panics from SCSI IPL path
2024-10-08 1:15 ` [PATCH v3 09/19] pc-bios/s390-ccw: Remove panics from SCSI " jrossi
@ 2024-10-09 11:18 ` Thomas Huth
2024-10-10 1:37 ` Jared Rossi
0 siblings, 1 reply; 36+ messages in thread
From: Thomas Huth @ 2024-10-09 11:18 UTC (permalink / raw)
To: jrossi, qemu-devel, qemu-s390x; +Cc: frankja
On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
> From: Jared Rossi <jrossi@linux.ibm.com>
>
> 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>
> ---
...
> @@ -78,24 +84,30 @@ 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);
Should there be a "return" with a non-0 value here? ...
> + }
> +
> + 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 +122,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 cc = vs_run("inquiry", inquiry,
> + vdev, &cdb, sizeof(cdb), data, data_size);
... since the caller site now obviously checks for a non-zero value!
> - return virtio_scsi_response_ok(&resp);
> + return cc ? cc : virtio_scsi_response_ok(&resp);
> }
...
> @@ -207,7 +221,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, cc, 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 +247,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))) {
> + cc = scsi_report_luns(vdev, data, sizeof(data));
> + if (cc < 0) {
> + return cc;
> + }
By the way, calling a variable "cc" reminds me of the CC of the PSW, so I'd
expect values from 0 to 3 for this variable. Obviously this was meant to
convey negative error codes instead, so I'd like to suggest to rename that
variable to "ret" or something similar instead.
> + else if (cc == 0) {
> if (resp.response == VIRTIO_SCSI_S_BAD_TARGET) {
> continue;
> }
> printf("target 0x%X", target);
> - virtio_scsi_verify_response(&resp, "SCSI cannot report LUNs");
> + if (!virtio_scsi_verify_response(&resp, "SCSI cannot report LUNs")) {
> + return -EIO;
> + }
> }
Thomas
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v3 09/19] pc-bios/s390-ccw: Remove panics from SCSI IPL path
2024-10-09 11:18 ` Thomas Huth
@ 2024-10-10 1:37 ` Jared Rossi
0 siblings, 0 replies; 36+ messages in thread
From: Jared Rossi @ 2024-10-10 1:37 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, qemu-s390x; +Cc: frankja
On 10/9/24 7:18 AM, Thomas Huth wrote:
> On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
>> + if (!vs_io_assert(virtio_run(vdev, VR_REQUEST, cmd) == 0, title)) {
>> + puts(title);
>
> Should there be a "return" with a non-0 value here? ...
>
>> + }
>> +
>> + 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 +122,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 cc = vs_run("inquiry", inquiry,
>> + vdev, &cdb, sizeof(cdb), data, data_size);
>
> ... since the caller site now obviously checks for a non-zero value!
>
>> - return virtio_scsi_response_ok(&resp);
>> + return cc ? cc : virtio_scsi_response_ok(&resp);
>> }
> ...
>> @@ -207,7 +221,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, cc, 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 +247,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))) {
>> + cc = scsi_report_luns(vdev, data, sizeof(data));
>> + if (cc < 0) {
>> + return cc;
>> + }
>
> By the way, calling a variable "cc" reminds me of the CC of the PSW,
> so I'd expect values from 0 to 3 for this variable. Obviously this was
> meant to convey negative error codes instead, so I'd like to suggest
> to rename that variable to "ret" or something similar instead.
>
>> + else if (cc == 0) {
>> if (resp.response == VIRTIO_SCSI_S_BAD_TARGET) {
>> continue;
>> }
>> printf("target 0x%X", target);
>> - virtio_scsi_verify_response(&resp, "SCSI cannot report
>> LUNs");
>> + if (!virtio_scsi_verify_response(&resp, "SCSI cannot
>> report LUNs")) {
>> + return -EIO;
>> + }
>> }
>
> Thomas
>
Fixed the missing return and also changed the variable to "ret" instead
of "cc" as suggested.
Jared
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 10/19] pc-bios/s390-ccw: Remove panics from DASD IPL path
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (8 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 09/19] pc-bios/s390-ccw: Remove panics from SCSI " jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-08 1:15 ` [PATCH v3 11/19] pc-bios/s390-ccw: Remove panics from Netboot " jrossi
` (8 subsequent siblings)
18 siblings, 0 replies; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Remove panic-on-error from DASD 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>
---
pc-bios/s390-ccw/dasd-ipl.h | 2 +-
pc-bios/s390-ccw/dasd-ipl.c | 66 ++++++++++++++++++++-----------------
2 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/pc-bios/s390-ccw/dasd-ipl.h b/pc-bios/s390-ccw/dasd-ipl.h
index c394828906..eb1898c84a 100644
--- a/pc-bios/s390-ccw/dasd-ipl.h
+++ b/pc-bios/s390-ccw/dasd-ipl.h
@@ -11,6 +11,6 @@
#ifndef DASD_IPL_H
#define DASD_IPL_H
-void dasd_ipl(SubChannelId schid, uint16_t cutype);
+int dasd_ipl(SubChannelId schid, uint16_t cutype);
#endif /* DASD_IPL_H */
diff --git a/pc-bios/s390-ccw/dasd-ipl.c b/pc-bios/s390-ccw/dasd-ipl.c
index 99c0b93083..cd4fb884d6 100644
--- a/pc-bios/s390-ccw/dasd-ipl.c
+++ b/pc-bios/s390-ccw/dasd-ipl.c
@@ -111,38 +111,29 @@ static void make_readipl(void)
ccwIplRead->count = 0x18; /* Read 0x18 bytes of data */
}
-static void run_readipl(SubChannelId schid, uint16_t cutype)
+static int run_readipl(SubChannelId schid, uint16_t cutype)
{
- if (do_cio(schid, cutype, 0x00, CCW_FMT0)) {
- panic("dasd-ipl: Failed to run Read IPL channel program\n");
- }
+ return do_cio(schid, cutype, 0x00, CCW_FMT0);
}
/*
* The architecture states that IPL1 data should consist of a psw followed by
* format-0 READ and TIC CCWs. Let's sanity check.
*/
-static void check_ipl1(void)
+static bool check_ipl1(void)
{
Ccw0 *ccwread = (Ccw0 *)0x08;
Ccw0 *ccwtic = (Ccw0 *)0x10;
- if (ccwread->cmd_code != CCW_CMD_DASD_READ ||
- ccwtic->cmd_code != CCW_CMD_TIC) {
- panic("dasd-ipl: IPL1 data invalid. Is this disk really bootable?\n");
- }
+ return (ccwread->cmd_code == CCW_CMD_DASD_READ &&
+ ccwtic->cmd_code == CCW_CMD_TIC);
}
-static void check_ipl2(uint32_t ipl2_addr)
+static bool check_ipl2(uint32_t ipl2_addr)
{
Ccw0 *ccw = u32toptr(ipl2_addr);
- if (ipl2_addr == 0x00) {
- panic("IPL2 address invalid. Is this disk really bootable?\n");
- }
- if (ccw->cmd_code == 0x00) {
- panic("IPL2 ccw data invalid. Is this disk really bootable?\n");
- }
+ return (ipl2_addr != 0x00 && ccw->cmd_code != 0x00);
}
static uint32_t read_ipl2_addr(void)
@@ -188,52 +179,67 @@ static void ipl1_fixup(void)
ccwSearchTic->cda = ptr2u32(ccwSearchID);
}
-static void run_ipl1(SubChannelId schid, uint16_t cutype)
+static int run_ipl1(SubChannelId schid, uint16_t cutype)
{
uint32_t startAddr = 0x08;
- if (do_cio(schid, cutype, startAddr, CCW_FMT0)) {
- panic("dasd-ipl: Failed to run IPL1 channel program\n");
- }
+ return do_cio(schid, cutype, startAddr, CCW_FMT0);
}
-static void run_ipl2(SubChannelId schid, uint16_t cutype, uint32_t addr)
+static int run_ipl2(SubChannelId schid, uint16_t cutype, uint32_t addr)
{
- if (run_dynamic_ccw_program(schid, cutype, addr)) {
- panic("dasd-ipl: Failed to run IPL2 channel program\n");
- }
+ return run_dynamic_ccw_program(schid, cutype, addr);
}
/*
* Limitations in vfio-ccw support complicate the IPL process. Details can
* be found in docs/devel/s390-dasd-ipl.rst
*/
-void dasd_ipl(SubChannelId schid, uint16_t cutype)
+int dasd_ipl(SubChannelId schid, uint16_t cutype)
{
PSWLegacy *pswl = (PSWLegacy *) 0x00;
uint32_t ipl2_addr;
/* Construct Read IPL CCW and run it to read IPL1 from boot disk */
make_readipl();
- run_readipl(schid, cutype);
+ if (run_readipl(schid, cutype)) {
+ puts("Failed to run Read IPL channel program");
+ return -EIO;
+ }
+
ipl2_addr = read_ipl2_addr();
- check_ipl1();
+
+ if (!check_ipl1()) {
+ puts("IPL1 invalid for DASD-IPL");
+ return -EINVAL;
+ }
/*
* Fixup IPL1 channel program to account for vfio-ccw limitations, then run
* it to read IPL2 channel program from boot disk.
*/
ipl1_fixup();
- run_ipl1(schid, cutype);
- check_ipl2(ipl2_addr);
+ if (run_ipl1(schid, cutype)) {
+ puts("Failed to run IPL1 channel program");
+ return -EIO;
+ }
+
+ if (!check_ipl2(ipl2_addr)) {
+ puts("IPL2 invalid for DASD-IPL");
+ return -EINVAL;
+ }
/*
* Run IPL2 channel program to read operating system code from boot disk
*/
- run_ipl2(schid, cutype, ipl2_addr);
+ if (run_ipl2(schid, cutype, ipl2_addr)) {
+ puts("Failed to run IPL2 channel program");
+ return -EIO;
+ }
/* Transfer control to the guest operating system */
pswl->mask |= PSW_MASK_EAMODE; /* Force z-mode */
pswl->addr |= PSW_MASK_BAMODE; /* ... */
jump_to_low_kernel();
+ return 1;
}
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 11/19] pc-bios/s390-ccw: Remove panics from Netboot IPL path
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (9 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 10/19] pc-bios/s390-ccw: Remove panics from DASD " jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-09 11:35 ` Thomas Huth
2024-10-08 1:15 ` [PATCH v3 12/19] pc-bios/s390-ccw: Enable failed IPL to return after error jrossi
` (7 subsequent siblings)
18 siblings, 1 reply; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Remove panic-on-error from Netboot 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>
---
pc-bios/s390-ccw/s390-ccw.h | 2 +-
pc-bios/s390-ccw/bootmap.c | 1 +
pc-bios/s390-ccw/netmain.c | 17 +++++++++++------
pc-bios/s390-ccw/virtio-net.c | 7 +++++--
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 7516e96a14..496dccb2aa 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -58,7 +58,7 @@ unsigned int get_loadparm_index(void);
void main(void);
/* netmain.c */
-void netmain(void);
+int netmain(void);
/* sclp.c */
void sclp_print(const char *string);
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index 534d900f9e..1874d4bf5e 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -1065,6 +1065,7 @@ void zipl_load(void)
if (virtio_get_device_type() == VIRTIO_ID_NET) {
netmain();
+ panic("\n! Cannot IPL from this network !\n");
}
if (ipl_scsi()) {
diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
index bc6ad8695f..0c2329c752 100644
--- a/pc-bios/s390-ccw/netmain.c
+++ b/pc-bios/s390-ccw/netmain.c
@@ -464,7 +464,7 @@ static bool find_net_dev(Schib *schib, int dev_no)
return false;
}
-static void virtio_setup(void)
+static int virtio_setup(void)
{
Schib schib;
int ssid;
@@ -495,10 +495,10 @@ static void virtio_setup(void)
}
}
- IPL_assert(found, "No virtio net device found");
+ return found;
}
-void netmain(void)
+int netmain(void)
{
filename_ip_t fn_ip;
int rc, fnlen;
@@ -506,11 +506,15 @@ void netmain(void)
sclp_setup();
puts("Network boot starting...");
- virtio_setup();
+ if (!virtio_setup()) {
+ puts("No virtio net device found.");
+ return 1;
+ }
rc = net_init(&fn_ip);
if (rc) {
- panic("Network initialization failed. Halting.");
+ puts("Network initialization failed.");
+ return 1;
}
fnlen = strlen(fn_ip.filename);
@@ -528,5 +532,6 @@ void netmain(void)
jump_to_low_kernel();
}
- panic("Failed to load OS from network.");
+ puts("Failed to load OS from network.");
+ return 1;
}
diff --git a/pc-bios/s390-ccw/virtio-net.c b/pc-bios/s390-ccw/virtio-net.c
index 2fcb0a58c5..f9854a22c3 100644
--- a/pc-bios/s390-ccw/virtio-net.c
+++ b/pc-bios/s390-ccw/virtio-net.c
@@ -54,8 +54,11 @@ int virtio_net_init(void *mac_addr)
vdev->guest_features[0] = VIRTIO_NET_F_MAC_BIT;
virtio_setup_ccw(vdev);
- IPL_assert(vdev->guest_features[0] & VIRTIO_NET_F_MAC_BIT,
- "virtio-net device does not support the MAC address feature");
+ if (!(vdev->guest_features[0] & VIRTIO_NET_F_MAC_BIT)) {
+ puts("virtio-net device does not support the MAC address feature");
+ return -1;
+ }
+
memcpy(mac_addr, vdev->config.net.mac, ETH_ALEN);
for (i = 0; i < 64; i++) {
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH v3 11/19] pc-bios/s390-ccw: Remove panics from Netboot IPL path
2024-10-08 1:15 ` [PATCH v3 11/19] pc-bios/s390-ccw: Remove panics from Netboot " jrossi
@ 2024-10-09 11:35 ` Thomas Huth
2024-10-10 1:37 ` Jared Rossi
0 siblings, 1 reply; 36+ messages in thread
From: Thomas Huth @ 2024-10-09 11:35 UTC (permalink / raw)
To: jrossi, qemu-devel, qemu-s390x; +Cc: frankja
On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
> From: Jared Rossi <jrossi@linux.ibm.com>
>
> Remove panic-on-error from Netboot 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>
> ---
...
> diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
> index bc6ad8695f..0c2329c752 100644
> --- a/pc-bios/s390-ccw/netmain.c
> +++ b/pc-bios/s390-ccw/netmain.c
> @@ -464,7 +464,7 @@ static bool find_net_dev(Schib *schib, int dev_no)
> return false;
> }
>
> -static void virtio_setup(void)
> +static int virtio_setup(void)
Maybe better use "bool" instead of "int" here...
> {
> Schib schib;
> int ssid;
> @@ -495,10 +495,10 @@ static void virtio_setup(void)
> }
> }
>
> - IPL_assert(found, "No virtio net device found");
> + return found;
... since the function obviously returns a boolean value.
Thomas
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v3 11/19] pc-bios/s390-ccw: Remove panics from Netboot IPL path
2024-10-09 11:35 ` Thomas Huth
@ 2024-10-10 1:37 ` Jared Rossi
0 siblings, 0 replies; 36+ messages in thread
From: Jared Rossi @ 2024-10-10 1:37 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, qemu-s390x; +Cc: frankja
On 10/9/24 7:35 AM, Thomas Huth wrote:
> On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
>> From: Jared Rossi <jrossi@linux.ibm.com>
>>
>> Remove panic-on-error from Netboot 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>
>> ---
> ...
>> diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
>> index bc6ad8695f..0c2329c752 100644
>> --- a/pc-bios/s390-ccw/netmain.c
>> +++ b/pc-bios/s390-ccw/netmain.c
>> @@ -464,7 +464,7 @@ static bool find_net_dev(Schib *schib, int dev_no)
>> return false;
>> }
>> -static void virtio_setup(void)
>> +static int virtio_setup(void)
>
> Maybe better use "bool" instead of "int" here...
>
>> {
>> Schib schib;
>> int ssid;
>> @@ -495,10 +495,10 @@ static void virtio_setup(void)
>> }
>> }
>> - IPL_assert(found, "No virtio net device found");
>> + return found;
>
> ... since the function obviously returns a boolean value.
>
> Thomas
>
Fixed, changed return type to bool.
Jared
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 12/19] pc-bios/s390-ccw: Enable failed IPL to return after error
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (10 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 11/19] pc-bios/s390-ccw: Remove panics from Netboot " jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-09 12:12 ` Thomas Huth
2024-10-08 1:15 ` [PATCH v3 13/19] include/hw/s390x: Add include files for common IPL structs jrossi
` (6 subsequent siblings)
18 siblings, 1 reply; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Remove panic-on-error from IPL functions such that a return code is propagated
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 must
result in termination.
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
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 | 35 +++++++++--------
pc-bios/s390-ccw/virtio-blkdev.c | 4 +-
pc-bios/s390-ccw/virtio.c | 65 +++++++++++++++++++++-----------
8 files changed, 111 insertions(+), 58 deletions(-)
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 496dccb2aa..cdf998868c 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -79,7 +79,7 @@ void zipl_load(void);
/* 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);
/* 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 flags);
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);
int virtio_net_init(void *mac_addr);
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index 1874d4bf5e..c80fcd6f01 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -62,15 +62,34 @@ static void *s2_prev_blk = _s2;
static void *s2_cur_blk = _s2 + MAX_SECTOR_SIZE;
static void *s2_next_blk = _s2 + MAX_SECTOR_SIZE * 2;
-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 BootInfo");
- IPL_assert(bip->version == BOOT_INFO_VERSION, "Wrong zIPL version");
- IPL_assert(bip->bp_type == BOOT_INFO_BP_TYPE_IPL, "DASD is not for IPL");
- IPL_assert(bip->dev_type == BOOT_INFO_DEV_TYPE_ECKD, "DASD is not ECKD");
- IPL_assert(bip->flags == 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 != BOOT_INFO_VERSION) {
+ puts("Wrong zIPL version");
+ return -EINVAL;
+ }
+ if (bip->bp_type != BOOT_INFO_BP_TYPE_IPL) {
+ puts("DASD is not for IPL");
+ return -ENODEV;
+ }
+ if (bip->dev_type != BOOT_INFO_DEV_TYPE_ECKD) {
+ puts("DASD is not ECKD");
+ return -ENODEV;
+ }
+ if (bip->flags != 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;
}
static void eckd_format_chs(ExtEckdBlockPtr *ptr, bool ldipl,
@@ -368,8 +387,8 @@ static int run_eckd_boot_script(block_number_t bmt_block_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;
}
@@ -1060,16 +1079,19 @@ void zipl_load(void)
if (vdev->is_cdrom) {
ipl_iso_el_torito();
- panic("\n! Cannot IPL this ISO image !\n");
+ puts("Failed to IPL this ISO image!");
+ return;
}
if (virtio_get_device_type() == VIRTIO_ID_NET) {
netmain();
- panic("\n! Cannot IPL from this network !\n");
+ puts("Failed to IPL from this network!");
+ return;
}
if (ipl_scsi()) {
- panic("\n! Cannot IPL this SCSI device !\n");
+ puts("Failed to IPL from this SCSI device!");
+ return;
}
switch (virtio_get_device_type()) {
@@ -1080,8 +1102,9 @@ void zipl_load(void)
zipl_load_vscsi();
break;
default:
- panic("\n! Unknown IPL device type !\n");
+ puts("Unknown IPL device type!");
+ return;
}
- 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 758e74965e..35b08ba7c1 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)
};
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;
}
return sense_data.cu_type;
diff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c
index 6671e4fe5c..92627b56c6 100644
--- a/pc-bios/s390-ccw/jump2ipl.c
+++ b/pc-bios/s390-ccw/jump2ipl.c
@@ -34,7 +34,7 @@ static void jump_to_IPL_addr(void)
/* should not return */
}
-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();
@@ -69,7 +69,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;
}
void jump_to_low_kernel(void)
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 2345432abb..f818bd7210 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_no)
enable_subchannel(blk_schid);
cutype = cu_type(blk_schid);
+ if (cutype == CU_TYPE_UNKNOWN) {
+ return -EIO;
+ }
/*
* Note: we always have to run virtio_is_supported() here to make
@@ -194,10 +197,10 @@ static void boot_setup(void)
have_iplb = store_iplb(&iplb);
}
-static void find_boot_device(void)
+static bool find_boot_device(void)
{
VDev *vdev = virtio_get_device();
- bool found;
+ bool found = false;
switch (iplb.pbt) {
case S390_IPL_TYPE_CCW:
@@ -215,10 +218,10 @@ static void find_boot_device(void)
found = find_subch(iplb.scsi.devno);
break;
default:
- panic("List-directed IPL not supported yet!\n");
+ puts("Unsupported IPLB");
}
- IPL_assert(found, "Boot device not found\n");
+ return found;
}
static int virtio_setup(void)
@@ -244,11 +247,13 @@ static int virtio_setup(void)
ret = virtio_scsi_setup_device(blk_schid);
break;
default:
- panic("\n! No IPL device available !\n");
+ puts("\n! No IPL device available !\n");
+ return 1;
}
- if (!ret) {
- IPL_assert(virtio_ipl_disk_is_valid(), "No valid IPL device detected");
+ if (!ret && !virtio_ipl_disk_is_valid()) {
+ puts("No valid IPL device detected");
+ return -ENODEV;
}
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() == 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", cutype);
- panic("\nBoot failed.\n");
}
}
@@ -288,7 +293,8 @@ static void probe_boot_device(void)
break;
}
if (ret == true) {
- ipl_boot_device(); /* Only returns if unsuccessful */
+ ipl_boot_device(); /* Only returns if unsuccessful */
+ return;
}
}
}
@@ -301,12 +307,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();
}
- 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-blkdev.c
index 1c585f034b..5ef273bdc0 100644
--- a/pc-bios/s390-ccw/virtio-blkdev.c
+++ b/pc-bios/s390-ccw/virtio-blkdev.c
@@ -59,8 +59,8 @@ int virtio_read_many(unsigned long sector, void *load_addr, 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;
+
+ return 1;
}
unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long rec_list2,
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;
}
-void virtio_setup_ccw(VDev *vdev)
+int virtio_setup_ccw(VDev *vdev)
{
- int i, rc, cfg_size = 0;
+ int i, cfg_size = 0;
uint8_t status;
struct VirtioFeatureDesc {
uint32_t features;
uint8_t index;
} __attribute__((packed)) feats;
- 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 */
vdev->config.blk.blk_size = 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);
status = VIRTIO_CONFIG_S_ACKNOWLEDGE;
- rc = run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), false);
- IPL_assert(rc == 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;
+ }
switch (vdev->senseid.cu_model) {
case VIRTIO_ID_NET:
@@ -255,27 +260,37 @@ void virtio_setup_ccw(VDev *vdev)
cfg_size = sizeof(vdev->config.scsi);
break;
default:
- panic("Unsupported virtio device\n");
+ puts("Unsupported virtio device");
+ return -ENODEV;
}
status |= VIRTIO_CONFIG_S_DRIVER;
- rc = run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), false);
- IPL_assert(rc == 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;
+ }
/* Feature negotiation */
for (i = 0; i < ARRAY_SIZE(vdev->guest_features); i++) {
feats.features = 0;
feats.index = i;
- rc = run_ccw(vdev, CCW_CMD_READ_FEAT, &feats, sizeof(feats), false);
- IPL_assert(rc == 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] &= bswap32(feats.features);
feats.features = bswap32(vdev->guest_features[i]);
- rc = run_ccw(vdev, CCW_CMD_WRITE_FEAT, &feats, sizeof(feats), false);
- IPL_assert(rc == 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;
+ }
}
- rc = run_ccw(vdev, CCW_CMD_READ_CONF, &vdev->config, cfg_size, false);
- IPL_assert(rc == 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;
+ }
for (i = 0; i < vdev->nr_vqs; i++) {
VqInfo info = {
@@ -289,19 +304,27 @@ void virtio_setup_ccw(VDev *vdev)
.num = 0,
};
- rc = run_ccw(vdev, CCW_CMD_READ_VQ_CONF, &config, sizeof(config), false);
- IPL_assert(rc == 0, "Could not get virtio device VQ configuration");
+ 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 = config.num;
vring_init(&vdev->vrings[i], &info);
vdev->vrings[i].schid = vdev->schid;
- IPL_assert(
- run_ccw(vdev, CCW_CMD_SET_VQ, &info, sizeof(info), false) == 0,
- "Cannot set VQ info");
+ if (run_ccw(vdev, CCW_CMD_SET_VQ, &info, sizeof(info), false)) {
+ puts("Cannot set VQ info");
+ return -EIO;
+ }
}
status |= VIRTIO_CONFIG_S_DRIVER_OK;
- rc = run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), false);
- IPL_assert(rc == 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;
}
bool virtio_is_supported(SubChannelId schid)
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 13/19] include/hw/s390x: Add include files for common IPL structs
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (11 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 12/19] pc-bios/s390-ccw: Enable failed IPL to return after error jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-08 1:15 ` [PATCH v3 14/19] s390x: Add individual loadparm assignment to CCW device jrossi
` (5 subsequent siblings)
18 siblings, 0 replies; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Currently, structures defined in both hw/s390x/ipl.h and pc-bios/s390-ccw/iplb.h
must be kept in sync, which is prone to error. Instead, create a new directory
at include/hw/s390x/ipl/ to contain the definitions that must be shared.
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/s390x/ipl.h | 104 +-----------------------------
include/hw/s390x/ipl/qipl.h | 123 ++++++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/iplb.h | 84 ++----------------------
pc-bios/s390-ccw/Makefile | 2 +-
4 files changed, 130 insertions(+), 183 deletions(-)
create mode 100644 include/hw/s390x/ipl/qipl.h
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index b2105b616a..fa394c339d 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -16,95 +16,11 @@
#include "cpu.h"
#include "exec/address-spaces.h"
#include "hw/qdev-core.h"
+#include "hw/s390x/ipl/qipl.h"
#include "qom/object.h"
-struct IPLBlockPVComp {
- uint64_t tweak_pref;
- uint64_t addr;
- uint64_t size;
-} QEMU_PACKED;
-typedef struct IPLBlockPVComp IPLBlockPVComp;
-
-struct IPLBlockPV {
- uint8_t reserved18[87]; /* 0x18 */
- uint8_t version; /* 0x6f */
- uint32_t reserved70; /* 0x70 */
- uint32_t num_comp; /* 0x74 */
- uint64_t pv_header_addr; /* 0x78 */
- uint64_t pv_header_len; /* 0x80 */
- struct IPLBlockPVComp components[0];
-} QEMU_PACKED;
-typedef struct IPLBlockPV IPLBlockPV;
-
-struct IplBlockCcw {
- uint8_t reserved0[85];
- uint8_t ssid;
- uint16_t devno;
- uint8_t vm_flags;
- uint8_t reserved3[3];
- uint32_t vm_parm_len;
- uint8_t nss_name[8];
- uint8_t vm_parm[64];
- uint8_t reserved4[8];
-} QEMU_PACKED;
-typedef struct IplBlockCcw IplBlockCcw;
-
-struct IplBlockFcp {
- uint8_t reserved1[305 - 1];
- uint8_t opt;
- uint8_t reserved2[3];
- uint16_t reserved3;
- uint16_t devno;
- uint8_t reserved4[4];
- uint64_t wwpn;
- uint64_t lun;
- uint32_t bootprog;
- uint8_t reserved5[12];
- uint64_t br_lba;
- uint32_t scp_data_len;
- uint8_t reserved6[260];
- uint8_t scp_data[0];
-} QEMU_PACKED;
-typedef struct IplBlockFcp IplBlockFcp;
-
-struct IplBlockQemuScsi {
- uint32_t lun;
- uint16_t target;
- uint16_t channel;
- uint8_t reserved0[77];
- uint8_t ssid;
- uint16_t devno;
-} QEMU_PACKED;
-typedef struct IplBlockQemuScsi IplBlockQemuScsi;
-
#define DIAG308_FLAGS_LP_VALID 0x80
-union IplParameterBlock {
- struct {
- uint32_t len;
- uint8_t reserved0[3];
- uint8_t version;
- uint32_t blk0_len;
- uint8_t pbt;
- uint8_t flags;
- uint16_t reserved01;
- uint8_t loadparm[8];
- union {
- IplBlockCcw ccw;
- IplBlockFcp fcp;
- IPLBlockPV pv;
- IplBlockQemuScsi scsi;
- };
- } QEMU_PACKED;
- struct {
- uint8_t reserved1[110];
- uint16_t devno;
- uint8_t reserved2[88];
- uint8_t reserved_ext[4096 - 200];
- } QEMU_PACKED;
-} QEMU_PACKED;
-typedef union IplParameterBlock IplParameterBlock;
-
int s390_ipl_set_loadparm(uint8_t *loadparm);
void s390_ipl_update_diag308(IplParameterBlock *iplb);
int s390_ipl_prepare_pv_header(Error **errp);
@@ -131,24 +47,6 @@ void s390_ipl_clear_reset_request(void);
#define QIPL_FLAG_BM_OPTS_CMD 0x80
#define QIPL_FLAG_BM_OPTS_ZIPL 0x40
-/*
- * The QEMU IPL Parameters will be stored at absolute address
- * 204 (0xcc) which means it is 32-bit word aligned but not
- * double-word aligned. Placement of 64-bit data fields in this
- * area must account for their alignment needs.
- * The total size of the struct must never exceed 28 bytes.
- * This definition must be kept in sync with the definition
- * in pc-bios/s390-ccw/iplb.h.
- */
-struct QemuIplParameters {
- uint8_t qipl_flags;
- uint8_t reserved1[3];
- uint64_t reserved2;
- uint32_t boot_menu_timeout;
- uint8_t reserved3[12];
-} QEMU_PACKED;
-typedef struct QemuIplParameters QemuIplParameters;
-
#define TYPE_S390_IPL "s390-ipl"
OBJECT_DECLARE_SIMPLE_TYPE(S390IPLState, S390_IPL)
diff --git a/include/hw/s390x/ipl/qipl.h b/include/hw/s390x/ipl/qipl.h
new file mode 100644
index 0000000000..0ef04af027
--- /dev/null
+++ b/include/hw/s390x/ipl/qipl.h
@@ -0,0 +1,123 @@
+/*
+ * S/390 boot structures
+ *
+ * Copyright 2024 IBM Corp.
+ * Author(s): Jared Rossi <jrossi@linux.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or (at
+ * your option) any later version. See the COPYING file in the top-level
+ * directory.
+ */
+
+#ifndef S390X_QIPL_H
+#define S390X_QIPL_H
+
+/* Boot Menu flags */
+#define QIPL_FLAG_BM_OPTS_CMD 0x80
+#define QIPL_FLAG_BM_OPTS_ZIPL 0x40
+
+#define QIPL_ADDRESS 0xcc
+#define LOADPARM_LEN 8
+
+/*
+ * The QEMU IPL Parameters will be stored at absolute address
+ * 204 (0xcc) which means it is 32-bit word aligned but not
+ * double-word aligned. Placement of 64-bit data fields in this
+ * area must account for their alignment needs.
+ * The total size of the struct must never exceed 28 bytes.
+ */
+struct QemuIplParameters {
+ uint8_t qipl_flags;
+ uint8_t reserved1[3];
+ uint64_t reserved2;
+ uint32_t boot_menu_timeout;
+ uint8_t reserved3[12];
+} QEMU_PACKED;
+typedef struct QemuIplParameters QemuIplParameters;
+
+struct IPLBlockPVComp {
+ uint64_t tweak_pref;
+ uint64_t addr;
+ uint64_t size;
+} QEMU_PACKED;
+typedef struct IPLBlockPVComp IPLBlockPVComp;
+
+struct IPLBlockPV {
+ uint8_t reserved18[87]; /* 0x18 */
+ uint8_t version; /* 0x6f */
+ uint32_t reserved70; /* 0x70 */
+ uint32_t num_comp; /* 0x74 */
+ uint64_t pv_header_addr; /* 0x78 */
+ uint64_t pv_header_len; /* 0x80 */
+ struct IPLBlockPVComp components[0];
+} QEMU_PACKED;
+typedef struct IPLBlockPV IPLBlockPV;
+
+struct IplBlockCcw {
+ uint8_t reserved0[85];
+ uint8_t ssid;
+ uint16_t devno;
+ uint8_t vm_flags;
+ uint8_t reserved3[3];
+ uint32_t vm_parm_len;
+ uint8_t nss_name[8];
+ uint8_t vm_parm[64];
+ uint8_t reserved4[8];
+} QEMU_PACKED;
+typedef struct IplBlockCcw IplBlockCcw;
+
+struct IplBlockFcp {
+ uint8_t reserved1[305 - 1];
+ uint8_t opt;
+ uint8_t reserved2[3];
+ uint16_t reserved3;
+ uint16_t devno;
+ uint8_t reserved4[4];
+ uint64_t wwpn;
+ uint64_t lun;
+ uint32_t bootprog;
+ uint8_t reserved5[12];
+ uint64_t br_lba;
+ uint32_t scp_data_len;
+ uint8_t reserved6[260];
+ uint8_t scp_data[0];
+} QEMU_PACKED;
+typedef struct IplBlockFcp IplBlockFcp;
+
+struct IplBlockQemuScsi {
+ uint32_t lun;
+ uint16_t target;
+ uint16_t channel;
+ uint8_t reserved0[77];
+ uint8_t ssid;
+ uint16_t devno;
+} QEMU_PACKED;
+typedef struct IplBlockQemuScsi IplBlockQemuScsi;
+
+union IplParameterBlock {
+ struct {
+ uint32_t len;
+ uint8_t reserved0[3];
+ uint8_t version;
+ uint32_t blk0_len;
+ uint8_t pbt;
+ uint8_t flags;
+ uint16_t reserved01;
+ uint8_t loadparm[LOADPARM_LEN];
+ union {
+ IplBlockCcw ccw;
+ IplBlockFcp fcp;
+ IPLBlockPV pv;
+ IplBlockQemuScsi scsi;
+ };
+ } QEMU_PACKED;
+ struct {
+ uint8_t reserved1[110];
+ uint16_t devno;
+ uint8_t reserved2[88];
+ uint8_t reserved_ext[4096 - 200];
+ } QEMU_PACKED;
+} QEMU_PACKED;
+typedef union IplParameterBlock IplParameterBlock;
+
+#endif
diff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h
index 3758698468..16643f5879 100644
--- a/pc-bios/s390-ccw/iplb.h
+++ b/pc-bios/s390-ccw/iplb.h
@@ -12,88 +12,14 @@
#ifndef IPLB_H
#define IPLB_H
-#define LOADPARM_LEN 8
+#ifndef QEMU_PACKED
+#define QEMU_PACKED __attribute__((packed))
+#endif
-struct IplBlockCcw {
- uint8_t reserved0[85];
- uint8_t ssid;
- uint16_t devno;
- uint8_t vm_flags;
- uint8_t reserved3[3];
- uint32_t vm_parm_len;
- uint8_t nss_name[8];
- uint8_t vm_parm[64];
- uint8_t reserved4[8];
-} __attribute__ ((packed));
-typedef struct IplBlockCcw IplBlockCcw;
-
-struct IplBlockFcp {
- uint8_t reserved1[305 - 1];
- uint8_t opt;
- uint8_t reserved2[3];
- uint16_t reserved3;
- uint16_t devno;
- uint8_t reserved4[4];
- uint64_t wwpn;
- uint64_t lun;
- uint32_t bootprog;
- uint8_t reserved5[12];
- uint64_t br_lba;
- uint32_t scp_data_len;
- uint8_t reserved6[260];
- uint8_t scp_data[];
-} __attribute__ ((packed));
-typedef struct IplBlockFcp IplBlockFcp;
-
-struct IplBlockQemuScsi {
- uint32_t lun;
- uint16_t target;
- uint16_t channel;
- uint8_t reserved0[77];
- uint8_t ssid;
- uint16_t devno;
-} __attribute__ ((packed));
-typedef struct IplBlockQemuScsi IplBlockQemuScsi;
-
-struct IplParameterBlock {
- uint32_t len;
- uint8_t reserved0[3];
- uint8_t version;
- uint32_t blk0_len;
- uint8_t pbt;
- uint8_t flags;
- uint16_t reserved01;
- uint8_t loadparm[LOADPARM_LEN];
- union {
- IplBlockCcw ccw;
- IplBlockFcp fcp;
- IplBlockQemuScsi scsi;
- };
-} __attribute__ ((packed));
-typedef struct IplParameterBlock IplParameterBlock;
-
-extern IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
-
-#define QIPL_ADDRESS 0xcc
-
-/* Boot Menu flags */
-#define QIPL_FLAG_BM_OPTS_CMD 0x80
-#define QIPL_FLAG_BM_OPTS_ZIPL 0x40
-
-/*
- * This definition must be kept in sync with the definition
- * in hw/s390x/ipl.h
- */
-struct QemuIplParameters {
- uint8_t qipl_flags;
- uint8_t reserved1[3];
- uint64_t reserved2;
- uint32_t boot_menu_timeout;
- uint8_t reserved3[12];
-} __attribute__ ((packed));
-typedef struct QemuIplParameters QemuIplParameters;
+#include <qipl.h>
extern QemuIplParameters qipl;
+extern IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
#define S390_IPL_TYPE_FCP 0x00
#define S390_IPL_TYPE_CCW 0x02
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 27cbb354af..db9e8f0892 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -3,7 +3,7 @@ all: build-all
@true
include config-host.mak
-CFLAGS = -O2 -g
+CFLAGS = -O2 -g -I $(SRC_PATH)/../../include/hw/s390x/ipl
MAKEFLAGS += -rR
GIT_SUBMODULES = roms/SLOF
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 14/19] s390x: Add individual loadparm assignment to CCW device
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (12 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 13/19] include/hw/s390x: Add include files for common IPL structs jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-08 1:15 ` [PATCH v3 15/19] hw/s390x: Build an IPLB for each boot device jrossi
` (4 subsequent siblings)
18 siblings, 0 replies; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Add a loadparm property to the VirtioCcwDevice object so that different
loadparms can be defined on a per-device basis for CCW boot devices.
The machine/global loadparm is still supported. If both a global and per-device
loadparm are defined, the per-device value will override the global value for
that device, but any other devices that do not specify a per-device loadparm
will still use the global loadparm.
It is invalid to assign a loadparm to a non-boot device.
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/s390x/ccw-device.h | 2 ++
hw/s390x/ipl.h | 3 +-
hw/s390x/ccw-device.c | 46 ++++++++++++++++++++++++++
hw/s390x/ipl.c | 66 +++++++++++++++++++++++---------------
hw/s390x/s390-virtio-ccw.c | 18 +----------
hw/s390x/sclp.c | 3 +-
pc-bios/s390-ccw/main.c | 10 ++++--
7 files changed, 100 insertions(+), 48 deletions(-)
diff --git a/hw/s390x/ccw-device.h b/hw/s390x/ccw-device.h
index 5feeb0ee7a..1e1737c0f3 100644
--- a/hw/s390x/ccw-device.h
+++ b/hw/s390x/ccw-device.h
@@ -26,6 +26,8 @@ struct CcwDevice {
CssDevId dev_id;
/* The actual busid of the virtual subchannel. */
CssDevId subch_id;
+ /* If set, use this loadparm value when device is boot target */
+ uint8_t loadparm[8];
};
typedef struct CcwDevice CcwDevice;
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index fa394c339d..b670bad551 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -21,7 +21,8 @@
#define DIAG308_FLAGS_LP_VALID 0x80
-int s390_ipl_set_loadparm(uint8_t *loadparm);
+void s390_ipl_convert_loadparm(char *ascii_lp, uint8_t *ebcdic_lp);
+void s390_ipl_fmt_loadparm(uint8_t *loadparm, char *str, Error **errp);
void s390_ipl_update_diag308(IplParameterBlock *iplb);
int s390_ipl_prepare_pv_header(Error **errp);
int s390_ipl_pv_unpack(void);
diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c
index 14c24e3890..230cc09e03 100644
--- a/hw/s390x/ccw-device.c
+++ b/hw/s390x/ccw-device.c
@@ -13,6 +13,10 @@
#include "ccw-device.h"
#include "hw/qdev-properties.h"
#include "qemu/module.h"
+#include "ipl.h"
+#include "qapi/visitor.h"
+#include "qemu/ctype.h"
+#include "qapi/error.h"
static void ccw_device_refill_ids(CcwDevice *dev)
{
@@ -37,10 +41,52 @@ static bool ccw_device_realize(CcwDevice *dev, Error **errp)
return true;
}
+static void ccw_device_get_loadparm(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ CcwDevice *dev = CCW_DEVICE(obj);
+ char *str = g_strndup((char *) dev->loadparm, sizeof(dev->loadparm));
+
+ visit_type_str(v, name, &str, errp);
+ g_free(str);
+}
+
+static void ccw_device_set_loadparm(Object *obj, Visitor *v,
+ const char *name, void *opaque,
+ Error **errp)
+{
+ CcwDevice *dev = CCW_DEVICE(obj);
+ char *val;
+ int index;
+
+ index = object_property_get_int(obj, "bootindex", NULL);
+
+ if (index < 0) {
+ error_setg(errp, "LOADPARM is only valid for boot devices!");
+ }
+
+ if (!visit_type_str(v, name, &val, errp)) {
+ return;
+ }
+
+ s390_ipl_fmt_loadparm(dev->loadparm, val, errp);
+}
+
+static const PropertyInfo ccw_loadparm = {
+ .name = "ccw_loadparm",
+ .description = "Up to 8 chars in set of [A-Za-z0-9. ] to pass"
+ " to the guest loader/kernel",
+ .get = ccw_device_get_loadparm,
+ .set = ccw_device_set_loadparm,
+};
+
static Property ccw_device_properties[] = {
DEFINE_PROP_CSS_DEV_ID("devno", CcwDevice, devno),
DEFINE_PROP_CSS_DEV_ID_RO("dev_id", CcwDevice, dev_id),
DEFINE_PROP_CSS_DEV_ID_RO("subch_id", CcwDevice, subch_id),
+ DEFINE_PROP("loadparm", CcwDevice, loadparm, ccw_loadparm,
+ typeof(uint8_t[8])),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 8c490eeb52..55a83bb836 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -34,6 +34,7 @@
#include "qemu/config-file.h"
#include "qemu/cutils.h"
#include "qemu/option.h"
+#include "qemu/ctype.h"
#include "standard-headers/linux/virtio_ids.h"
#define KERN_IMAGE_START 0x010000UL
@@ -397,12 +398,43 @@ static CcwDevice *s390_get_ccw_device(DeviceState *dev_st, int *devtype)
return ccw_dev;
}
+void s390_ipl_fmt_loadparm(uint8_t *loadparm, char *str, Error **errp)
+{
+ int i;
+
+ /* Initialize the loadparm with spaces */
+ memset(loadparm, ' ', LOADPARM_LEN);
+ for (i = 0; i < LOADPARM_LEN && str[i]; i++) {
+ uint8_t c = qemu_toupper(str[i]); /* mimic HMC */
+
+ if (qemu_isalnum(c) || c == '.' || c == ' ') {
+ loadparm[i] = c;
+ } else {
+ error_setg(errp, "LOADPARM: invalid character '%c' (ASCII 0x%02x)",
+ c, c);
+ return;
+ }
+ }
+}
+
+void s390_ipl_convert_loadparm(char *ascii_lp, uint8_t *ebcdic_lp)
+{
+ int i;
+
+ /* Initialize the loadparm with EBCDIC spaces (0x40) */
+ memset(ebcdic_lp, '@', LOADPARM_LEN);
+ for (i = 0; i < LOADPARM_LEN && ascii_lp[i]; i++) {
+ ebcdic_lp[i] = ascii2ebcdic[(uint8_t) ascii_lp[i]];
+ }
+}
+
static bool s390_gen_initial_iplb(S390IPLState *ipl)
{
DeviceState *dev_st;
CcwDevice *ccw_dev = NULL;
SCSIDevice *sd;
int devtype;
+ uint8_t *lp;
dev_st = get_boot_device(0);
if (dev_st) {
@@ -413,6 +445,8 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)
* Currently allow IPL only from CCW devices.
*/
if (ccw_dev) {
+ lp = ccw_dev->loadparm;
+
switch (devtype) {
case CCW_DEVTYPE_SCSI:
sd = SCSI_DEVICE(dev_st);
@@ -445,40 +479,20 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)
break;
}
- if (!s390_ipl_set_loadparm(ipl->iplb.loadparm)) {
- ipl->iplb.flags |= DIAG308_FLAGS_LP_VALID;
+ /* If the device loadparm is empty use the global machine loadparm */
+ if (memcmp(lp, "\0\0\0\0\0\0\0\0", 8) == 0) {
+ lp = S390_CCW_MACHINE(qdev_get_machine())->loadparm;
}
+ s390_ipl_convert_loadparm((char *)lp, ipl->iplb.loadparm);
+ ipl->iplb.flags |= DIAG308_FLAGS_LP_VALID;
+
return true;
}
return false;
}
-int s390_ipl_set_loadparm(uint8_t *loadparm)
-{
- MachineState *machine = MACHINE(qdev_get_machine());
- char *lp = object_property_get_str(OBJECT(machine), "loadparm", NULL);
-
- if (lp) {
- int i;
-
- /* lp is an uppercase string without leading/embedded spaces */
- for (i = 0; i < 8 && lp[i]; i++) {
- loadparm[i] = ascii2ebcdic[(uint8_t) lp[i]];
- }
-
- if (i < 8) {
- memset(loadparm + i, 0x40, 8 - i); /* fill with EBCDIC spaces */
- }
-
- g_free(lp);
- return 0;
- }
-
- return -1;
-}
-
static bool is_virtio_ccw_device_of_type(IplParameterBlock *iplb,
int virtio_id)
{
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 529e53f308..fe03f716f3 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -722,28 +722,12 @@ static void machine_set_loadparm(Object *obj, Visitor *v,
{
S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
char *val;
- int i;
if (!visit_type_str(v, name, &val, errp)) {
return;
}
- for (i = 0; i < sizeof(ms->loadparm) && val[i]; i++) {
- uint8_t c = qemu_toupper(val[i]); /* mimic HMC */
-
- if (('A' <= c && c <= 'Z') || ('0' <= c && c <= '9') || (c == '.') ||
- (c == ' ')) {
- ms->loadparm[i] = c;
- } else {
- error_setg(errp, "LOADPARM: invalid character '%c' (ASCII 0x%02x)",
- c, c);
- return;
- }
- }
-
- for (; i < sizeof(ms->loadparm); i++) {
- ms->loadparm[i] = ' '; /* pad right with spaces */
- }
+ s390_ipl_fmt_loadparm(ms->loadparm, val, errp);
}
static void ccw_machine_class_init(ObjectClass *oc, void *data)
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index e725dcd5fd..8b2d7a88bd 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -175,7 +175,8 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)
memcpy(&read_info->loadparm, &ipib->loadparm,
sizeof(read_info->loadparm));
} else {
- s390_ipl_set_loadparm(read_info->loadparm);
+ s390_ipl_convert_loadparm((char *)S390_CCW_MACHINE(machine)->loadparm,
+ read_info->loadparm);
}
sccb->h.response_code = cpu_to_be16(SCLP_RC_NORMAL_READ_COMPLETION);
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index f818bd7210..d7c457e0ed 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -183,8 +183,14 @@ static void css_setup(void)
static void boot_setup(void)
{
char lpmsg[] = "LOADPARM=[________]\n";
+ have_iplb = store_iplb(&iplb);
+
+ if (memcmp(iplb.loadparm, "@@@@@@@@", LOADPARM_LEN) != 0) {
+ ebcdic_to_ascii((char *) iplb.loadparm, loadparm_str, LOADPARM_LEN);
+ } else {
+ sclp_get_loadparm_ascii(loadparm_str);
+ }
- sclp_get_loadparm_ascii(loadparm_str);
memcpy(lpmsg + 10, loadparm_str, 8);
puts(lpmsg);
@@ -193,8 +199,6 @@ static void boot_setup(void)
* so we don't taint our decision-making process during a reboot.
*/
memset((char *)S390EP, 0, 6);
-
- have_iplb = store_iplb(&iplb);
}
static bool find_boot_device(void)
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 15/19] hw/s390x: Build an IPLB for each boot device
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (13 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 14/19] s390x: Add individual loadparm assignment to CCW device jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-09 12:27 ` Thomas Huth
2024-10-08 1:15 ` [PATCH v3 16/19] s390x: Rebuild IPLB for SCSI device directly from DIAG308 jrossi
` (3 subsequent siblings)
18 siblings, 1 reply; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Build an IPLB for any device with a bootindex (up to a maximum of 8 devices).
The IPLB chain is placed immediately before the BIOS in memory. Because this
is not a fixed address, the location of the next IPLB and number of remaining
boot devices is stored in the QIPL global variable for possible later access by
the guest during IPL.
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
hw/s390x/ipl.h | 1 +
include/hw/s390x/ipl/qipl.h | 4 +-
hw/s390x/ipl.c | 123 ++++++++++++++++++++++++++++--------
3 files changed, 99 insertions(+), 29 deletions(-)
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index b670bad551..54eb48fd6e 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -20,6 +20,7 @@
#include "qom/object.h"
#define DIAG308_FLAGS_LP_VALID 0x80
+#define MAX_BOOT_DEVS 8 /* Max number of devices that may have a bootindex */
void s390_ipl_convert_loadparm(char *ascii_lp, uint8_t *ebcdic_lp);
void s390_ipl_fmt_loadparm(uint8_t *loadparm, char *str, Error **errp);
diff --git a/include/hw/s390x/ipl/qipl.h b/include/hw/s390x/ipl/qipl.h
index 0ef04af027..e56b181298 100644
--- a/include/hw/s390x/ipl/qipl.h
+++ b/include/hw/s390x/ipl/qipl.h
@@ -31,7 +31,9 @@ struct QemuIplParameters {
uint8_t reserved1[3];
uint64_t reserved2;
uint32_t boot_menu_timeout;
- uint8_t reserved3[12];
+ uint8_t reserved3[2];
+ uint16_t chain_len;
+ uint64_t next_iplb;
} QEMU_PACKED;
typedef struct QemuIplParameters QemuIplParameters;
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 55a83bb836..aec79f41a8 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -56,6 +56,13 @@ static bool iplb_extended_needed(void *opaque)
return ipl->iplbext_migration;
}
+/* Place the IPLB chain immediately before the BIOS in memory */
+static uint64_t find_iplb_chain_addr(uint64_t bios_addr, uint16_t count)
+{
+ return (bios_addr & TARGET_PAGE_MASK)
+ - (count * sizeof(IplParameterBlock));
+}
+
static const VMStateDescription vmstate_iplb_extended = {
.name = "ipl/iplb_extended",
.version_id = 0,
@@ -398,6 +405,17 @@ static CcwDevice *s390_get_ccw_device(DeviceState *dev_st, int *devtype)
return ccw_dev;
}
+static uint64_t s390_ipl_map_iplb_chain(IplParameterBlock *iplb_chain)
+{
+ S390IPLState *ipl = get_ipl_device();
+ uint16_t count = ipl->qipl.chain_len;
+ uint64_t len = sizeof(IplParameterBlock) * count;
+ uint64_t chain_addr = find_iplb_chain_addr(ipl->bios_start_addr, count);
+
+ cpu_physical_memory_write(chain_addr, iplb_chain, len);
+ return chain_addr;
+}
+
void s390_ipl_fmt_loadparm(uint8_t *loadparm, char *str, Error **errp)
{
int i;
@@ -428,54 +446,51 @@ void s390_ipl_convert_loadparm(char *ascii_lp, uint8_t *ebcdic_lp)
}
}
-static bool s390_gen_initial_iplb(S390IPLState *ipl)
+static bool s390_build_iplb(DeviceState *dev_st, IplParameterBlock *iplb)
{
- DeviceState *dev_st;
+ S390IPLState *ipl = get_ipl_device();
CcwDevice *ccw_dev = NULL;
SCSIDevice *sd;
int devtype;
uint8_t *lp;
- dev_st = get_boot_device(0);
- if (dev_st) {
- ccw_dev = s390_get_ccw_device(dev_st, &devtype);
- }
-
/*
* Currently allow IPL only from CCW devices.
*/
+ ccw_dev = s390_get_ccw_device(dev_st, &devtype);
if (ccw_dev) {
lp = ccw_dev->loadparm;
switch (devtype) {
case CCW_DEVTYPE_SCSI:
sd = SCSI_DEVICE(dev_st);
- ipl->iplb.len = cpu_to_be32(S390_IPLB_MIN_QEMU_SCSI_LEN);
- ipl->iplb.blk0_len =
+ iplb->len = cpu_to_be32(S390_IPLB_MIN_QEMU_SCSI_LEN);
+ iplb->blk0_len =
cpu_to_be32(S390_IPLB_MIN_QEMU_SCSI_LEN - S390_IPLB_HEADER_LEN);
- ipl->iplb.pbt = S390_IPL_TYPE_QEMU_SCSI;
- ipl->iplb.scsi.lun = cpu_to_be32(sd->lun);
- ipl->iplb.scsi.target = cpu_to_be16(sd->id);
- ipl->iplb.scsi.channel = cpu_to_be16(sd->channel);
- ipl->iplb.scsi.devno = cpu_to_be16(ccw_dev->sch->devno);
- ipl->iplb.scsi.ssid = ccw_dev->sch->ssid & 3;
+ iplb->pbt = S390_IPL_TYPE_QEMU_SCSI;
+ iplb->scsi.lun = cpu_to_be32(sd->lun);
+ iplb->scsi.target = cpu_to_be16(sd->id);
+ iplb->scsi.channel = cpu_to_be16(sd->channel);
+ iplb->scsi.devno = cpu_to_be16(ccw_dev->sch->devno);
+ iplb->scsi.ssid = ccw_dev->sch->ssid & 3;
break;
case CCW_DEVTYPE_VFIO:
- ipl->iplb.len = cpu_to_be32(S390_IPLB_MIN_CCW_LEN);
- ipl->iplb.pbt = S390_IPL_TYPE_CCW;
- ipl->iplb.ccw.devno = cpu_to_be16(ccw_dev->sch->devno);
- ipl->iplb.ccw.ssid = ccw_dev->sch->ssid & 3;
+ iplb->len = cpu_to_be32(S390_IPLB_MIN_CCW_LEN);
+ iplb->pbt = S390_IPL_TYPE_CCW;
+ iplb->ccw.devno = cpu_to_be16(ccw_dev->sch->devno);
+ iplb->ccw.ssid = ccw_dev->sch->ssid & 3;
break;
case CCW_DEVTYPE_VIRTIO_NET:
+ /* The S390IPLState netboot is true if ANY IPLB may use netboot */
ipl->netboot = true;
/* Fall through to CCW_DEVTYPE_VIRTIO case */
case CCW_DEVTYPE_VIRTIO:
- ipl->iplb.len = cpu_to_be32(S390_IPLB_MIN_CCW_LEN);
- ipl->iplb.blk0_len =
+ iplb->len = cpu_to_be32(S390_IPLB_MIN_CCW_LEN);
+ iplb->blk0_len =
cpu_to_be32(S390_IPLB_MIN_CCW_LEN - S390_IPLB_HEADER_LEN);
- ipl->iplb.pbt = S390_IPL_TYPE_CCW;
- ipl->iplb.ccw.devno = cpu_to_be16(ccw_dev->sch->devno);
- ipl->iplb.ccw.ssid = ccw_dev->sch->ssid & 3;
+ iplb->pbt = S390_IPL_TYPE_CCW;
+ iplb->ccw.devno = cpu_to_be16(ccw_dev->sch->devno);
+ iplb->ccw.ssid = ccw_dev->sch->ssid & 3;
break;
}
@@ -484,8 +499,8 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)
lp = S390_CCW_MACHINE(qdev_get_machine())->loadparm;
}
- s390_ipl_convert_loadparm((char *)lp, ipl->iplb.loadparm);
- ipl->iplb.flags |= DIAG308_FLAGS_LP_VALID;
+ s390_ipl_convert_loadparm((char *)lp, iplb->loadparm);
+ iplb->flags |= DIAG308_FLAGS_LP_VALID;
return true;
}
@@ -493,6 +508,56 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)
return false;
}
+static bool s390_init_all_iplbs(S390IPLState *ipl)
+{
+ int iplb_num = 0;
+ IplParameterBlock iplb_chain[7];
+ DeviceState *dev_st = get_boot_device(0);
+
+ /*
+ * Parse the boot devices. Generate an IPLB for only the first boot device
+ * which will later be set with DIAG308.
+ */
+ if (!dev_st) {
+ ipl->qipl.chain_len = 0;
+ return false;
+ }
+
+ iplb_num = 1;
+ s390_build_iplb(dev_st, &ipl->iplb);
+
+ /* Index any fallback boot devices */
+ while (get_boot_device(iplb_num)) {
+ iplb_num++;
+ }
+
+ if (iplb_num > MAX_BOOT_DEVS) {
+ warn_report("Excess boot devices defined! %d boot devices found, "
+ "but only the first %d will be considered.",
+ iplb_num, MAX_BOOT_DEVS);
+
+ iplb_num = MAX_BOOT_DEVS;
+ }
+
+ ipl->qipl.chain_len = iplb_num - 1;
+
+ /*
+ * Build fallback IPLBs for any boot devices above index 0, up to a
+ * maximum amount as defined in ipl.h
+ */
+ if (iplb_num > 1) {
+ /* Start at 1 because the IPLB for boot index 0 is not chained */
+ for (int i = 1; i < iplb_num; i++) {
+ dev_st = get_boot_device(i);
+ s390_build_iplb(dev_st, &iplb_chain[i - 1]);
+ }
+
+ ipl->qipl.next_iplb = s390_ipl_map_iplb_chain(iplb_chain);
+ }
+
+ return iplb_num;
+}
+
static bool is_virtio_ccw_device_of_type(IplParameterBlock *iplb,
int virtio_id)
{
@@ -620,7 +685,7 @@ void s390_ipl_reset_request(CPUState *cs, enum s390_reset reset_type)
* this is the original boot device's SCSI
* so restore IPL parameter info from it
*/
- ipl->iplb_valid = s390_gen_initial_iplb(ipl);
+ ipl->iplb_valid = s390_build_iplb(get_boot_device(0), &ipl->iplb);
}
}
if (reset_type == S390_RESET_MODIFIED_CLEAR ||
@@ -714,7 +779,9 @@ void s390_ipl_prepare_cpu(S390CPU *cpu)
if (!ipl->kernel || ipl->iplb_valid) {
cpu->env.psw.addr = ipl->bios_start_addr;
if (!ipl->iplb_valid) {
- ipl->iplb_valid = s390_gen_initial_iplb(ipl);
+ ipl->iplb_valid = s390_init_all_iplbs(ipl);
+ } else {
+ ipl->qipl.chain_len = 0;
}
}
s390_ipl_set_boot_menu(ipl);
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH v3 15/19] hw/s390x: Build an IPLB for each boot device
2024-10-08 1:15 ` [PATCH v3 15/19] hw/s390x: Build an IPLB for each boot device jrossi
@ 2024-10-09 12:27 ` Thomas Huth
0 siblings, 0 replies; 36+ messages in thread
From: Thomas Huth @ 2024-10-09 12:27 UTC (permalink / raw)
To: jrossi, qemu-devel, qemu-s390x; +Cc: frankja
On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
> From: Jared Rossi <jrossi@linux.ibm.com>
>
> Build an IPLB for any device with a bootindex (up to a maximum of 8 devices).
>
> The IPLB chain is placed immediately before the BIOS in memory. Because this
> is not a fixed address, the location of the next IPLB and number of remaining
> boot devices is stored in the QIPL global variable for possible later access by
> the guest during IPL.
>
> Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
> ---
> hw/s390x/ipl.h | 1 +
> include/hw/s390x/ipl/qipl.h | 4 +-
> hw/s390x/ipl.c | 123 ++++++++++++++++++++++++++++--------
> 3 files changed, 99 insertions(+), 29 deletions(-)
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 16/19] s390x: Rebuild IPLB for SCSI device directly from DIAG308
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (14 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 15/19] hw/s390x: Build an IPLB for each boot device jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-08 1:15 ` [PATCH v3 17/19] pc-bios/s390x: Enable multi-device boot loop jrossi
` (2 subsequent siblings)
18 siblings, 0 replies; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Because virtio-scsi type devices use a non-architected IPLB pbt code they cannot
be set and stored normally. Instead, the IPLB must be rebuilt during re-ipl.
As s390x does not natively support multiple boot devices, the devno field is
used to store the position in the boot order for the device.
Handling the rebuild as part of DIAG308 removes the need to check the devices
for invalid IPLBs later in the IPL.
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
hw/s390x/ipl.h | 11 ++++--
include/hw/s390x/ipl/qipl.h | 3 +-
hw/s390x/ipl.c | 75 +++++++------------------------------
pc-bios/s390-ccw/jump2ipl.c | 11 ++++--
target/s390x/diag.c | 9 ++++-
5 files changed, 39 insertions(+), 70 deletions(-)
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index 54eb48fd6e..aead1d6ae5 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -24,6 +24,7 @@
void s390_ipl_convert_loadparm(char *ascii_lp, uint8_t *ebcdic_lp);
void s390_ipl_fmt_loadparm(uint8_t *loadparm, char *str, Error **errp);
+void s390_rebuild_iplb(uint16_t index, IplParameterBlock *iplb);
void s390_ipl_update_diag308(IplParameterBlock *iplb);
int s390_ipl_prepare_pv_header(Error **errp);
int s390_ipl_pv_unpack(void);
@@ -65,7 +66,8 @@ struct S390IPLState {
bool enforce_bios;
bool iplb_valid;
bool iplb_valid_pv;
- bool netboot;
+ bool rebuilt_iplb;
+ uint16_t iplb_index;
/* reset related properties don't have to be migrated or reset */
enum s390_reset reset_type;
int reset_cpu_index;
@@ -172,11 +174,14 @@ static inline bool iplb_valid_pv(IplParameterBlock *iplb)
static inline bool iplb_valid(IplParameterBlock *iplb)
{
+ uint32_t len = be32_to_cpu(iplb->len);
+
switch (iplb->pbt) {
case S390_IPL_TYPE_FCP:
- return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_FCP_LEN;
+ return len >= S390_IPLB_MIN_FCP_LEN;
case S390_IPL_TYPE_CCW:
- return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_CCW_LEN;
+ return (len >= S390_IPLB_MIN_CCW_LEN);
+ case S390_IPL_TYPE_QEMU_SCSI:
default:
return false;
}
diff --git a/include/hw/s390x/ipl/qipl.h b/include/hw/s390x/ipl/qipl.h
index e56b181298..451f3b1684 100644
--- a/include/hw/s390x/ipl/qipl.h
+++ b/include/hw/s390x/ipl/qipl.h
@@ -28,7 +28,8 @@
*/
struct QemuIplParameters {
uint8_t qipl_flags;
- uint8_t reserved1[3];
+ uint8_t index;
+ uint8_t reserved1[2];
uint64_t reserved2;
uint32_t boot_menu_timeout;
uint8_t reserved3[2];
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index aec79f41a8..50fde05b67 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -448,7 +448,6 @@ void s390_ipl_convert_loadparm(char *ascii_lp, uint8_t *ebcdic_lp)
static bool s390_build_iplb(DeviceState *dev_st, IplParameterBlock *iplb)
{
- S390IPLState *ipl = get_ipl_device();
CcwDevice *ccw_dev = NULL;
SCSIDevice *sd;
int devtype;
@@ -481,9 +480,6 @@ static bool s390_build_iplb(DeviceState *dev_st, IplParameterBlock *iplb)
iplb->ccw.ssid = ccw_dev->sch->ssid & 3;
break;
case CCW_DEVTYPE_VIRTIO_NET:
- /* The S390IPLState netboot is true if ANY IPLB may use netboot */
- ipl->netboot = true;
- /* Fall through to CCW_DEVTYPE_VIRTIO case */
case CCW_DEVTYPE_VIRTIO:
iplb->len = cpu_to_be32(S390_IPLB_MIN_CCW_LEN);
iplb->blk0_len =
@@ -508,6 +504,17 @@ static bool s390_build_iplb(DeviceState *dev_st, IplParameterBlock *iplb)
return false;
}
+
+void s390_rebuild_iplb(uint16_t dev_index, IplParameterBlock *iplb)
+{
+ S390IPLState *ipl = get_ipl_device();
+ uint16_t index;
+ index = ipl->rebuilt_iplb ? ipl->iplb_index : dev_index;
+
+ ipl->rebuilt_iplb = s390_build_iplb(get_boot_device(index), iplb);
+ ipl->iplb_index = index;
+}
+
static bool s390_init_all_iplbs(S390IPLState *ipl)
{
int iplb_num = 0;
@@ -558,44 +565,6 @@ static bool s390_init_all_iplbs(S390IPLState *ipl)
return iplb_num;
}
-static bool is_virtio_ccw_device_of_type(IplParameterBlock *iplb,
- int virtio_id)
-{
- uint8_t cssid;
- uint8_t ssid;
- uint16_t devno;
- uint16_t schid;
- SubchDev *sch = NULL;
-
- if (iplb->pbt != S390_IPL_TYPE_CCW) {
- return false;
- }
-
- devno = be16_to_cpu(iplb->ccw.devno);
- ssid = iplb->ccw.ssid & 3;
-
- for (schid = 0; schid < MAX_SCHID; schid++) {
- for (cssid = 0; cssid < MAX_CSSID; cssid++) {
- sch = css_find_subch(1, cssid, ssid, schid);
-
- if (sch && sch->devno == devno) {
- return sch->id.cu_model == virtio_id;
- }
- }
- }
- return false;
-}
-
-static bool is_virtio_net_device(IplParameterBlock *iplb)
-{
- return is_virtio_ccw_device_of_type(iplb, VIRTIO_ID_NET);
-}
-
-static bool is_virtio_scsi_device(IplParameterBlock *iplb)
-{
- return is_virtio_ccw_device_of_type(iplb, VIRTIO_ID_SCSI);
-}
-
static void update_machine_ipl_properties(IplParameterBlock *iplb)
{
Object *machine = qdev_get_machine();
@@ -635,7 +604,7 @@ void s390_ipl_update_diag308(IplParameterBlock *iplb)
ipl->iplb = *iplb;
ipl->iplb_valid = true;
}
- ipl->netboot = is_virtio_net_device(iplb);
+
update_machine_ipl_properties(iplb);
}
@@ -662,32 +631,14 @@ IplParameterBlock *s390_ipl_get_iplb(void)
void s390_ipl_reset_request(CPUState *cs, enum s390_reset reset_type)
{
S390IPLState *ipl = get_ipl_device();
-
if (reset_type == S390_RESET_EXTERNAL || reset_type == S390_RESET_REIPL) {
/* use CPU 0 for full resets */
ipl->reset_cpu_index = 0;
} else {
ipl->reset_cpu_index = cs->cpu_index;
}
- ipl->reset_type = reset_type;
- if (reset_type == S390_RESET_REIPL &&
- ipl->iplb_valid &&
- !ipl->netboot &&
- ipl->iplb.pbt == S390_IPL_TYPE_CCW &&
- is_virtio_scsi_device(&ipl->iplb)) {
- CcwDevice *ccw_dev = s390_get_ccw_device(get_boot_device(0), NULL);
-
- if (ccw_dev &&
- cpu_to_be16(ccw_dev->sch->devno) == ipl->iplb.ccw.devno &&
- (ccw_dev->sch->ssid & 3) == ipl->iplb.ccw.ssid) {
- /*
- * this is the original boot device's SCSI
- * so restore IPL parameter info from it
- */
- ipl->iplb_valid = s390_build_iplb(get_boot_device(0), &ipl->iplb);
- }
- }
+ ipl->reset_type = reset_type;
if (reset_type == S390_RESET_MODIFIED_CLEAR ||
reset_type == S390_RESET_LOAD_NORMAL ||
reset_type == S390_RESET_PV) {
diff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c
index 92627b56c6..711a69a206 100644
--- a/pc-bios/s390-ccw/jump2ipl.c
+++ b/pc-bios/s390-ccw/jump2ipl.c
@@ -40,10 +40,15 @@ int jump_to_IPL_code(uint64_t address)
write_subsystem_identification();
write_iplb_location();
- /* prevent unknown IPL types in the guest */
+ /*
+ * The IPLB for QEMU SCSI type devices must be rebuilt during re-ipl. The
+ * iplb.devno is set to the boot position of the target SCSI device.
+ */
if (iplb.pbt == S390_IPL_TYPE_QEMU_SCSI) {
- iplb.pbt = S390_IPL_TYPE_CCW;
- set_iplb(&iplb);
+ iplb.devno = qipl.index;
+ if (!set_iplb(&iplb)) {
+ panic("Failed to set IPLB");
+ }
}
/*
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index 27ffd48576..a1fd54ddac 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -133,7 +133,14 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
valid = subcode == DIAG308_PV_SET ? iplb_valid_pv(iplb) : iplb_valid(iplb);
if (!valid) {
- env->regs[r1 + 1] = DIAG_308_RC_INVALID;
+ if (subcode == DIAG308_SET && iplb->pbt == S390_IPL_TYPE_QEMU_SCSI) {
+ s390_rebuild_iplb(iplb->devno, iplb);
+ s390_ipl_update_diag308(iplb);
+ env->regs[r1 + 1] = DIAG_308_RC_OK;
+ } else {
+ env->regs[r1 + 1] = DIAG_308_RC_INVALID;
+ }
+
goto out;
}
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 17/19] pc-bios/s390x: Enable multi-device boot loop
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (15 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 16/19] s390x: Rebuild IPLB for SCSI device directly from DIAG308 jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-08 18:27 ` Jared Rossi
2024-10-08 1:15 ` [PATCH v3 18/19] docs/system: Update documentation for s390x IPL jrossi
2024-10-08 1:15 ` [PATCH v3 19/19] tests/qtest: Add s390x boot order tests to cdrom-test.c jrossi
18 siblings, 1 reply; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Allow attempts to boot from multiple IPL devices. If the first device fails to
IPL, select the pre-built IPLB for the next device in the boot order and attempt
to IPL from it. Continue this process until IPL is successful or there are no
devices left to try.
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
pc-bios/s390-ccw/iplb.h | 23 ++++++++++++++++++
pc-bios/s390-ccw/jump2ipl.c | 7 +++---
pc-bios/s390-ccw/main.c | 47 ++++++++++++++++++++++---------------
pc-bios/s390-ccw/netmain.c | 3 ++-
4 files changed, 57 insertions(+), 23 deletions(-)
---
pc-bios/s390-ccw/iplb.h | 23 ++++++++++++++++++
pc-bios/s390-ccw/jump2ipl.c | 7 +++---
pc-bios/s390-ccw/main.c | 47 ++++++++++++++++++++++---------------
pc-bios/s390-ccw/netmain.c | 3 ++-
4 files changed, 57 insertions(+), 23 deletions(-)
diff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h
index 16643f5879..d58fe71974 100644
--- a/pc-bios/s390-ccw/iplb.h
+++ b/pc-bios/s390-ccw/iplb.h
@@ -17,6 +17,7 @@
#endif
#include <qipl.h>
+#include <string.h>
extern QemuIplParameters qipl;
extern IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
@@ -49,4 +50,26 @@ static inline bool set_iplb(IplParameterBlock *iplb)
return manage_iplb(iplb, false);
}
+/*
+ * The IPL started on the device, but failed in some way. If the IPLB chain
+ * still has more devices left to try, use the next device in order.
+ */
+static inline bool load_next_iplb(void)
+{
+ IplParameterBlock *next_iplb;
+
+ if (qipl.chain_len < 1) {
+ return false;
+ }
+
+ qipl.index++;
+ next_iplb = (IplParameterBlock *) qipl.next_iplb;
+ memcpy(&iplb, next_iplb, sizeof(IplParameterBlock));
+
+ qipl.chain_len--;
+ qipl.next_iplb = qipl.next_iplb + sizeof(IplParameterBlock);
+
+ return true;
+}
+
#endif /* IPLB_H */
diff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c
index 711a69a206..a3e5d55499 100644
--- a/pc-bios/s390-ccw/jump2ipl.c
+++ b/pc-bios/s390-ccw/jump2ipl.c
@@ -46,9 +46,10 @@ int jump_to_IPL_code(uint64_t address)
*/
if (iplb.pbt == S390_IPL_TYPE_QEMU_SCSI) {
iplb.devno = qipl.index;
- if (!set_iplb(&iplb)) {
- panic("Failed to set IPLB");
- }
+ }
+
+ if (have_iplb && !set_iplb(&iplb)) {
+ panic("Failed to set IPLB");
}
/*
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index d7c457e0ed..1b05174ace 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -23,7 +23,7 @@ static SubChannelId blk_schid = { .one = 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 */
@@ -55,6 +55,12 @@ void write_iplb_location(void)
}
}
+static void copy_qipl(void)
+{
+ QemuIplParameters *early_qipl = (QemuIplParameters *)QIPL_ADDRESS;
+ memcpy(&qipl, early_qipl, sizeof(QemuIplParameters));
+}
+
unsigned int get_loadparm_index(void)
{
return atoi(loadparm_str);
@@ -152,6 +158,7 @@ static void menu_setup(void)
/* If loadparm was set to any other value, then do not enable menu */
if (memcmp(loadparm_str, LOADPARM_EMPTY, LOADPARM_LEN) != 0) {
+ menu_set_parms(qipl.qipl_flags && ~BOOT_MENU_FLAG_MASK, 0);
return;
}
@@ -183,7 +190,6 @@ static void css_setup(void)
static void boot_setup(void)
{
char lpmsg[] = "LOADPARM=[________]\n";
- have_iplb = store_iplb(&iplb);
if (memcmp(iplb.loadparm, "@@@@@@@@", LOADPARM_LEN) != 0) {
ebcdic_to_ascii((char *) iplb.loadparm, loadparm_str, LOADPARM_LEN);
@@ -191,6 +197,10 @@ static void boot_setup(void)
sclp_get_loadparm_ascii(loadparm_str);
}
+ if (have_iplb) {
+ menu_setup();
+ }
+
memcpy(lpmsg + 10, loadparm_str, 8);
puts(lpmsg);
@@ -208,6 +218,7 @@ static bool find_boot_device(void)
switch (iplb.pbt) {
case S390_IPL_TYPE_CCW:
+ vdev->scsi_device_selected = false;
debug_print_int("device no. ", iplb.ccw.devno);
blk_schid.ssid = iplb.ccw.ssid & 0x3;
debug_print_int("ssid ", blk_schid.ssid);
@@ -231,15 +242,8 @@ static bool find_boot_device(void)
static int virtio_setup(void)
{
VDev *vdev = virtio_get_device();
- QemuIplParameters *early_qipl = (QemuIplParameters *)QIPL_ADDRESS;
int ret;
- memcpy(&qipl, early_qipl, sizeof(QemuIplParameters));
-
- if (have_iplb) {
- menu_setup();
- }
-
switch (vdev->senseid.cu_model) {
case VIRTIO_ID_NET:
puts("Network boot device detected");
@@ -271,11 +275,9 @@ static void ipl_boot_device(void)
dasd_ipl(blk_schid, cutype);
break;
case CU_TYPE_VIRTIO:
- if (virtio_setup()) {
- return; /* Only returns in case of errors */
+ if (virtio_setup() == 0) {
+ zipl_load();
}
- zipl_load();
- break;
default:
printf("Attempting to boot from unexpected device type 0x%X", cutype);
}
@@ -298,7 +300,6 @@ static void probe_boot_device(void)
}
if (ret == true) {
ipl_boot_device(); /* Only returns if unsuccessful */
- return;
}
}
}
@@ -308,14 +309,22 @@ static void probe_boot_device(void)
void main(void)
{
+ copy_qipl();
sclp_setup();
css_setup();
- boot_setup();
- if (have_iplb && find_boot_device()) {
- ipl_boot_device();
- } else {
+ have_iplb = store_iplb(&iplb);
+ if (!have_iplb) {
probe_boot_device();
}
- panic("Failed to IPL. Halting...");
+ while (have_iplb) {
+ boot_setup();
+ if (have_iplb && find_boot_device()) {
+ ipl_boot_device();
+ }
+ have_iplb = load_next_iplb();
+ }
+
+ panic("No suitable device for IPL. Halting...");
+
}
diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
index 0c2329c752..5e62ea2724 100644
--- a/pc-bios/s390-ccw/netmain.c
+++ b/pc-bios/s390-ccw/netmain.c
@@ -41,6 +41,7 @@
#define DEFAULT_TFTP_RETRIES 20
extern char _start[];
+extern bool have_iplb;
#define KERNEL_ADDR ((void *)0L)
#define KERNEL_MAX_SIZE ((long)_start)
@@ -478,7 +479,7 @@ static int virtio_setup(void)
*/
enable_mss_facility();
- if (store_iplb(&iplb)) {
+ if (have_iplb || store_iplb(&iplb)) {
IPL_assert(iplb.pbt == S390_IPL_TYPE_CCW, "IPL_TYPE_CCW expected");
dev_no = iplb.ccw.devno;
debug_print_int("device no. ", dev_no);
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH v3 17/19] pc-bios/s390x: Enable multi-device boot loop
2024-10-08 1:15 ` [PATCH v3 17/19] pc-bios/s390x: Enable multi-device boot loop jrossi
@ 2024-10-08 18:27 ` Jared Rossi
0 siblings, 0 replies; 36+ messages in thread
From: Jared Rossi @ 2024-10-08 18:27 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja
On 10/7/24 9:15 PM, jrossi@linux.ibm.com wrote:
> [snip...]
>
> switch (vdev->senseid.cu_model) {
> case VIRTIO_ID_NET:
> puts("Network boot device detected");
> @@ -271,11 +275,9 @@ static void ipl_boot_device(void)
> dasd_ipl(blk_schid, cutype);
> break;
> case CU_TYPE_VIRTIO:
> - if (virtio_setup()) {
> - return; /* Only returns in case of errors */
> + if (virtio_setup() == 0) {
> + zipl_load();
> }
> - zipl_load();
> - break;
> default:
> printf("Attempting to boot from unexpected device type 0x%X", cutype);
> }
>
> [snip...]
A small mistake I found after posting is that the break is missing after
zipl_load(). This causes the "unexpected device type" message to print after
a failed virtio IPL, but it is fixed simply by not removing the break
and will
be will be corrected in the next version.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v3 18/19] docs/system: Update documentation for s390x IPL
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (16 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 17/19] pc-bios/s390x: Enable multi-device boot loop jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-09 12:39 ` Thomas Huth
2024-10-08 1:15 ` [PATCH v3 19/19] tests/qtest: Add s390x boot order tests to cdrom-test.c jrossi
18 siblings, 1 reply; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Update docs to show that s390x PC BIOS can support more than one boot device.
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
docs/system/bootindex.rst | 7 ++++---
docs/system/s390x/bootdevices.rst | 9 ++++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/docs/system/bootindex.rst b/docs/system/bootindex.rst
index 8b057f812f..988f7b3beb 100644
--- a/docs/system/bootindex.rst
+++ b/docs/system/bootindex.rst
@@ -49,10 +49,11 @@ Limitations
-----------
Some firmware has limitations on which devices can be considered for
-booting. For instance, the PC BIOS boot specification allows only one
-disk to be bootable. If boot from disk fails for some reason, the BIOS
+booting. For instance, the x86 PC BIOS boot specification allows only one
+disk to be bootable. If boot from disk fails for some reason, the x86 BIOS
won't retry booting from other disk. It can still try to boot from
-floppy or net, though.
+floppy or net, though. In the case of s390x BIOS, the BIOS will try up to
+8 total devices, any number of which may be disks.
Sometimes, firmware cannot map the device path QEMU wants firmware to
boot from to a boot method. It doesn't happen for devices the firmware
diff --git a/docs/system/s390x/bootdevices.rst b/docs/system/s390x/bootdevices.rst
index c97efb8fc0..1a1a764c1c 100644
--- a/docs/system/s390x/bootdevices.rst
+++ b/docs/system/s390x/bootdevices.rst
@@ -6,9 +6,7 @@ Booting with bootindex parameter
For classical mainframe guests (i.e. LPAR or z/VM installations), you always
have to explicitly specify the disk where you want to boot from (or "IPL" from,
-in s390x-speak -- IPL means "Initial Program Load"). In particular, there can
-also be only one boot device according to the architecture specification, thus
-specifying multiple boot devices is not possible (yet).
+in s390x-speak -- IPL means "Initial Program Load").
So for booting an s390x guest in QEMU, you should always mark the
device where you want to boot from with the ``bootindex`` property, for
@@ -17,6 +15,11 @@ example::
qemu-system-s390x -drive if=none,id=dr1,file=guest.qcow2 \
-device virtio-blk,drive=dr1,bootindex=1
+Multiple devices may have a bootindex. The lowest bootindex is assigned to the
+device to IPL first. If the IPL fails for the first, the device with the second
+lowest bootindex will be tried and so on until IPL is successful or there are no
+remaining boot devices to try.
+
For booting from a CD-ROM ISO image (which needs to include El-Torito boot
information in order to be bootable), it is recommended to specify a ``scsi-cd``
device, for example like this::
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH v3 19/19] tests/qtest: Add s390x boot order tests to cdrom-test.c
2024-10-08 1:15 [PATCH v3 00/19] s390x: Add Full Boot Order Support jrossi
` (17 preceding siblings ...)
2024-10-08 1:15 ` [PATCH v3 18/19] docs/system: Update documentation for s390x IPL jrossi
@ 2024-10-08 1:15 ` jrossi
2024-10-09 12:48 ` Thomas Huth
18 siblings, 1 reply; 36+ messages in thread
From: jrossi @ 2024-10-08 1:15 UTC (permalink / raw)
To: qemu-devel, qemu-s390x, thuth; +Cc: frankja, jrossi
From: Jared Rossi <jrossi@linux.ibm.com>
Add two new qtests to verify that a valid IPL device can successfully boot after
failed IPL attempts from one or more invalid devices.
cdrom-test/as-fallback-device: Defines the primary boot target as a device that
is invalid for IPL and a second boot target that is valid for IPL. Ensures that
the valid device will be selected after the initial failed IPL.
cdrom-test/as-last-option: Defines the maximum number of boot devices (8)
where only the final entry in the boot order is valid. Ensures that a valid
device will be selected even after multiple failed IPL attempts from both
virtio-blk and virtio-scsi device types.
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
---
tests/qtest/cdrom-test.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
index 9d72b24e4b..123c067589 100644
--- a/tests/qtest/cdrom-test.c
+++ b/tests/qtest/cdrom-test.c
@@ -213,6 +213,30 @@ static void add_s390x_tests(void)
"-drive driver=null-co,read-zeroes=on,if=none,id=d1 "
"-device virtio-blk,drive=d2,bootindex=1 "
"-drive if=none,id=d2,media=cdrom,file=", test_cdboot);
+ qtest_add_data_func("cdrom/boot/as-fallback-device",
+ "-device virtio-serial -device virtio-scsi "
+ "-device virtio-blk,drive=d1,bootindex=1 "
+ "-drive driver=null-co,read-zeroes=on,if=none,id=d1 "
+ "-device virtio-blk,drive=d2,bootindex=2 "
+ "-drive if=none,id=d2,media=cdrom,file=", test_cdboot);
+ qtest_add_data_func("cdrom/boot/as-last-option",
+ "-device virtio-serial -device virtio-scsi "
+ "-device virtio-blk,drive=d1,bootindex=1 "
+ "-drive driver=null-co,read-zeroes=on,if=none,id=d1 "
+ "-device virtio-blk,drive=d2,bootindex=2 "
+ "-drive driver=null-co,read-zeroes=on,if=none,id=d2 "
+ "-device virtio-blk,drive=d3,bootindex=3 "
+ "-drive driver=null-co,read-zeroes=on,if=none,id=d3 "
+ "-device scsi-hd,drive=d4,bootindex=4 "
+ "-drive driver=null-co,read-zeroes=on,if=none,id=d4 "
+ "-device scsi-hd,drive=d5,bootindex=5 "
+ "-drive driver=null-co,read-zeroes=on,if=none,id=d5 "
+ "-device virtio-blk,drive=d6,bootindex=6 "
+ "-drive driver=null-co,read-zeroes=on,if=none,id=d6 "
+ "-device scsi-hd,drive=d7,bootindex=7 "
+ "-drive driver=null-co,read-zeroes=on,if=none,id=d7 "
+ "-device virtio-blk,drive=d8,bootindex=8 "
+ "-drive if=none,id=d8,media=cdrom,file=", test_cdboot);
if (qtest_has_device("x-terminal3270")) {
qtest_add_data_func("cdrom/boot/without-bootindex",
"-device virtio-scsi -device virtio-serial "
--
2.45.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH v3 19/19] tests/qtest: Add s390x boot order tests to cdrom-test.c
2024-10-08 1:15 ` [PATCH v3 19/19] tests/qtest: Add s390x boot order tests to cdrom-test.c jrossi
@ 2024-10-09 12:48 ` Thomas Huth
2024-10-10 1:37 ` Jared Rossi
0 siblings, 1 reply; 36+ messages in thread
From: Thomas Huth @ 2024-10-09 12:48 UTC (permalink / raw)
To: jrossi, qemu-devel, qemu-s390x; +Cc: frankja
On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
> From: Jared Rossi <jrossi@linux.ibm.com>
>
> Add two new qtests to verify that a valid IPL device can successfully boot after
> failed IPL attempts from one or more invalid devices.
>
> cdrom-test/as-fallback-device: Defines the primary boot target as a device that
> is invalid for IPL and a second boot target that is valid for IPL. Ensures that
> the valid device will be selected after the initial failed IPL.
>
> cdrom-test/as-last-option: Defines the maximum number of boot devices (8)
> where only the final entry in the boot order is valid. Ensures that a valid
> device will be selected even after multiple failed IPL attempts from both
> virtio-blk and virtio-scsi device types.
>
> Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
> ---
> tests/qtest/cdrom-test.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
> index 9d72b24e4b..123c067589 100644
> --- a/tests/qtest/cdrom-test.c
> +++ b/tests/qtest/cdrom-test.c
> @@ -213,6 +213,30 @@ static void add_s390x_tests(void)
> "-drive driver=null-co,read-zeroes=on,if=none,id=d1 "
> "-device virtio-blk,drive=d2,bootindex=1 "
> "-drive if=none,id=d2,media=cdrom,file=", test_cdboot);
> + qtest_add_data_func("cdrom/boot/as-fallback-device",
> + "-device virtio-serial -device virtio-scsi "
> + "-device virtio-blk,drive=d1,bootindex=1 "
> + "-drive driver=null-co,read-zeroes=on,if=none,id=d1 "
> + "-device virtio-blk,drive=d2,bootindex=2 "
> + "-drive if=none,id=d2,media=cdrom,file=", test_cdboot);
> + qtest_add_data_func("cdrom/boot/as-last-option",
> + "-device virtio-serial -device virtio-scsi "
> + "-device virtio-blk,drive=d1,bootindex=1 "
> + "-drive driver=null-co,read-zeroes=on,if=none,id=d1 "
> + "-device virtio-blk,drive=d2,bootindex=2 "
> + "-drive driver=null-co,read-zeroes=on,if=none,id=d2 "
> + "-device virtio-blk,drive=d3,bootindex=3 "
> + "-drive driver=null-co,read-zeroes=on,if=none,id=d3 "
> + "-device scsi-hd,drive=d4,bootindex=4 "
> + "-drive driver=null-co,read-zeroes=on,if=none,id=d4 "
> + "-device scsi-hd,drive=d5,bootindex=5 "
> + "-drive driver=null-co,read-zeroes=on,if=none,id=d5 "
> + "-device virtio-blk,drive=d6,bootindex=6 "
> + "-drive driver=null-co,read-zeroes=on,if=none,id=d6 "
> + "-device scsi-hd,drive=d7,bootindex=7 "
> + "-drive driver=null-co,read-zeroes=on,if=none,id=d7 "
> + "-device virtio-blk,drive=d8,bootindex=8 "
> + "-drive if=none,id=d8,media=cdrom,file=", test_cdboot);
Could you please use a scsi-hd for the good device here in the second test,
too? ... so we make sure that the good drive detection also works with
virtio-scsi devices and not only with virtio-blk devices.
Thanks,
Thomas
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v3 19/19] tests/qtest: Add s390x boot order tests to cdrom-test.c
2024-10-09 12:48 ` Thomas Huth
@ 2024-10-10 1:37 ` Jared Rossi
2024-10-10 5:46 ` Thomas Huth
0 siblings, 1 reply; 36+ messages in thread
From: Jared Rossi @ 2024-10-10 1:37 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, qemu-s390x; +Cc: frankja
On 10/9/24 8:48 AM, Thomas Huth wrote:
> On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
>> From: Jared Rossi <jrossi@linux.ibm.com>
>>
>> Add two new qtests to verify that a valid IPL device can successfully
>> boot after
>> failed IPL attempts from one or more invalid devices.
>>
>> cdrom-test/as-fallback-device: Defines the primary boot target as a
>> device that
>> is invalid for IPL and a second boot target that is valid for IPL.
>> Ensures that
>> the valid device will be selected after the initial failed IPL.
>>
>> cdrom-test/as-last-option: Defines the maximum number of boot devices
>> (8)
>> where only the final entry in the boot order is valid. Ensures that a
>> valid
>> device will be selected even after multiple failed IPL attempts from
>> both
>> virtio-blk and virtio-scsi device types.
>>
>> Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
>> ---
>> tests/qtest/cdrom-test.c | 24 ++++++++++++++++++++++++
>> 1 file changed, 24 insertions(+)
>>
>> diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
>> index 9d72b24e4b..123c067589 100644
>> --- a/tests/qtest/cdrom-test.c
>> +++ b/tests/qtest/cdrom-test.c
>> @@ -213,6 +213,30 @@ static void add_s390x_tests(void)
>> "-drive
>> driver=null-co,read-zeroes=on,if=none,id=d1 "
>> "-device virtio-blk,drive=d2,bootindex=1 "
>> "-drive if=none,id=d2,media=cdrom,file=",
>> test_cdboot);
>> + qtest_add_data_func("cdrom/boot/as-fallback-device",
>> + "-device virtio-serial -device virtio-scsi "
>> + "-device virtio-blk,drive=d1,bootindex=1 "
>> + "-drive
>> driver=null-co,read-zeroes=on,if=none,id=d1 "
>> + "-device virtio-blk,drive=d2,bootindex=2 "
>> + "-drive if=none,id=d2,media=cdrom,file=",
>> test_cdboot);
>> + qtest_add_data_func("cdrom/boot/as-last-option",
>> + "-device virtio-serial -device virtio-scsi "
>> + "-device virtio-blk,drive=d1,bootindex=1 "
>> + "-drive
>> driver=null-co,read-zeroes=on,if=none,id=d1 "
>> + "-device virtio-blk,drive=d2,bootindex=2 "
>> + "-drive
>> driver=null-co,read-zeroes=on,if=none,id=d2 "
>> + "-device virtio-blk,drive=d3,bootindex=3 "
>> + "-drive
>> driver=null-co,read-zeroes=on,if=none,id=d3 "
>> + "-device scsi-hd,drive=d4,bootindex=4 "
>> + "-drive
>> driver=null-co,read-zeroes=on,if=none,id=d4 "
>> + "-device scsi-hd,drive=d5,bootindex=5 "
>> + "-drive
>> driver=null-co,read-zeroes=on,if=none,id=d5 "
>> + "-device virtio-blk,drive=d6,bootindex=6 "
>> + "-drive
>> driver=null-co,read-zeroes=on,if=none,id=d6 "
>> + "-device scsi-hd,drive=d7,bootindex=7 "
>> + "-drive
>> driver=null-co,read-zeroes=on,if=none,id=d7 "
>> + "-device virtio-blk,drive=d8,bootindex=8 "
>> + "-drive if=none,id=d8,media=cdrom,file=",
>> test_cdboot);
>
> Could you please use a scsi-hd for the good device here in the second
> test, too? ... so we make sure that the good drive detection also
> works with virtio-scsi devices and not only with virtio-blk devices.
>
> Thanks,
> Thomas
>
Do you mean use "scsi-cd" instead?
Jared
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PATCH v3 19/19] tests/qtest: Add s390x boot order tests to cdrom-test.c
2024-10-10 1:37 ` Jared Rossi
@ 2024-10-10 5:46 ` Thomas Huth
0 siblings, 0 replies; 36+ messages in thread
From: Thomas Huth @ 2024-10-10 5:46 UTC (permalink / raw)
To: Jared Rossi, qemu-devel, qemu-s390x; +Cc: frankja
On 10/10/2024 03.37, Jared Rossi wrote:
>
>
> On 10/9/24 8:48 AM, Thomas Huth wrote:
>> On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
>>> From: Jared Rossi <jrossi@linux.ibm.com>
>>>
>>> Add two new qtests to verify that a valid IPL device can successfully
>>> boot after
>>> failed IPL attempts from one or more invalid devices.
>>>
>>> cdrom-test/as-fallback-device: Defines the primary boot target as a
>>> device that
>>> is invalid for IPL and a second boot target that is valid for IPL.
>>> Ensures that
>>> the valid device will be selected after the initial failed IPL.
>>>
>>> cdrom-test/as-last-option: Defines the maximum number of boot devices (8)
>>> where only the final entry in the boot order is valid. Ensures that a valid
>>> device will be selected even after multiple failed IPL attempts from both
>>> virtio-blk and virtio-scsi device types.
>>>
>>> Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
>>> ---
>>> tests/qtest/cdrom-test.c | 24 ++++++++++++++++++++++++
>>> 1 file changed, 24 insertions(+)
>>>
>>> diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
>>> index 9d72b24e4b..123c067589 100644
>>> --- a/tests/qtest/cdrom-test.c
>>> +++ b/tests/qtest/cdrom-test.c
>>> @@ -213,6 +213,30 @@ static void add_s390x_tests(void)
>>> "-drive driver=null-co,read-
>>> zeroes=on,if=none,id=d1 "
>>> "-device virtio-blk,drive=d2,bootindex=1 "
>>> "-drive if=none,id=d2,media=cdrom,file=",
>>> test_cdboot);
>>> + qtest_add_data_func("cdrom/boot/as-fallback-device",
>>> + "-device virtio-serial -device virtio-scsi "
>>> + "-device virtio-blk,drive=d1,bootindex=1 "
>>> + "-drive driver=null-co,read-
>>> zeroes=on,if=none,id=d1 "
>>> + "-device virtio-blk,drive=d2,bootindex=2 "
>>> + "-drive if=none,id=d2,media=cdrom,file=",
>>> test_cdboot);
>>> + qtest_add_data_func("cdrom/boot/as-last-option",
>>> + "-device virtio-serial -device virtio-scsi "
>>> + "-device virtio-blk,drive=d1,bootindex=1 "
>>> + "-drive driver=null-co,read-
>>> zeroes=on,if=none,id=d1 "
>>> + "-device virtio-blk,drive=d2,bootindex=2 "
>>> + "-drive driver=null-co,read-
>>> zeroes=on,if=none,id=d2 "
>>> + "-device virtio-blk,drive=d3,bootindex=3 "
>>> + "-drive driver=null-co,read-
>>> zeroes=on,if=none,id=d3 "
>>> + "-device scsi-hd,drive=d4,bootindex=4 "
>>> + "-drive driver=null-co,read-
>>> zeroes=on,if=none,id=d4 "
>>> + "-device scsi-hd,drive=d5,bootindex=5 "
>>> + "-drive driver=null-co,read-
>>> zeroes=on,if=none,id=d5 "
>>> + "-device virtio-blk,drive=d6,bootindex=6 "
>>> + "-drive driver=null-co,read-
>>> zeroes=on,if=none,id=d6 "
>>> + "-device scsi-hd,drive=d7,bootindex=7 "
>>> + "-drive driver=null-co,read-
>>> zeroes=on,if=none,id=d7 "
>>> + "-device virtio-blk,drive=d8,bootindex=8 "
>>> + "-drive if=none,id=d8,media=cdrom,file=",
>>> test_cdboot);
>>
>> Could you please use a scsi-hd for the good device here in the second
>> test, too? ... so we make sure that the good drive detection also works
>> with virtio-scsi devices and not only with virtio-blk devices.
>>
>> Thanks,
>> Thomas
>>
>
> Do you mean use "scsi-cd" instead?
Oh, right, sorry for the confusion!
Thomas
^ permalink raw reply [flat|nested] 36+ messages in thread