svn commit: r305157 - stable/11/sys/vm
Mark Johnston
markj at FreeBSD.org
Wed Aug 31 21:14:17 UTC 2016
Author: markj
Date: Wed Aug 31 21:14:16 2016
New Revision: 305157
URL: https://svnweb.freebsd.org/changeset/base/305157
Log:
MFC r304053, r304054:
Initialize busy lock state and strengthen busy lock assertions.
Modified:
stable/11/sys/vm/vm_page.c
stable/11/sys/vm/vm_phys.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/vm/vm_page.c
==============================================================================
--- stable/11/sys/vm/vm_page.c Wed Aug 31 21:12:50 2016 (r305156)
+++ stable/11/sys/vm/vm_page.c Wed Aug 31 21:14:16 2016 (r305157)
@@ -1712,8 +1712,7 @@ vm_page_alloc(vm_object_t object, vm_pin
("vm_page_alloc: page %p has unexpected queue %d", m, m->queue));
KASSERT(m->wire_count == 0, ("vm_page_alloc: page %p is wired", m));
KASSERT(m->hold_count == 0, ("vm_page_alloc: page %p is held", m));
- KASSERT(!vm_page_sbusied(m),
- ("vm_page_alloc: page %p is busy", m));
+ KASSERT(!vm_page_busied(m), ("vm_page_alloc: page %p is busy", m));
KASSERT(m->dirty == 0, ("vm_page_alloc: page %p is dirty", m));
KASSERT(pmap_page_get_memattr(m) == VM_MEMATTR_DEFAULT,
("vm_page_alloc: page %p has unexpected memattr %d", m,
@@ -2021,7 +2020,7 @@ vm_page_alloc_init(vm_page_t m)
("vm_page_alloc_init: page %p is wired", m));
KASSERT(m->hold_count == 0,
("vm_page_alloc_init: page %p is held", m));
- KASSERT(!vm_page_sbusied(m),
+ KASSERT(!vm_page_busied(m),
("vm_page_alloc_init: page %p is busy", m));
KASSERT(m->dirty == 0,
("vm_page_alloc_init: page %p is dirty", m));
Modified: stable/11/sys/vm/vm_phys.c
==============================================================================
--- stable/11/sys/vm/vm_phys.c Wed Aug 31 21:12:50 2016 (r305156)
+++ stable/11/sys/vm/vm_phys.c Wed Aug 31 21:14:16 2016 (r305157)
@@ -741,6 +741,7 @@ vm_phys_add_page(vm_paddr_t pa)
vm_cnt.v_page_count++;
m = vm_phys_paddr_to_vm_page(pa);
+ m->busy_lock = VPB_UNBUSIED;
m->phys_addr = pa;
m->queue = PQ_NONE;
m->segind = vm_phys_paddr_to_segind(pa);
More information about the svn-src-stable
mailing list