From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 60FF67803D7 for ; Wed, 11 Sep 2024 19:32:53 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=b0x0M2/eXsZXrcwMRAJBsbJ1Ik5xbO8KSBRP189m8n8=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:User-Agent:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240830; t=1726083173; v=1; x=1726342371; b=QQWEwcb0a6KUjWXNkEmz3Pw2r8WEK8FE1W/2bODXjKCaOjn2H+qgw5onBuiKQ1mlwtWlZEe2 yrgJ3Fb9PlTXGntYHYxaO0yeRc+F3cWK4yPpdqYR2hXCd0iWodGRDO3QuTxF4jJHrejdWJiMbrU dzj+vCmUmtI3BSaRSwk2egTbdyPerlnDUQZ6WMo/QqMRNAaF6sogof1Jc0XgVX5sJoga8kMkou+ d0X8922HeH23aGtKKERs/mK/sgPz58vJp5KCmBtRCUllz+b6hCLLonAD7Jk4knlRsUWxSPdVJbp hkcZDbO0syD4tFn1Gt5nHi7OiAURYOoeV13tf6LxnmNRA== X-Received: by 127.0.0.2 with SMTP id UcuZYY7687511x2H8r5sJflU; Wed, 11 Sep 2024 12:32:51 -0700 X-Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by mx.groups.io with SMTP id smtpd.web10.23163.1726065259331612321 for ; Wed, 11 Sep 2024 07:34:19 -0700 X-Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a8a7596b7dfso171198166b.0 for ; Wed, 11 Sep 2024 07:34:19 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCXOHBlFvWEXHiOxXcapSKQsU1VFaQFLAmQPgCbLZWMXaBzhCYffGkLvxLp4XStCzPNMsVKl5w==@edk2.groups.io X-Gm-Message-State: xrcsT1A7B7CxBtVlt8BS2R8px7686176AA= X-Google-Smtp-Source: AGHT+IFWvH0mfTXi2x5OaLKLnSmNiGDqfGOGOCka3ud/AYA498nx/U9l4CG0TQPaUla3tH3QYSfjGQ== X-Received: by 2002:a17:906:4fce:b0:a8d:6a35:5091 with SMTP id a640c23a62f3a-a8ffaac0a52mr483464966b.1.1726065256856; Wed, 11 Sep 2024 07:34:16 -0700 (PDT) X-Received: from ?IPV6:2a03:83e0:1126:4:eb:d0d0:c7fd:c82c? ([2620:10d:c092:500::5:aa41]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25c7286esm613294166b.138.2024.09.11.07.34.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 11 Sep 2024 07:34:16 -0700 (PDT) Message-ID: Date: Wed, 11 Sep 2024 15:34:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [edk2-devel] [RFC] efi/tpm: add efi.tpm_log as a reserved region in 820_table_firmware To: Ard Biesheuvel Cc: linux-efi@vger.kernel.org, devel@edk2.groups.io, kexec@lists.infradead.org, ebiederm@xmission.com, bhe@redhat.com, vgoyal@redhat.com, tglx@linutronix.de, dave.hansen@linux.intel.com, x86@kernel.org, linux-kernel@vger.kernel.org, leitao@debian.org, rmikey@meta.com, gourry@gourry.net References: <20240911104109.1831501-1-usamaarif642@gmail.com> From: Usama Arif In-Reply-To: Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Wed, 11 Sep 2024 12:32:44 -0700 Resent-From: usamaarif642@gmail.com Reply-To: devel@edk2.groups.io,usamaarif642@gmail.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240830 header.b=QQWEwcb0; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io On 11/09/2024 12:51, Ard Biesheuvel wrote: > On Wed, 11 Sept 2024 at 12:41, Usama Arif wrote: >> >> Looking at the TPM spec [1] >> >> If the ACPI TPM2 table contains the address and size of the Platform >> Firmware TCG log, firmware “pins” the memory associated with the >> Platform FirmwareTCG log, and reports this memory as “Reserved” memory >> via the INT 15h/E820 interface. >> >> It looks like the firmware should pass this as reserved in e820 memory >> map. However, it doesn't seem to. The firmware being tested on is: >> dmidecode -s bios-version >> edk2-20240214-2.el9 >> >> When this area is not reserved, it comes up as usable in >> /sys/firmware/memmap. This means that kexec, which uses that memmap >> to find usable memory regions, can select the region where efi.tpm_log >> is and overwrite it and relocate_kernel. >> >> Having a fix in firmware can be difficult to get through. As a secondary >> fix, this patch marks that region as reserved in e820_table_firmware if it >> is currently E820_TYPE_RAM so that kexec doesn't use it for kernel segments. >> >> [1] https://trustedcomputinggroup.org/wp-content/uploads/PC-ClientPlatform_Profile_for_TPM_2p0_Systems_v49_161114_public-review.pdf >> >> Signed-off-by: Usama Arif Forgot to add: Reported-by: Breno Leitao > > I would expect the EFI memory map to E820 conversion implemented in > the EFI stub to take care of this. > > If you are not booting via the EFI stub, the bootloader is performing > this conversion, and so it should be done there instead. > I will look into this and report back. Thanks > >> --- >> arch/x86/include/asm/e820/api.h | 2 ++ >> arch/x86/kernel/e820.c | 6 ++++++ >> arch/x86/platform/efi/efi.c | 9 +++++++++ >> drivers/firmware/efi/tpm.c | 2 +- >> include/linux/efi.h | 7 +++++++ >> 5 files changed, 25 insertions(+), 1 deletion(-) >> >> diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h >> index 2e74a7f0e935..4e9aa24f03bd 100644 >> --- a/arch/x86/include/asm/e820/api.h >> +++ b/arch/x86/include/asm/e820/api.h >> @@ -16,6 +16,8 @@ extern bool e820__mapped_all(u64 start, u64 end, enum e820_type type); >> >> extern void e820__range_add (u64 start, u64 size, enum e820_type type); >> extern u64 e820__range_update(u64 start, u64 size, enum e820_type old_type, enum e820_type new_type); >> +extern u64 e820__range_update_firmware(u64 start, u64 size, enum e820_type old_type, >> + enum e820_type new_type); >> extern u64 e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool check_type); >> extern u64 e820__range_update_table(struct e820_table *t, u64 start, u64 size, enum e820_type old_type, enum e820_type new_type); >> >> diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c >> index 4893d30ce438..912400161623 100644 >> --- a/arch/x86/kernel/e820.c >> +++ b/arch/x86/kernel/e820.c >> @@ -538,6 +538,12 @@ u64 __init e820__range_update_table(struct e820_table *t, u64 start, u64 size, >> return __e820__range_update(t, start, size, old_type, new_type); >> } >> >> +u64 __init e820__range_update_firmware(u64 start, u64 size, enum e820_type old_type, >> + enum e820_type new_type) >> +{ >> + return __e820__range_update(e820_table_firmware, start, size, old_type, new_type); >> +} >> + >> /* Remove a range of memory from the E820 table: */ >> u64 __init e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool check_type) >> { >> diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c >> index 88a96816de9a..aa95f77d7a30 100644 >> --- a/arch/x86/platform/efi/efi.c >> +++ b/arch/x86/platform/efi/efi.c >> @@ -171,6 +171,15 @@ static void __init do_add_efi_memmap(void) >> e820__update_table(e820_table); >> } >> >> +/* Reserve firmware area if it was marked as RAM */ >> +void arch_update_firmware_area(u64 addr, u64 size) >> +{ >> + if (e820__get_entry_type(addr, addr + size) == E820_TYPE_RAM) { >> + e820__range_update_firmware(addr, size, E820_TYPE_RAM, E820_TYPE_RESERVED); >> + e820__update_table(e820_table_firmware); >> + } >> +} >> + >> /* >> * Given add_efi_memmap defaults to 0 and there is no alternative >> * e820 mechanism for soft-reserved memory, import the full EFI memory >> diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c >> index e8d69bd548f3..8e6e7131d718 100644 >> --- a/drivers/firmware/efi/tpm.c >> +++ b/drivers/firmware/efi/tpm.c >> @@ -60,6 +60,7 @@ int __init efi_tpm_eventlog_init(void) >> } >> >> tbl_size = sizeof(*log_tbl) + log_tbl->size; >> + arch_update_firmware_area(efi.tpm_log, tbl_size); >> memblock_reserve(efi.tpm_log, tbl_size); >> >> if (efi.tpm_final_log == EFI_INVALID_TABLE_ADDR) { >> @@ -107,4 +108,3 @@ int __init efi_tpm_eventlog_init(void) >> early_memunmap(log_tbl, sizeof(*log_tbl)); >> return ret; >> } >> - >> diff --git a/include/linux/efi.h b/include/linux/efi.h >> index 6bf3c4fe8511..9c239cdff771 100644 >> --- a/include/linux/efi.h >> +++ b/include/linux/efi.h >> @@ -1371,4 +1371,11 @@ extern struct blocking_notifier_head efivar_ops_nh; >> void efivars_generic_ops_register(void); >> void efivars_generic_ops_unregister(void); >> >> +#ifdef CONFIG_X86_64 >> +void __init arch_update_firmware_area(u64 addr, u64 size); >> +#else >> +static inline void __init arch_update_firmware_area(u64 addr, u64 size) >> +{ >> +} >> +#endif >> #endif /* _LINUX_EFI_H */ >> -- >> 2.43.5 >> -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#120553): https://edk2.groups.io/g/devel/message/120553 Mute This Topic: https://groups.io/mt/108391994/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-