Author: markj
Date: Sat Nov 5 20:14:23 2016
New Revision: 308349
URL: https://svnweb.freebsd.org/changeset/base/308349
Log:
MFC r304053, r304054:
Initialize busy lock state and strengthen busy lock assertions.
Tested by: Oliver Pinter
Modified:
stable/10/sys/vm/vm_page.c
stable/10/sys/vm/vm_phys.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/vm/vm_page.c
==============================================================================
--- stable/10/sys/vm/vm_page.c Sat Nov 5 19:51:13 2016 (r308348)
+++ stable/10/sys/vm/vm_page.c Sat Nov 5 20:14:23 2016 (r308349)
@@ -1574,8 +1574,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,
@@ -1887,7 +1886,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/10/sys/vm/vm_phys.c
==============================================================================
--- stable/10/sys/vm/vm_phys.c Sat Nov 5 19:51:13 2016 (r308348)
+++ stable/10/sys/vm/vm_phys.c Sat Nov 5 20:14:23 2016 (r308349)
@@ -504,6 +504,7 @@ vm_phys_add_page(vm_paddr_t pa)
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);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
