diff options
| author | kib <kib@FreeBSD.org> | 2013-08-10 17:36:42 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2013-08-10 17:36:42 +0000 |
| commit | 4675fcfce0ca7178b334ea67fe2d3ab745477a95 (patch) | |
| tree | 2ae4177fdf8f77bdbf75571d149fb9e54db96bda /sys/vm/vm_phys.c | |
| parent | 29e6d17ad1d88a5156b4c44ff927a4ae7be2c279 (diff) | |
| download | FreeBSD-src-4675fcfce0ca7178b334ea67fe2d3ab745477a95.zip FreeBSD-src-4675fcfce0ca7178b334ea67fe2d3ab745477a95.tar.gz | |
Different consumers of the struct vm_page abuse pageq member to keep
additional information, when the page is guaranteed to not belong to a
paging queue. Usually, this results in a lot of type casts which make
reasoning about the code correctness harder.
Sometimes m->object is used instead of pageq, which could cause real
and confusing bugs if non-NULL m->object is leaked. See r141955 and
r253140 for examples.
Change the pageq member into a union containing explicitly-typed
members. Use them instead of type-punning or abusing m->object in x86
pmaps, uma and vm_page_alloc_contig().
Requested and reviewed by: alc
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/vm/vm_phys.c')
| -rw-r--r-- | sys/vm/vm_phys.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 4c988db..ce6dfd3 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -226,9 +226,9 @@ vm_freelist_add(struct vm_freelist *fl, vm_page_t m, int order, int tail) m->order = order; if (tail) - TAILQ_INSERT_TAIL(&fl[order].pl, m, pageq); + TAILQ_INSERT_TAIL(&fl[order].pl, m, plinks.q); else - TAILQ_INSERT_HEAD(&fl[order].pl, m, pageq); + TAILQ_INSERT_HEAD(&fl[order].pl, m, plinks.q); fl[order].lcnt++; } @@ -236,7 +236,7 @@ static void vm_freelist_rem(struct vm_freelist *fl, vm_page_t m, int order) { - TAILQ_REMOVE(&fl[order].pl, m, pageq); + TAILQ_REMOVE(&fl[order].pl, m, plinks.q); fl[order].lcnt--; m->order = VM_NFREEORDER; } @@ -819,7 +819,7 @@ vm_phys_zero_pages_idle(void) fl = vm_phys_free_queues[domain][0][0]; mtx_assert(&vm_page_queue_free_mtx, MA_OWNED); for (;;) { - TAILQ_FOREACH_REVERSE(m, &fl[oind].pl, pglist, pageq) { + TAILQ_FOREACH_REVERSE(m, &fl[oind].pl, pglist, plinks.q) { for (m_tmp = m; m_tmp < &m[1 << oind]; m_tmp++) { if ((m_tmp->flags & (PG_CACHED | PG_ZERO)) == 0) { vm_phys_unfree_page(m_tmp); @@ -889,7 +889,7 @@ restartdom: for (oind = min(order, VM_NFREEORDER - 1); oind < VM_NFREEORDER; oind++) { for (pind = 0; pind < VM_NFREEPOOL; pind++) { fl = &vm_phys_free_queues[domain][flind][pind][0]; - TAILQ_FOREACH(m_ret, &fl[oind].pl, pageq) { + TAILQ_FOREACH(m_ret, &fl[oind].pl, plinks.q) { /* * A free list may contain physical pages * from one or more segments. |
