Skip to content

Fix boot on legacy TXT #24

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

Merged
krystian-hebel merged 2 commits into from
Apr 24, 2025
Merged

Fix boot on legacy TXT #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aff6284
xen/arch/x86/intel_txt.c: use __va() on slaunch_slrt
SergiiDmytruk Apr 9, 2025
3ea3f9c
xen/arch/x86/intel_txt.c: better error checks on reserving memory
SergiiDmytruk Apr 9, 2025
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
35 changes: 28 additions & 7 deletions xen/arch/x86/intel_txt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,39 @@ void __init map_txt_mem_regions(void)
map_l2(txt_heap_base, txt_heap_size);
}

/* Mark RAM region as RESERVED if it isn't marked that way already. */
static int __init reserve_e820(struct e820map *e820, uint64_t s, uint64_t e)
{
unsigned int i;

for ( i = 0; i < e820->nr_map; i++ )
{
uint64_t rs = e820->map[i].addr;
uint64_t re = rs + e820->map[i].size;
if ( s >= rs && e <= re )
break;
}

if ( i != e820->nr_map && e820->map[i].type == E820_RESERVED )
{
/* Nothing to do, the range is already covered as reserved. */
return 1;
}

return reserve_e820_ram(e820, s, e);
}

void __init protect_txt_mem_regions(void)
{
int rc;
uint64_t sinit_base, sinit_size;

/* TXT Heap */
BUG_ON(txt_heap_base == 0);
printk("SLAUNCH: reserving TXT heap (%#lx - %#lx)\n", txt_heap_base,
txt_heap_base + txt_heap_size);
e820_change_range_type(&e820_raw, txt_heap_base,
txt_heap_base + txt_heap_size,
E820_RAM, E820_RESERVED);
rc = reserve_e820(&e820_raw, txt_heap_base, txt_heap_base + txt_heap_size);
BUG_ON(rc == 0);

sinit_base = read_txt_reg(TXTCR_SINIT_BASE);
BUG_ON(sinit_base == 0);
Expand All @@ -51,9 +73,8 @@ void __init protect_txt_mem_regions(void)
/* SINIT */
printk("SLAUNCH: reserving SINIT memory (%#lx - %#lx)\n", sinit_base,
sinit_base + sinit_size);
e820_change_range_type(&e820_raw, sinit_base,
sinit_base + sinit_size,
E820_RAM, E820_RESERVED);
rc = reserve_e820(&e820_raw, sinit_base, sinit_base + sinit_size);
BUG_ON(rc == 0);

/* TXT Private Space */
e820_change_range_type(&e820_raw, TXT_PRIV_CONFIG_REGS_BASE,
Expand Down Expand Up @@ -143,7 +164,7 @@ void __init txt_restore_mtrrs(bool e820_verbose)
}
}

slrt = (struct slr_table *)(uintptr_t)slaunch_slrt;
slrt = __va(slaunch_slrt);
intel_info = (struct slr_entry_intel_info *)
slr_next_entry_by_tag(slrt, NULL, SLR_ENTRY_INTEL_INFO);

Expand Down