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

Apply r350335(5d18382b72) to powerpc64 radix pmap

Browse Source 
Simplify pmap_clear_modify() a bit, by assuming that since the superpage
demotion succeeded, all 4k mappings from it are valid.  Deindent the
surrounding code, as there are no 'else' branches in the code anyway.
This commit is contained in:
Justin Hibbits 2021-05-09 11:07:28 -05:00
parent b40538683a
commit 09947faee8
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/powerpc/aim/mmu_radix.c
View File

@ -2433,28 +2433,24 @@ mmu_radix_clear_modify(vm_page_t m)
va = pv->pv_va;
l3e = pmap_pml3e(pmap, va);
oldl3e = be64toh(*l3e);
if ((oldl3e & PG_RW) != 0) {
if (pmap_demote_l3e_locked(pmap, l3e, va, &lock)) {
if ((oldl3e & PG_W) == 0) {
/*
* Write protect the mapping to a
* single page so that a subsequent
* write access may repromote.
*/
va += VM_PAGE_TO_PHYS(m) - (oldl3e &
PG_PS_FRAME);
pte = pmap_l3e_to_pte(l3e, va);
oldpte = be64toh(*pte);
if ((oldpte & PG_V) != 0) {
while (!atomic_cmpset_long(pte,
htobe64(oldpte),
htobe64((oldpte | RPTE_EAA_R) & ~(PG_M | PG_RW))))
oldpte = be64toh(*pte);
vm_page_dirty(m);
pmap_invalidate_page(pmap, va);
}
}
}
if ((oldl3e & PG_RW) != 0 &&
pmap_demote_l3e_locked(pmap, l3e, va, &lock) &&
(oldl3e & PG_W) == 0) {
/*
* Write protect the mapping to a
* single page so that a subsequent
* write access may repromote.
*/
va += VM_PAGE_TO_PHYS(m) - (oldl3e &
PG_PS_FRAME);
pte = pmap_l3e_to_pte(l3e, va);
oldpte = be64toh(*pte);
while (!atomic_cmpset_long(pte,
htobe64(oldpte),
htobe64((oldpte | RPTE_EAA_R) & ~(PG_M | PG_RW))))
oldpte = be64toh(*pte);
vm_page_dirty(m);
pmap_invalidate_page(pmap, va);
}
PMAP_UNLOCK(pmap);
}