mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
riscv: Fix another race in pmap_pinit()
Commitc862d5f2a7("riscv: Fix a race in pmap_pinit()") did not really fix the race. Alan writes, Suppose that N entries in the L1 tables are in use, and we are in the middle of the memcpy(). Specifically, we have read the zero-filled (N+1)st entry from the kernel L1 table. Then, we are preempted. Now, another core/thread does pmap_growkernel(), which fills the (N+1)st entry. Finally, we return to the original core/thread, and overwrite the valid entry with the zero that we earlier read. Try to fix the race properly, by copying kernel L1 entries while holding the allpmaps lock. To avoid doing unnecessary work while holding this global lock, copy only the entries that we expect to be valid. Fixes:c862d5f2a7("riscv: Fix a race in pmap_pinit()") Reported by: alc, jrtc27 Reviewed by: alc Sponsored by: The FreeBSD Foundation (cherry picked from commitd5c0a7b6d3)
This commit is contained in:
parent
15a1637945
commit
302c426103
1 changed files with 10 additions and 2 deletions
|
|
@ -1231,12 +1231,20 @@ pmap_pinit(pmap_t pmap)
|
|||
|
||||
CPU_ZERO(&pmap->pm_active);
|
||||
|
||||
/*
|
||||
* Copy L1 entries from the kernel pmap. This must be done with the
|
||||
* allpmaps lock held to avoid races with pmap_distribute_l1().
|
||||
*/
|
||||
mtx_lock(&allpmaps_lock);
|
||||
LIST_INSERT_HEAD(&allpmaps, pmap, pm_list);
|
||||
for (size_t i = pmap_l1_index(VM_MIN_KERNEL_ADDRESS);
|
||||
i < pmap_l1_index(VM_MAX_KERNEL_ADDRESS); i++)
|
||||
pmap->pm_l1[i] = kernel_pmap->pm_l1[i];
|
||||
for (size_t i = pmap_l1_index(DMAP_MIN_ADDRESS);
|
||||
i < pmap_l1_index(DMAP_MAX_ADDRESS); i++)
|
||||
pmap->pm_l1[i] = kernel_pmap->pm_l1[i];
|
||||
mtx_unlock(&allpmaps_lock);
|
||||
|
||||
memcpy(pmap->pm_l1, kernel_pmap->pm_l1, PAGE_SIZE);
|
||||
|
||||
vm_radix_init(&pmap->pm_root);
|
||||
|
||||
return (1);
|
||||
|
|
|
|||
Loading…
Reference in a new issue