From nobody Thu Nov 28 12:45:51 2024 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; 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=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1670209124039953.9922965701982; Sun, 4 Dec 2022 18:58:44 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.453113.710792 (Exim 4.92) (envelope-from ) id 1p21gQ-0000mI-V6; Mon, 05 Dec 2022 02:58:18 +0000 Received: by outflank-mailman (output) from mailman id 453113.710792; Mon, 05 Dec 2022 02:58:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p21gQ-0000m9-S7; Mon, 05 Dec 2022 02:58:18 +0000 Received: by outflank-mailman (input) for mailman id 453113; Mon, 05 Dec 2022 02:58:17 +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 1p21gP-0008OK-34 for xen-devel@lists.xenproject.org; Mon, 05 Dec 2022 02:58:17 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-flk1.inumbo.com (Halon) with ESMTP id a9ece343-7448-11ed-8fd2-01056ac49cbb; Mon, 05 Dec 2022 03:58:15 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 11F8C23A; Sun, 4 Dec 2022 18:58:22 -0800 (PST) Received: from a015966.shanghai.arm.com (a015966.shanghai.arm.com [10.169.190.24]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 49FD33F73D; Sun, 4 Dec 2022 18:58:13 -0800 (PST) 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: a9ece343-7448-11ed-8fd2-01056ac49cbb From: Henry Wang To: xen-devel@lists.xenproject.org Cc: Henry Wang , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk Subject: [PATCH 3/3] xen/arm: Extend the memory overlap check to include EfiACPIReclaimMemory Date: Mon, 5 Dec 2022 10:57:53 +0800 Message-Id: <20221205025753.2178965-4-Henry.Wang@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221205025753.2178965-1-Henry.Wang@arm.com> References: <20221205025753.2178965-1-Henry.Wang@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1670209126047100007 Content-Type: text/plain; charset="utf-8" Similarly as the static regions and boot modules, memory regions with EfiACPIReclaimMemory type (defined in bootinfo.acpi if CONFIG_ACPI is enabled) should also not be overlapping with memory regions in bootinfo.reserved_mem and bootinfo.modules. Therefore, this commit further extends the check in function `check_reserved_regions_overlap()` to include memory regions in bootinfo.acpi, and use the extended `check_reserved_regions_overlap()` in `meminfo_add_bank()` defined in `efi-boot.h` to return early if any error occurs. Signed-off-by: Henry Wang --- xen/arch/arm/efi/efi-boot.h | 10 ++++++++-- xen/arch/arm/setup.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 43a836c3a7..6121ba1f2f 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -161,13 +161,19 @@ static bool __init meminfo_add_bank(struct meminfo *m= em, EFI_MEMORY_DESCRIPTOR *desc) { struct membank *bank; + paddr_t start =3D desc->PhysicalStart; + paddr_t size =3D desc->NumberOfPages * EFI_PAGE_SIZE; =20 if ( mem->nr_banks >=3D NR_MEM_BANKS ) return false; +#ifdef CONFIG_ACPI + if ( check_reserved_regions_overlap(start, size) ) + return false; +#endif =20 bank =3D &mem->bank[mem->nr_banks]; - bank->start =3D desc->PhysicalStart; - bank->size =3D desc->NumberOfPages * EFI_PAGE_SIZE; + bank->start =3D start; + bank->size =3D size; =20 mem->nr_banks++; =20 diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index b43c8e118a..f2c2a3b6df 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -287,6 +287,13 @@ static int __init overlap_check(void *bootinfo_type, num =3D bootinfo.modules.nr_mods; type_str =3D "bootmodules"; } +#ifdef CONFIG_ACPI + else if ( bootinfo_type =3D=3D &bootinfo.acpi ) + { + num =3D bootinfo.acpi.nr_banks; + type_str =3D "EfiACPIReclaimMemory"; + } +#endif else panic("Invalid bootinfo type passed to overlap check\n"); =20 @@ -302,6 +309,13 @@ static int __init overlap_check(void *bootinfo_type, bank_start =3D bootinfo.modules.module[i].start; bank_end =3D bank_start + bootinfo.modules.module[i].size; } +#ifdef CONFIG_ACPI + else if ( bootinfo_type =3D=3D &bootinfo.acpi ) + { + bank_start =3D bootinfo.acpi.bank[i].start; + bank_end =3D bank_start + bootinfo.acpi.bank[i].size; + } +#endif =20 if ( region_end <=3D bank_start || region_start >=3D bank_end ) continue; @@ -345,6 +359,12 @@ int __init check_reserved_regions_overlap(paddr_t regi= on_start, if ( overlap_check(&bootinfo.modules, region_start, region_end) ) return -EINVAL; =20 +#ifdef CONFIG_ACPI + /* Check if input region is overlapping with ACPI EfiACPIReclaimMemory= */ + if ( overlap_check(&bootinfo.acpi, region_start, region_end) ) + return -EINVAL; +#endif + return 0; } =20 --=20 2.25.1