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

amd64: fix tlb shootdown when all cpus are passed in the bitmap

Browse Source 
Right now the routine leaves the current CPU in the map, later tripping
on an assert when filling in the scoreboard: panic: IPI scoreboard is
zero, initiator 1 target 1

Instead pre-check if all CPUs are present in the map and remember that
outcome for later.

Fixes:	7eaea04a5b ("amd64: compare TLB shootdown target to all_cpus")
Reviewed by:	kib
Differential Revision:	https://reviews.freebsd.org/D28111
This commit is contained in:
Mateusz Guzik 2021-01-12 08:47:32 +00:00
parent 9402bb44f1
commit 44121a0fbe
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -660,6 +660,7 @@ smp_targeted_tlb_shootdown(cpuset_t mask, pmap_t pmap, vm_offset_t addr1,
cpuset_t other_cpus, mask1;
uint32_t generation, *p_cpudone;
int cpu;
bool is_all;
/*
* It is not necessary to signal other CPUs while booting or
@ -673,14 +674,10 @@ smp_targeted_tlb_shootdown(cpuset_t mask, pmap_t pmap, vm_offset_t addr1,
/*
* Check for other cpus. Return if none.
*/
if (!CPU_CMP(&mask, &all_cpus)) {
if (mp_ncpus <= 1)
goto local_cb;
} else {
CPU_CLR(PCPU_GET(cpuid), &mask);
if (CPU_EMPTY(&mask))
goto local_cb;
}
is_all = !CPU_CMP(&mask, &all_cpus);
CPU_CLR(PCPU_GET(cpuid), &mask);
if (CPU_EMPTY(&mask))
goto local_cb;
/*
* Initiator must have interrupts enabled, which prevents
@ -719,7 +716,7 @@ smp_targeted_tlb_shootdown(cpuset_t mask, pmap_t pmap, vm_offset_t addr1,
* (zeroing slot) and reading from it below (wait for
* acknowledgment).
*/
if (!CPU_CMP(&mask, &all_cpus)) {
if (is_all) {
ipi_all_but_self(IPI_INVLOP);
other_cpus = all_cpus;
CPU_CLR(PCPU_GET(cpuid), &other_cpus);