diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2025-11-28 15:57:22 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2025-12-15 10:38:58 +0000 |
| commit | 99f641267d449f26a2e13449964f29d17897c29f (patch) | |
| tree | e67918259fdc7ae30976818e7e9d2a548dc9b3a6 | |
| parent | 76dc56765afdb5d7d44df83f91585357d4757568 (diff) | |
vm_fault: only rely on PG_ZERO when the page was newly allocated
(cherry picked from commit cff67bc43df14d492ccc08ec92fddceadd069953)
| -rw-r--r-- | sys/vm/vm_fault.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 9f7176eebabb..87744e2d3210 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -137,6 +137,7 @@ struct faultstate { vm_object_t object; vm_pindex_t pindex; vm_page_t m; + bool m_needs_zeroing; /* Top-level map object. */ vm_object_t first_object; @@ -272,6 +273,7 @@ static void vm_fault_deallocate(struct faultstate *fs) { + fs->m_needs_zeroing = true; vm_fault_page_release(&fs->m_cow); vm_fault_page_release(&fs->m); vm_object_pip_wakeup(fs->object); @@ -1205,7 +1207,7 @@ vm_fault_zerofill(struct faultstate *fs) /* * Zero the page if necessary and mark it valid. */ - if ((fs->m->flags & PG_ZERO) == 0) { + if (fs->m_needs_zeroing) { pmap_zero_page(fs->m); } else { VM_CNT_INC(v_ozfod); @@ -1319,6 +1321,7 @@ vm_fault_allocate(struct faultstate *fs) vm_waitpfault(dset, vm_pfault_oom_wait * hz); return (FAULT_RESTART); } + fs->m_needs_zeroing = (fs->m->flags & PG_ZERO) == 0; fs->oom_started = false; return (FAULT_CONTINUE); @@ -1650,6 +1653,7 @@ vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, fs.fault_flags = fault_flags; fs.map = map; fs.lookup_still_valid = false; + fs.m_needs_zeroing = true; fs.oom_started = false; fs.nera = -1; fs.can_read_lock = true; |