mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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, kexec@lists.infradead.org,
	linux-efi@vger.kernel.org, iommu@lists.linux-foundation.org
Cc: ross.philipson@oracle.com, dpsmith@apertussolutions.com,
	tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
	hpa@zytor.com, dave.hansen@linux.intel.com, ardb@kernel.org,
	mjg59@srcf.ucam.org, James.Bottomley@hansenpartnership.com,
	peterhuewe@gmx.de, jarkko@kernel.org, jgg@ziepe.ca,
	luto@amacapital.net, nivedita@alum.mit.edu,
	herbert@gondor.apana.org.au, davem@davemloft.net, corbet@lwn.net,
	ebiederm@xmission.com, dwmw2@infradead.org,
	baolu.lu@linux.intel.com, kanth.ghatraju@oracle.com,
	andrew.cooper3@citrix.com, trenchboot-devel@googlegroups.com
Subject: [PATCH v9 19/19] x86: EFI stub DRTM launch support for Secure Launch
Date: Thu, 30 May 2024 18:03:31 -0700	[thread overview]
Message-ID: <20240531010331.134441-20-ross.philipson@oracle.com> (raw)
In-Reply-To: <20240531010331.134441-1-ross.philipson@oracle.com>

This support allows the DRTM launch to be initiated after an 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. This has to be
called after the EFI stub does Exit Boot Services.

Signed-off-by: Ross Philipson <ross.philipson@oracle.com>
---
 drivers/firmware/efi/libstub/x86-stub.c | 98 +++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
index d5a8182cf2e1..a1143d006202 100644
--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
@@ -9,6 +9,8 @@
 #include <linux/efi.h>
 #include <linux/pci.h>
 #include <linux/stddef.h>
+#include <linux/slr_table.h>
+#include <linux/slaunch.h>
 
 #include <asm/efi.h>
 #include <asm/e820/types.h>
@@ -830,6 +832,97 @@ static efi_status_t efi_decompress_kernel(unsigned long *kernel_entry)
 	return efi_adjust_memory_range_protection(addr, kernel_text_size);
 }
 
