Page MenuHomeFreeBSD
Files F148060037

D17304.diff
No OneTemporary
Actions

D17304.diff
View Options

Index: head/sys/vm/vm_glue.c
===================================================================
--- head/sys/vm/vm_glue.c
+++ head/sys/vm/vm_glue.c
@@ -68,6 +68,7 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/domainset.h>
#include <sys/limits.h>
#include <sys/lock.h>
#include <sys/malloc.h>
@@ -298,7 +299,7 @@
struct kstack_cache_entry *kstack_cache;
static int kstack_cache_size = 128;
-static int kstacks;
+static int kstacks, kstack_domain_iter;
static struct mtx kstack_cache_mtx;
MTX_SYSINIT(kstack_cache, &kstack_cache_mtx, "kstkch", MTX_DEF);
@@ -367,6 +368,17 @@
printf("vm_thread_new: kstack allocation failed\n");
vm_object_deallocate(ksobj);
return (0);
+ }
+
+ /*
+ * Ensure that kstack objects can draw pages from any memory
+ * domain. Otherwise a local memory shortage can block a process
+ * swap-in.
+ */
+ if (vm_ndomains > 1) {
+ ksobj->domain.dr_policy = DOMAINSET_RR();
+ ksobj->domain.dr_iter = atomic_fetchadd_int(&kstack_domain_iter,
+ 1);
}
atomic_add_int(&kstacks, 1);
Index: head/sys/vm/vm_swapout.c
===================================================================
--- head/sys/vm/vm_swapout.c
+++ head/sys/vm/vm_swapout.c
@@ -742,7 +742,8 @@
/*
* Limit swapper to swap in one non-WKILLED process in MAXSLP/2
* interval, assuming that there is:
- * - no memory shortage;
+ * - there exists at least one domain that is not suffering from a shortage of
+ * free memory;
* - no parallel swap-ins;
* - no other swap-ins in the current SWAPIN_INTERVAL.
*/
@@ -750,7 +751,7 @@
swapper_wkilled_only(void)
{
- return (vm_page_count_min() || swap_inprogress > 0 ||
+ return (vm_page_count_min_set(&all_domains) || swap_inprogress > 0 ||
(u_int)(ticks - last_swapin) < SWAPIN_INTERVAL);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 16, 12:06 PM (10 m, 10 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29734815
Default Alt Text
D17304.diff (1 KB)

Event Timeline