Page MenuHomeFreeBSD
Files F101981495

D47181.diff
No OneTemporary
Actions

D47181.diff
View Options

diff --git a/sys/vm/vm_reserv.c b/sys/vm/vm_reserv.c
--- a/sys/vm/vm_reserv.c
+++ b/sys/vm/vm_reserv.c
@@ -616,6 +616,40 @@
vm_reserv_partpopq_update(rv);
}
+/*
+ * Populates the given reservation's popmap from ['start', 'end')
+ * and increases its population count. Moves the reservation
+ * to the tail of the partially populated reservation queue.
+ */
+static void
+vm_reserv_populate_range(vm_reserv_t rv, int start, int end)
+{
+
+ vm_reserv_assert_locked(rv);
+ CTR5(KTR_VM, "%s: rv %p object %p popcnt %d inpartpop %d",
+ __FUNCTION__, rv, rv->object, rv->popcnt, rv->inpartpopq);
+ vm_reserv_populate_check(rv);
+ KASSERT(start >= 0 && start < end,
+ ("%s: invalid range %d, %d",
+ __FUNCTION__, start, end));
+ KASSERT(end <= VM_LEVEL_0_NPAGES,
+ ("%s: end index is out of range: %d",
+ __FUNCTION__, end));
+
+ bit_nset(rv->popmap, start, end - 1);
+ rv->popcnt += end - start;
+#ifdef VM_SUBLEVEL_0_NPAGES
+ if (vm_reserv_is_sublevel_full(rv, start))
+ rv->pages[rounddown2(start, VM_SUBLEVEL_0_NPAGES)].psind = 1;
+ for (start = roundup2(start, VM_SUBLEVEL_0_NPAGES); start < end;
+ start += VM_SUBLEVEL_0_NPAGES)
+ rv->pages[rounddown2(start - 1, VM_SUBLEVEL_0_NPAGES)].psind = 1;
+ if (vm_reserv_is_sublevel_full(rv, end - 1))
+ rv->pages[rounddown2(end - 1, VM_SUBLEVEL_0_NPAGES)].psind = 1;
+#endif
+ vm_reserv_partpopq_update(rv);
+}
+
/*
* Allocates a contiguous set of physical pages of the given size "npages"
* from existing or newly created reservations. All of the physical pages
@@ -642,7 +676,7 @@
vm_pindex_t first, leftcap, rightcap;
vm_reserv_t rv;
u_long allocpages, maxpages, minpages;
- int i, index, n;
+ int index, n;
VM_OBJECT_ASSERT_WLOCKED(object);
KASSERT(npages != 0, ("vm_reserv_alloc_contig: npages is 0"));
@@ -696,8 +730,7 @@
goto out;
if (!vm_domain_allocate(vmd, req, npages))
goto out;
- for (i = 0; i < npages; i++)
- vm_reserv_populate(rv, index + i);
+ vm_reserv_populate_range(rv, index, index + npages);
vm_reserv_unlock(rv);
return (m);
out:
@@ -804,8 +837,7 @@
vm_reserv_lock(rv);
vm_reserv_insert(rv, object, first);
n = ulmin(VM_LEVEL_0_NPAGES - index, npages);
- for (i = 0; i < n; i++)
- vm_reserv_populate(rv, index + i);
+ vm_reserv_populate_range(rv, index, index + n);
npages -= n;
if (m_ret == NULL) {
m_ret = &rv->pages[index];

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 7, 3:29 AM (21 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14279161
Default Alt Text
D47181.diff (2 KB)

Event Timeline