diff options
author | alc <alc@FreeBSD.org> | 2011-07-02 23:42:04 +0000 |
---|---|---|
committer | alc <alc@FreeBSD.org> | 2011-07-02 23:42:04 +0000 |
commit | 9cb2f04853640f386dd7db2d61d981a14cd67729 (patch) | |
tree | 9d1b848b20f8b3ec0d8618a84d9c0f1b691b2a9b | |
parent | dd0c3b188c37cbd1ccd18d9a4a4593d236e10f24 (diff) | |
download | FreeBSD-src-9cb2f04853640f386dd7db2d61d981a14cd67729.zip FreeBSD-src-9cb2f04853640f386dd7db2d61d981a14cd67729.tar.gz |
When iterating over a paging queue, explicitly check for PG_MARKER, instead
of relying on zeroed memory being interpreted as an empty PV list.
Reviewed by: kib
-rw-r--r-- | sys/amd64/amd64/pmap.c | 2 | ||||
-rw-r--r-- | sys/i386/i386/pmap.c | 2 | ||||
-rw-r--r-- | sys/i386/xen/pmap.c | 2 | ||||
-rw-r--r-- | sys/ia64/ia64/pmap.c | 2 | ||||
-rw-r--r-- | sys/mips/mips/pmap.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 941e85e..3366f41 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2104,7 +2104,7 @@ pmap_collect(pmap_t locked_pmap, struct vpgqueues *vpq) vm_page_t m, free; TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy) + if ((m->flags & PG_MARKER) != 0 || m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 45d19b2..e63cddd 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -2188,7 +2188,7 @@ pmap_collect(pmap_t locked_pmap, struct vpgqueues *vpq) sched_pin(); TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy) + if ((m->flags & PG_MARKER) != 0 || m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c index a23ae6d..87bc0a0 100644 --- a/sys/i386/xen/pmap.c +++ b/sys/i386/xen/pmap.c @@ -2012,7 +2012,7 @@ pmap_collect(pmap_t locked_pmap, struct vpgqueues *vpq) sched_pin(); TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy) + if ((m->flags & PG_MARKER) != 0 || m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c index b59de46..5339660 100644 --- a/sys/ia64/ia64/pmap.c +++ b/sys/ia64/ia64/pmap.c @@ -774,7 +774,7 @@ get_pv_entry(pmap_t locked_pmap) vpq = &vm_page_queues[PQ_INACTIVE]; retry: TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy) + if ((m->flags & PG_MARKER) != 0 || m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; diff --git a/sys/mips/mips/pmap.c b/sys/mips/mips/pmap.c index 1d4d411..f05bffa 100644 --- a/sys/mips/mips/pmap.c +++ b/sys/mips/mips/pmap.c @@ -1414,7 +1414,7 @@ get_pv_entry(pmap_t locked_pmap) vpq = &vm_page_queues[PQ_INACTIVE]; retry: TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy) + if ((m->flags & PG_MARKER) != 0 || m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; |