git: cfbf1da0deed - main - vm_page_unswappable: remove wrong assertion
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 09 Nov 2022 20:30:41 UTC
The branch main has been updated by vangyzen:
URL: https://cgit.FreeBSD.org/src/commit/?id=cfbf1da0deede6b82ac197471b6cd439706a2dea
commit cfbf1da0deede6b82ac197471b6cd439706a2dea
Author: Anton Rang <rang@acm.org>
AuthorDate: 2022-11-09 20:13:01 +0000
Commit: Eric van Gyzen <vangyzen@FreeBSD.org>
CommitDate: 2022-11-09 20:28:03 +0000
vm_page_unswappable: remove wrong assertion
markj says:
...the assertion is incorrect and should simply be removed.
It has been racy since we removed the use of the page hash
lock to synchronize wiring of pages.
PR: 267621
Reviewed by: markj, Anton Rang <rang@acm.org>
MFC after: 1 week
Sponsored by: Dell Inc.
Differential Revision: https://reviews.freebsd.org/D37320
---
sys/vm/vm_page.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 8895b0f1da5a..4f97b84ee205 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -4200,7 +4200,8 @@ void
vm_page_unswappable(vm_page_t m)
{
- KASSERT(!vm_page_wired(m) && (m->oflags & VPO_UNMANAGED) == 0,
+ VM_OBJECT_ASSERT_LOCKED(m->object);
+ KASSERT((m->oflags & VPO_UNMANAGED) == 0,
("page %p already unswappable", m));
vm_page_dequeue(m);