Received: by 2002:a05:6500:2018:b0:1fb:9675:f89d with SMTP id t24csp162259lqh; Thu, 30 May 2024 18:32:28 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXkXfUrQRwqeZ1Ohd+EdCbBs3KR9Ma2KrGe8WxAZxkMqqw0jFAi7oDkVuV4ewmWFyKGb/dGCx9yLcAPE48Q2hTOnodN+OrRktI+vDHi4w== X-Google-Smtp-Source: AGHT+IHGdrqct+pk+OvzOBmW39kGWM2Y5pBk2Jcs8SG8MXwRg+Irb3Guag20qaCDjDVRl/Tabv5e X-Received: by 2002:ac8:7f8e:0:b0:43f:f10b:6cc6 with SMTP id d75a77b69052e-43ff527d568mr4227171cf.35.1717119148231; Thu, 30 May 2024 18:32:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717119148; cv=pass; d=google.com; s=arc-20160816; b=ehBCDCwIYyEKmMfzdcPOz6jjEDUqzJLt989SSwT6P8+XTdT7WJb7eDeIyeP4jxdkIW jfwwJbbFN+0fDycSXxjcQyh97iDJmu6yaCYFP2FrJaD9YIap2Q80nT/Iwf3dB8v1OEpP aoAmy6Ym1vx5XK+nFD+87POuX1hspREY6wPGGQDXXqFPcLrHXTvshp55cEUMY9MpVSN9 dyINOX8vytXfauZ0MbBTqAFykAdZ/iINd4ArpTyoIcKvv2XwHhAJdNNV6y6mvbwW8z2O 24rEaHjusny2zw+erO89kwYyzEX5A+a24bNhiCYWqVophGWP5JfQ/Gw4XVm8FwDBc90a u4fw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=9m2aNR1g/4krse8kqjCyTPG8hy+6sHMM4ClRX172BWM=; fh=ksrYNUbdo9+K4DYOCXVji8cRdTI1C1SaRA8HdvQyCiA=; b=MRtxzBGzNY58hUEFd49V17P32JIpi2A/IEHXHKoJE4rFBO5ZZljWklHedpM4zJM6gE GmK0R4P0Uo5qpjI2MWqyURk5jnK1Ac9Yk/q+9yWpMh5+MG6/JA3uym2b83cWqKarYzMl ZLn6rfcslXCxXuF/RcOJMcIhrEiAS8sipQ9SuBCeYxeCw4qn4oIfqtitVAZj0ztuhCtg GeXXusw+dSwPjvpCuhSdzm/eBfTzK8G09RMEenBK6AP9pOLqsCTz1YKAECFreYjijrZn p/BcKyqeoLTfj43NF3Td95AB13kDn7MzXYPwivQE56f1H3H6IIrQKKIRmE/ZckF8Pd3i vveA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=neutral (bad format) header.i=@oracle.com; arc=pass (i=1 spf=pass spfdomain=oracle.com dmarc=pass fromdomain=oracle.com); spf=pass (google.com: domain of linux-crypto+bounces-4546-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-crypto+bounces-4546-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=oracle.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id d75a77b69052e-43ff23ac0c8si9728931cf.25.2024.05.30.18.32.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 May 2024 18:32:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto+bounces-4546-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=neutral (bad format) header.i=@oracle.com; arc=pass (i=1 spf=pass spfdomain=oracle.com dmarc=pass fromdomain=oracle.com); spf=pass (google.com: domain of linux-crypto+bounces-4546-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-crypto+bounces-4546-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=oracle.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id E0F471C23368 for ; Fri, 31 May 2024 01:32:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BC112101EC; Fri, 31 May 2024 01:32:17 +0000 (UTC) X-Original-To: linux-crypto@vger.kernel.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 302895C89; Fri, 31 May 2024 01:32:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.165.32 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717119137; cv=none; b=GhfTjsVW3rlXJ7zgyxhykpJq2436Wl5LwObLvE0xu9HSHre5EAeUHsjWEXyXGodFUxEnl/6UGjNUWwXBiTJtpEeZLOZnheavZ0ugWG3NS6cbXFQKByU0VjtUQKktkHsqI8y+8QZpfHubrHBeCAEGyqYSVC5AZgFK5P6vt3e7vtk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717119137; c=relaxed/simple; bh=jHl6b3dMJ6FFg3UIi6LmmEvFgirmAw+HES4vhbbCYg4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qFQy6eT5++IdU7ewUY4ywoej5D+vm/ZJnLpf+xV2n5M0G0UnW+LfKksI987pdDRUrWjb9unoPG7FF94rjM4fmNESWSGnwG7T3hb2kFazINXDmYmIPlNjClD6fxR2I5uuA0ueA1CIQefEMxkxqq5UZQfbzuOf8UnS+hrnyr622Ew= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=none smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 44UFU2Fi006307; Fri, 31 May 2024 01:31:42 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:date:from:in-reply-to:message-i?= =?UTF-8?Q?d:mime-version:references:subject:to;_s=3Dcorp-2023-11-20;_bh?= =?UTF-8?Q?=3D9m2aNR1g/4krse8kqjCyTPG8hy+6sHMM4ClRX172BWM=3D;_b=3DI6Oo8GVh?= =?UTF-8?Q?reCS/o27w4AvW5Cwmi9+K5FSkmTakQH5+Wr6+ItFaaO3TOlLABLKfLl6YvAJ_hV?= =?UTF-8?Q?p6Wm3kOQfgb4qzOQ55h+Cqvzn42FDfnZXdk3jHlS83iVbchCkKAix3o+DZtj4bH?= =?UTF-8?Q?SwX_tZVqJEMnTXDboT4d1JnOErQV9r/JlmTZVBhz5PcLP8ZUhrP2/GKA6huCllm?= =?UTF-8?Q?JrMp5wYM4_2K1Q/Rif9ino8Dy+UdzIcnQX35q6gYdVqERxdw8kXopHurL8ypvVO?= =?UTF-8?Q?HNNPC37pdHz9TrE_IeQg9VLzO8UxovUdCv8wZTsh59OHsJoFbw14c0zn4s37zzc?= =?UTF-8?Q?qHw7VuNmgqV6qwXc88/T0_+A=3D=3D_?= Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yb8p7t3hd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 May 2024 01:31:42 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 44V10JZw016201; Fri, 31 May 2024 01:31:41 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3yc50t985y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 31 May 2024 01:31:41 +0000 Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 44V1SKNq027418; Fri, 31 May 2024 01:31:40 GMT Received: from bur-virt-x6-2-100.us.oracle.com (bur-virt-x6-2-100.us.oracle.com [10.153.92.40]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3yc50t96yw-20 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 31 May 2024 01:31:39 +0000 From: Ross Philipson 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 Message-Id: <20240531010331.134441-20-ross.philipson@oracle.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240531010331.134441-1-ross.philipson@oracle.com> References: <20240531010331.134441-1-ross.philipson@oracle.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-30_21,2024-05-30_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 spamscore=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2405310010 X-Proofpoint-ORIG-GUID: 0aK0fOvrZX65T8BZ6lZx1WP0me2ls7dG X-Proofpoint-GUID: 0aK0fOvrZX65T8BZ6lZx1WP0me2ls7dG 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 --- 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 #include #include +#include +#include #include #include @@ -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