Page MenuHomeFreeBSD
Files F140086737

D22394.id64410.diff
No OneTemporary
Actions

D22394.id64410.diff
View Options

Index: sys/vm/vm_page.c
===================================================================
--- sys/vm/vm_page.c
+++ sys/vm/vm_page.c
@@ -1829,18 +1829,11 @@
* Returns true if the number of free pages exceeds the minimum
* for the request class and false otherwise.
*/
-int
-vm_domain_allocate(struct vm_domain *vmd, int req, int npages)
+static int
+_vm_domain_allocate(struct vm_domain *vmd, int req, int npages)
{
u_int limit, old, new;
- req = req & VM_ALLOC_CLASS_MASK;
-
- /*
- * The page daemon is allowed to dig deeper into the free page list.
- */
- if (curproc == pageproc && req != VM_ALLOC_INTERRUPT)
- req = VM_ALLOC_SYSTEM;
if (req == VM_ALLOC_INTERRUPT)
limit = 0;
else if (req == VM_ALLOC_SYSTEM)
@@ -1871,6 +1864,19 @@
return (1);
}
+int
+vm_domain_allocate(struct vm_domain *vmd, int req, int npages)
+{
+
+ /*
+ * The page daemon is allowed to dig deeper into the free page list.
+ */
+ req &= VM_ALLOC_CLASS_MASK;
+ if (curproc == pageproc && req != VM_ALLOC_INTERRUPT)
+ req = VM_ALLOC_SYSTEM;
+ return (_vm_domain_allocate(vmd, req, npages));
+}
+
vm_page_t
vm_page_alloc_domain_after(vm_object_t object, vm_pindex_t pindex, int domain,
int req, vm_page_t mpred)
@@ -2316,8 +2322,13 @@
pgcache = arg;
vmd = VM_DOMAIN(pgcache->domain);
- /* Only import if we can bring in a full bucket. */
- if (cnt == 1 || !vm_domain_allocate(vmd, VM_ALLOC_NORMAL, cnt))
+
+ /*
+ * The page daemon should avoid creating extra memory pressure since its
+ * main purpose is to replenish the store of free pages.
+ */
+ if (vmd->vmd_severeset || curproc == pageproc ||
+ !_vm_domain_allocate(vmd, VM_ALLOC_NORMAL, cnt))
return (0);
domain = vmd->vmd_domain;
vm_domain_free_lock(vmd);

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 21, 1:35 AM (3 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27104524
Default Alt Text
D22394.id64410.diff (1 KB)

Event Timeline