From nobody Fri Oct 31 03:42:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1750836885; cv=none; d=zohomail.com; s=zohoarc; b=N4wWRJl8CYIfEPjYjBpm7K3HtrROVcNCxSLkYCoPP0TsOpZmO4NsosxTsU7Z08NxqO7arKWsG/RFQxwtwgyZ49tpQVaHRcQm6ZvndhONNs44j5dQpMvE1dYiykUsqUF7gTwAABMXiSOmeGEkzygoIwEgiSDIKmwLn4JeEBmkcBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750836885; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Vsyq/VDtJXv+144v9RhWaKYSLA/NOYLJKdqG4Hj8gbU=; b=RhzOZQTa8a0ni6ATRlb0A5uI5nlcTrdAwopzMnwcQZA1wUQ4M9DO1JgnhUJISJrHSWRK+brcxgZ3IvoUrjGePWxXGK7aBmZDoRnL2eHcat6fZeH8GRFZYG/fpl1xSsVMVWQUenMReHE1FoBz+o7YiZH8vhTRdk0f3oFxTdNSU3s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1750836885730157.94544527833625; Wed, 25 Jun 2025 00:34:45 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1024417.1400298 (Exim 4.92) (envelope-from ) id 1uUKeG-0007HI-NF; Wed, 25 Jun 2025 07:34:24 +0000 Received: by outflank-mailman (output) from mailman id 1024417.1400298; Wed, 25 Jun 2025 07:34:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUKeG-0007HB-KT; Wed, 25 Jun 2025 07:34:24 +0000 Received: by outflank-mailman (input) for mailman id 1024417; Wed, 25 Jun 2025 07:34:23 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUKeF-00071z-4I for xen-devel@lists.xenproject.org; Wed, 25 Jun 2025 07:34:23 +0000 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [2a00:1450:4864:20::433]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id cff02075-5196-11f0-a30f-13f23c93f187; Wed, 25 Jun 2025 09:34:22 +0200 (CEST) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3a4fea34e07so648369f8f.1 for ; Wed, 25 Jun 2025 00:34:22 -0700 (PDT) Received: from localhost.localdomain (253.226.6.51.dyn.plus.net. [51.6.226.253]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538233c05csm11319445e9.5.2025.06.25.00.34.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 00:34:21 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cff02075-5196-11f0-a30f-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1750836862; x=1751441662; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Vsyq/VDtJXv+144v9RhWaKYSLA/NOYLJKdqG4Hj8gbU=; b=GzoQLVhIhO0TZ0utu+HsxFuX8zslSeOBPA3K45AS8iwvDbjq6DawN9PDlXChaw/LFz SBz4wlpb7X1P+T0xfuOmpPKCgOCgA1Xd/yKyMnmRWAGkl0/ic9t6IyE4uz4wZLm6YjJZ WrfP4v88wJKJvGFtvFmP4zTxIcvXGs2a5vPHw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750836862; x=1751441662; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vsyq/VDtJXv+144v9RhWaKYSLA/NOYLJKdqG4Hj8gbU=; b=K11YFcgCmwnP0xjP+JHNOiqL2l61i0ZNPDWIFndylB5pFU0TKP9pBKvJdoT/Hhif9G iZPnU9i0v3GA7QKRJKm9ODlGcaCwGNNyphVVduy1bM6APmErXgtx1RPm+ZhnZxlbFu+W kBxNd/2DSqJXcnZ48MpTFQy/h7JuA0MJ3oYE9SK99G6Q5dt9K2m4qrhWxWrJmFIBwfnD zevOv8VGSAlUzI9X/m+8tN1oU1Np2/zCxeIc8bnxEzDIyrqGUW8koGBaCTuQ31f3eZww ne0yf3lM4cDCGYk8NQ1NkAjodv1t4somWKCSxDPMC9I36W3FRgsFF08bW0xoD1KU/Y+9 8VSg== X-Gm-Message-State: AOJu0YxnQUxvSBwA0CGGOrv/duiwd8nDJHUfrrjjNCKc5KOSVR1timj/ /yANC/pYy72BPY/yHDXrnjP4s5x77PEzNPtrDfcbcImqir7Jz4EfrAu+diHprXAO6jHpNA/bokh ygQKdgG4A7w== X-Gm-Gg: ASbGnctV94loPCyZk330r632IWcz5Ndr80OGTKxLJfjoh0MlaJlz6uUNf3OPcAta/5U 43yZGxl2WVgNecrXZB/mHGmnDjU/DiDbora9A09Zzw3ZC+UgJA9YovYQRanZNy1pfQ4OkeEQEQX nfRviSf1KdSmLRbvKQEBXDwPbwJQCOTffOwlW/ghgD+AfmL9aCNgnQbP3LvjH/yGTP6gRvF41Vf 7JaX9coib+iad9R1kzqppOAdEt49GJzQt3AFJnUK2PZsi8vJUeRwPJ069Gen+9gKtBbXhm/98li Pzi/ZW/VA2ez5ZwHNSv+DT4cKnQCLrWvPt3AtpAJjPOGphVNw1+jHfdwdsGI41K5OzgUd2aQOW7 X0B+Ml1a44i9pxQHMubAJhmmAH51FqA== X-Google-Smtp-Source: AGHT+IFVmrgt1T38A7ERw6soRLcvDczrOUkuFgE2tl8CzJitksBUAXlHjE6GPe7vMJCVFLlc1m8Y8w== X-Received: by 2002:a5d:64c2:0:b0:3a3:7753:20ff with SMTP id ffacd0b85a97d-3a6ed655bc3mr1599155f8f.35.1750836861536; Wed, 25 Jun 2025 00:34:21 -0700 (PDT) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , "Daniel P. Smith" , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Jan Beulich Subject: [PATCH v3 1/3] xen/efi: Handle cases where file didn't come from ESP Date: Wed, 25 Jun 2025 08:34:03 +0100 Message-ID: <20250625073408.7496-2-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250625073408.7496-1-frediano.ziglio@cloud.com> References: <20250625073408.7496-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1750836887105116600 A boot loader can load files from outside ESP. In these cases device could be not provided or path could be something not supported. In these cases allows to boot anyway, all information could be provided using UKI or using other boot loader features. Signed-off-by: Frediano Ziglio Acked-by: Marek Marczykowski-G=C3=B3recki --- Changes since v1: - set "leaf" to NULL instead of a buffer with an empty string; - keep read_file fatal if cannot load file (except configuration). Changes since v2: - Added acked-by. --- xen/common/efi/boot.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 1a9b4e7dae..b18af2f1f4 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -443,6 +443,18 @@ static EFI_FILE_HANDLE __init get_parent_handle(const = EFI_LOADED_IMAGE *loaded_i CHAR16 *pathend, *ptr; EFI_STATUS ret; =20 + /* + * In some cases the image could not come from a specific device. + * For instance this can happen if Xen was loaded using GRUB2 "linux" + * command. + */ + *leaf =3D NULL; + if ( !loaded_image->DeviceHandle ) + { + PrintStr(L"Xen image loaded without providing a device\r\n"); + return NULL; + } + do { EFI_FILE_IO_INTERFACE *fio; =20 @@ -466,7 +478,15 @@ static EFI_FILE_HANDLE __init get_parent_handle(const = EFI_LOADED_IMAGE *loaded_i =20 if ( DevicePathType(dp) !=3D MEDIA_DEVICE_PATH || DevicePathSubType(dp) !=3D MEDIA_FILEPATH_DP ) - blexit(L"Unsupported device path component"); + { + /* + * The image could come from an unsupported device. + * For instance this can happen if Xen was loaded using GRUB2 + * "chainloader" command and the file was not from ESP. + */ + PrintStr(L"Unsupported device path component\r\n"); + return NULL; + } =20 if ( *buffer ) { @@ -772,8 +792,11 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handl= e, CHAR16 *name, =20 if ( !name ) PrintErrMesg(L"No filename", EFI_OUT_OF_RESOURCES); - ret =3D dir_handle->Open(dir_handle, &FileHandle, name, - EFI_FILE_MODE_READ, 0); + if ( dir_handle ) + ret =3D dir_handle->Open(dir_handle, &FileHandle, name, + EFI_FILE_MODE_READ, 0); + else + ret =3D EFI_NOT_FOUND; if ( file =3D=3D &cfg && ret =3D=3D EFI_NOT_FOUND ) return false; if ( EFI_ERROR(ret) ) @@ -1404,7 +1427,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE Imag= eHandle, /* Read and parse the config file. */ if ( read_section(loaded_image, L"config", &cfg, NULL) ) PrintStr(L"Using builtin config file\r\n"); - else if ( !cfg_file_name ) + else if ( !cfg_file_name && file_name) { CHAR16 *tail; =20 @@ -1515,7 +1538,8 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE Imag= eHandle, efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size)); cfg.addr =3D 0; =20 - dir_handle->Close(dir_handle); + if ( dir_handle ) + dir_handle->Close(dir_handle); =20 if ( gop && !base_video ) { --=20 2.43.0 From nobody Fri Oct 31 03:42:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1750836889; cv=none; d=zohomail.com; s=zohoarc; b=EiCRk7pOt85rrAv1YVROmELfJrzJAmctNkTkPpEfCAFCBjOHcBP3m7XpJ+pCIud97sGlzklLgxbfve0W9eQKBmN0wNfppJKeEdpZdS78wCr0e+i3GH/y6polQ4B8JTM6tiSdaPEdXmrLInvJc8Ic+zp+cZ35b1G1zQrrZ4EBqVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750836889; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LGXZEs8C2ojkzsUWVpaRntklr8ldtVYfN6U4O6Kve+s=; b=FXazAhRFPJNENlHvhqDczwKt7xsmGg2pvvWZrHPqYBkzqhwM3iO9GZjrjXiY0A1o0x/txxwM/slItT5vLGWbtIhV6bHtFZWt2VQ33xSCy3WCk+OBec4X4DJ94dkrZ9xJ58Ir/pk3oOYnjymO0/Z5GvmcZNcWRXoqWGTFozH4Q3c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 175083688929296.91236675192079; Wed, 25 Jun 2025 00:34:49 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1024419.1400318 (Exim 4.92) (envelope-from ) id 1uUKeM-0007mn-55; Wed, 25 Jun 2025 07:34:30 +0000 Received: by outflank-mailman (output) from mailman id 1024419.1400318; Wed, 25 Jun 2025 07:34:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUKeM-0007me-2M; Wed, 25 Jun 2025 07:34:30 +0000 Received: by outflank-mailman (input) for mailman id 1024419; Wed, 25 Jun 2025 07:34:28 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUKeK-00071t-KT for xen-devel@lists.xenproject.org; Wed, 25 Jun 2025 07:34:28 +0000 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [2a00:1450:4864:20::32e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d0624c6c-5196-11f0-b894-0df219b8e170; Wed, 25 Jun 2025 09:34:23 +0200 (CEST) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-450dd065828so10443125e9.2 for ; Wed, 25 Jun 2025 00:34:23 -0700 (PDT) Received: from localhost.localdomain (253.226.6.51.dyn.plus.net. [51.6.226.253]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538233c05csm11319445e9.5.2025.06.25.00.34.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 00:34:21 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d0624c6c-5196-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1750836862; x=1751441662; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LGXZEs8C2ojkzsUWVpaRntklr8ldtVYfN6U4O6Kve+s=; b=NujdmlbWXGT++dZ/DIwDuw/4o6wtiyhzGbnZuthRPySmisCFKAmiJOFhf3VlF31bG+ /wCxQJvpyiRR9E+dBkQv/UQAvPxY6NTLe6h6RDVG39MosHDQrEdCd4yJDlUyN647HLwv If1agaNS0HnnDfATlJhmV2K7CtzUwEjoOIH60= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750836862; x=1751441662; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LGXZEs8C2ojkzsUWVpaRntklr8ldtVYfN6U4O6Kve+s=; b=HEUs9ua9b3vykecorZ1cd9UgcVCczubLw5SKTPKQPiXjcL8pWHzV5EpNRl5mOYe9Qt GIfztuwZdLSkVDkGWTAeI7oI5/CMygSgIfQbYqvXV8/qu23KhqWxMYCz+HupF/uIYxwh Dv3t8/XJLV6C0VllTW35bcNt/P52v6oHRxKvEIpabN9/dwf367nVco+gfFZdYrS4TmvH XwVtjQOHt0vFlET4w/QZKVcyViGw6y0gBr65Iol3KatKcrNU96WaROfgvJCQpKaGsWRk WEf7KRSjBJ6qSWVy9R7JJlsG+QsjgICZwrwFE2ULjuQcFZg9jeCM0TftugyDLYPIxArP RghA== X-Gm-Message-State: AOJu0YzT1mjByR2OOdSEYTifNHzFRq8a3FeqMgjPFC2aILfe3u/5M2pI D8S9WDtezSSpUcFZoSPJ4GPsA+sFSVkld1cVcbmnBEEi/qsA76fiSi6mse+oZQyxovNNvUudIwG L3YIcLvCsBg== X-Gm-Gg: ASbGnctPdk4WRGahYUZtUG7uC5RBmjryOG2e6VrsW2i6EYetgATGfe6gfg/Ws8K+r25 8iuFmsxqnYLqMg+bQeW1Yz3zhrhnau2LQi3yznlD7WceQzTMZmhLhh4UHajC1NG1mffyOz3ITPV 2CT31SPtrWmFR+cSoSZ3+TJ+0m6B0zaTV0Yx7RFfzkszR89Bac7oM0diodVF4xZwtOPPkUmhBUo wGNBtcoVH79+Ph604QF7Yn9rRs6yWH6XSxbIouGXLRJbCsYugeGRvUaxCNSHNkfomOuuWIsrPFn An5ukSbSpQa4RcmXQCxBf6QAxMq7ptpHxw0ePJiaPoVJGOkz7KiM8kqwJsXVXxqoVjkK2hzT/TW C8cg0j9CZL2jlD+vIwq+yeptYEe39PA== X-Google-Smtp-Source: AGHT+IGgmbl/LRwOIK7iBZHPOQtU4N7XqXv2rwd65foSNPt8UucyHihR3kQtschc7xRYK0lxcl8AOQ== X-Received: by 2002:a05:600c:a48:b0:450:d4a6:799e with SMTP id 5b1f17b1804b1-45381af6b04mr13712695e9.20.1750836862370; Wed, 25 Jun 2025 00:34:22 -0700 (PDT) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , "Daniel P. Smith" , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Jan Beulich Subject: [PATCH v3 2/3] xen/efi: Support loading initrd using GRUB2 LoadFile2 protocol Date: Wed, 25 Jun 2025 08:34:04 +0100 Message-ID: <20250625073408.7496-3-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250625073408.7496-1-frediano.ziglio@cloud.com> References: <20250625073408.7496-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1750836891187116600 Content-Type: text/plain; charset="utf-8" Allows to load Xen using "linux" and "initrd" GRUB2 commands. This can be used with UKI to separate initrd in a different module instead of bundling all together. Bundling all together can be a problem with Secure Boot where we need to sign the bundle making harder to change it. As initrd content does not need to be signed for Secure Boot bundling it force it to be signed too. Signed-off-by: Frediano Ziglio --- Changes since v1: - attempt to use LoadFile2 protocol after embedded section. --- xen/common/efi/boot.c | 71 ++++++++++++++++++++++++++++++++++++++- xen/include/efi/efidevp.h | 21 ++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index b18af2f1f4..b6ce3a0257 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -850,6 +850,74 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handl= e, CHAR16 *name, return true; } =20 +#pragma pack(1) +typedef struct { + VENDOR_DEVICE_PATH VenMediaNode; + EFI_DEVICE_PATH EndNode; +} SINGLE_NODE_VENDOR_MEDIA_DEVPATH; +#pragma pack() + +static bool __init initrd_load_file2(const CHAR16 *name, struct file *file) +{ + static const SINGLE_NODE_VENDOR_MEDIA_DEVPATH __initconst initrd_dev_p= ath =3D { + { + { + MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, { sizeof (VENDOR_DEVIC= E_PATH) } + }, + LINUX_EFI_INITRD_MEDIA_GUID + }, + { + END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, + { sizeof (EFI_DEVICE_PATH) } + } + }; + static EFI_GUID __initdata lf2_proto_guid =3D EFI_LOAD_FILE2_PROTOCOL_= GUID; + EFI_DEVICE_PATH *dp; + EFI_LOAD_FILE2_PROTOCOL *lf2; + EFI_HANDLE handle; + EFI_STATUS ret; + UINTN size; + + dp =3D (EFI_DEVICE_PATH *)&initrd_dev_path; + ret =3D efi_bs->LocateDevicePath(&lf2_proto_guid, &dp, &handle); + if ( EFI_ERROR(ret) ) + { + if ( ret =3D=3D EFI_NOT_FOUND) + return false; + PrintErrMesg(L"Error getting file with LoadFile2 interface", ret); + } + + ret =3D efi_bs->HandleProtocol(handle, &lf2_proto_guid, (void **)&lf2); + if ( EFI_ERROR(ret) ) + PrintErrMesg(L"LoadFile2 file does not provide correct protocol", = ret); + + size =3D 0; + ret =3D lf2->LoadFile(lf2, dp, false, &size, NULL); + if ( ret !=3D EFI_BUFFER_TOO_SMALL ) + PrintErrMesg(L"Loading failed", ret); + + file->addr =3D min(1UL << (32 + PAGE_SHIFT), + HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START); + ret =3D efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, + PFN_UP(size), &file->addr); + if ( EFI_ERROR(ret) ) + PrintErrMesg(L"Allocation failed", ret); + + file->need_to_free =3D true; + file->size =3D size; + + ret =3D lf2->LoadFile(lf2, dp, false, &size, file->str); + if ( EFI_ERROR(ret) ) + { + efi_bs->FreePages(file->addr, PFN_UP(size)); + PrintErrMesg(L"Loading failed", ret); + } + + efi_arch_handle_module(file, name, NULL); + + return true; +} + static bool __init read_section(const EFI_LOADED_IMAGE *image, const CHAR16 *name, struct file *file, const char *options) @@ -1493,7 +1561,8 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE Imag= eHandle, kernel_verified =3D true; } =20 - if ( !read_section(loaded_image, L"ramdisk", &ramdisk, NULL) ) + if ( !read_section(loaded_image, L"ramdisk", &ramdisk, NULL) && + !initrd_load_file2(L"ramdisk", &ramdisk) ) { name.s =3D get_value(&cfg, section.s, "ramdisk"); if ( name.s ) diff --git a/xen/include/efi/efidevp.h b/xen/include/efi/efidevp.h index beb5785a45..b240c15d2a 100644 --- a/xen/include/efi/efidevp.h +++ b/xen/include/efi/efidevp.h @@ -398,5 +398,26 @@ typedef union { =20 } EFI_DEV_PATH_PTR; =20 +#define EFI_LOAD_FILE2_PROTOCOL_GUID \ + { 0x4006c0c1, 0xfcb3, 0x403e, {0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe= 0, 0x6d } } + +typedef struct EFI_LOAD_FILE2_PROTOCOL EFI_LOAD_FILE2_PROTOCOL; + +typedef +EFI_STATUS +(EFIAPI *EFI_LOAD_FILE2)( + IN EFI_LOAD_FILE2_PROTOCOL *This, + IN EFI_DEVICE_PATH *FilePath, + IN BOOLEAN BootPolicy, + IN OUT UINTN *BufferSize, + IN VOID *Buffer OPTIONAL + ); + +struct EFI_LOAD_FILE2_PROTOCOL { + EFI_LOAD_FILE2 LoadFile; +}; + +#define LINUX_EFI_INITRD_MEDIA_GUID \ + { 0x5568e427, 0x68fc, 0x4f3d, {0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xc= c, 0x68} } =20 #endif --=20 2.43.0 From nobody Fri Oct 31 03:42:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1750836883; cv=none; d=zohomail.com; s=zohoarc; b=lc2x2VnO49jpXRW1tCyE1PkCLLEvj2IqCVWo/cPiVDAQQXN9j1aYGu+NJMq/hMZTswiqNRoVCRj5YMyaJXALfdt3aEVh1BmXLlNRwt9VShzCWgw7gWqVptvOb95s5mo4DJVWslKLGYxtdmNL9781ItfgUqHMIht7J8hZ8C39AlU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750836883; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2u/dNL0zGTpCOJg2Jk0Pnt2b5neRnRqaGdBf3ycdnjw=; b=bg+lBKcJ1ZZdcs/Lo6UVzRjIhdJBUTR15gFMUuWQHeRMGmtmiAVj761bf+3Sm+1c5RqUmXfAXRvQ28YGbskub7QJSy83xor9Fqt/YHKsAUnXktFneIrkDok7UyX7GpfZBwXudQQoyPL6SoTIXObfI8y224Ec3xVrYxP/7CDRtVc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1750836883366643.4413782323319; Wed, 25 Jun 2025 00:34:43 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1024418.1400307 (Exim 4.92) (envelope-from ) id 1uUKeI-0007WB-Tw; Wed, 25 Jun 2025 07:34:26 +0000 Received: by outflank-mailman (output) from mailman id 1024418.1400307; Wed, 25 Jun 2025 07:34:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUKeI-0007W4-Qz; Wed, 25 Jun 2025 07:34:26 +0000 Received: by outflank-mailman (input) for mailman id 1024418; Wed, 25 Jun 2025 07:34:25 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUKeH-00071t-KN for xen-devel@lists.xenproject.org; Wed, 25 Jun 2025 07:34:25 +0000 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [2a00:1450:4864:20::330]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d0d81e65-5196-11f0-b894-0df219b8e170; Wed, 25 Jun 2025 09:34:24 +0200 (CEST) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-45363645a8eso9982275e9.1 for ; Wed, 25 Jun 2025 00:34:24 -0700 (PDT) Received: from localhost.localdomain (253.226.6.51.dyn.plus.net. [51.6.226.253]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538233c05csm11319445e9.5.2025.06.25.00.34.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 00:34:22 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d0d81e65-5196-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1750836863; x=1751441663; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2u/dNL0zGTpCOJg2Jk0Pnt2b5neRnRqaGdBf3ycdnjw=; b=G6SMwt9vfW/+omiNV8CIM78WHHaBEWSQAArbfT7RO+EzQTqyqHga5pZzYJMHXpnfZo P8H2omnfLzdN43/JHCAQ586ujNUK4gsF1v/nINJYszJKVIyI+0SuaQpH3UpQ/fSQ6Izy n3Xp0SY75c2nlvBn5Zjz28mDYYdtw0fxugFEk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750836863; x=1751441663; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2u/dNL0zGTpCOJg2Jk0Pnt2b5neRnRqaGdBf3ycdnjw=; b=lPzq9or4glMsAbWpGE26qPcTtU0xxON9PihKQz5VnTCXjwPelqKpM0Gjuig8Qn6ylC rmMzHQj+3Ab0pVR7aHSYGCe2Gi22mBD7n7BarvQA1bQR/bVphzVF+vtYkrXSsfNH1WVn jC8b5u5lWXWX2S5gjBqKPkwYCy4Z63981VT33KppLOxULL5jsZBWFCE+ZuyYvdgm/KyP GkGeuAjHgJcnHtKZO6e9Zep25p9Od4uMNiFBF0BTZFfI+v78CiJcvvUYf31UWO6r+Bf9 4XGMe1hk/VNiAwgssCSi744DCq0B/BdkoZsrz/71RX9wTddTLuL14H22i+N7J3fSvtkn eNig== X-Gm-Message-State: AOJu0Yz5isTnRBgEIlbDYalrNfb2YMI2taJamKZnTfFKoiYKEHp1ulge YicO+m3h+WhludThvrjKh2/2hxBYqn4y87Z8wfr4CvVfnRmQhzdVyRM97wtDzA+tdMOJZ/i/rum bJCXj2HbUIA== X-Gm-Gg: ASbGncsMBjy+IB3KYHyvZSuy89NHbM3zSlkJnIgRZzCFOyexuecNVxzsLuHtNxff9sw Y0Zr9z4PItPPTM1C/wQgRL8915fwegPNklugWht0fU0jr+yphX5JuI71S0AzItguOMbmzq66uey u5uYcQAF+YIQ5+szw10utOx0K87VuIhEDqn/SeE8v1SxnAALvJ+nNCvLis0BY5lEupvoSr8syuA HdyPSH2L/8MV1ckLDlOCpyAEOjtyUOxdFySep5H7exDH4VBZpbR1ASpj4RLf7moSpb1iYypOREu tpTIOt9Eq8iTTaMe+YwB0L4aSa9e7CbIMCBK734WapMRSNAXag+GBrHFwMQAbua0iQagri4Po0v 5lEgH0UjDziS/G4dB9eGlfIrk/CIhVg== X-Google-Smtp-Source: AGHT+IECGcdpnjc8qdQWw0CpidFRo4B7mb6gEOKf268r3/OuAS0AJUvt6RM81TyWc1Q6MtmwJ+1Thw== X-Received: by 2002:a05:600c:8b58:b0:440:9b1a:cd78 with SMTP id 5b1f17b1804b1-45381ac23aemr17908645e9.10.1750836863225; Wed, 25 Jun 2025 00:34:23 -0700 (PDT) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , "Daniel P. Smith" , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Jan Beulich Subject: [PATCH v3 3/3] xen/efi: Update error flow for read_file function Date: Wed, 25 Jun 2025 08:34:05 +0100 Message-ID: <20250625073408.7496-4-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250625073408.7496-1-frediano.ziglio@cloud.com> References: <20250625073408.7496-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1750836885361116600 Content-Type: text/plain; charset="utf-8" Use more explicit goto statements to handle common error code path instead of a lot of if/else. Signed-off-by: Frediano Ziglio --- xen/common/efi/boot.c | 80 +++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index b6ce3a0257..fa61da4931 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -792,6 +792,8 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle= , CHAR16 *name, =20 if ( !name ) PrintErrMesg(L"No filename", EFI_OUT_OF_RESOURCES); + + what =3D L"Open"; if ( dir_handle ) ret =3D dir_handle->Open(dir_handle, &FileHandle, name, EFI_FILE_MODE_READ, 0); @@ -800,54 +802,58 @@ static bool __init read_file(EFI_FILE_HANDLE dir_hand= le, CHAR16 *name, if ( file =3D=3D &cfg && ret =3D=3D EFI_NOT_FOUND ) return false; if ( EFI_ERROR(ret) ) - what =3D L"Open"; - else - ret =3D FileHandle->SetPosition(FileHandle, -1); + goto fail; + + what =3D L"Seek"; + ret =3D FileHandle->SetPosition(FileHandle, -1); if ( EFI_ERROR(ret) ) - what =3D what ?: L"Seek"; - else - ret =3D FileHandle->GetPosition(FileHandle, &size); + goto fail; + + what =3D L"Get size"; + ret =3D FileHandle->GetPosition(FileHandle, &size); if ( EFI_ERROR(ret) ) - what =3D what ?: L"Get size"; - else - ret =3D FileHandle->SetPosition(FileHandle, 0); + goto fail; + + what =3D L"Seek"; + ret =3D FileHandle->SetPosition(FileHandle, 0); if ( EFI_ERROR(ret) ) - what =3D what ?: L"Seek"; - else - { - file->addr =3D min(1UL << (32 + PAGE_SHIFT), - HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START); - ret =3D efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, - PFN_UP(size), &file->addr); - } + goto fail; + + what =3D L"Allocation"; + file->addr =3D min(1UL << (32 + PAGE_SHIFT), + HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START); + ret =3D efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, + PFN_UP(size), &file->addr); if ( EFI_ERROR(ret) ) - what =3D what ?: L"Allocation"; - else - { - file->need_to_free =3D true; - file->size =3D size; - handle_file_info(name, file, options); + goto fail; =20 - ret =3D FileHandle->Read(FileHandle, &file->size, file->str); - if ( !EFI_ERROR(ret) && file->size !=3D size ) - ret =3D EFI_ABORTED; - if ( EFI_ERROR(ret) ) - what =3D L"Read"; - } + file->need_to_free =3D true; + file->size =3D size; + handle_file_info(name, file, options); =20 - if ( FileHandle ) - FileHandle->Close(FileHandle); + what =3D L"Read"; + ret =3D FileHandle->Read(FileHandle, &file->size, file->str); + if ( !EFI_ERROR(ret) && file->size !=3D size ) + ret =3D EFI_ABORTED; + if ( EFI_ERROR(ret) ) + goto fail; =20 - if ( what ) - { - PrintErr(what); - PrintErr(L" failed for "); - PrintErrMesg(name, ret); - } + FileHandle->Close(FileHandle); =20 efi_arch_flush_dcache_area(file->ptr, file->size); =20 return true; + +fail: + if ( FileHandle ) + FileHandle->Close(FileHandle); + + PrintErr(what); + PrintErr(L" failed for "); + PrintErrMesg(name, ret); + + /* not reached */ + return false; } =20 #pragma pack(1) --=20 2.43.0