Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "smp/x86: Free up trampoline memory after use"

Browse Source 
This reverts commit 4b132dc190.
This commit is contained in:
mintsuki 2022-11-02 15:28:08 +01:00
parent 8d9c116ef9
commit dd0ae4117c
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/sys/smp.c
View File

@ -42,8 +42,6 @@ struct madt_x2apic {
extern symbol smp_trampoline_start;
extern size_t smp_trampoline_size;
static void *trampoline = NULL;
struct trampoline_passed_info {
uint8_t smp_tpl_booted_flag;
uint8_t smp_tpl_target_mode;
@ -57,6 +55,14 @@ static bool smp_start_ap(uint32_t lapic_id, struct gdtr *gdtr,
struct smp_information *info_struct,
bool longmode, bool lv5, uint32_t pagemap,
bool x2apic, bool nx, uint64_t hhdm, bool wp) {
// Prepare the trampoline
static void *trampoline = NULL;
if (trampoline == NULL) {
trampoline = conv_mem_alloc(smp_trampoline_size);
memcpy(trampoline, smp_trampoline_start, smp_trampoline_size);
}
static struct trampoline_passed_info *passed_info = NULL;
if (passed_info == NULL) {
passed_info = (void *)(((uintptr_t)trampoline + smp_trampoline_size)
@ -191,14 +197,6 @@ struct smp_information *init_smp(size_t header_hack_size,
*cpu_count = 0;
// Try to start all APs
// Prepare the trampoline
if (trampoline == NULL) {
trampoline = conv_mem_alloc(smp_trampoline_size);
memcpy(trampoline, smp_trampoline_start, smp_trampoline_size);
}
for (uint8_t *madt_ptr = (uint8_t *)madt->madt_entries_begin;
(uintptr_t)madt_ptr < (uintptr_t)madt + madt->header.length;
madt_ptr += *(madt_ptr + 1)) {
@ -277,9 +275,5 @@ struct smp_information *init_smp(size_t header_hack_size,
}
}
if (trampoline != NULL) {
pmm_free(trampoline, smp_trampoline_size);
}
return ret;
}