Swap token re-tuned
Subsystems (4)
RFC PATCH 2/2 Swap token re-tuned
New scheme to preempt token.
Signed-off-by Ashwin Chaugule <[email protected]>
include/linux/sched.h +9 -3
@@ -342,9 +342,15 @@ struct mm_struct {/* Architecture-specific MM context */ mm_context_t context; -/* Token based thrashing protection. */ -unsigned long swap_token_time; -char recent_pagein; +/* Swap token stuff */ +/* Last value of global fault stamp as seen by this process. +* In other words, this value gives an indication of how long +* it has been since this task got the token */ +unsigned int faultstamp; + +/* Deciding factor ! Increment if (global_faults - faultstamp < 5) +* else decrement. High priority wins the token.*/ +int token_priority;/* coredumping support */ int core_waiters;
include/linux/swap.h +0 -1
@@ -259,7 +259,6 @@ extern spinlock_t swap_lock;/* linux/mm/thrash.c */ extern struct mm_struct * swap_token_mm; -extern unsigned long swap_token_default_timeout;extern void grab_swap_token (void );extern void __put_swap_token (struct mm_struct *);
kernel/sysctl.c +2 -0
@@ -910,6 +910,7 @@ #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT .extra1 = &zero, },#endif +#if 0 /* Not needed anymore */ #ifdef CONFIG_SWAP { .ctl_name = VM_SWAP_TOKEN_TIMEOUT,
@@ -921,6 +922,7 @@ #ifdef CONFIG_SWAP .strategy = &sysctl_jiffies, },#endif +#endif #ifdef CONFIG_NUMA { .ctl_name = VM_ZONE_RECLAIM_MODE,
mm/thrash.c +48 -60
140 lines not on this page · raw message
Quoted 15 lines · Ashwin Chaugule
New scheme to preempt token.
Signed-off-by Ashwin Chaugule <[email protected]>include/linux/sched.h +0
-2@@ -342,9 +342,15 @@ struct mm_struct {/* Architecture-specific MM context */ mm_context_t context; -/* Token based thrashing protection. */ -unsigned long swap_token_time;
include/linux/sched.h struct mm_struct { · line 353
Quoted 10 lines
include/linux/sched.h +9
-1-char recent_pagein; +/* Swap token stuff */ +/* Last value of global fault stamp as seen by this process. +* In other words, this value gives an indication of how long +* it has been since this task got the token */ +unsigned int faultstamp; + +/* Deciding factor ! Increment if (global_faults - faultstamp < 5) +* else decrement. High priority wins the token.*/ +int token_priority;
/*
* multi line comments look like this
*/
Quoted 11 lines
kernel/sysctl.c +1
-0@@ -910,6 +910,7 @@ #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT .extra1 = &zero, },#endif +#if 0 /* Not needed anymore */ #ifdef CONFIG_SWAP { .ctl_name = VM_SWAP_TOKEN_TIMEOUT,
kernel/sysctl.c #ifdef CONFIG_SWAP · line 925
Quoted 4 lines
kernel/sysctl.c +1
-0@@ -921,6 +922,7 @@ #ifdef CONFIG_SWAP .strategy = &sysctl_jiffies, },#endif +#endif
Just remove it.
Quoted 4 lines
kernel/sysctl.c +0
-1static int should_release_swap_token (struct mm_struct *mm) {int ret =0 ; -if (!mm->recent_pagein)
kernel/sysctl.c #ifdef CONFIG_SWAP
Quoted 10 lines
kernel/sysctl.c +4
-5- ret =SWAP_TOKEN_ENOUGH_RSS ; - else if (time_after(jiffies, swap_token_timeout)) - ret =SWAP_TOKEN_TIMED_OUT ; - mm->recent_pagein =0 ; -return ret; +if ( current->mm->token_priority > mm->token_priority ) +return ret =SWAP_TOKEN_PREEMPT ; +else +return ret; }
if (..)
ret = SWAP_TOKEN_PREEMPT;
return ret;
Quoted 8 lines
kernel/sysctl.c +0
-6-/* -* Try to grab the swapout protection token. We only try to -* grab it once every TOKEN_CHECK_INTERVAL, both to prevent -* SMP lock contention and to check that the process that held -* the token before is no longer thrashing. -*/ void grab_swap_token (void ) {
kernel/sysctl.c
Quoted 10 lines
kernel/sysctl.c +2
-6-struct mm_struct *mm; +struct mm_struct *mm_temp;int reason; -/* We have the token. Let others know we still need it. */ -if (has_swap_token (current->mm)) { - current->mm->recent_pagein =1 ; -if (unlikely (!swap_token_default_timeout)) -disable_swap_token (); +/* This gives an indication of the number of processes contending for the token.*/
80 char max
kernel/sysctl.c
Quoted 8 lines
kernel/sysctl.c +4
-2+ global_faults++; + +if (!spin_trylock (&swap_token_lock))return ; - } -if (time_after (jiffies, swap_token_check)) { +/* First come first served. If a process holding the token exits, its up for grabs immediately */
ditto
Quoted 8 lines
kernel/sysctl.c +5
-2+if ( swap_token_mm ==NULL ) { + swap_token_mm = current->mm; + swap_token_mm->faultstamp = global_faults; + goto out; + } -if (!swap_token_default_timeout) { - swap_token_check = jiffies +SWAP_TOKEN_CHECK_INTERVAL ;
kernel/sysctl.c
Quoted 10 lines
kernel/sysctl.c +4
-5-return ; - } +if ((global_faults - current->mm->faultstamp) <FAULTSTAMP_DIFF ) { -/* ... or if we recently held the token. */ -if (time_before (jiffies, current->mm->swap_token_time)) -return ; +/* This would mean that too many of the current tasks pages +* have been evicted and therefore it's calling swap-in or no-page +* too frequently. */
/*
* multi line coment
*/
kernel/sysctl.c
Quoted 9 lines
kernel/sysctl.c +7
-2-if (!spin_trylock (&swap_token_lock)) -return ; + current->mm->faultstamp = global_faults; + current->mm->token_priority++; + mm_temp = swap_token_mm; + } +else { +/* Decrement priority to ensure that the token holder doesnt +* hold on to it for too long. */
more comments
kernel/sysctl.c
Quoted 6 lines
kernel/sysctl.c +5
-1- swap_token_check = jiffies +SWAP_TOKEN_CHECK_INTERVAL ; +if (current->mm->token_priority >0 ) + current->mm->token_priority--; +else { +/* After this, the process will be able to contend for the token +* again.*/
ditto
Quoted 7 lines · Peter Zijlstra
Quoted 2 lines · Ashwin Chaugule
New scheme to preempt token.
/*
* multi line comments look like this
*/
Thanks Peter !
Patch with reformatted comments.
Signed-off-by Ashwin Chaugule <[email protected]>
---
include/linux/sched.h +14 -3
@@ -342,9 +342,20 @@ struct mm_struct {/* Architecture-specific MM context */ mm_context_t context; -/* Token based thrashing protection. */ -unsigned long swap_token_time; -char recent_pagein; +/* Swap token stuff */ +/* +* Last value of global fault stamp as seen by this process. +* In other words, this value gives an indication of how long +* it has been since this task got the token +*/ +unsigned int faultstamp; + +/* +* Deciding factor ! +* Incrememt if (global_faults - faultstamp < FAULTSTAMP_DIFF ) +* else decrement. High priority wins the token. +*/ +int token_priority;/* coredumping support */ int core_waiters;
include/linux/swap.h +0 -1
@@ -259,7 +259,6 @@ extern spinlock_t swap_lock;/* linux/mm/thrash.c */ extern struct mm_struct * swap_token_mm; -extern unsigned long swap_token_default_timeout;extern void grab_swap_token (void );extern void __put_swap_token (struct mm_struct *);
kernel/sysctl.c +0 -11
@@ -910,17 +910,6 @@ #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT .extra1 = &zero, },#endif -#ifdef CONFIG_SWAP - { - .ctl_name = VM_SWAP_TOKEN_TIMEOUT, - .procname = "swap_token_timeout", - .data = &swap_token_default_timeout, - .maxlen = sizeof(swap_token_default_timeout), - .mode = 0644, - .proc_handler = &proc_dointvec_jiffies, - .strategy = &sysctl_jiffies, - }, -#endif#ifdef CONFIG_NUMA { .ctl_name = VM_ZONE_RECLAIM_MODE,
mm/thrash.c +61 -59
153 lines not on this page · raw message
---