d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: fix trampoline memory allocation after r332073

Browse Source 
Add the missing breaks in the for loops, in order to exit the loop
when a suitable entry is found.

Also switch amd64 native_start_all_aps to use PHYS_TO_DMAP in order to
find the virtual address of the boot_trampoline and the initial page
tables.

Reported and tested by:	pho
Sponsored by:		Citrix Systems R&D
This commit is contained in:
Roger Pau Monné 2018-04-06 16:22:14 +00:00
parent 1ff545d642
commit e0f92f5c77
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/amd64/amd64/mp_machdep.c
View File

@ -128,6 +128,7 @@ mp_bootaddress(vm_paddr_t *physmap, unsigned int *physmap_idx)
sizeof(*physmap) * (*physmap_idx - i + 2));
*physmap_idx -= 2;
}
break;
}
if (!allocated) {
@ -336,7 +337,6 @@ init_secondary(void)
int
native_start_all_aps(void)
{
vm_offset_t va = boot_address + KERNBASE;
u_int64_t *pt4, *pt3, *pt2;
u_int32_t mpbioswarmvec;
int apic_id, cpu, i;
@ -344,13 +344,11 @@ native_start_all_aps(void)
mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN);
/* install the AP 1st level boot code */
pmap_kenter(va, boot_address);
pmap_invalidate_page(kernel_pmap, va);
bcopy(mptramp_start, (void *)va, bootMP_size);
/* copy the AP 1st level boot code */
bcopy(mptramp_start, (void *)PHYS_TO_DMAP(boot_address), bootMP_size);
/* Locate the page tables, they'll be below the trampoline */
pt4 = (u_int64_t *)(uintptr_t)(mptramp_pagetables + KERNBASE);
pt4 = (uint64_t *)PHYS_TO_DMAP(mptramp_pagetables);
pt3 = pt4 + (PAGE_SIZE) / sizeof(u_int64_t);
pt2 = pt3 + (PAGE_SIZE) / sizeof(u_int64_t);

1
sys/x86/x86/mp_x86.c
View File

@ -947,6 +947,7 @@ alloc_ap_trampoline(vm_paddr_t *physmap, unsigned int *physmap_idx)
sizeof(*physmap) * (*physmap_idx - i + 2));
*physmap_idx -= 2;
}
break;
}
if (!allocated) {