Received-SPF: pass (google.com: domain of linux-crypto+bounces-2232-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <dc53f100-062b-47ae-abc8-5414ce8d041c@oracle.com>
Date: Wed, 21 Feb 2024 12:17:30 -0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v8 15/15] x86: EFI stub DRTM launch support for Secure
 Launch
To: Ard Biesheuvel <ardb@kernel.org>
Cc: 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, dpsmith@apertussolutions.com,
        tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com,
        dave.hansen@linux.intel.com, 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, kanth.ghatraju@oracle.com,
        trenchboot-devel@googlegroups.com
References: <20240214221847.2066632-1-ross.philipson@oracle.com>
 <20240214221847.2066632-16-ross.philipson@oracle.com>
 <CAMj1kXF3k_c4Wn9GU+NC_+_aYfDpAzAUnfR=A4L_T+re1H3G=w@mail.gmail.com>
Content-Language: en-US
From: ross.philipson@oracle.com
In-Reply-To: <CAMj1kXF3k_c4Wn9GU+NC_+_aYfDpAzAUnfR=A4L_T+re1H3G=w@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?utf-8?B?T25lc3dPR3gvdTYzM084SS80ZENiTDVtR1RYY1ZGN3BPKzF3MUswYjZPclFm?=
 =?utf-8?B?eW5kZUV3MEo3SEJoNWNVT3ByVXhqVWFCWUoyQjlNTk11UWZneVhBTnFWdk5o?=
 =?utf-8?B?dnlmeTFGLzNYajZPMHR3S0pieXNRR29jL2xodUR5TEFNaWlWbm9iNG9NKzJq?=
 =?utf-8?B?SzRBYnNZOFN5WW0vdDVXajM0SzM5bWlaQmswWVVpenM3SHo3MmVnSC94V1NL?=
 =?utf-8?B?NDVCY2VOME40akJhQjFBNjlkNHd1M3JxWWcrQjRRTGMzMDhCREhSVklobGlr?=
 =?utf-8?B?YS80ZmJ6SFdNZGpYRGFsMXhOajN1MXhKaW4rWWNUcy9KQXNnNFBPcTh3NnZ0?=
 =?utf-8?B?RHhNcnVqYy96R21oazVXK1BUZFd0d2EyendtRTlsbWMycy9hSkRZMnFoSE1D?=
 =?utf-8?B?UkRuTkRoTkczYzgvQ0NRbzc1blNnN2NFVHpwbWptOG9NZEF3Rkk5V1ZLdjdY?=
 =?utf-8?B?ZkxvV2YyOXV0dmtINkdJaGZ3L2xheXdaTlVHa0w1Tms0RUE3b0JwaStQKzJy?=
 =?utf-8?B?elRuWkJzWWxZcVIwZFcwUm5mV05BTy85a2g3STJDdTF4eEJ3UHZoTEZLUkJC?=
 =?utf-8?B?TGdFYXd0T28zRHppdDJqdkdQaktMMFZjVEF3VUxLOWxYa0xxeW1iRTN3b2ZT?=
 =?utf-8?B?VXMyZ3luSnVLRnZIbUt1YjhUM08zaVBBU1FWQmN4YkxSYjdBNjIxVnc3bHkw?=
 =?utf-8?B?SHZ5R3MrWGlISmF2QnFVZUp6amlieDMvMHRHcnN3TVg3b3dsQy9aSWRFSzJX?=
 =?utf-8?B?Uk5nUERWRTFRc3A4ZVV3UFRXM0x4Z1BLSTZkS3UxcU16TTQyemlMeU43QWY1?=
 =?utf-8?B?SHVhRkZybVYzNzRPcGNMY3hlN3VZMmQ2eFFRK2JMc2xNVTdGQWFtM256OTUr?=
 =?utf-8?B?VTgrUklONzIxRUVINTlhN3BacmNYVXBENjlTNHBzVkYyNzZ4d3FGd2t3NVor?=
 =?utf-8?B?cVgvYjRhbE96Q2txWFRDU2FrMnc2bHlFVW5SUDhmdkNrVEdBbkp0Tlh2YlR6?=
 =?utf-8?B?L3ZJMmVTUlVZQWRlYjJqZnlSdGdGcml2VGNrbmtySU55bjVWMWZmR2JTN1Ri?=
 =?utf-8?B?UjhabmpmVFRPbkt3YTFjbzFjWk1UL1V0YUFaWXBZeDBYd0VseC9kcVBnWjZ5?=
 =?utf-8?B?ckZ2YW1JeGRFZ1lFWWhEajMzbzRJVW40VlFrLy9SMUx0aDFjcS91VGZpRTNF?=
 =?utf-8?B?cThheklUR3NBT3piN3Exc1hLMUg1NEtqUlJvZzJDS2M4a1dSMjJTTklRZkds?=
 =?utf-8?B?eUNyMmMzQVUxQ1gxVkJrdkU4ak5yZXdJdnJqZWdja3QwQlZXZ01CZUtFT2N2?=
 =?utf-8?B?UnhWQnNQMUYxNkVvMFBKOVBrK2g2YjM1Nnd5YWlmbytUOGJ2ZW1TRngzSWkw?=
 =?utf-8?B?Nko4RWdlWHZpeHFNRlNva1BJeFJlT0tkdlpoRytxMUdJZ2lET3VSTlpaYk9z?=
 =?utf-8?B?M3FvbnU2UkhuYTByRm1NUHVMZUx5RVhQUDV3aC9Xc1lYNC9leXJqcWFIdm1n?=
 =?utf-8?B?dUlsM214ZnRvQ2VEaWU5MUJJVGNKVUJhL2VkSDZrNTg5dzBYQ1FhcEw5Y3RL?=
 =?utf-8?B?SktOUXNTQld6bXBvVUE0N09iVVBqNjNXU2F4Y2VTVzZUb1RhR2lXSVBCemFp?=
 =?utf-8?B?ZFdoVFZsbjJQUUZpaVlOcmNOTER1bVZNa2xZblExSUUrbk9FOUFuLzZzS0VH?=
 =?utf-8?B?aitPeFFzWk5hQTFLaU1URlNpaUZSUjhBSm4yN1Y0YmtCdWlXUzY1Ym1mWjhY?=
 =?utf-8?B?SkRLc1N3NEg4QjJNTDJtWTczTnFwZnVGclZTalNnY3ozRE5iOC92NldBR1NS?=
 =?utf-8?B?ZVZzNERIMVAvdVNscmlpYUFZVTRoaEpadjhWelNPTndqMWlzNEVack1EYXpk?=
 =?utf-8?B?WVU5d0lyYzdWRUQ5cEdLYnFTWENXU0FGS0hCbWZTVitzbHFrSDNoN1JacStl?=
 =?utf-8?B?c1hnSDByQitPcUZCbERQZG1zanAyMXFSTE9XWXBCcGRiSEhDMkM2N3ZuSGo4?=
 =?utf-8?B?Sk9sMVgyRm56eHNGVjB1L3ZzYTRDb3VjZFQybHhQbUlIM0dpZlFOdXpMMjM0?=
 =?utf-8?B?bUZqOFM1ejVJMTJoTXpxYWpSVUhhRnhOUEQ4cjhXZVZVOU94VmJlQXdkSEVp?=
 =?utf-8?B?UU04UUs3MWFqSGFzUzlySjBnOGVkU3hJd1ROZnhMM1cveXFKWjZDUHNQZVUr?=
 =?utf-8?B?OFE9PQ==?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	w6hBZzRxR1l4c/lIa3eK4r2+FNNaqlx5AouU/fzAbUOY7wPHQe0mtPd09+rCLqR5cMCDYSJGNIRtV/xeJnAtSDtWturTinpAB9EutsP1IWCx/vd8DpRcv75UKVnP20F4KQyozeWOLyd3SA2uoJTLxqlnzVKBLE4wLKF3nHQNHK6qg4cGFRVSVCnPGp08wi7DWdEEDuH5NvtOooGGulGXfcqysXz7EBCS9uAbjw7xpSYLeLc2toD2UV0DlEhSRdJY0OVyo0FwCP9LRAf1oLONDNDyOMFnjhSoPz1Trmsw/mgjMqr5Vj/31DNw9GHBG9ZxP5sRlkdmyaS9s9ud6LPiRnBfvz1B6idkS68YsZBkg8n+hVPC7od6WAGt90XDx9tPXHJn5KDuCIsI4xosTZaKRv5gkzMnTrtKMnw+lvAe2XVzRk4I6B9zlkjYPX1kn22blWemaQeR+OEjOgFP3Nsj3VKzwTOsnR8YJ+eT3FF1F3mCwBnclsUirIqiExF+wLifFSyb5b64s+mo3a0BHqsFQO9hUGy2OojyAzKJBo9rdkZSa5R/N5bCqoskWchO/JT40OFLBa/t2/4KVXbX3Y3Ei1FmokLMJDkIFZcX2pTYiqM=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1efbb1d9-c6af-4e3b-73f5-08dc331a23e0
