From: Ross Philipson <ross.philipson@oracle.com> To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-integrity@vger.kernel.org, linux-doc@vger.kernel.org, linux-crypto@vger.kernel.org, iommu@lists.linux-foundation.org, kexec@lists.infradead.org, linux-efi@vger.kernel.org Cc: ross.philipson@oracle.com, dpsmith@apertussolutions.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, ardb@kernel.org, mjg59@srcf.ucam.org, James.Bottomley@hansenpartnership.com, luto@amacapital.net, nivedita@alum.mit.edu, kanth.ghatraju@oracle.com, trenchboot-devel@googlegroups.com Subject: [PATCH v6 14/14] x86: EFI stub DRTM launch support for Secure Launch Date: Thu, 4 May 2023 14:50:23 +0000 [thread overview] Message-ID: <20230504145023.835096-15-ross.philipson@oracle.com> (raw) In-Reply-To: <20230504145023.835096-1-ross.philipson@oracle.com> This support allows the DRTM launch to be initiated after and EFI stub launch of the Linux kernel is done. This is accomplished by providing a handler to jump to when a Secure Launch is in progress. Signed-off-by: Ross Philipson <ross.philipson@oracle.com> --- drivers/firmware/efi/libstub/x86-stub.c | 55 +++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c index a0bfd31..66ff922 100644 --- a/drivers/firmware/efi/libstub/x86-stub.c +++ b/drivers/firmware/efi/libstub/x86-stub.c @@ -9,6 +9,7 @@ #include <linux/efi.h> #include <linux/pci.h> #include <linux/stddef.h> +#include <linux/slr_table.h> #include <asm/efi.h> #include <asm/e820/types.h> @@ -760,6 +761,57 @@ static efi_status_t exit_boot(struct boot_params *boot_params, void *handle) return EFI_SUCCESS; } +static void efi_secure_launch(struct boot_params *boot_params) +{ + struct slr_entry_uefi_config *uefi_config; + struct slr_uefi_cfg_entry *uefi_entry; + struct slr_entry_dl_info *dlinfo; + efi_guid_t guid = SLR_TABLE_GUID; + struct slr_table *slrt; + u64 memmap_hi; + void *table; + u8 buf[64] = {0}; + + table = get_efi_config_table(guid); + + /* + * The presence of this table indicated a Secure Launch + * is being requested. + */ + if (!table) + return; + + slrt = (struct slr_table *)table; + + if (slrt->magic != SLR_TABLE_MAGIC) + return; + + /* Add config information to measure the UEFI memory map */ + uefi_config = (struct slr_entry_uefi_config *)buf; + uefi_config->hdr.tag = SLR_ENTRY_UEFI_CONFIG; + uefi_config->hdr.size = sizeof(*uefi_config) + sizeof(*uefi_entry); + uefi_config->revision = SLR_UEFI_CONFIG_REVISION; + uefi_config->nr_entries = 1; + uefi_entry = (struct slr_uefi_cfg_entry *)(buf + sizeof(*uefi_config)); + uefi_entry->pcr = 18; + uefi_entry->cfg = boot_params->efi_info.efi_memmap; + memmap_hi = boot_params->efi_info.efi_memmap_hi; + uefi_entry->cfg |= memmap_hi << 32; + uefi_entry->size = boot_params->efi_info.efi_memmap_size; + memcpy(&uefi_entry->evt_info[0], "Measured UEFI memory map", + strlen("Measured UEFI memory map")); + + if (slr_add_entry(slrt, (struct slr_entry_hdr *)uefi_config)) + return; + + /* Jump through DL stub to initiate Secure Launch */ + dlinfo = (struct slr_entry_dl_info *) + slr_next_entry_by_tag(slrt, NULL, SLR_ENTRY_DL_INFO); + + asm volatile ("jmp *%%rax" + : : "a" (dlinfo->dl_handler), "D" (&dlinfo->bl_context)); +} + /* * On success, we return the address of startup_32, which has potentially been * relocated by efi_relocate_kernel. @@ -905,6 +957,9 @@ asmlinkage unsigned long efi_main(efi_handle_t handle, goto fail; } + /* If a secure launch is in progress, this never returns */ + efi_secure_launch(boot_params); + return bzimage_addr; fail: efi_err("efi_main() failed!\n"); -- 1.8.3.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
WARNING: multiple messages have this Message-ID (diff)
From: Ross Philipson <ross.philipson@oracle.com> To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-integrity@vger.kernel.org, linux-doc@vger.kernel.org, linux-crypto@vger.kernel.org, iommu@lists.linux-foundation.org, kexec@lists.infradead.org, linux-efi@vger.kernel.org Cc: ross.philipson@oracle.com, dpsmith@apertussolutions.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, ardb@kernel.org, mjg59@srcf.ucam.org, James.Bottomley@hansenpartnership.com, luto@amacapital.net, nivedita@alum.mit.edu, kanth.ghatraju@oracle.com, trenchboot-devel@googlegroups.com Subject: [PATCH v6 14/14] x86: EFI stub DRTM launch support for Secure Launch Date: Thu, 4 May 2023 14:50:23 +0000 [thread overview] Message-ID: <20230504145023.835096-15-ross.philipson@oracle.com> (raw) In-Reply-To: <20230504145023.835096-1-ross.philipson@oracle.com> This support allows the DRTM launch to be initiated after and EFI stub launch of the Linux kernel is done. This is accomplished by providing a handler to jump to when a Secure Launch is in progress. Signed-off-by: Ross Philipson <ross.philipson@oracle.com> --- drivers/firmware/efi/libstub/x86-stub.c | 55 +++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c index a0bfd31..66ff922 100644 --- a/drivers/firmware/efi/libstub/x86-stub.c +++ b/drivers/firmware/efi/libstub/x86-stub.c @@ -9,6 +9,7 @@ #include <linux/efi.h> #include <linux/pci.h> #include <linux/stddef.h> +#include <linux/slr_table.h> #include <asm/efi.h> #include <asm/e820/types.h> @@ -760,6 +761,57 @@ static efi_status_t exit_boot(struct boot_params *boot_params, void *handle) return EFI_SUCCESS; } +static void efi_secure_launch(struct boot_params *boot_params) +{ + struct slr_entry_uefi_config *uefi_config; + struct slr_uefi_cfg_entry *uefi_entry; + struct slr_entry_dl_info *dlinfo; + efi_guid_t guid = SLR_TABLE_GUID; + struct slr_table *slrt; + u64 memmap_hi; + void *table; + u8 buf[64] = {0}; + + table = get_efi_config_table(guid); + + /* + * The presence of this table indicated a Secure Launch + * is being requested. + */ + if (!table) + return; + + slrt = (struct slr_table *)table; + + if (slrt->magic != SLR_TABLE_MAGIC) + return; + + /* Add config information to measure the UEFI memory map */ + uefi_config = (struct slr_entry_uefi_config *)buf; + uefi_config->hdr.tag = SLR_ENTRY_UEFI_CONFIG; + uefi_config->hdr.size = sizeof(*uefi_config) + sizeof(*uefi_entry); + uefi_config->revision = SLR_UEFI_CONFIG_REVISION; + uefi_config->nr_entries = 1; + uefi_entry = (struct slr_uefi_cfg_entry *)(buf + sizeof(*uefi_config)); + uefi_entry->pcr = 18; + uefi_entry->cfg = boot_params->efi_info.efi_memmap; + memmap_hi = boot_params->efi_info.efi_memmap_hi; + uefi_entry->cfg |= memmap_hi << 32; + uefi_entry->size = boot_params->efi_info.efi_memmap_size; + memcpy(&uefi_entry->evt_info[0], "Measured UEFI memory map", + strlen("Measured UEFI memory map")); + + if (slr_add_entry(slrt, (struct slr_entry_hdr *)uefi_config)) + return; + + /* Jump through DL stub to initiate Secure Launch */ + dlinfo = (struct slr_entry_dl_info *) + slr_next_entry_by_tag(slrt, NULL, SLR_ENTRY_DL_INFO); + + asm volatile ("jmp *%%rax" + : : "a" (dlinfo->dl_handler), "D" (&dlinfo->bl_context)); +} + /* * On success, we return the address of startup_32, which has potentially been * relocated by efi_relocate_kernel. @@ -905,6 +957,9 @@ asmlinkage unsigned long efi_main(efi_handle_t handle, goto fail; } + /* If a secure launch is in progress, this never returns */ + efi_secure_launch(boot_params); + return bzimage_addr; fail: efi_err("efi_main() failed!\n"); -- 1.8.3.1
next prev parent reply other threads:[~2023-05-04 14:51 UTC|newest] Thread overview: 200+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-05-04 14:50 [PATCH v6 00/14] x86: Trenchboot secure dynamic launch Linux kernel support Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-04 14:50 ` [PATCH v6 01/14] x86/boot: Place kernel_info at a fixed offset Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-04 14:50 ` [PATCH v6 02/14] Documentation/x86: Secure Launch kernel documentation Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-05 16:19 ` Simon Horman 2023-05-05 16:19 ` Simon Horman 2023-05-05 17:32 ` Ross Philipson 2023-05-05 17:32 ` Ross Philipson 2023-05-06 8:48 ` Bagas Sanjaya 2023-05-06 8:48 ` Bagas Sanjaya 2023-05-10 15:41 ` Ross Philipson 2023-05-10 15:41 ` Ross Philipson 2023-05-12 10:47 ` Matthew Garrett 2023-05-12 10:47 ` Matthew Garrett 2023-06-16 16:44 ` Daniel P. Smith 2023-06-16 16:44 ` Daniel P. Smith 2023-06-16 16:54 ` Matthew Garrett 2023-06-16 16:54 ` Matthew Garrett 2023-06-16 18:21 ` Daniel P. Smith 2023-06-16 18:21 ` Daniel P. Smith 2023-05-12 13:19 ` Thomas Gleixner 2023-05-12 13:19 ` Thomas Gleixner 2023-05-04 14:50 ` [PATCH v6 03/14] x86: Secure Launch Kconfig Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-04 14:50 ` [PATCH v6 04/14] x86: Secure Launch Resource Table header file Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-05 16:22 ` Simon Horman 2023-05-05 16:22 ` Simon Horman 2023-05-05 17:34 ` Ross Philipson 2023-05-05 17:34 ` Ross Philipson 2023-05-10 23:04 ` Jarkko Sakkinen 2023-05-10 23:04 ` Jarkko Sakkinen 2023-05-15 20:58 ` Daniel P. Smith 2023-05-15 20:58 ` Daniel P. Smith 2023-05-12 10:55 ` Matthew Garrett 2023-05-12 10:55 ` Matthew Garrett 2023-05-15 21:15 ` Daniel P. Smith 2023-05-15 21:15 ` Daniel P. Smith 2023-05-15 21:22 ` Matthew Garrett 2023-05-15 21:22 ` Matthew Garrett 2023-05-16 0:41 ` Daniel P. Smith 2023-05-16 0:41 ` Daniel P. Smith 2023-05-16 1:43 ` Matthew Garrett 2023-05-16 1:43 ` Matthew Garrett 2023-06-16 20:01 ` Daniel P. Smith 2023-06-16 20:01 ` Daniel P. Smith 2023-06-16 20:15 ` Matthew Garrett 2023-06-16 20:15 ` Matthew Garrett 2023-07-07 19:31 ` Daniel P. Smith 2023-07-07 19:31 ` Daniel P. Smith 2023-05-04 14:50 ` [PATCH v6 05/14] x86: Secure Launch main " Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-05 16:25 ` Simon Horman 2023-05-05 16:25 ` Simon Horman 2023-05-05 17:37 ` Ross Philipson 2023-05-05 17:37 ` Ross Philipson 2023-05-12 11:00 ` Matthew Garrett 2023-05-12 11:00 ` Matthew Garrett 2023-05-12 16:10 ` Ross Philipson 2023-05-12 16:10 ` Ross Philipson 2023-10-31 21:37 ` ross.philipson 2023-10-31 21:37 ` ross.philipson 2023-05-04 14:50 ` [PATCH v6 06/14] x86: Add early SHA support for Secure Launch early measurements Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-05 16:34 ` Simon Horman 2023-05-05 16:34 ` Simon Horman 2023-05-09 16:09 ` Daniel P. Smith 2023-05-09 16:09 ` Daniel P. Smith 2023-05-10 1:21 ` Eric Biggers 2023-05-10 1:21 ` Eric Biggers 2023-05-10 22:28 ` Jarkko Sakkinen 2023-05-10 22:28 ` Jarkko Sakkinen 2023-05-12 11:04 ` Matthew Garrett 2023-05-12 11:04 ` Matthew Garrett 2023-05-12 11:18 ` Ard Biesheuvel 2023-05-12 11:18 ` Ard Biesheuvel 2023-05-12 11:28 ` Matthew Garrett 2023-05-12 11:28 ` Matthew Garrett 2023-05-12 11:58 ` Ard Biesheuvel 2023-05-12 11:58 ` Ard Biesheuvel 2023-05-12 12:24 ` Andrew Cooper 2023-05-12 12:24 ` Andrew Cooper 2023-05-14 18:18 ` Eric Biggers 2023-05-14 18:18 ` Eric Biggers 2023-05-14 19:11 ` Matthew Garrett 2023-05-14 19:11 ` Matthew Garrett 2023-05-12 13:24 ` Thomas Gleixner 2023-05-12 13:24 ` Thomas Gleixner 2023-05-12 16:13 ` Matthew Garrett 2023-05-12 16:13 ` Matthew Garrett 2023-05-12 18:17 ` Thomas Gleixner 2023-05-12 18:17 ` Thomas Gleixner 2023-05-12 19:12 ` Matthew Garrett 2023-05-12 19:12 ` Matthew Garrett 2023-05-12 19:42 ` Andrew Cooper 2023-05-12 19:42 ` Andrew Cooper 2023-05-15 21:23 ` Daniel P. Smith 2023-05-15 21:23 ` Daniel P. Smith 2023-05-11 3:33 ` Herbert Xu 2023-05-11 3:33 ` Herbert Xu 2023-05-16 0:50 ` Daniel P. Smith 2023-05-16 0:50 ` Daniel P. Smith 2023-05-04 14:50 ` [PATCH v6 07/14] x86: Secure Launch kernel early boot stub Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-05 17:47 ` Simon Horman 2023-05-05 17:47 ` Simon Horman 2023-05-05 18:58 ` Ross Philipson 2023-05-05 18:58 ` Ross Philipson 2023-05-05 19:46 ` Simon Horman 2023-05-05 19:46 ` Simon Horman 2023-05-12 11:26 ` Matthew Garrett 2023-05-12 11:26 ` Matthew Garrett 2023-05-12 16:17 ` Ross Philipson 2023-05-12 16:17 ` Ross Philipson 2023-05-12 16:27 ` Matthew Garrett 2023-05-12 16:27 ` Matthew Garrett 2023-05-16 1:11 ` Daniel P. Smith 2023-05-16 1:11 ` Daniel P. Smith 2023-05-16 1:45 ` Matthew Garrett 2023-05-16 1:45 ` Matthew Garrett 2023-06-15 18:00 ` Ross Philipson 2023-06-15 18:00 ` Ross Philipson 2023-05-12 18:04 ` Thomas Gleixner 2023-05-12 18:04 ` Thomas Gleixner 2023-05-15 20:13 ` Ross Philipson 2023-05-15 20:13 ` Ross Philipson 2023-09-20 21:40 ` ross.philipson 2023-09-20 21:40 ` ross.philipson 2023-05-04 14:50 ` [PATCH v6 08/14] x86: Secure Launch kernel late " Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-05 17:52 ` Simon Horman 2023-05-05 17:52 ` Simon Horman 2023-05-05 18:59 ` Ross Philipson 2023-05-05 18:59 ` Ross Philipson 2023-05-10 23:02 ` Jarkko Sakkinen 2023-05-10 23:02 ` Jarkko Sakkinen 2023-05-12 15:58 ` Ross Philipson 2023-05-12 15:58 ` Ross Philipson 2023-05-24 2:55 ` Jarkko Sakkinen 2023-05-24 2:55 ` Jarkko Sakkinen 2023-05-12 15:44 ` Thomas Gleixner 2023-05-12 15:44 ` Thomas Gleixner 2023-05-15 20:06 ` Ross Philipson 2023-05-15 20:06 ` Ross Philipson 2023-05-04 14:50 ` [PATCH v6 09/14] x86: Secure Launch SMP bringup support Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-05 17:54 ` Simon Horman 2023-05-05 17:54 ` Simon Horman 2023-05-05 18:59 ` Ross Philipson 2023-05-05 18:59 ` Ross Philipson 2023-05-10 22:55 ` Jarkko Sakkinen 2023-05-10 22:55 ` Jarkko Sakkinen 2023-05-11 16:21 ` Ross Philipson 2023-05-11 16:21 ` Ross Philipson 2023-05-12 18:02 ` Thomas Gleixner 2023-05-12 18:02 ` Thomas Gleixner 2023-05-15 20:19 ` Ross Philipson 2023-05-15 20:19 ` Ross Philipson 2023-05-04 14:50 ` [PATCH v6 10/14] kexec: Secure Launch kexec SEXIT support Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-04 14:50 ` [PATCH v6 11/14] reboot: Secure Launch SEXIT support on reboot paths Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-12 11:40 ` Matthew Garrett 2023-05-12 11:40 ` Matthew Garrett 2023-05-15 18:16 ` Ross Philipson 2023-05-15 18:16 ` Ross Philipson 2023-05-16 1:23 ` Daniel P. Smith 2023-05-16 1:23 ` Daniel P. Smith 2023-05-04 14:50 ` [PATCH v6 12/14] x86: Secure Launch late initcall platform module Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-05 19:42 ` Simon Horman 2023-05-05 19:42 ` Simon Horman 2023-05-08 15:07 ` Ross Philipson 2023-05-08 15:07 ` Ross Philipson 2023-05-10 22:39 ` Jarkko Sakkinen 2023-05-10 22:39 ` Jarkko Sakkinen 2023-05-12 15:53 ` Ross Philipson 2023-05-12 15:53 ` Ross Philipson 2023-05-10 22:40 ` Jarkko Sakkinen 2023-05-10 22:40 ` Jarkko Sakkinen 2023-05-12 15:54 ` Ross Philipson 2023-05-12 15:54 ` Ross Philipson 2023-05-04 14:50 ` [PATCH v6 13/14] tpm: Allow locality 2 to be set when initializing the TPM for Secure Launch Ross Philipson 2023-05-04 14:50 ` Ross Philipson 2023-05-12 11:43 ` Matthew Garrett 2023-05-12 11:43 ` Matthew Garrett 2023-05-12 16:22 ` Ross Philipson 2023-05-12 16:22 ` Ross Philipson 2023-05-16 1:37 ` Daniel P. Smith 2023-05-16 1:37 ` Daniel P. Smith 2023-05-04 14:50 ` Ross Philipson [this message] 2023-05-04 14:50 ` [PATCH v6 14/14] x86: EFI stub DRTM launch support " Ross Philipson 2023-05-05 8:39 ` [PATCH v6 00/14] x86: Trenchboot secure dynamic launch Linux kernel support Bagas Sanjaya 2023-05-05 8:39 ` Bagas Sanjaya 2023-05-05 15:45 ` Ross Philipson 2023-05-05 15:45 ` Ross Philipson 2023-05-06 7:56 ` Bagas Sanjaya 2023-05-06 7:56 ` Bagas Sanjaya
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230504145023.835096-15-ross.philipson@oracle.com \ --to=ross.philipson@oracle.com \ --cc=James.Bottomley@hansenpartnership.com \ --cc=ardb@kernel.org \ --cc=bp@alien8.de \ --cc=dpsmith@apertussolutions.com \ --cc=hpa@zytor.com \ --cc=iommu@lists.linux-foundation.org \ --cc=kanth.ghatraju@oracle.com \ --cc=kexec@lists.infradead.org \ --cc=linux-crypto@vger.kernel.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-efi@vger.kernel.org \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=luto@amacapital.net \ --cc=mingo@redhat.com \ --cc=mjg59@srcf.ucam.org \ --cc=nivedita@alum.mit.edu \ --cc=tglx@linutronix.de \ --cc=trenchboot-devel@googlegroups.com \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.