From nobody Fri Apr 3 10:43:31 2026 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1774347488; cv=none; d=zohomail.com; s=zohoarc; b=QdoLWyYNAvPFeAzQRMYTyXMohrsnOW+ASUuWK/qfIClR0BKLF9uKvkVLUVg/FYzCS67LwxGv3wQsZcYy9KrPRgvNnHD4KAF+tCFbXm2ZEQBLCponQWWWP1BemvFEJVp7Qg+V1aDfH/lytMbaaDBimkFXpDkYPeGGGf4nFmDFZ4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774347488; 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=vMyU7Zt+Npx8war2PFOLJHgfUteMUgErNfOEenK+5EA=; b=hoqSkledWCpUlcdayobFf7ybQnAw2K3MYiWzJMuMq8qcxoTX+tig1aJ5NX69e/E0Z67cKhsUhNc2985XNSmdihUeJ1Mh/sFaOfCdElEfT6L63HpYJjMHXqueQmJOvq+bq0Q/PfGY2Mx6VBkrct6NIIkBWuPnHSsgGLHqRMbRTPc= 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=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1774347488225365.36436229452806; Tue, 24 Mar 2026 03:18:08 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1260275.1553638 (Exim 4.92) (envelope-from ) id 1w4ypS-0005Le-6Y; Tue, 24 Mar 2026 10:17:42 +0000 Received: by outflank-mailman (output) from mailman id 1260275.1553638; Tue, 24 Mar 2026 10:17:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w4ypS-0005LX-3i; Tue, 24 Mar 2026 10:17:42 +0000 Received: by outflank-mailman (input) for mailman id 1260275; Tue, 24 Mar 2026 10:17:41 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w4ypR-0005L7-5g for xen-devel@lists.xenproject.org; Tue, 24 Mar 2026 10:17:41 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1w4ypQ-0063h1-I8 for xen-devel@lists.xenproject.org; Tue, 24 Mar 2026 11:17:40 +0100 Received: from [10.42.69.7] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69c264c4-2eae-0a2a0a5409dd-0a2a4507e97c-0 for ; Tue, 24 Mar 2026 11:17:40 +0100 Received: from [209.85.216.66] (helo=mail-pj1-f66.google.com) by tlsNG-ef75cf.mxtls.expurgate.net with ESMTPS (eXpurgate 4.55.2) (envelope-from ) id 69c264c2-fd74-0a2a45070019-d155d842cce5-3 for ; Tue, 24 Mar 2026 11:17:40 +0100 Received: by mail-pj1-f66.google.com with SMTP id 98e67ed59e1d1-35a1f549e7eso2174018a91.0 for ; Tue, 24 Mar 2026 03:17:39 -0700 (PDT) Received: from fedora ([103.2.232.250]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35c031412f2sm1939382a91.7.2026.03.24.03.17.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 03:17:37 -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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=20251104 header.d=gmail.com header.i="@gmail.com" header.h="Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774347458; x=1774952258; 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=vMyU7Zt+Npx8war2PFOLJHgfUteMUgErNfOEenK+5EA=; b=hFgvvYm7JK4qpzrHClfHA2EgU2oGJeIj8TNTsQHRr549XY6B6NzyBCd3I8gCW3apB7 Fn4+mrbaIyPwBH5yqbrFtwDwRmLkc8fnJL+BXJaCTsSz0vOIxYOogO2TT7z6hjdQHKWf KUdv70bfh2dMdPM3DxnY8VISbAjnTZRdnDFjEZbtIjk3HknC29svknlJojRYIfZnwveo yUEICIhTD/ngKYNI5+XbUp3Q9lxXmwZOREdv+23N/tHWcN63uDaUeqh95/eG0vItx8fn Wh51ggrWy2oyu7tAcZbmnE+oKOnUuhjPiSxDPcdy8S6VSnMThgBHfgLuJykDFgEWwLSi t+fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774347458; x=1774952258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vMyU7Zt+Npx8war2PFOLJHgfUteMUgErNfOEenK+5EA=; b=dHWnV5+HBASObTZhrfGkUuvpVO2GMvAiCaKNoIOHljpFdmslq1BNcUWT7Z6bx/ohKJ /tAkThuWUI4k6H9uwAVqUaQsLeLZ6RUYIM8RPUr8r5dTbeHF8BCVRuTqCf+xYOXf2bjk RsIAZu+7Oh3uS5g3ZcjqmNCyROEFkosn+aQuNvbDLzabmDhXUb+qHJVp8qBYe64IYu53 XAing7KlC/RzOfwUrNsDZZUZMAxmLLb9MVjX/YbotqEKnMzsSjXiKDbhSD1hS5jeLqqI m+tKzofOoR+03ycceBwuc+kXbohr0fcPldHrm+9wh8G3Sv2JgusbGyfKSf4ddOYQDkAQ k4Rw== X-Gm-Message-State: AOJu0Yz/sl1QvR3cC/pwM43a8pm9HJxE6aWlVTx2JpAPgYygPb8+vScB Ve4CCJbirW5NKzD0LL9E/KS6tqUVj9i8uZej90KfPqIOa+bNQb2kWme/fl2g3MDv X-Gm-Gg: ATEYQzw8jLLfuHDGiiBCdijxGAyOJANBDL8wOTLKVxNkJYz6bSmhfGnDWIo1CbmcUhF eILIpGPuS84ClwS4ZNNOSYRDKH4fNLGTkiV8NosZr6XCbvenXw7fWqgA63O39/QuayhBYmCh/5H gnVE1xwQ3eQeXnYNpIihqlmKxFqUkHEKXM9ozneTIl6eSqV/Ce54ppHxi5kkxidgHNdyapmFdZz b/KW9HnwmEIQVhwDTf+pNUdYNobKFQGHSmnCmIvLczFiKxdhItDMb6yM5HEkzaIk9Qyvg4Mjsy0 zHPMa2Tv4LwNTF9sOr5cXiDYn6gVU8bugc7bdi4tQq1u0gxcFWZhcy9Sj3tFNzrWsACvQNAfPbm LFqAcJwHcjxIkhf4TREmDZOvAZLN1qb/efl4qrcLbEvsBFTPpmniXGvZR4ZhA2DB8aiFT13ja1M NbxmFpilU4vTZRkNhzVkDrVyWY624zoQ4sVruIJ4/7nFSMHRQleAdtrhozU0DFrJOTUn9+XoicS JhBtfbnLetjUyUiBQVHVSjCOLbBgWcs2Q/9i73wpxKS38C2hk2NqF93rV3TVzEvBvqEIrfGEA== X-Received: by 2002:a17:90b:3d03:b0:35b:9682:51dd with SMTP id 98e67ed59e1d1-35bd2cde5a4mr12713503a91.24.1774347457887; Tue, 24 Mar 2026 03:17:37 -0700 (PDT) From: Soumyajyotii Ssarkar To: xen-devel@lists.xenproject.org, sarkarsoumyajyoti23@gmail.com Cc: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Andrew Cooper , Jan Beulich , "Daniel P . Smith" , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Soumyajyotii Ssarkar Subject: [PATCH v4 1/3] x86/efi: Add BGRT image preservation infrastructure Date: Tue, 24 Mar 2026 15:47:24 +0530 Message-ID: <20260324101726.6929-2-soumyajyotisarkar23@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260324101726.6929-1-soumyajyotisarkar23@gmail.com> References: <20260324101726.6929-1-soumyajyotisarkar23@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-ef75cf/1774347460-576A7303-9BBDAAFE/0/0 X-purgate-type: clean X-purgate-size: 6339 X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1774347490596154100 Content-Type: text/plain; charset="utf-8" Add core EFI boot services code to preserve BGRT (Boot Graphics Resource Table) images during Xen boot. The BGRT contains a pointer to a boot logo stored in BootServicesData memory. Without preservation, this memory is reclaimed causing ACPI checksum errors in dom0. Implementation: - Walk XSDT to locate BGRT table (reusing efi.acpi20 from efi_tables()) - Validate BMP image signature and size constraints (max 16MB) - Allocate EfiACPIReclaimMemory and copy image data - Update BGRT table with new address and recalculate checksum The preservation follows the ESRT pattern, running before ExitBootServices() to ensure image remains accessible. Signed-off-by: Soumyajyotii Ssarkar Reported-by: Jan Beulich=C2=A0 Reported-by: Marek Marczykowski-G=C3=B3recki --- xen/arch/x86/efi/efi-boot.h | 2 + xen/common/efi/boot.c | 133 +++++++++++++++++++++++++++++++++++ xen/common/efi/common-stub.c | 1 + 3 files changed, 136 insertions(+) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 42a2c46b5e..0547d845cd 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -910,6 +910,8 @@ void __init efi_multiboot2(EFI_HANDLE ImageHandle, efi_relocate_esrt(SystemTable); + efi_preserve_bgrt_img(); + efi_exit_boot(ImageHandle, SystemTable); } diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 967094994d..47d5b9b2a8 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1,12 +1,16 @@ #include "efi.h" #include #include +#include +#include +#include #include #include #include #include #include #include +#include #include #include #include @@ -747,6 +751,133 @@ static void __init efi_relocate_esrt(EFI_SYSTEM_TABLE= *SystemTable) efi_bs->FreePool(memory_map); } +typedef struct { + UINT16 signature; + UINT32 file_size; + UINT16 reserved[2]; + UINT32 data_offset; +} __attribute__((packed)) BMP_HEADER; + +static __initdata struct { + bool preserved; + const void *old_addr; + const void *new_addr; + UINTN size; + const char *failure_reason; +} bgrt_info =3D { + /* We would prefer the failure_reason to print */ + .failure_reason =3D "", +}; + +static struct acpi_table_bgrt *__init efi_get_bgrt(void) +{ + const struct acpi_table_rsdp *rsdp; + const struct acpi_table_xsdt *xsdt; + UINTN entry_count; + unsigned int i; + + if ( efi.acpi20 =3D=3D EFI_INVALID_TABLE_ADDR ) + return NULL; + + rsdp =3D (const void *)(UINTN)efi.acpi20; + if ( !rsdp || !rsdp->xsdt_physical_address ) + return NULL; + + xsdt =3D (const void *)rsdp->xsdt_physical_address; + + if ( memcmp(xsdt->header.signature, ACPI_SIG_XSDT, 4) !=3D 0 ) + return NULL; + + if ( xsdt->header.length < sizeof(xsdt->header) ) + return NULL; + entry_count =3D (xsdt->header.length - sizeof(xsdt->header)) / + sizeof(xsdt->table_offset_entry[0]); + + for ( i =3D 0; i < entry_count; i++ ) + { + const struct acpi_table_header *hdr; + + hdr =3D (const void *)xsdt->table_offset_entry[i]; + if ( !hdr ) + continue; + + if ( memcmp(hdr->signature, ACPI_SIG_BGRT, 4) =3D=3D 0 && + hdr->length >=3D sizeof(struct acpi_table_bgrt) ) + return (struct acpi_table_bgrt *)hdr; + } + + return NULL; +} + +#define BMP_SIGNATURE 0x4D42 +#define MAX_BGRT_IMAGE_SIZE (16 * 1024 * 1024) + +static void __init efi_preserve_bgrt_img(void) +{ + struct acpi_table_bgrt *bgrt; + const BMP_HEADER *bmp; + const void *old_image; + void *new_image; + UINTN image_size; + EFI_STATUS status; + UINT8 checksum; + unsigned int i; + + bgrt_info.preserved =3D false; + + bgrt =3D efi_get_bgrt(); + if ( !bgrt ) + { + bgrt_info.failure_reason =3D "BGRT table not found"; + return; + } + + if ( !bgrt->image_address ) + return; + + old_image =3D (const void *)bgrt->image_address; + bmp =3D old_image; + + if ( bmp->signature !=3D BMP_SIGNATURE ) + { + bgrt_info.failure_reason =3D "Invalid BMP signature"; + return; + } + + image_size =3D bmp->file_size; + if ( !image_size || image_size > MAX_BGRT_IMAGE_SIZE ) + { + bgrt_info.failure_reason =3D "Image size exceeds limit"; + return; + } + + /* + * Allocate memory of type EfiACPIReclaimMemory so that the image + * will remain available for the OS after ExitBootServices(). + */ + status =3D efi_bs->AllocatePool(EfiACPIReclaimMemory, image_size, &new= _image); + if ( EFI_ERROR(status) ) + { + bgrt_info.failure_reason =3D "Memory allocation failed"; + return; + } + memcpy(new_image, old_image, image_size); + bgrt->image_address =3D (UINTN)new_image; + bgrt->header.checksum =3D 0; + checksum =3D 0; + + for ( i =3D 0; i < bgrt->header.length; i++ ) + checksum +=3D ((const UINT8 *)bgrt)[i]; + + bgrt->header.checksum =3D -checksum; + + /* Filling the debug struct for printing later */ + bgrt_info.preserved =3D true; + bgrt_info.old_addr =3D old_image; + bgrt_info.new_addr =3D new_image; + bgrt_info.size =3D image_size; +} + /* * Include architecture specific implementation here, which references the * static globals defined above. @@ -1671,6 +1802,8 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE Imag= eHandle, efi_relocate_esrt(SystemTable); + efi_preserve_bgrt_img(); + efi_exit_boot(ImageHandle, SystemTable); efi_arch_post_exit_boot(); /* Doesn't return. */ diff --git a/xen/common/efi/common-stub.c b/xen/common/efi/common-stub.c index 77f138a6c5..9e595600d7 100644 --- a/xen/common/efi/common-stub.c +++ b/xen/common/efi/common-stub.c @@ -20,6 +20,7 @@ unsigned long efi_get_time(void) void efi_halt_system(void) { } void efi_reset_system(bool warm) { } +void __init efi_bgrt_status_info(void) { } int efi_get_info(uint32_t idx, union xenpf_efi_info *info) { -- 2.53.0 From nobody Fri Apr 3 10:43:31 2026 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1774347488; cv=none; d=zohomail.com; s=zohoarc; b=kVtguSVEdlJju9UA2PNG6Tyav4TJBYKhXN9qdUfWepW9rUUS/ml47VcwZBd6sz7C4YvSI65hvGfgAdALmzK41+XPmGsJMCXr7XgorgaZvrvqT2PGnx3nGyZo0IxdaQ4x3Zf7P/xGraTKfVg5wK5J3092cgD/SEhHt5vaRntqmhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774347488; 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=S7lJOGAyXgWXm5RAImeMolbrvF/QPjaKzs3OuvcIdvo=; b=DdN2z/VkH8BDFvr8szaQBx97skBe14anQyMnGLs/QO6LLceiifPqeFOH8MmlcHR28K4rNgRMTxToSwkaIymaKf6hRnbLI5hKjHlGdAmCxe/hW0MsdaLqjZbFMGe91B2p0uLdn//biGjckhRigxX6jd9MrYvUWe85dYvWf/nRlYg= 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=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1774347488812198.2264227510168; Tue, 24 Mar 2026 03:18:08 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1260277.1553647 (Exim 4.92) (envelope-from ) id 1w4ypW-0005ek-CT; Tue, 24 Mar 2026 10:17:46 +0000 Received: by outflank-mailman (output) from mailman id 1260277.1553647; Tue, 24 Mar 2026 10:17:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w4ypW-0005ed-9H; Tue, 24 Mar 2026 10:17:46 +0000 Received: by outflank-mailman (input) for mailman id 1260277; Tue, 24 Mar 2026 10:17:45 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w4ypV-0005ck-9l for xen-devel@lists.xenproject.org; Tue, 24 Mar 2026 10:17:45 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1w4ypT-008Ntf-44 for xen-devel@lists.xenproject.org; Tue, 24 Mar 2026 11:17:44 +0100 Received: from [10.42.69.4] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69c264bc-5cb7-0a2a0a5109dd-0a2a45048a58-28 for ; Tue, 24 Mar 2026 11:17:44 +0100 Received: from [209.85.216.67] (helo=mail-pj1-f67.google.com) by tlsNG-ebf023.mxtls.expurgate.net with ESMTPS (eXpurgate 4.55.2) (envelope-from ) id 69c264c7-c823-0a2a45040019-d155d843a56e-3 for ; Tue, 24 Mar 2026 11:17:44 +0100 Received: by mail-pj1-f67.google.com with SMTP id 98e67ed59e1d1-35b88a4f123so2545909a91.1 for ; Tue, 24 Mar 2026 03:17:43 -0700 (PDT) Received: from fedora ([103.2.232.250]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35c031412f2sm1939382a91.7.2026.03.24.03.17.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 03:17:41 -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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=20251104 header.d=gmail.com header.i="@gmail.com" header.h="Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774347462; x=1774952262; 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=S7lJOGAyXgWXm5RAImeMolbrvF/QPjaKzs3OuvcIdvo=; b=oaSCFT8H5Eo46cbTddQidd7PgV2YPdTRKX9hGjN59sPMuaAhDQH7ohF6K2NSEa/2/Y Ts4d6B6NxhhGtNSE9mKf0znqnrhxqqjzYxeE2RhODNkDQat7gnsJUKT0qF+f8vIOMju+ 71L2VpJHl7hjQCAJDTsDIfV6EE5BJyPC2Wn1nA7U4MP8LHlJIOfPNdPQ81hAkMEsSV5U krATnXDDwsWa1DRRMUARN51YGqmY71+PM6DDb1BZTPlIW4LNEku5B9/VKzNGCkU7YtM7 IJWdShJqyHD2oI5v8gKxnV1DQOM+9nMavvrB/Lt2Sx6c5KoXMBEyzDGeMMknzcuPAnqs OqtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774347462; x=1774952262; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=S7lJOGAyXgWXm5RAImeMolbrvF/QPjaKzs3OuvcIdvo=; b=GkhP64fCKalzHfv4Gja0acbuUanCJcAZK/cWcNlH+ON/8w7tzF9dGYgDei5pehVqjB wBXzXJ7cZpU5oyGtuV0A/mDQYhB251R9Cqdph8PEl5jeBPnM69QgDXToI+u1Xmsc9XvZ rjFfAb5nPAxcL8Q0vVXYmVIuIkoE+6n28P39Ytmn6KXrPh9Q5Qz/seTy3hitrC5Lp+SX 4NB0HAzSp7t2ITMgSUQslT30+Do9jC7o7DvXZljl0b2T88m9z7dJEZuOUfHOgGk5XPwg ePI2Gg+sE/sLhSzGtbCFke2Qp5JOrwJiG0RRysSxFKFnrn3EgRjDHvVFu7hoGhHF2+DQ W4tw== X-Gm-Message-State: AOJu0YwgK4vCoJL5vEt3ZyWfeU6MAtbBsoNcvsHn6bdtePWKxUtnFIFX koa4WaPYnhhBoGB47htzQt2D0RgrfsJ70Izh/ECAePFroav3YZSI3nOywFhbh2y6 X-Gm-Gg: ATEYQzxw/vPBMibGRupDgX6u25Ru8u+ciaDryZldIhO++CGQrAktYFroKHjDaLPLLpJ rffgRLq9Yxofa73PwlPoVG7vXFeB8ZmlFG8XBl/AHmXoBNNFzP8zcOS8E/J6xAgFST9UyjrVnzY ZdkSDfuDb8zj5T3xM9Z17LzkPveJzD0m/isSRMQLaudiaxBG1GfAUNl4/P/j3dxAGXD1jjPks2G N/TrYq7notyHwwx8wadz6Ewx/tXg9xTcTi7dyqzGPW/BMlHZ92rfgRUTKzzZP2b5dsLOdQKHiiU dTvR7fD0OGU+vyO4bfCfuQZLd4OWMUPzctKGfPB1MsNd4dK5ZfRCZ/BvWu6CKKt2eKz0aHMDbtX 4E4ZiL398h8SpUz1MXuVviLTGs+ta/Ntth+IEvlOKxXvm6M3wk2ZnYYQQxqgzhGl6euWKDgCYfq Ivip3EwT5yQz09LPZApb05mm4tvZGDBgljBVshXJFCS/iOuATXMqmrPEqzWZlfCLbSkIrj4ST7q BWocstk4xNAykWrZ83BR7WKgFzRM7wH/i2aQPpy16CKcahsEFnvrzLMoWFXqCHx67DLaBPKIw== X-Received: by 2002:a17:90b:1fc4:b0:35b:92ba:66e4 with SMTP id 98e67ed59e1d1-35c008311e5mr1936050a91.7.1774347462028; Tue, 24 Mar 2026 03:17:42 -0700 (PDT) From: Soumyajyotii Ssarkar To: xen-devel@lists.xenproject.org, sarkarsoumyajyoti23@gmail.com Cc: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Andrew Cooper , Jan Beulich , "Daniel P . Smith" , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Soumyajyotii Ssarkar Subject: [PATCH v4 2/3] x86/acpi: Integrate BGRT preservation with status reporting Date: Tue, 24 Mar 2026 15:47:25 +0530 Message-ID: <20260324101726.6929-3-soumyajyotisarkar23@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260324101726.6929-1-soumyajyotisarkar23@gmail.com> References: <20260324101726.6929-1-soumyajyotisarkar23@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-ebf023/1774347464-B9C819D1-A61567DF/0/0 X-purgate-type: clean X-purgate-size: 3168 X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1774347490833158500 Content-Type: text/plain; charset="utf-8" Add status reporting for BGRT preservation and integrate with Xen's ACPI subsystem: - efi_bgrt_status_info() prints preservation status (success/failure) - Called from acpi_boot_init() after ACPI tables are processed - Clarifying comment explains why invalidation code remains The invalidation code in acpi_invalidate_bgrt() now acts as a safety net: if preservation fails, the image remains in conventional RAM and gets invalidated. If preservation succeeds, the image is in EfiACPIReclaimMemory which won't match the RAM_TYPE_CONVENTIONAL check, leaving the table valid. Signed-off-by: Soumyajyotii Ssarkar Reported-by: Jan Beulich=C2=A0 Reported-by: Marek Marczykowski-G=C3=B3recki --- xen/arch/x86/acpi/boot.c | 8 ++++++++ xen/common/efi/boot.c | 16 ++++++++++++++++ xen/include/xen/efi.h | 1 + 3 files changed, 25 insertions(+) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 1ca2360e00..20afe79db9 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -327,6 +328,11 @@ static int __init cf_check acpi_parse_hpet(struct acpi= _table_header *table) return 0; } +/* + * Invalidate BGRT if image is in conventional RAM (preservation failed). + * If preservation succeeded, image is in EfiACPIReclaimMemory, which + * won't match RAM_TYPE_CONVENTIONAL check, so table remains valid. + */ static int __init cf_check acpi_invalidate_bgrt(struct acpi_table_header *= table) { struct acpi_table_bgrt *bgrt_tbl =3D @@ -754,5 +760,7 @@ int __init acpi_boot_init(void) acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt); + efi_bgrt_status_info(); + return 0; } diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 47d5b9b2a8..e22a42c15b 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1911,6 +1911,22 @@ static bool __init cf_check rt_range_valid(unsigned = long smfn, unsigned long emf return true; } +void __init efi_bgrt_status_info(void) +{ + if ( !efi_enabled(EFI_BOOT) ) + return; + + if ( bgrt_info.preserved ) + { + printk(XENLOG_INFO "EFI: BGRT image preserved: %lu KB\n", + bgrt_info.size / 1024); + printk(XENLOG_INFO "EFI: BGRT relocated from %p to %p\n", + bgrt_info.old_addr, bgrt_info.new_addr); + } + else if ( bgrt_info.failure_reason[0] ) + printk(XENLOG_WARNING "EFI: BGRT preservation failed: %s\n", + bgrt_info.failure_reason); +} void __init efi_init_memory(void) { diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 723cb80852..e72ab3c6b5 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -39,6 +39,7 @@ static inline bool efi_enabled(unsigned int feature) extern bool efi_secure_boot; void efi_init_memory(void); +void efi_bgrt_status_info(void); bool efi_boot_mem_unused(unsigned long *start, unsigned long *end); bool efi_rs_using_pgtables(void); unsigned long efi_get_time(void); -- 2.53.0 From nobody Fri Apr 3 10:43:31 2026 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1774347489; cv=none; d=zohomail.com; s=zohoarc; b=GkzOB0jIPow1BUiAsNIEKPPIGZhSJGkVb3Kakk8vT6gulCCzRE4VmnyoN4DPPsy3GcRIlI7AkwOEhSOvwdN29Be5l0U9MJUS3ZDqw2/rUf58aT9CXwt3OeAZim4skh88HCX9tVbOgcmOlvxhWsaSFnIG4Wc+AMSND6x1cEJvXB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774347489; 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=6/EFfTLPPvtpKfYbDxMVwQU9jDgu7ScMy19tpR6gQjI=; b=awOF22Rlcp1TgiVvykFRKCtjzoY/WijkS2sY3qfs1M+8rJzONDbXN5/KB3VHd9V4f3Uvh0LWkQWofznP1o93FzCG1ZBiASh/AaAOW9QuNnL6oxdjdymtHblBGFHqekzR9+RtAnRGhzX5InbPso8BqUTaNQlaMoYg/9X5Kyqpw8I= 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=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1774347489915437.876080482461; Tue, 24 Mar 2026 03:18:09 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1260279.1553656 (Exim 4.92) (envelope-from ) id 1w4ypa-0005xz-P5; Tue, 24 Mar 2026 10:17:50 +0000 Received: by outflank-mailman (output) from mailman id 1260279.1553656; Tue, 24 Mar 2026 10:17:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w4ypa-0005xo-Jl; Tue, 24 Mar 2026 10:17:50 +0000 Received: by outflank-mailman (input) for mailman id 1260279; Tue, 24 Mar 2026 10:17:49 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w4ypZ-0005vq-Da for xen-devel@lists.xenproject.org; Tue, 24 Mar 2026 10:17:49 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1w4ypY-000XdF-Pa for xen-devel@lists.xenproject.org; Tue, 24 Mar 2026 11:17:48 +0100 Received: from [10.42.69.2] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69c264bf-e002-0a2a0a5209dd-0a2a4502d2e4-36 for ; Tue, 24 Mar 2026 11:17:48 +0100 Received: from [209.85.216.65] (helo=mail-pj1-f65.google.com) by tlsNG-720697.mxtls.expurgate.net with ESMTPS (eXpurgate 4.55.2) (envelope-from ) id 69c264cb-63bb-0a2a45020019-d155d841b872-3 for ; Tue, 24 Mar 2026 11:17:48 +0100 Received: by mail-pj1-f65.google.com with SMTP id 98e67ed59e1d1-356337f058aso2947602a91.2 for ; Tue, 24 Mar 2026 03:17:48 -0700 (PDT) Received: from fedora ([103.2.232.250]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35c031412f2sm1939382a91.7.2026.03.24.03.17.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 03:17:45 -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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=20251104 header.d=gmail.com header.i="@gmail.com" header.h="Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774347466; x=1774952266; 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=6/EFfTLPPvtpKfYbDxMVwQU9jDgu7ScMy19tpR6gQjI=; b=Q5oW//VJ43BNtn9crNw8gtsQ2S3M9YvHWAVYYYvaoKhXnwX80dGlZeisgCfadyqHfQ cIcvTI8b6L7DEP3Hprn/3lH1uO4qXAhs34+21CDJt8VqNwH6o2ZqBQpip5i4RbfFUsJa 4I77k9P3bzXMt29r0lLJ0xHn6U8T4PdMLu3MoZedN9rCSwJAMVP1V53LO7ExDkhlmEDz XeImNgXooMHqlbEh4eAzGACJsO5BZANiY2lJ4v0hNSRjyypZVlMtsWaTtAjsvlIr/0sC 8p6vYRRmpHFgQfsOf6+aRIRsleGEnoVIFbamejIRn6utsgYaY4YbjWRukfFF2OPn5wxa 7FvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774347466; x=1774952266; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=6/EFfTLPPvtpKfYbDxMVwQU9jDgu7ScMy19tpR6gQjI=; b=sfJpZSeVsMC3AI/vhrjHdtBUDTLupFJuskUprzDClyeDL8dcQ421+x+JH4mXK46Ts6 WHAc37ePBG5AjIt6fQOl2aIKU8tPrkcK3FXdjHcQOyiyWGfJr0fWISHAjrdaw/lX5cm5 WKbt9tXTaoL7jN9ujAY8y09Oiq4Kd3EEDa2gDGOR22OVYI9tf4z+Z4dwQbQA9AvuSBWO eg1TcKtErKcsVWUCGEFq+6a4dG3+Y4QZLlbY823nAXGgnQZZEFOS/BI31cZJu4xF9T/7 tQZAwUyfRZnGH77zSsEFdfIl6R8swjH60Z8RZQnA3+UoarztfZUDjdYCO6r+NOGJUWg3 JRiQ== X-Gm-Message-State: AOJu0YznZaDkPhUBcPg/vm0EYga+KNengPUZdF0maJ2OhEI2psU0sAvb cnuiB1aK+FiBZw3LN/h0o3VOPSfuTymhIpdqHsy0TLV08AeFVAIyIBVj+Skyvy47 X-Gm-Gg: ATEYQzzA9anb79Jf8woX5LTcpaZt4RHiyhVthoeyvD4ndmi45PcQoNf4v7yUvBTQ2ZO 4yMajM5HUJtV6hP8cTdUqD8aqOG1YwNgTVXgsM5BmpXaGCQvoNgO4zUv6HNuQQXl8Sr4tbP+Pov JlHKxEh5DFG6O2yqbatXryqTiOzLSHXdb4ymNdWDu0bvpkrq1FEypWDdlq+py7yMTGcBus9woG3 0Bv+d5Jh+z/mBluyAK9z4K+osdnKPB0xKhFaq6yAkxY3eJIARwUSda1SBIQw4DVQyQKOleEUQF5 jJcaLWvD4iMgIGdoVA0tbf/f6SaZDvvqpnG3/zkCisCNLT8NRLDR1mL3tXSn3NTCGp7lUWvq8vV YHSbqvPFdh5yS9giwcSpmjjabC6/gvBy78E41+d1uEbkbWcU4H0iFH2vWRv4gGNJq05ZFUK47MN VrxkRLKOgFvKObheIfxbgY/ca5u5wM9dqf9JcGVIok1XcndkhBg7fHxVn5f3r+UV2qVPdLDh3cy akx98WoL8znOgR0gA4qp7TISUAdow4YNZpGg9d2UMVf92anzFD+3dSjE1Fki20uw3xk/C5+/w== X-Received: by 2002:a17:90a:e7cb:b0:359:83d3:27d3 with SMTP id 98e67ed59e1d1-35bd2b937f5mr12836202a91.2.1774347466254; Tue, 24 Mar 2026 03:17:46 -0700 (PDT) From: Soumyajyotii Ssarkar To: xen-devel@lists.xenproject.org, sarkarsoumyajyoti23@gmail.com Cc: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Andrew Cooper , Jan Beulich , "Daniel P . Smith" , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Soumyajyotii Ssarkar Subject: [PATCH v4 3/3] x86/efi: Add opt-out mechanism for BGRT preservation Date: Tue, 24 Mar 2026 15:47:26 +0530 Message-ID: <20260324101726.6929-4-soumyajyotisarkar23@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260324101726.6929-1-soumyajyotisarkar23@gmail.com> References: <20260324101726.6929-1-soumyajyotisarkar23@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-720697/1774347468-42099DB8-074385BD/0/0 X-purgate-type: clean X-purgate-size: 3800 X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1774347490572154100 Content-Type: text/plain; charset="utf-8" BGRT preservation is now enabled by default to fix ACPI corruption for desktop/workstation systems (similar to ESRT). As described in the task: https://github.com/QubesOS/qubes-issues/issues/10764 Add an opt-out parameter to allow disabling BGRT preservation on systems where the ~1MB memory overhead is not desired. The opt-out is implemented through two boot paths with early parsing during the EFI boot phase before preservation runs: 1. xen.efi direct boot: '-nobgrt' command line option (parsed in efi_start()) 2. Multiboot2 (GRUB): 'efi=3Dno-bgrt' peeked from mb2 cmdline tag using get_option() in efi_multiboot2() The flag is checked at the start of efi_preserve_bgrt_img() to skip preservation entirely when disabled. Status logging indicates whether preservation was disabled, succeeded, or failed. Usage: Default: BGRT preserved automatically xen.efi: Add '-nobgrt' option GRUB/MB2: Add 'efi=3Dno-bgrt' to Xen command line Signed-off-by: Soumyajyotii Ssarkar Reported-by: Jan Beulich=C2=A0 Reported-by: Marek Marczykowski-G=C3=B3recki --- xen/arch/x86/efi/efi-boot.h | 3 +++ xen/common/efi/boot.c | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 0547d845cd..6c986cf6c0 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -897,6 +897,9 @@ void __init efi_multiboot2(EFI_HANDLE ImageHandle, efi_arch_edid(gop_handle); } + if ( cmdline && get_option(cmdline, "efi=3Dno-bgrt") ) + opt_bgrt_disabled =3D true; + efi_arch_edd(); efi_arch_cpu(); diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index e22a42c15b..a4db7ee516 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -170,6 +170,7 @@ static SIMPLE_TEXT_OUTPUT_INTERFACE *__initdata StdErr; static UINT32 __initdata mdesc_ver; static bool __initdata map_bs; +static bool __initdata opt_bgrt_disabled =3D false; static struct file __initdata cfg; static struct file __initdata kernel; @@ -825,6 +826,9 @@ static void __init efi_preserve_bgrt_img(void) bgrt_info.preserved =3D false; + if ( opt_bgrt_disabled ) + return; + bgrt =3D efi_get_bgrt(); if ( !bgrt ) { @@ -1582,6 +1586,8 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE Imag= eHandle, base_video =3D true; else if ( wstrcmp(ptr + 1, L"mapbs") =3D=3D 0 ) map_bs =3D true; + else if ( wstrcmp(ptr + 1, L"nobgrt") =3D=3D 0 ) + opt_bgrt_disabled =3D true; else if ( wstrncmp(ptr + 1, L"cfg=3D", 4) =3D=3D 0 ) cfg_file_name =3D ptr + 5; else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") =3D=3D = 0 ) @@ -1592,6 +1598,7 @@ void EFIAPI __init noreturn efi_start(EFI_HANDLE Imag= eHandle, PrintStr(L"Xen EFI Loader options:\r\n"); PrintStr(L"-basevideo retain current video mode\r\n"= ); PrintStr(L"-mapbs map EfiBootServices{Code,Data}= \r\n"); + PrintStr(L"-nobgrt disable BGRT preservation\r\n"= ); PrintStr(L"-cfg=3D specify configuration file\r= \n"); PrintStr(L"-help, -? display this help\r\n"); blexit(NULL); @@ -1916,7 +1923,9 @@ void __init efi_bgrt_status_info(void) if ( !efi_enabled(EFI_BOOT) ) return; - if ( bgrt_info.preserved ) + if ( opt_bgrt_disabled ) + printk(XENLOG_INFO "EFI: BGRT preservation disabled\n"); + else if ( bgrt_info.preserved ) { printk(XENLOG_INFO "EFI: BGRT image preserved: %lu KB\n", bgrt_info.size / 1024); -- 2.53.0