+#if (IS_ENABLED(CONFIG_SECURE_LAUNCH))
+static bool efi_secure_launch_update_boot_params(struct slr_table *slrt,
+						 struct boot_params *boot_params)
+{
+	struct slr_entry_intel_info *txt_info;
+	struct slr_entry_policy *policy;
+	struct txt_os_mle_data *os_mle;
+	bool updated = false;
+	int i;
+
+	txt_info = slr_next_entry_by_tag(slrt, NULL, SLR_ENTRY_INTEL_INFO);
+	if (!txt_info)
+		return false;
+
+	os_mle = txt_os_mle_data_start((void *)txt_info->txt_heap);
+	if (!os_mle)
+		return false;
+
+	os_mle->boot_params_addr = (u32)(u64)boot_params;
+
+	policy = slr_next_entry_by_tag(slrt, NULL, SLR_ENTRY_ENTRY_POLICY);
+	if (!policy)
+		return false;
+
+	for (i = 0; i < policy->nr_entries; i++) {
+		if (policy->policy_entries[i].entity_type == SLR_ET_BOOT_PARAMS) {
+			policy->policy_entries[i].entity = (u64)boot_params;
+			updated = true;
+			break;
+		}
+	}
+
+	/*
+	 * If this is a PE entry into EFI stub the mocked up boot params will
+	 * be missing some of the setup header data needed for the second stage
+	 * of the Secure Launch boot.
+	 */
+	if (image) {
+		struct setup_header *hdr = (struct setup_header *)((u8 *)image->image_base + 0x1f1);
+		u64 cmdline_ptr, hi_val;
+
+		boot_params->hdr.setup_sects = hdr->setup_sects;
+		boot_params->hdr.syssize = hdr->syssize;
+		boot_params->hdr.version = hdr->version;
+		boot_params->hdr.loadflags = hdr->loadflags;
+		boot_params->hdr.kernel_alignment = hdr->kernel_alignment;
+		boot_params->hdr.min_alignment = hdr->min_alignment;
+		boot_params->hdr.xloadflags = hdr->xloadflags;
+		boot_params->hdr.init_size = hdr->init_size;
+		boot_params->hdr.kernel_info_offset = hdr->kernel_info_offset;
+		hi_val = boot_params->ext_cmd_line_ptr;
+		cmdline_ptr = boot_params->hdr.cmd_line_ptr | hi_val << 32;
+		boot_params->hdr.cmdline_size = strlen((const char *)cmdline_ptr);;
+	}
+
+	return updated;
+}
+
+static void efi_secure_launch(struct boot_params *boot_params)
+{
+	struct slr_entry_dl_info *dlinfo;
+	efi_guid_t guid = SLR_TABLE_GUID;
+	dl_handler_func handler_callback;
+	struct slr_table *slrt;
+
+	/*
+	 * The presence of this table indicated a Secure Launch
+	 * is being requested.
+	 */
+	slrt = (struct slr_table *)get_efi_config_table(guid);
+	if (!slrt || slrt->magic != SLR_TABLE_MAGIC)
+		return;
+
+	/*
+	 * Since the EFI stub library creates its own boot_params on entry, the
+	 * SLRT and TXT heap have to be updated with this version.
+	 */
+	if (!efi_secure_launch_update_boot_params(slrt, boot_params))
+		return;
+
+	/* Jump through DL stub to initiate Secure Launch */
+	dlinfo = slr_next_entry_by_tag(slrt, NULL, SLR_ENTRY_DL_INFO);
+
+	handler_callback = (dl_handler_func)dlinfo->dl_handler;
+
+	handler_callback(&dlinfo->bl_context);
+
+	unreachable();
+}
+#endif
+
 static void __noreturn enter_kernel(unsigned long kernel_addr,
 				    struct boot_params *boot_params)
 {
@@ -957,6 +1050,11 @@ void __noreturn efi_stub_entry(efi_handle_t handle,
 		goto fail;
 	}
 
+#if (IS_ENABLED(CONFIG_SECURE_LAUNCH))
+	/* If a Secure Launch is in progress, this never returns */
+	efi_secure_launch(boot_params);
+#endif
+
 	/*
 	 * Call the SEV init code while still running with the firmware's
 	 * GDT/IDT, so #VC exceptions will be handled by EFI.
-- 
2.39.3


  parent reply	other threads:[~2024-05-31  1:32 UTC|newest]

Thread overview: 116+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-31  1:03 [PATCH v9 00/19] x86: Trenchboot secure dynamic launch Linux kernel support Ross Philipson
2024-05-31  1:03 ` [PATCH v9 01/19] x86/boot: Place kernel_info at a fixed offset Ross Philipson
2024-06-04 18:18   ` Jarkko Sakkinen
2024-06-04 20:28     ` ross.philipson
2024-05-31  1:03 ` [PATCH v9 02/19] Documentation/x86: Secure Launch kernel documentation Ross Philipson
2024-05-31  1:03 ` [PATCH v9 03/19] x86: Secure Launch Kconfig Ross Philipson
2024-05-31  1:03 ` [PATCH v9 04/19] x86: Secure Launch Resource Table header file Ross Philipson
2024-06-04 18:21   ` Jarkko Sakkinen
2024-06-04 20:31     ` ross.philipson
2024-06-04 22:36       ` Jarkko Sakkinen
2024-06-04 23:00         ` ross.philipson
2024-06-05  0:22           ` Jarkko Sakkinen
2024-06-05  0:27             ` Jarkko Sakkinen
2024-06-05  2:33             ` ross.philipson
2024-06-05  4:04               ` Jarkko Sakkinen
2024-06-05 19:03                 ` ross.philipson
2024-06-06  6:02                   ` Jarkko Sakkinen
2024-06-06 16:49                     ` ross.philipson
2024-06-20  0:18                       ` Jarkko Sakkinen
2024-06-20 16:55                         ` ross.philipson
2024-05-31  1:03 ` [PATCH v9 05/19] x86: Secure Launch main " Ross Philipson
2024-06-04 18:24   ` Jarkko Sakkinen
2024-06-04 20:52     ` ross.philipson
2024-05-31  1:03 ` [PATCH v9 06/19] x86: Add early SHA-1 support for Secure Launch early measurements Ross Philipson
2024-05-31  2:16   ` Eric Biggers
2024-05-31 13:54     ` Eric W. Biederman
2024-08-15 17:38       ` Daniel P. Smith
2024-08-15 19:10         ` Thomas Gleixner
2024-08-16 10:42           ` Jarkko Sakkinen
2024-08-16 11:01           ` Andrew Cooper
2024-08-16 11:22             ` Jarkko Sakkinen
2024-08-16 18:41               ` Matthew Garrett
2024-08-19 18:05                 ` Jarkko Sakkinen
2024-08-19 18:24                   ` Matthew Garrett
2024-08-20 15:26                     ` Jarkko Sakkinen
2024-08-22 18:29           ` Daniel P. Smith
2026-02-20 15:35             ` Ard Biesheuvel
2026-02-23 23:08               ` Andrew Cooper
2026-02-24  8:25                 ` Ard Biesheuvel
2024-08-29  3:17           ` Andy Lutomirski
2024-08-29  3:25             ` Matthew Garrett
2024-08-29 17:26               ` Andy Lutomirski
2024-09-05  1:01             ` Daniel P. Smith
2024-09-13  0:34               ` Daniel P. Smith
2024-09-14  3:57                 ` Andy Lutomirski
2024-09-21 18:36                   ` Daniel P. Smith
2024-09-21 22:40                     ` Andy Lutomirski
2024-11-02 14:53                       ` Daniel P. Smith
2024-11-02 16:04                         ` James Bottomley
2024-11-15  1:17                           ` Daniel P. Smith
2024-11-18 18:43                             ` Andy Lutomirski
2024-11-18 18:50                               ` Andy Lutomirski
2024-11-18 19:12                               ` James Bottomley
2024-11-18 20:02                                 ` Andy Lutomirski
2024-11-21 20:11                                   ` ross.philipson
2024-11-21 20:54                                     ` Andy Lutomirski
2024-11-21 22:42                                       ` Andy Lutomirski
2024-11-22 23:37                                         ` ross.philipson
2024-12-12 19:56                                   ` Daniel P. Smith
2024-12-12 22:30                                     ` Andy Lutomirski
2024-12-14  2:56                                       ` Daniel P. Smith
2024-05-31 16:18     ` ross.philipson
2024-08-27 18:14     ` Eric Biggers
2024-08-28 20:14       ` ross.philipson
2024-08-28 23:13         ` Eric Biggers
2024-06-04 18:52   ` Jarkko Sakkinen
2024-06-04 21:02     ` ross.philipson
2024-06-04 22:40       ` Jarkko Sakkinen
2024-05-31  1:03 ` [PATCH v9 07/19] x86: Add early SHA-256 " Ross Philipson
2024-05-31  1:03 ` [PATCH v9 08/19] x86: Secure Launch kernel early boot stub Ross Philipson
2024-05-31 11:00   ` Ard Biesheuvel
2024-05-31 13:33     ` Ard Biesheuvel
2024-05-31 14:04       ` Ard Biesheuvel
2024-05-31 16:13         ` Ard Biesheuvel
2024-06-04 17:31         ` ross.philipson
2024-06-04 17:24       ` ross.philipson
2024-06-04 17:27         ` Ard Biesheuvel
2024-06-04 17:33           ` ross.philipson
2024-06-04 20:54             ` Ard Biesheuvel
2024-06-04 21:12               ` ross.philipson
2024-06-04 17:14     ` ross.philipson
2024-06-04 19:56   ` Jarkko Sakkinen
2024-06-04 21:09     ` ross.philipson
2024-06-04 22:43       ` Jarkko Sakkinen
2024-05-31  1:03 ` [PATCH v9 09/19] x86: Secure Launch kernel late " Ross Philipson
2024-06-04 19:58   ` Jarkko Sakkinen
2024-06-04 21:16     ` ross.philipson
2024-06-04 22:45       ` Jarkko Sakkinen
2024-06-04 19:59   ` Jarkko Sakkinen
2024-06-04 21:17     ` ross.philipson
2024-08-12 19:02     ` ross.philipson
2024-08-15 18:35       ` Jarkko Sakkinen
2024-05-31  1:03 ` [PATCH v9 10/19] x86: Secure Launch SMP bringup support Ross Philipson
2024-06-04 20:05   ` Jarkko Sakkinen
2024-06-04 21:47     ` ross.philipson
2024-06-04 22:46       ` Jarkko Sakkinen
2024-05-31  1:03 ` [PATCH v9 11/19] kexec: Secure Launch kexec SEXIT support Ross Philipson
2024-05-31  1:03 ` [PATCH v9 12/19] reboot: Secure Launch SEXIT support on reboot paths Ross Philipson
2024-05-31  1:03 ` [PATCH v9 13/19] tpm: Protect against locality counter underflow Ross Philipson
2024-06-04 20:12   ` Jarkko Sakkinen
2024-08-15 18:52     ` Daniel P. Smith
2024-05-31  1:03 ` [PATCH v9 14/19] tpm: Ensure tpm is in known state at startup Ross Philipson
2024-06-04 20:14   ` Jarkko Sakkinen
2024-08-15 19:24     ` Daniel P. Smith
2024-05-31  1:03 ` [PATCH v9 15/19] tpm: Make locality requests return consistent values Ross Philipson
2024-05-31  1:03 ` [PATCH v9 16/19] tpm: Add ability to set the preferred locality the TPM chip uses Ross Philipson
2024-06-04 20:27   ` Jarkko Sakkinen
2024-06-04 22:14     ` ross.philipson
2024-06-04 22:50       ` Jarkko Sakkinen
2024-06-04 23:04         ` ross.philipson
2024-05-31  1:03 ` [PATCH v9 17/19] tpm: Add sysfs interface to allow setting and querying the preferred locality Ross Philipson
2024-06-04 20:27   ` Jarkko Sakkinen
2024-05-31  1:03 ` [PATCH v9 18/19] x86: Secure Launch late initcall platform module Ross Philipson
2024-05-31  1:03 ` Ross Philipson [this message]
2024-05-31 11:09   ` [PATCH v9 19/19] x86: EFI stub DRTM launch support for Secure Launch Ard Biesheuvel
2024-06-04 17:22     ` ross.philipson

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=20240531010331.134441-20-ross.philipson@oracle.com \
    --to=ross.philipson@oracle.com \
    --cc=James.Bottomley@hansenpartnership.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=ardb@kernel.org \
    --cc=baolu.lu@linux.intel.com \
    --cc=bp@alien8.de \
    --cc=corbet@lwn.net \
    --cc=dave.hansen@linux.intel.com \
    --cc=davem@davemloft.net \
    --cc=dpsmith@apertussolutions.com \
    --cc=dwmw2@infradead.org \
    --cc=ebiederm@xmission.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=hpa@zytor.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jarkko@kernel.org \
    --cc=jgg@ziepe.ca \
    --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=peterhuewe@gmx.de \
    --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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®