Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use slr_entry_amd_info instead of slr_entry_dl_info for SKINIT #20

Merged
merged 2 commits into from
Dec 14, 2024
Merged

Use slr_entry_amd_info instead of slr_entry_dl_info for SKINIT #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
164fbf0
xen/include/xen/slr_table.h: fill in slr_entry_amd_info
SergiiDmytruk Dec 6, 2024
681dcae
xen/arch/x86/boot/slaunch_early.c: switch to slr_entry_amd_info on AMD
SergiiDmytruk Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions xen/arch/x86/boot/slaunch_early.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@
#include <xen/slr_table.h>
#include <asm/x86-vendors.h>

/*
* The AMD-defined structure layout for the SLB. The last two fields are
* SL-specific.
*/
struct skinit_sl_header
{
uint16_t skl_entry_point;
uint16_t length;
uint8_t reserved[62];
uint16_t skl_info_offset;
uint16_t bootloader_data_offset;
} __packed;

struct early_tests_results
{
uint32_t mbi_pa;
Expand Down Expand Up @@ -133,29 +146,28 @@ void slaunch_early_tests(uint32_t load_base_addr,
{
/*
* Not an Intel CPU. Currently the only other option is AMD with SKINIT
* and secure-kernel-loader.
* and secure-kernel-loader (SKL).
*/
struct slr_table *slrt;
struct slr_entry_dl_info *dl_info;
struct slr_entry_amd_info *amd_info;
const struct skinit_sl_header *sl_header = (void *)slaunch_param;

const uint16_t *sl_header = (void *)slaunch_param;
/*
* The fourth 16-bit integer of SKL's header is an offset to
* bootloader's data, which is SLRT.
* slaunch_param holds a physical address of SLB.
* Bootloader's data is SLRT.
*/
result->slrt_pa = slaunch_param + sl_header[3];
result->slrt_pa = slaunch_param + sl_header->bootloader_data_offset;
result->mbi_pa = 0;

slrt = (struct slr_table *)result->slrt_pa;

result->mbi_pa = 0;
dl_info = (struct slr_entry_dl_info *)
slr_next_entry_by_tag (slrt, NULL, SLR_ENTRY_DL_INFO);
amd_info = (struct slr_entry_amd_info *)
slr_next_entry_by_tag (slrt, NULL, SLR_ENTRY_AMD_INFO);
/* Basic checks only, SKL checked and consumed the rest. */
if ( dl_info == NULL
|| dl_info->hdr.size != sizeof(*dl_info)
|| dl_info->bl_context.bootloader != SLR_BOOTLOADER_GRUB )
if ( amd_info == NULL || amd_info->hdr.size != sizeof(*amd_info) )
return;

result->mbi_pa = dl_info->bl_context.context;
result->mbi_pa = amd_info->boot_params_base;
return;
}

Expand Down
6 changes: 6 additions & 0 deletions xen/include/xen/slr_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,12 @@ struct slr_entry_intel_info
struct slr_entry_amd_info
{
struct slr_entry_hdr hdr;
u64 next;
u32 type;
u32 len;
u64 slrt_size;
u64 slrt_base;
u64 boot_params_base;
} __packed;

/*
Expand Down