diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2019-12-29 20:01:03 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2019-12-29 20:01:03 +0000 |
| commit | 758b2c02bbc10bf56d75b3b2bfeb1509ab3f09c7 (patch) | |
| tree | 39aef706e374cc1a6a59cf5a637757245903deb5 | |
| parent | cfdb91850cec60ea14aa12003b06f6d44aeee874 (diff) | |
| download | src-758b2c02bbc10bf56d75b3b2bfeb1509ab3f09c7.tar.gz src-758b2c02bbc10bf56d75b3b2bfeb1509ab3f09c7.zip | |
Restore a vm_page_wired() check in vm_page_mvqueue() after r356156.
We now set PGA_DEQUEUE on a managed page when it is wired after
allocation, and vm_page_mvqueue() ignores pages with this flag set,
ensuring that they do not end up in the page queues. However, this is
not sufficient for managed fictitious pages or pages managed by the
TTM. In particular, the TTM makes use of the plinks.q queue linkage
fields for its own purposes.
PR: 242961
Reported and tested by: Greg V <greg@unrelenting.technology>
Notes
Notes:
svn path=/head/; revision=356183
| -rw-r--r-- | sys/vm/vm_page.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 7e133cda0994..112407a52095 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4010,7 +4010,7 @@ vm_page_mvqueue(vm_page_t m, const uint8_t nqueue, const uint16_t nflag) KASSERT(nflag == PGA_REQUEUE || nflag == PGA_REQUEUE_HEAD, ("%s: invalid flags %x", __func__, nflag)); - if ((m->oflags & VPO_UNMANAGED) != 0) + if ((m->oflags & VPO_UNMANAGED) != 0 || vm_page_wired(m)) return; old = vm_page_astate_load(m); |