git: aae4bd0ea4b6 - main - vm_fault: use iterator in populate_cleanup
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 19 Apr 2025 17:36:20 UTC
The branch main has been updated by dougm:
URL: https://cgit.FreeBSD.org/src/commit/?id=aae4bd0ea4b62e4a1361c2b08f11a517f6af7ac3
commit aae4bd0ea4b62e4a1361c2b08f11a517f6af7ac3
Author: Doug Moore <dougm@FreeBSD.org>
AuthorDate: 2025-04-19 17:34:40 +0000
Commit: Doug Moore <dougm@FreeBSD.org>
CommitDate: 2025-04-19 17:36:10 +0000
vm_fault: use iterator in populate_cleanup
Change vm_fault_populate_cleanup() to use a page iterator, rather than
tailq pointers.
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D49900
---
sys/vm/vm_fault.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index e1db7ac8b524..1950ac4b41b3 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -108,6 +108,7 @@
#include <vm/vm_radix.h>
#include <vm/vm_extern.h>
#include <vm/vm_reserv.h>
+#include <vm/vm_radix.h>
#define PFBAK 4
#define PFFOR 4
@@ -480,19 +481,18 @@ static void
vm_fault_populate_cleanup(vm_object_t object, vm_pindex_t first,
vm_pindex_t last)
{
+ struct pctrie_iter pages;
vm_page_t m;
- vm_pindex_t pidx;
VM_OBJECT_ASSERT_WLOCKED(object);
MPASS(first <= last);
- for (pidx = first, m = vm_page_lookup(object, pidx);
- pidx <= last; pidx++, m = TAILQ_NEXT(m, listq)) {
- KASSERT(m != NULL && m->pindex == pidx,
- ("%s: pindex mismatch", __func__));
+ vm_page_iter_limit_init(&pages, object, last + 1);
+ VM_RADIX_FORALL_FROM(m, &pages, first) {
vm_fault_populate_check_page(m);
vm_page_deactivate(m);
vm_page_xunbusy(m);
}
+ KASSERT(pages.index == last, ("%s: pindex mismatch", __func__));
}
static enum fault_status