diff options
| -rw-r--r-- | sys/vm/vm_pageout.c | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 7dc7040..c4d5ad7 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -85,6 +85,7 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/kthread.h> #include <sys/ktr.h> +#include <sys/mount.h> #include <sys/resourcevar.h> #include <sys/sched.h> #include <sys/signalvar.h> @@ -145,6 +146,9 @@ int vm_pageout_pages_needed; /* flag saying that the pageout daemon needs pages #if !defined(NO_SWAPPING) static int vm_pageout_req_swapout; /* XXX */ static int vm_daemon_needed; +static struct mtx vm_daemon_mtx; +/* Allow for use by vm_pageout before vm_daemon is initialized. */ +MTX_SYSINIT(vm_daemon, &vm_daemon_mtx, "vm daemon", MTX_DEF); #endif static int vm_max_launder = 32; static int vm_pageout_stats_max=0, vm_pageout_stats_interval = 0; @@ -206,7 +210,7 @@ int vm_page_max_wired; /* XXX max # of wired pages system-wide */ #if !defined(NO_SWAPPING) static void vm_pageout_map_deactivate_pages(vm_map_t, long); static void vm_pageout_object_deactivate_pages(pmap_t, vm_object_t, long); -static void vm_req_vmdaemon(void); +static void vm_req_vmdaemon(int req); #endif static void vm_pageout_page_stats(void); @@ -683,7 +687,6 @@ vm_pageout_scan(int pass) int vnodes_skipped = 0; int maxlaunder; - mtx_lock(&Giant); /* * Decrease registered cache sizes. */ @@ -882,7 +885,7 @@ rescan0: * pressure where there are insufficient clean pages * on the inactive queue, we may have to go all out. */ - int swap_pageouts_ok; + int swap_pageouts_ok, vfslocked = 0; struct vnode *vp = NULL; struct mount *mp; @@ -950,10 +953,11 @@ rescan0: goto unlock_and_continue; } vm_page_unlock_queues(); - VI_LOCK(vp); VM_OBJECT_UNLOCK(object); - if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK | - LK_TIMELOCK, curthread)) { + vfslocked = VFS_LOCK_GIANT(vp->v_mount); + if (vget(vp, LK_EXCLUSIVE | LK_TIMELOCK, + curthread)) { + VFS_UNLOCK_GIANT(vfslocked); VM_OBJECT_LOCK(object); vm_page_lock_queues(); ++pageout_lock_miss; @@ -1022,6 +1026,7 @@ unlock_and_continue: if (vp) { vm_page_unlock_queues(); vput(vp); + VFS_UNLOCK_GIANT(vfslocked); vn_finished_write(mp); vm_page_lock_queues(); } @@ -1173,8 +1178,7 @@ unlock_and_continue: if (vm_swap_idle_enabled) { static long lsec; if (time_second != lsec) { - vm_pageout_req_swapout |= VM_SWAP_IDLE; - vm_req_vmdaemon(); + vm_req_vmdaemon(VM_SWAP_IDLE); lsec = time_second; } } @@ -1189,10 +1193,8 @@ unlock_and_continue: if (vnodes_skipped && vm_page_count_min()) (void) speedup_syncer(); #if !defined(NO_SWAPPING) - if (vm_swap_enabled && vm_page_count_target()) { - vm_req_vmdaemon(); - vm_pageout_req_swapout |= VM_SWAP_NORMAL; - } + if (vm_swap_enabled && vm_page_count_target()) + vm_req_vmdaemon(VM_SWAP_NORMAL); #endif } @@ -1284,7 +1286,6 @@ unlock_and_continue: wakeup(&cnt.v_free_count); } } - mtx_unlock(&Giant); } /* @@ -1538,14 +1539,17 @@ pagedaemon_wakeup() #if !defined(NO_SWAPPING) static void -vm_req_vmdaemon() +vm_req_vmdaemon(int req) { static int lastrun = 0; + mtx_lock(&vm_daemon_mtx); + vm_pageout_req_swapout |= req; if ((ticks > (lastrun + hz)) || (ticks < lastrun)) { wakeup(&vm_daemon_needed); lastrun = ticks; } + mtx_unlock(&vm_daemon_mtx); } static void @@ -1554,15 +1558,17 @@ vm_daemon() struct rlimit rsslim; struct proc *p; struct thread *td; - int breakout; + int breakout, swapout_flags; - mtx_lock(&Giant); while (TRUE) { - tsleep(&vm_daemon_needed, PPAUSE, "psleep", 0); - if (vm_pageout_req_swapout) { - swapout_procs(vm_pageout_req_swapout); - vm_pageout_req_swapout = 0; - } + mtx_lock(&vm_daemon_mtx); + msleep(&vm_daemon_needed, &vm_daemon_mtx, PPAUSE, "psleep", 0); + swapout_flags = vm_pageout_req_swapout; + vm_pageout_req_swapout = 0; + mtx_unlock(&vm_daemon_mtx); + if (swapout_flags) + swapout_procs(swapout_flags); + /* * scan the processes for exceeding their rlimits or if * process is swapped out -- deactivate pages |