X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7224.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2024 20:17:34.6343
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: HbmQsw7E+6y3O8+2GRRC61+ubuhhXqabNKvgGSwyv3oS7XNg7DQpF/FselCZ1OFgRO6Y9bXNE0Rf/cKJoXpelbYRYDNp85M5ZsdY8Uo5sNM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB6142
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-21_07,2024-02-21_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0
 adultscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 malwarescore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2402210157
X-Proofpoint-GUID: kESAnOLVYH5JpD43DR3OkTjnGIR9v5Vx
X-Proofpoint-ORIG-GUID: kESAnOLVYH5JpD43DR3OkTjnGIR9v5Vx

On 2/15/24 1:01 AM, Ard Biesheuvel wrote:
> On Wed, 14 Feb 2024 at 23:32, Ross Philipson <ross.philipson@oracle.com> wrote:
>>
>> 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 | 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 0d510c9a06a4..4df2cf539194 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>
>> @@ -810,6 +811,57 @@ static efi_status_t efi_decompress_kernel(unsigned long *kernel_entry)
>>          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};
>> +
> 
> If you add a flex array to slr_entry_uefi_config as I suggested in
> response to the other patch, we could simplify this substantially

I feel like there is some reason why we did not use flex arrays. We were 
talking and we seem to remember we used to use them and someone asked us 
to remove them. We are still looking into it. But if we can go back to 
them, I will take all the changes you recommended here.

