From nobody Sat Nov 15 07:42:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1755553517; cv=none; d=zohomail.com; s=zohoarc; b=ghHHeIrH3v4Y1Kv3nRycQAYE27gyreaw1m+Hsnm39q2dmHa+T4wP+zCsOvPmC4iXmvA2rKiJd1JB80+1LFHL0fj9zxibdC/kAUd52BUTkrNQo3oTCZZTfWrBPRC60aeWQCWy2pLD/lWjVyaUlz59sHYUFQ6abF2Cw7F7+tqEJuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755553517; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4x+WT6lb7CEAsIr3qiRPURO1S0J07qNcICn0EVTg6Kk=; b=jUXwFyefOQxPz6OZ+Zz2txhlxAbem3YVTZYJ6NeLviOY+xaQA0fth8/1s72FRxL78c8l+9YD/rCEAPXB54S9d8Pw2yAF0I4x6wbd3vSsXmnaU18T97w0TOi+81fx364tL3XVe14ns7RySIr46DilB4sYt/glu6SojCS8cIQfkeQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1755553517332485.80917391397224; Mon, 18 Aug 2025 14:45:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uo7ep-0002gD-0y; Mon, 18 Aug 2025 17:44:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uo7ec-0002AO-Mz; Mon, 18 Aug 2025 17:44:37 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uo7eZ-0003oi-MJ; Mon, 18 Aug 2025 17:44:34 -0400 Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 57IJpGnA029140; Mon, 18 Aug 2025 21:43:59 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 48jhny3gfn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 Aug 2025 21:43:58 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 57IJo6UH003162; Mon, 18 Aug 2025 21:43:57 GMT Received: from smtprelay03.wdc07v.mail.ibm.com ([172.16.1.70]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 48k6hm7cvx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 Aug 2025 21:43:57 +0000 Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 57ILhlAJ28049930 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 18 Aug 2025 21:43:47 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A42B858057; Mon, 18 Aug 2025 21:43:55 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9F09458058; Mon, 18 Aug 2025 21:43:54 +0000 (GMT) Received: from fedora-workstation.ibmuc.com (unknown [9.61.98.172]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTP; Mon, 18 Aug 2025 21:43:54 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=4x+WT6lb7CEAsIr3q iRPURO1S0J07qNcICn0EVTg6Kk=; b=nFHqc64iojaqXBNgQwCF/D9KDjDtat9F0 7VQBt42ZFPceDIb4kfOlcrQUGkNT2I3VTZbKXjce/ZOouqpCkwQeWFsb7z4rPX0A lFgPvTwID70aF9mxYK0l/gQUS2XqpuonMFuF+wXzJzAfrT17ljfkwJlwnCwJXwrH XR4LsTLOLQPBJPCZgnV/zmFVEaLoFo7jkL9C2eXQ5EL55bg2lUvbnAZ9bxBxMZfj 4ItCyBDDjcrTz2qskeye+0dAjv+EUJMgu6USIv4JblIUXNZsiAbJJ7kp47EqccpF KlwUpa8gm72bZ5hFAE1N7Q9AVfwUQ1f/kJiT8Wx6lID4qUGYA83MQ== From: Zhuoying Cai To: thuth@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, david@redhat.com, jrossi@linux.ibm.com, qemu-s390x@nongnu.org, qemu-devel@nongnu.org Cc: walling@linux.ibm.com, jjherne@linux.ibm.com, pasic@linux.ibm.com, borntraeger@linux.ibm.com, farman@linux.ibm.com, mjrosato@linux.ibm.com, iii@linux.ibm.com, eblake@redhat.com, armbru@redhat.com, alifm@linux.ibm.com, zycai@linux.ibm.com Subject: [PATCH v5 26/29] pc-bios/s390-ccw: Handle secure boot with multiple boot devices Date: Mon, 18 Aug 2025 17:43:19 -0400 Message-ID: <20250818214323.529501-27-zycai@linux.ibm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818214323.529501-1-zycai@linux.ibm.com> References: <20250818214323.529501-1-zycai@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=XbqJzJ55 c=1 sm=1 tr=0 ts=68a39e9e cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=2OwXVqhp2XgA:10 a=VnNF1IyMAAAA:8 a=OWglaXZkh0GZWmb_D2oA:9 X-Proofpoint-ORIG-GUID: myyCd-pGNmzpnK-FRLBxh_u8sBNssDcD X-Proofpoint-GUID: myyCd-pGNmzpnK-FRLBxh_u8sBNssDcD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODE2MDAyNyBTYWx0ZWRfX5KQ5tX7bxWsE MEuXSzo0IM01YdkgfWTOBig4keOugyQqBB6YS9P6/Nx7q0V03FKGTAlJCeEPw6Bb5M6eVeeefKT 9d0HKXHoXf/sztl8t+ptQ5Q7kF3/HQvQA9TfwfrINXV6UzmPUegVl59VVOfC9ZSFyGsexmdaZFS 5+s1QHbWL9s5i8gMwB18/+YlvqkfTyypkT9WGwkjA2RzJHNQIVMO9Ksv+GkhVXXL0HrBEWwGjWy tvA44VmyuU90MqOZtsLc+WqFsx3QQJ42C9d/dvZdAFPrPohs0p/vSZ+YU0Dfh+Ap70IJrY77pZU 7D76360id2jPFPczEKZEJmCalRTN9B9KCSupRP9hQ9F9F2n4XF1XZRR7X6tJQrNZJt1uUZiNUJF lWusAupT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-18_06,2025-08-14_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 suspectscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 malwarescore=0 spamscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2508160027 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=zycai@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1755553520249124100 Content-Type: text/plain; charset="utf-8" The current approach to enable secure boot relies on providing secure-boot and boot-certs parameters of s390-ccw-virtio machine type option, which apply to all boot devices. With the possibility of multiple boot devices, secure boot expects all provided devices to be supported and eligible (e.g., virtio-blk/virtio-scsi using the SCSI scheme). If multiple boot devices are provided and include an unsupported (e.g., ECKD, VFIO) or a non-eligible (e.g., Net) device, the boot process will terminate with an error logged to the console. Signed-off-by: Zhuoying Cai --- pc-bios/s390-ccw/bootmap.c | 31 ++++++++------- pc-bios/s390-ccw/main.c | 75 ++++++++++++++++++++++++++++++++++--- pc-bios/s390-ccw/s390-ccw.h | 1 + 3 files changed, 88 insertions(+), 19 deletions(-) diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c index 3ab89b91fb..8297f22c3c 100644 --- a/pc-bios/s390-ccw/bootmap.c +++ b/pc-bios/s390-ccw/bootmap.c @@ -1136,25 +1136,35 @@ ZiplBootMode zipl_mode(uint8_t hdr_flags) return ZIPL_BOOT_MODE_NORMAL; } =20 +int zipl_check_scsi_mbr_magic(void) +{ + ScsiMbr *mbr =3D (void *)sec; + + /* Grab the MBR */ + memset(sec, FREE_SPACE_FILLER, sizeof(sec)); + if (virtio_read(0, mbr)) { + puts("Cannot read block 0"); + return -EIO; + } + + if (!magic_match(mbr->magic, ZIPL_MAGIC)) { + return -1; + } + + return 0; +} + void zipl_load(void) { VDev *vdev =3D virtio_get_device(); =20 if (vdev->is_cdrom) { - if (boot_mode =3D=3D ZIPL_BOOT_MODE_SECURE_AUDIT || - boot_mode =3D=3D ZIPL_BOOT_MODE_SECURE) { - panic("Secure boot from ISO image is not supported!"); - } ipl_iso_el_torito(); puts("Failed to IPL this ISO image!"); return; } =20 if (virtio_get_device_type() =3D=3D VIRTIO_ID_NET) { - if (boot_mode =3D=3D ZIPL_BOOT_MODE_SECURE_AUDIT || - boot_mode =3D=3D ZIPL_BOOT_MODE_SECURE) { - panic("Virtio net boot device does not support secure boot!"); - } netmain(); puts("Failed to IPL from this network!"); return; @@ -1165,11 +1175,6 @@ void zipl_load(void) return; } =20 - if (boot_mode =3D=3D ZIPL_BOOT_MODE_SECURE_AUDIT || - boot_mode =3D=3D ZIPL_BOOT_MODE_SECURE) { - panic("ECKD boot device does not support secure boot!"); - } - switch (virtio_get_device_type()) { case VIRTIO_ID_BLOCK: zipl_load_vblk(); diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index c5b425209a..228b52a37e 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -271,8 +271,43 @@ static int virtio_setup(void) return ret; } =20 -static void ipl_boot_device(void) +static void validate_secure_boot_device(void) +{ + switch (cutype) { + case CU_TYPE_DASD_3990: + case CU_TYPE_DASD_2107: + panic("Passthrough (vfio) device does not support secure boot!"); + break; + case CU_TYPE_VIRTIO: + if (virtio_setup() =3D=3D 0) { + VDev *vdev =3D virtio_get_device(); + + if (vdev->is_cdrom) { + panic("Secure boot from ISO image is not supported!"); + } + + if (virtio_get_device_type() =3D=3D VIRTIO_ID_NET) { + panic("Virtio net boot device does not support secure boot= !"); + } + + if (zipl_check_scsi_mbr_magic()) { + panic("ECKD boot device does not support secure boot!"); + } + } + break; + default: + panic("Secure boot from unexpected device type is not supported!"); + } + + printf("SCSI boot device supports secure boot.\n"); +} + +static void check_secure_boot_support(void) { + bool have_iplb_copy; + IplParameterBlock *iplb_copy; + QemuIplParameters *qipl_copy; + if (boot_mode =3D=3D ZIPL_BOOT_MODE_UNSPECIFIED) { boot_mode =3D zipl_mode(iplb->hdr_flags); } @@ -281,14 +316,40 @@ static void ipl_boot_device(void) panic("Need at least one certificate for secure boot!"); } =20 + if (boot_mode =3D=3D ZIPL_BOOT_MODE_NORMAL) { + return; + } + + /* + * Store copies of have_iplb, iplb and qipl. + * They will be updated in load_next_iplb(). + */ + have_iplb_copy =3D have_iplb; + iplb_copy =3D malloc(sizeof(IplParameterBlock)); + qipl_copy =3D malloc(sizeof(QemuIplParameters)); + + memcpy(qipl_copy, &qipl, sizeof(QemuIplParameters)); + memcpy(iplb_copy, iplb, sizeof(IplParameterBlock)); + + while (have_iplb_copy) { + if (have_iplb_copy && find_boot_device()) { + validate_secure_boot_device(); + } + have_iplb_copy =3D load_next_iplb(); + } + + memcpy(&qipl, qipl_copy, sizeof(QemuIplParameters)); + memcpy(iplb, iplb_copy, sizeof(IplParameterBlock)); + + free(qipl_copy); + free(iplb_copy); +} + +static void ipl_boot_device(void) +{ switch (cutype) { case CU_TYPE_DASD_3990: case CU_TYPE_DASD_2107: - if (boot_mode =3D=3D ZIPL_BOOT_MODE_SECURE_AUDIT || - boot_mode =3D=3D ZIPL_BOOT_MODE_SECURE) { - panic("Passthrough (vfio) device does not support secure boot!= "); - } - dasd_ipl(blk_schid, cutype); break; case CU_TYPE_VIRTIO: @@ -338,6 +399,8 @@ void main(void) probe_boot_device(); } =20 + check_secure_boot_support(); + while (have_iplb) { boot_setup(); if (have_iplb && find_boot_device()) { diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h index 389cc8ea7c..3009104686 100644 --- a/pc-bios/s390-ccw/s390-ccw.h +++ b/pc-bios/s390-ccw/s390-ccw.h @@ -93,6 +93,7 @@ typedef enum ZiplBootMode { extern ZiplBootMode boot_mode; =20 ZiplBootMode zipl_mode(uint8_t hdr_flags); +int zipl_check_scsi_mbr_magic(void); =20 /* jump2ipl.c */ void write_reset_psw(uint64_t psw); --=20 2.50.1