diff options
author | Mark Johnston <markj@FreeBSD.org> | 2021-10-20 01:22:50 +0000 |
---|---|---|
committer | Mark Johnston <markj@FreeBSD.org> | 2021-10-20 01:22:50 +0000 |
commit | a23e6a1078d6d6c361481ab4f835449f177edac3 (patch) | |
tree | 12b4367a24c259b778ec752125b4f01dacffa727 | |
parent | 1c99af1ebe61cbaf633792941640dcd254acf921 (diff) | |
download | src-a23e6a1078d6d6c361481ab4f835449f177edac3.tar.gz src-a23e6a1078d6d6c361481ab4f835449f177edac3.zip |
vm_page: Move vm_page_alloc_check() to after page allocator definitions
This way all of the vm_page_alloc_*() allocator functions are grouped
together.
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
-rw-r--r-- | sys/vm/vm_page.c | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 25e6dce32aa6..bc1c6bbe4ce1 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2395,28 +2395,6 @@ found: } /* - * Check a page that has been freshly dequeued from a freelist. - */ -static void -vm_page_alloc_check(vm_page_t m) -{ - - KASSERT(m->object == NULL, ("page %p has object", m)); - KASSERT(m->a.queue == PQ_NONE && - (m->a.flags & PGA_QUEUE_STATE_MASK) == 0, - ("page %p has unexpected queue %d, flags %#x", - m, m->a.queue, (m->a.flags & PGA_QUEUE_STATE_MASK))); - KASSERT(m->ref_count == 0, ("page %p has references", m)); - KASSERT(vm_page_busy_freed(m), ("page %p is not freed", m)); - KASSERT(m->dirty == 0, ("page %p is dirty", m)); - KASSERT(pmap_page_get_memattr(m) == VM_MEMATTR_DEFAULT, - ("page %p has unexpected memattr %d", - m, pmap_page_get_memattr(m))); - KASSERT(m->valid == 0, ("free page %p is valid", m)); - pmap_vm_page_alloc_check(m); -} - -/* * vm_page_alloc_freelist: * * Allocate a physical page from the specified free page list. @@ -2494,6 +2472,27 @@ again: return (m); } +/* + * Check a page that has been freshly dequeued from a freelist. + */ +static void +vm_page_alloc_check(vm_page_t m) +{ + KASSERT(m->object == NULL, ("page %p has object", m)); + KASSERT(m->ref_count == 0, ("page %p has references", m)); + KASSERT(vm_page_busy_freed(m), ("page %p is not freed", m)); + KASSERT(m->a.queue == PQ_NONE && + (m->a.flags & PGA_QUEUE_STATE_MASK) == 0, + ("page %p has unexpected queue %d, flags %#x", + m, m->a.queue, (m->a.flags & PGA_QUEUE_STATE_MASK))); + KASSERT(m->valid == 0, ("free page %p is valid", m)); + KASSERT(m->dirty == 0, ("page %p is dirty", m)); + KASSERT(pmap_page_get_memattr(m) == VM_MEMATTR_DEFAULT, + ("page %p has unexpected memattr %d", + m, pmap_page_get_memattr(m))); + pmap_vm_page_alloc_check(m); +} + static int vm_page_zone_import(void *arg, void **store, int cnt, int domain, int flags) { |