Messages in this thread Patch in this message | | | Date | Sun, 10 Jan 1999 22:01:47 +0100 (CET) | From | Andrea Arcangeli <> | Subject | Re: Results: pre6 vs pre6+zlatko's_patch vs pre5 vs arcavm13 |
| |
On Sun, 10 Jan 1999, Linus Torvalds wrote:
> The above is horribly broken, and should be killed on sight.
Woops thanks and excuse me. I did not thought at the sleep case...
Here it is arca-vm-15 with at least this bug removed... excuse me again...
Index: linux/mm/vmscan.c diff -u linux/mm/vmscan.c:1.1.1.11 linux/mm/vmscan.c:1.1.1.1.2.83 --- linux/mm/vmscan.c:1.1.1.11 Sat Jan 9 12:58:26 1999 +++ linux/mm/vmscan.c Sun Jan 10 21:34:56 1999 @@ -10,6 +10,11 @@ * Version: $Id: vmscan.c,v 1.5 1998/02/23 22:14:28 sct Exp $ */ +/* + * free_user_and_cache() and always async swapout original idea. + * Copyright (C) 1999 Andrea Arcangeli + */ + #include <linux/slab.h> #include <linux/kernel_stat.h> #include <linux/swap.h> @@ -20,6 +25,8 @@ #include <asm/pgtable.h> +int swapout_interval = HZ; + /* * The swap-out functions return 1 if they successfully * threw something out, and we got a free page. It returns @@ -306,7 +313,8 @@ static int swap_out(unsigned int priority, int gfp_mask) { struct task_struct * p, * pbest; - int counter, assign, max_cnt; + int counter, assign; + unsigned long max_cnt; /* * We make one or two passes through the task list, indexed by @@ -325,7 +333,7 @@ counter = nr_tasks / (priority+1); if (counter < 1) counter = 1; - if (counter > nr_tasks) + else if (counter > nr_tasks) counter = nr_tasks; for (; counter >= 0; counter--) { @@ -338,7 +346,7 @@ for (; p != &init_task; p = p->next_task) { if (!p->swappable) continue; - if (p->mm->rss <= 0) + if (p->mm->rss == 0) continue; /* Refresh swap_cnt? */ if (assign) @@ -430,7 +438,7 @@ break; current->state = TASK_INTERRUPTIBLE; run_task_queue(&tq_disk); - schedule_timeout(HZ); + schedule_timeout(swapout_interval); /* * kswapd isn't even meant to keep up with anything, @@ -438,13 +446,50 @@ * point is to make sure that the system doesn't stay * forever in a really bad memory squeeze. */ - if (nr_free_pages < freepages.high) - try_to_free_pages(0, 16); + if (nr_free_pages < freepages.min) + try_to_free_pages(0, freepages.high - nr_free_pages); } return 0; } +static int free_user_and_cache(int priority, int gfp_mask) +{ + static unsigned long grow_swap_cache = 0; + + if (nr_free_pages < freepages.min) + grow_swap_cache = 0; + + switch (grow_swap_cache) + { + case 0: + if (shrink_mmap(priority, gfp_mask)) + goto success; + if (swap_out(priority, gfp_mask)) + { + grow_swap_cache = 1; + goto success; + } + goto failed; + default: + if (swap_out(priority, gfp_mask)) + { + shrink_mmap(priority, gfp_mask); + if (++grow_swap_cache == SWAP_CLUSTER_MAX) + grow_swap_cache = 0; + goto success; + } + grow_swap_cache = 0; + if (shrink_mmap(priority, gfp_mask)) + goto success; + goto failed; + } + failed: + return 0; + success: + return 1; +} + /* * We need to make the locks finer granularity, but right * now we need this so that we can do page allocations @@ -457,33 +502,32 @@ int try_to_free_pages(unsigned int gfp_mask, int count) { int priority; + static int state = 0; lock_kernel(); - - /* Always trim SLAB caches when memory gets low. */ - kmem_cache_reap(gfp_mask); - - priority = 6; - do { - while (shrink_mmap(priority, gfp_mask)) { - if (!--count) - goto done; - } - /* Try to get rid of some shared memory pages.. */ - while (shm_swap(priority, gfp_mask)) { - if (!--count) - goto done; - } - - /* Then, try to page stuff out.. */ - while (swap_out(priority, gfp_mask)) { - if (!--count) - goto done; - } + priority = 8; + switch (state) + { + do { + case 0: + while (free_user_and_cache(priority, gfp_mask)) { + if (!--count) + goto done; + } + state = 1; + case 1: + /* Try to get rid of some shared memory pages.. */ + while (shm_swap(priority, gfp_mask)) { + if (!--count) + goto done; + } + state = 0; - shrink_dcache_memory(priority, gfp_mask); - } while (--priority >= 0); + kmem_cache_reap(gfp_mask); + shrink_dcache_memory(priority, gfp_mask); + } while (--priority >= 0); + } done: unlock_kernel();
I think you could try it now...
Andrea Arcangeli
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
| |