From 9bfc04f9ef6802fff0fc77130ff345a541783363 Mon Sep 17 00:00:00 2001 From: Janosch Frank Date: Wed, 4 Mar 2020 06:42:31 -0500 Subject: [PATCH 1/4] pc-bios: s390x: Save iplb location in lowcore The POP states that for a list directed IPL the IPLB is stored into memory by the machine loader and its address is stored at offset 0x14 of the lowcore. ZIPL currently uses the address in offset 0x14 to access the IPLB and acquire flags about secure boot. If the IPLB address points into memory which has an unsupported mix of flags set, ZIPL will panic instead of booting the OS. As the lowcore can have quite a high entropy for a guest that did drop out of protected mode (i.e. rebooted) we encountered the ZIPL panic quite often. Signed-off-by: Janosch Frank Tested-by: Marc Hartmayer Message-Id: <20200304114231.23493-19-frankja@linux.ibm.com> Reviewed-by: Christian Borntraeger Reviewed-by: David Hildenbrand Signed-off-by: Christian Borntraeger --- pc-bios/s390-ccw/jump2ipl.c | 1 + pc-bios/s390-ccw/main.c | 8 +++++++- pc-bios/s390-ccw/netmain.c | 1 + pc-bios/s390-ccw/s390-arch.h | 10 ++++++++-- pc-bios/s390-ccw/s390-ccw.h | 1 + 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c index da13c43cc0..4eba2510b0 100644 --- a/pc-bios/s390-ccw/jump2ipl.c +++ b/pc-bios/s390-ccw/jump2ipl.c @@ -35,6 +35,7 @@ void jump_to_IPL_code(uint64_t address) { /* store the subsystem information _after_ the bootmap was loaded */ write_subsystem_identification(); + write_iplb_location(); /* prevent unknown IPL types in the guest */ if (iplb.pbt == S390_IPL_TYPE_QEMU_SCSI) { diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index a21b386280..4e65b411e1 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -9,6 +9,7 @@ */ #include "libc.h" +#include "helper.h" #include "s390-arch.h" #include "s390-ccw.h" #include "cio.h" @@ -22,7 +23,7 @@ QemuIplParameters qipl; IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); static bool have_iplb; static uint16_t cutype; -LowCore const *lowcore; /* Yes, this *is* a pointer to address 0 */ +LowCore *lowcore; /* Yes, this *is* a pointer to address 0 */ #define LOADPARM_PROMPT "PROMPT " #define LOADPARM_EMPTY " " @@ -42,6 +43,11 @@ void write_subsystem_identification(void) *zeroes = 0; } +void write_iplb_location(void) +{ + lowcore->ptr_iplb = ptr2u32(&iplb); +} + void panic(const char *string) { sclp_print(string); diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c index f2dcc01e27..309ffa30d9 100644 --- a/pc-bios/s390-ccw/netmain.c +++ b/pc-bios/s390-ccw/netmain.c @@ -40,6 +40,7 @@ #define DEFAULT_TFTP_RETRIES 20 extern char _start[]; +void write_iplb_location(void) {} #define KERNEL_ADDR ((void *)0L) #define KERNEL_MAX_SIZE ((long)_start) diff --git a/pc-bios/s390-ccw/s390-arch.h b/pc-bios/s390-ccw/s390-arch.h index 504fc7c2f0..5f36361c02 100644 --- a/pc-bios/s390-ccw/s390-arch.h +++ b/pc-bios/s390-ccw/s390-arch.h @@ -36,7 +36,13 @@ typedef struct LowCore { /* prefix area: defined by architecture */ PSWLegacy ipl_psw; /* 0x000 */ uint32_t ccw1[2]; /* 0x008 */ - uint32_t ccw2[2]; /* 0x010 */ + union { + uint32_t ccw2[2]; /* 0x010 */ + struct { + uint32_t reserved10; + uint32_t ptr_iplb; + }; + }; uint8_t pad1[0x80 - 0x18]; /* 0x018 */ uint32_t ext_params; /* 0x080 */ uint16_t cpu_addr; /* 0x084 */ @@ -85,7 +91,7 @@ typedef struct LowCore { PSW io_new_psw; /* 0x1f0 */ } __attribute__((packed, aligned(8192))) LowCore; -extern LowCore const *lowcore; +extern LowCore *lowcore; static inline void set_prefix(uint32_t address) { diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h index 11bce7d73c..21f27e7990 100644 --- a/pc-bios/s390-ccw/s390-ccw.h +++ b/pc-bios/s390-ccw/s390-ccw.h @@ -57,6 +57,7 @@ void consume_io_int(void); /* main.c */ void panic(const char *string); void write_subsystem_identification(void); +void write_iplb_location(void); extern char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE))); unsigned int get_loadparm_index(void); From 73987ee5102ff646a62c4f4e5b89a1949b9fdbc9 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Thu, 5 Mar 2020 18:00:52 +0100 Subject: [PATCH 2/4] s390x/bios: rebuild s390-ccw.img contains 98df96d4edae ("pc-bios: s390x: Save iplb location in lowcore") Signed-off-by: Christian Borntraeger --- pc-bios/s390-ccw.img | Bin 42608 -> 42608 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pc-bios/s390-ccw.img b/pc-bios/s390-ccw.img index 91cdee4436ad828fe6cb664cfac270a21f2bde70..b9da9d8ecb10faa484a9a524a202f1f69cb59ad6 100644 GIT binary patch delta 8340 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 Date: Mon, 9 Mar 2020 14:32:23 +0100 Subject: [PATCH 3/4] s390/ipl: sync back loadparm We expose loadparm as a r/w machine property, but if loadparm is set by the guest via DIAG 308, we don't update the property. Having a disconnect between the guest view and the QEMU property is not nice in itself, but things get even worse for SCSI, where under certain circumstances (see 789b5a401b "s390: Ensure IPL from SCSI works as expected" for details) we call s390_gen_initial_iplb() on resets effectively overwriting the guest/user supplied loadparm with the stale value. Signed-off-by: Halil Pasic Fixes: 7104bae9de ("hw/s390x: provide loadparm property for the machine") Reported-by: Marc Hartmayer Reviewed-by: Janosch Frank Reviewed-by: Viktor Mihajlovski Tested-by: Marc Hartmayer Reviewed-by: David Hildenbrand Message-Id: <20200309133223.100491-1-pasic@linux.ibm.com> [borntraeger@de.ibm.com: use reverse xmas tree] Signed-off-by: Christian Borntraeger --- hw/s390x/ipl.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 9c1ecd423c..b81942e1e6 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -538,6 +538,30 @@ 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(); + Error *err = NULL; + + /* Sync loadparm */ + if (iplb->flags & DIAG308_FLAGS_LP_VALID) { + uint8_t *ebcdic_loadparm = iplb->loadparm; + char ascii_loadparm[8]; + int i; + + for (i = 0; i < 8 && ebcdic_loadparm[i]; i++) { + ascii_loadparm[i] = ebcdic2ascii[(uint8_t) ebcdic_loadparm[i]]; + } + ascii_loadparm[i] = 0; + object_property_set_str(machine, ascii_loadparm, "loadparm", &err); + } else { + object_property_set_str(machine, "", "loadparm", &err); + } + if (err) { + warn_report_err(err); + } +} + void s390_ipl_update_diag308(IplParameterBlock *iplb) { S390IPLState *ipl = get_ipl_device(); @@ -545,6 +569,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); } IplParameterBlock *s390_ipl_get_iplb(void) From 94c21436e5a89143f8b9cb4d089d1a2f3f4fd377 Mon Sep 17 00:00:00 2001 From: Janosch Frank Date: Tue, 10 Mar 2020 05:09:50 -0400 Subject: [PATCH 4/4] s390x: ipl: Consolidate iplb validity check into one function It's nicer to just call one function than calling a function for each possible iplb type. Signed-off-by: Janosch Frank Reviewed-by: David Hildenbrand Message-Id: <20200310090950.61172-1-frankja@linux.ibm.com> Reviewed-by: Christian Borntraeger Signed-off-by: Christian Borntraeger --- hw/s390x/ipl.h | 18 +++++++++--------- target/s390x/diag.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index d4813105db..3e44abe1c6 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -173,16 +173,16 @@ static inline bool iplb_valid_len(IplParameterBlock *iplb) return be32_to_cpu(iplb->len) <= sizeof(IplParameterBlock); } -static inline bool iplb_valid_ccw(IplParameterBlock *iplb) +static inline bool iplb_valid(IplParameterBlock *iplb) { - return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_CCW_LEN && - iplb->pbt == S390_IPL_TYPE_CCW; -} - -static inline bool iplb_valid_fcp(IplParameterBlock *iplb) -{ - return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_FCP_LEN && - iplb->pbt == S390_IPL_TYPE_FCP; + switch (iplb->pbt) { + case S390_IPL_TYPE_FCP: + return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_FCP_LEN; + case S390_IPL_TYPE_CCW: + return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_CCW_LEN; + default: + return false; + } } #endif diff --git a/target/s390x/diag.c b/target/s390x/diag.c index b5aec06d6b..54e5670b3f 100644 --- a/target/s390x/diag.c +++ b/target/s390x/diag.c @@ -117,7 +117,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len)); - if (!iplb_valid_ccw(iplb) && !iplb_valid_fcp(iplb)) { + if (!iplb_valid(iplb)) { env->regs[r1 + 1] = DIAG_308_RC_INVALID; goto out; }