system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

vm_fault: Revert commit 64087fd7f3

Browse source 
The underlying issue that originally triggered a kernel panic was
addressed and the fix was ported to all relevant pmaps, so the
safeguards placed in vm_fault.c can be removed now.

Reviewed by:	alc, kib, markj
MFC after:	1 month
Differential Revision:	https://reviews.freebsd.org/D42517
This commit is contained in:
Bojan Novković 2023-11-09 10:04:48 -05:00 committed by Mark Johnston
parent 44669b7650
commit e4078494f3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/vm/vm_fault.c
View file

@ -386,7 +386,7 @@ vm_fault_soft_fast(struct faultstate *fs)
rounddown2(vaddr, pagesizes[m_super->psind]) >= fs->entry->start &&
roundup2(vaddr + 1, pagesizes[m_super->psind]) <= fs->entry->end &&
(vaddr & (pagesizes[m_super->psind] - 1)) == (VM_PAGE_TO_PHYS(m) &
(pagesizes[m_super->psind] - 1)) && !fs->wired &&
(pagesizes[m_super->psind] - 1)) &&
pmap_ps_enabled(fs->map->pmap)) {
flags = PS_ALL_VALID;
if ((fs->prot & VM_PROT_WRITE) != 0) {
@ -619,7 +619,7 @@ vm_fault_populate(struct faultstate *fs)
psind = m->psind;
if (psind > 0 && ((vaddr & (pagesizes[psind] - 1)) != 0 ||
pidx + OFF_TO_IDX(pagesizes[psind]) - 1 > pager_last ||
!pmap_ps_enabled(fs->map->pmap) || fs->wired))
!pmap_ps_enabled(fs->map->pmap)))
psind = 0;
npages = atop(pagesizes[psind]);