Page MenuHomeFreeBSD
Files F148379875

D49207.1786542283.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D49207.1786542283.diff
View Options

diff --git a/sys/sys/pctrie.h b/sys/sys/pctrie.h
--- a/sys/sys/pctrie.h
+++ b/sys/sys/pctrie.h
@@ -47,6 +47,12 @@
it->node = NULL;
}
+static __inline bool
+pctrie_iter_is_reset(struct pctrie_iter *it)
+{
+ return (it->node == NULL);
+}
+
static __inline void
pctrie_iter_init(struct pctrie_iter *it, struct pctrie *ptree)
{
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -293,6 +293,8 @@
vm_page_iter_init(&pages, object);
VM_OBJECT_WLOCK(object);
retry:
+ KASSERT(pctrie_iter_is_reset(&pages),
+ ("%s: pctrie_iter not reset for retry", __func__));
for (m = vm_radix_iter_lookup_ge(&pages, 0); m != NULL;
m = vm_radix_iter_step(&pages)) {
if (!vm_page_busy_acquire(m, VM_ALLOC_WAITFAIL)) {
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -1576,7 +1576,8 @@
vm_object_set_flag(orig_object, OBJ_SPLIT);
vm_page_iter_limit_init(&pages, orig_object, offidxstart + size);
retry:
- pctrie_iter_reset(&pages);
+ KASSERT(pctrie_iter_is_reset(&pages),
+ ("%s: pctrie_iter not reset for retry", __func__));
for (m = vm_radix_iter_lookup_ge(&pages, offidxstart); m != NULL;
m = vm_radix_iter_step(&pages)) {
/*
@@ -1590,6 +1591,7 @@
VM_OBJECT_WUNLOCK(new_object);
if (vm_page_busy_sleep(m, "spltwt", 0))
VM_OBJECT_WLOCK(orig_object);
+ pctrie_iter_reset(&pages);
VM_OBJECT_WLOCK(new_object);
goto retry;
}
@@ -1611,6 +1613,7 @@
VM_OBJECT_WUNLOCK(new_object);
VM_OBJECT_WUNLOCK(orig_object);
vm_radix_wait();
+ pctrie_iter_reset(&pages);
VM_OBJECT_WLOCK(orig_object);
VM_OBJECT_WLOCK(new_object);
goto retry;
@@ -1996,7 +1999,8 @@
vm_object_pip_add(object, 1);
vm_page_iter_limit_init(&pages, object, end);
again:
- pctrie_iter_reset(&pages);
+ KASSERT(pctrie_iter_is_reset(&pages),
+ ("%s: pctrie_iter not reset for retry", __func__));
for (p = vm_radix_iter_lookup_ge(&pages, start); p != NULL;
p = vm_radix_iter_step(&pages)) {
/*
@@ -2025,6 +2029,7 @@
if (vm_page_tryxbusy(p) == 0) {
if (vm_page_busy_sleep(p, "vmopar", 0))
VM_OBJECT_WLOCK(object);
+ pctrie_iter_reset(&pages);
goto again;
}
if ((options & OBJPR_VALIDONLY) != 0 && vm_page_none_valid(p)) {

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 12, 1:44 PM (10 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29399399
Default Alt Text
D49207.1786542283.diff (2 KB)

Event Timeline