Thanks
Ross

> 
> static struct slr_entry_uefi_config cfg = {
>          .hdr.tag        = SLR_ENTRY_UEFI_CONFIG,
>          .hdr.size       = sizeof(cfg),
>          .revision       = SLR_UEFI_CONFIG_REVISION,
>          .nr_entries     = 1,
>          .entries[0]     = {
>                  .pcr    = 18,
>                  .evt_info = "Measured UEFI memory map",
>          },
> };
> 
> cfg.entries[0].cfg  = boot_params->efi_info.efi_memmap |
>                        (u64)boot_params->efi_info.efi_memmap_hi << 32;
> cfg.entries[0].size = boot_params->efi_info.efi_memmap_size;
> 
> 
> 
>> +       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;
>> +
> 
> slrt = (struct slr_table *)get_efi_config_table(guid);
> if (!slrt || 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"));
>> +
> 
> Drop all of this
> 
>> +       if (slr_add_entry(slrt, (struct slr_entry_hdr *)uefi_config))
> 
> if (slr_add_entry(slrt, &uefi_config.hdr))
> 
> 
>> +               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));
> 
> Fix the prototype and just do
> 
> dlinfo->dl_handler(&dlinfo->bl_context);
> unreachable();
> 
> 
> So in summary, this becomes
> 
> static void efi_secure_launch(struct boot_params *boot_params)
> {
>          static struct slr_entry_uefi_config cfg = {
>                  .hdr.tag        = SLR_ENTRY_UEFI_CONFIG,
>                  .hdr.size       = sizeof(cfg),
>                  .revision       = SLR_UEFI_CONFIG_REVISION,
>                  .nr_entries     = 1,
>                  .entries[0]     = {
>                          .pcr    = 18,
>                          .evt_info = "Measured UEFI memory map",
>                  },
>          };
>          struct slr_entry_dl_info *dlinfo;
>          efi_guid_t guid = SLR_TABLE_GUID;
>          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;
> 
>          cfg.entries[0].cfg  = boot_params->efi_info.efi_memmap |
>                                (u64)boot_params->efi_info.efi_memmap_hi << 32;
>          cfg.entries[0].size = boot_params->efi_info.efi_memmap_size;
> 
>          if (slr_add_entry(slrt, &cfg.hdr))
>                  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);
> 
>          dlinfo->dl_handler(&dlinfo->bl_context);
> 
>          unreachable();
> }
> 
> 
>> +}
>> +
>>   static void __noreturn enter_kernel(unsigned long kernel_addr,
>>                                      struct boot_params *boot_params)
>>   {
>> @@ -934,6 +986,9 @@ void __noreturn efi_stub_entry(efi_handle_t handle,
>>                  goto fail;
>>          }
>>
>> +       /* If a Secure Launch is in progress, this never returns */
> 
> if (IS_ENABLED(CONFIG_SECURE_LAUNCH))
> 
>> +       efi_secure_launch(boot_params);
>> +
>>          /*
>>           * 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
>>
>