2005-04-17 02:20:36 +04:00
/*
* linux / mm / swapfile . c
*
* Copyright ( C ) 1991 , 1992 , 1993 , 1994 Linus Torvalds
* Swap reorganised 29.12 .95 , Stephen Tweedie
*/
# include <linux/mm.h>
# include <linux/hugetlb.h>
# include <linux/mman.h>
# include <linux/slab.h>
# include <linux/kernel_stat.h>
# include <linux/swap.h>
# include <linux/vmalloc.h>
# include <linux/pagemap.h>
# include <linux/namei.h>
# include <linux/shm.h>
# include <linux/blkdev.h>
2009-01-07 01:39:54 +03:00
# include <linux/random.h>
2005-04-17 02:20:36 +04:00
# include <linux/writeback.h>
# include <linux/proc_fs.h>
# include <linux/seq_file.h>
# include <linux/init.h>
# include <linux/module.h>
ksm: let shared pages be swappable
Initial implementation for swapping out KSM's shared pages: add
page_referenced_ksm() and try_to_unmap_ksm(), which rmap.c calls when
faced with a PageKsm page.
Most of what's needed can be got from the rmap_items listed from the
stable_node of the ksm page, without discovering the actual vma: so in
this patch just fake up a struct vma for page_referenced_one() or
try_to_unmap_one(), then refine that in the next patch.
Add VM_NONLINEAR to ksm_madvise()'s list of exclusions: it has always been
implicit there (being only set with VM_SHARED, already excluded), but
let's make it explicit, to help justify the lack of nonlinear unmap.
Rely on the page lock to protect against concurrent modifications to that
page's node of the stable tree.
The awkward part is not swapout but swapin: do_swap_page() and
page_add_anon_rmap() now have to allow for new possibilities - perhaps a
ksm page still in swapcache, perhaps a swapcache page associated with one
location in one anon_vma now needed for another location or anon_vma.
(And the vma might even be no longer VM_MERGEABLE when that happens.)
ksm_might_need_to_copy() checks for that case, and supplies a duplicate
page when necessary, simply leaving it to a subsequent pass of ksmd to
rediscover the identity and merge them back into one ksm page.
Disappointingly primitive: but the alternative would have to accumulate
unswappable info about the swapped out ksm pages, limiting swappability.
Remove page_add_ksm_rmap(): page_add_anon_rmap() now has to allow for the
particular case it was handling, so just use it instead.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: Izik Eidus <ieidus@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Chris Wright <chrisw@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:59:24 +03:00
# include <linux/ksm.h>
2005-04-17 02:20:36 +04:00
# include <linux/rmap.h>
# include <linux/security.h>
# include <linux/backing-dev.h>
2006-01-19 04:42:33 +03:00
# include <linux/mutex.h>
2006-01-11 23:17:46 +03:00
# include <linux/capability.h>
2005-04-17 02:20:36 +04:00
# include <linux/syscalls.h>
2008-02-07 11:13:53 +03:00
# include <linux/memcontrol.h>
2005-04-17 02:20:36 +04:00
# include <asm/pgtable.h>
# include <asm/tlbflush.h>
# include <linux/swapops.h>
2009-01-08 05:07:58 +03:00
# include <linux/page_cgroup.h>
2005-04-17 02:20:36 +04:00
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
static bool swap_count_continued ( struct swap_info_struct * , pgoff_t ,
unsigned char ) ;
static void free_swap_count_continuations ( struct swap_info_struct * ) ;
2009-12-15 04:58:49 +03:00
static sector_t map_swap_entry ( swp_entry_t , struct block_device * * ) ;
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
2008-07-26 06:46:24 +04:00
static DEFINE_SPINLOCK ( swap_lock ) ;
static unsigned int nr_swapfiles ;
2009-01-07 01:39:41 +03:00
long nr_swap_pages ;
2005-04-17 02:20:36 +04:00
long total_swap_pages ;
mm: fix ever-decreasing swap priority
Vegard Nossum has noticed the ever-decreasing negative priority in a
swapon /swapoff loop, which eventually would misprioritize when int wraps
positive. Not worth spending much code on, but probably better fixed.
It's easy to handle the swapping on and off of just one area, but there's
not much point if a pair or more still misbehave. To handle the general
case, swapoff should compact negative priorities, keeping them always from
-1 to -MAX_SWAPFILES. That's a change, but should cause no regression,
since these negative (unspecified) priorities are disjoint from the the
positive specified priorities 0 to 32767.
One small functional difference, which seems appropriate: when swapoff
fails to free all swap from a negative priority area, that area is now
reinserted at lowest priority, rather than at its original priority.
In moving down swapon's setting of priority, I notice that an area is
visible to /proc/swaps when it has swap_map set, yet that was being set
before all the visible fields were properly filled in: corrected.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-24 08:28:23 +04:00
static int least_priority ;
2005-04-17 02:20:36 +04:00
static const char Bad_file [ ] = " Bad swap file entry " ;
static const char Unused_file [ ] = " Unused swap file entry " ;
static const char Bad_offset [ ] = " Bad swap offset entry " ;
static const char Unused_offset [ ] = " Unused swap offset entry " ;
2008-07-26 06:46:24 +04:00
static struct swap_list_t swap_list = { - 1 , - 1 } ;
2005-04-17 02:20:36 +04:00
2009-12-15 04:58:41 +03:00
static struct swap_info_struct * swap_info [ MAX_SWAPFILES ] ;
2005-04-17 02:20:36 +04:00
2006-01-19 04:42:33 +03:00
static DEFINE_MUTEX ( swapon_mutex ) ;
2005-04-17 02:20:36 +04:00
2009-12-15 04:58:45 +03:00
static inline unsigned char swap_count ( unsigned char ent )
2009-06-17 02:32:53 +04:00
{
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
return ent & ~ SWAP_HAS_CACHE ; /* may include SWAP_HAS_CONT flag */
2009-06-17 02:32:53 +04:00
}
2009-12-15 04:58:41 +03:00
/* returns 1 if swap entry is freed */
2009-06-17 02:32:54 +04:00
static int
__try_to_reclaim_swap ( struct swap_info_struct * si , unsigned long offset )
{
2009-12-15 04:58:41 +03:00
swp_entry_t entry = swp_entry ( si - > type , offset ) ;
2009-06-17 02:32:54 +04:00
struct page * page ;
int ret = 0 ;
page = find_get_page ( & swapper_space , entry . val ) ;
if ( ! page )
return 0 ;
/*
* This function is called from scan_swap_map ( ) and it ' s called
* by vmscan . c at reclaiming pages . So , we hold a lock on a page , here .
* We have to use trylock for avoiding deadlock . This is a special
* case and you should use try_to_free_swap ( ) with explicit lock_page ( )
* in usual operations .
*/
if ( trylock_page ( page ) ) {
ret = try_to_free_swap ( page ) ;
unlock_page ( page ) ;
}
page_cache_release ( page ) ;
return ret ;
}
2009-06-17 02:32:53 +04:00
2005-04-17 02:20:36 +04:00
/*
* We need this because the bdev - > unplug_fn can sleep and we cannot
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
* hold swap_lock while calling the unplug_fn . And swap_lock
2006-01-19 04:42:33 +03:00
* cannot be turned into a mutex .
2005-04-17 02:20:36 +04:00
*/
static DECLARE_RWSEM ( swap_unplug_sem ) ;
void swap_unplug_io_fn ( struct backing_dev_info * unused_bdi , struct page * page )
{
swp_entry_t entry ;
down_read ( & swap_unplug_sem ) ;
[PATCH] mm: split page table lock
Christoph Lameter demonstrated very poor scalability on the SGI 512-way, with
a many-threaded application which concurrently initializes different parts of
a large anonymous area.
This patch corrects that, by using a separate spinlock per page table page, to
guard the page table entries in that page, instead of using the mm's single
page_table_lock. (But even then, page_table_lock is still used to guard page
table allocation, and anon_vma allocation.)
In this implementation, the spinlock is tucked inside the struct page of the
page table page: with a BUILD_BUG_ON in case it overflows - which it would in
the case of 32-bit PA-RISC with spinlock debugging enabled.
Splitting the lock is not quite for free: another cacheline access. Ideally,
I suppose we would use split ptlock only for multi-threaded processes on
multi-cpu machines; but deciding that dynamically would have its own costs.
So for now enable it by config, at some number of cpus - since the Kconfig
language doesn't support inequalities, let preprocessor compare that with
NR_CPUS. But I don't think it's worth being user-configurable: for good
testing of both split and unsplit configs, split now at 4 cpus, and perhaps
change that to 8 later.
There is a benefit even for singly threaded processes: kswapd can be attacking
one part of the mm while another part is busy faulting.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-30 04:16:40 +03:00
entry . val = page_private ( page ) ;
2005-04-17 02:20:36 +04:00
if ( PageSwapCache ( page ) ) {
2009-12-15 04:58:41 +03:00
struct block_device * bdev = swap_info [ swp_type ( entry ) ] - > bdev ;
2005-04-17 02:20:36 +04:00
struct backing_dev_info * bdi ;
/*
* If the page is removed from swapcache from under us ( with a
* racy try_to_unuse / swapoff ) we need an additional reference
[PATCH] mm: split page table lock
Christoph Lameter demonstrated very poor scalability on the SGI 512-way, with
a many-threaded application which concurrently initializes different parts of
a large anonymous area.
This patch corrects that, by using a separate spinlock per page table page, to
guard the page table entries in that page, instead of using the mm's single
page_table_lock. (But even then, page_table_lock is still used to guard page
table allocation, and anon_vma allocation.)
In this implementation, the spinlock is tucked inside the struct page of the
page table page: with a BUILD_BUG_ON in case it overflows - which it would in
the case of 32-bit PA-RISC with spinlock debugging enabled.
Splitting the lock is not quite for free: another cacheline access. Ideally,
I suppose we would use split ptlock only for multi-threaded processes on
multi-cpu machines; but deciding that dynamically would have its own costs.
So for now enable it by config, at some number of cpus - since the Kconfig
language doesn't support inequalities, let preprocessor compare that with
NR_CPUS. But I don't think it's worth being user-configurable: for good
testing of both split and unsplit configs, split now at 4 cpus, and perhaps
change that to 8 later.
There is a benefit even for singly threaded processes: kswapd can be attacking
one part of the mm while another part is busy faulting.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-30 04:16:40 +03:00
* count to avoid reading garbage from page_private ( page ) above .
* If the WARN_ON triggers during a swapoff it maybe the race
2005-04-17 02:20:36 +04:00
* condition and it ' s harmless . However if it triggers without
* swapoff it signals a problem .
*/
WARN_ON ( page_count ( page ) < = 1 ) ;
bdi = bdev - > bd_inode - > i_mapping - > backing_dev_info ;
2005-05-17 08:53:40 +04:00
blk_run_backing_dev ( bdi , page ) ;
2005-04-17 02:20:36 +04:00
}
up_read ( & swap_unplug_sem ) ;
}
2009-01-07 01:39:51 +03:00
/*
* swapon tell device that all the old swap contents can be discarded ,
* to allow the swap device to optimize its wear - levelling .
*/
static int discard_swap ( struct swap_info_struct * si )
{
struct swap_extent * se ;
2009-12-15 04:58:42 +03:00
sector_t start_block ;
sector_t nr_blocks ;
2009-01-07 01:39:51 +03:00
int err = 0 ;
2009-12-15 04:58:42 +03:00
/* Do not discard the swap header page! */
se = & si - > first_swap_extent ;
start_block = ( se - > start_block + 1 ) < < ( PAGE_SHIFT - 9 ) ;
nr_blocks = ( ( sector_t ) se - > nr_pages - 1 ) < < ( PAGE_SHIFT - 9 ) ;
if ( nr_blocks ) {
err = blkdev_issue_discard ( si - > bdev , start_block ,
nr_blocks , GFP_KERNEL , DISCARD_FL_BARRIER ) ;
if ( err )
return err ;
cond_resched ( ) ;
}
2009-01-07 01:39:51 +03:00
2009-12-15 04:58:42 +03:00
list_for_each_entry ( se , & si - > first_swap_extent . list , list ) {
start_block = se - > start_block < < ( PAGE_SHIFT - 9 ) ;
nr_blocks = ( sector_t ) se - > nr_pages < < ( PAGE_SHIFT - 9 ) ;
2009-01-07 01:39:51 +03:00
err = blkdev_issue_discard ( si - > bdev , start_block ,
2009-12-15 04:58:42 +03:00
nr_blocks , GFP_KERNEL , DISCARD_FL_BARRIER ) ;
2009-01-07 01:39:51 +03:00
if ( err )
break ;
cond_resched ( ) ;
}
return err ; /* That will often be -EOPNOTSUPP */
}
2009-01-07 01:39:53 +03:00
/*
* swap allocation tell device that a cluster of swap can now be discarded ,
* to allow the swap device to optimize its wear - levelling .
*/
static void discard_swap_cluster ( struct swap_info_struct * si ,
pgoff_t start_page , pgoff_t nr_pages )
{
struct swap_extent * se = si - > curr_swap_extent ;
int found_extent = 0 ;
while ( nr_pages ) {
struct list_head * lh ;
if ( se - > start_page < = start_page & &
start_page < se - > start_page + se - > nr_pages ) {
pgoff_t offset = start_page - se - > start_page ;
sector_t start_block = se - > start_block + offset ;
2009-01-07 01:39:56 +03:00
sector_t nr_blocks = se - > nr_pages - offset ;
2009-01-07 01:39:53 +03:00
if ( nr_blocks > nr_pages )
nr_blocks = nr_pages ;
start_page + = nr_blocks ;
nr_pages - = nr_blocks ;
if ( ! found_extent + + )
si - > curr_swap_extent = se ;
start_block < < = PAGE_SHIFT - 9 ;
nr_blocks < < = PAGE_SHIFT - 9 ;
if ( blkdev_issue_discard ( si - > bdev , start_block ,
2009-12-15 04:58:42 +03:00
nr_blocks , GFP_NOIO , DISCARD_FL_BARRIER ) )
2009-01-07 01:39:53 +03:00
break ;
}
lh = se - > list . next ;
se = list_entry ( lh , struct swap_extent , list ) ;
}
}
static int wait_for_discard ( void * word )
{
schedule ( ) ;
return 0 ;
}
2005-09-04 02:54:40 +04:00
# define SWAPFILE_CLUSTER 256
# define LATENCY_LIMIT 256
2009-06-17 02:32:53 +04:00
static inline unsigned long scan_swap_map ( struct swap_info_struct * si ,
2009-12-15 04:58:45 +03:00
unsigned char usage )
2005-04-17 02:20:36 +04:00
{
2009-01-07 01:39:50 +03:00
unsigned long offset ;
2009-01-07 01:39:55 +03:00
unsigned long scan_base ;
2009-01-07 01:39:53 +03:00
unsigned long last_in_cluster = 0 ;
2005-09-04 02:54:40 +04:00
int latency_ration = LATENCY_LIMIT ;
2009-01-07 01:39:53 +03:00
int found_free_cluster = 0 ;
2005-09-04 02:54:38 +04:00
2009-01-07 01:39:48 +03:00
/*
2005-09-04 02:54:38 +04:00
* We try to cluster swap pages by allocating them sequentially
* in swap . Once we ' ve allocated SWAPFILE_CLUSTER pages this
* way , however , we resort to first - free allocation , starting
* a new cluster . This prevents us from scattering swap pages
* all over the entire swap partition , so that we reduce
* overall disk seek times between swap pages . - - sct
* But we do now try to find an empty cluster . - Andrea
2009-01-07 01:39:55 +03:00
* And we let swap pages go all over an SSD partition . Hugh
2005-09-04 02:54:38 +04:00
*/
[PATCH] swap: scan_swap_map drop swap_device_lock
get_swap_page has often shown up on latency traces, doing lengthy scans while
holding two spinlocks. swap_list_lock is already dropped, now scan_swap_map
drop swap_device_lock before scanning the swap_map.
While scanning for an empty cluster, don't worry that racing tasks may
allocate what was free and free what was allocated; but when allocating an
entry, check it's still free after retaking the lock. Avoid dropping the lock
in the expected common path. No barriers beyond the locks, just let the
cookie crumble; highest_bit limit is volatile, but benign.
Guard against swapoff: must check SWP_WRITEOK before allocating, must raise
SWP_SCANNING reference count while in scan_swap_map, swapoff wait for that to
fall - just use schedule_timeout, we don't want to burden scan_swap_map
itself, and it's very unlikely that anyone can really still be in
scan_swap_map once swapoff gets this far.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:39 +04:00
si - > flags + = SWP_SCANNING ;
2009-01-07 01:39:55 +03:00
scan_base = offset = si - > cluster_next ;
2009-01-07 01:39:50 +03:00
if ( unlikely ( ! si - > cluster_nr - - ) ) {
if ( si - > pages - si - > inuse_pages < SWAPFILE_CLUSTER ) {
si - > cluster_nr = SWAPFILE_CLUSTER - 1 ;
goto checks ;
}
2009-01-07 01:39:53 +03:00
if ( si - > flags & SWP_DISCARDABLE ) {
/*
* Start range check on racing allocations , in case
* they overlap the cluster we eventually decide on
* ( we scan without swap_lock to allow preemption ) .
* It ' s hardly conceivable that cluster_nr could be
* wrapped during our scan , but don ' t depend on it .
*/
if ( si - > lowest_alloc )
goto checks ;
si - > lowest_alloc = si - > max ;
si - > highest_alloc = 0 ;
}
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-09-04 02:54:38 +04:00
2009-01-07 01:39:55 +03:00
/*
* If seek is expensive , start searching for new cluster from
* start of partition , to minimize the span of allocated swap .
* But if seek is cheap , search from our current position , so
* that swap is allocated from all over the partition : if the
* Flash Translation Layer only remaps within limited zones ,
* we don ' t want to wear out the first zone too quickly .
*/
if ( ! ( si - > flags & SWP_SOLIDSTATE ) )
scan_base = offset = si - > lowest_bit ;
2005-09-04 02:54:38 +04:00
last_in_cluster = offset + SWAPFILE_CLUSTER - 1 ;
/* Locate the first empty (unaligned) cluster */
for ( ; last_in_cluster < = si - > highest_bit ; offset + + ) {
2005-04-17 02:20:36 +04:00
if ( si - > swap_map [ offset ] )
2005-09-04 02:54:38 +04:00
last_in_cluster = offset + SWAPFILE_CLUSTER ;
else if ( offset = = last_in_cluster ) {
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
2009-01-07 01:39:50 +03:00
offset - = SWAPFILE_CLUSTER - 1 ;
si - > cluster_next = offset ;
si - > cluster_nr = SWAPFILE_CLUSTER - 1 ;
2009-01-07 01:39:53 +03:00
found_free_cluster = 1 ;
2009-01-07 01:39:50 +03:00
goto checks ;
2005-04-17 02:20:36 +04:00
}
2005-09-04 02:54:40 +04:00
if ( unlikely ( - - latency_ration < 0 ) ) {
cond_resched ( ) ;
latency_ration = LATENCY_LIMIT ;
}
2005-09-04 02:54:38 +04:00
}
2009-01-07 01:39:50 +03:00
offset = si - > lowest_bit ;
2009-01-07 01:39:55 +03:00
last_in_cluster = offset + SWAPFILE_CLUSTER - 1 ;
/* Locate the first empty (unaligned) cluster */
for ( ; last_in_cluster < scan_base ; offset + + ) {
if ( si - > swap_map [ offset ] )
last_in_cluster = offset + SWAPFILE_CLUSTER ;
else if ( offset = = last_in_cluster ) {
spin_lock ( & swap_lock ) ;
offset - = SWAPFILE_CLUSTER - 1 ;
si - > cluster_next = offset ;
si - > cluster_nr = SWAPFILE_CLUSTER - 1 ;
found_free_cluster = 1 ;
goto checks ;
}
if ( unlikely ( - - latency_ration < 0 ) ) {
cond_resched ( ) ;
latency_ration = LATENCY_LIMIT ;
}
}
offset = scan_base ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
2009-01-07 01:39:50 +03:00
si - > cluster_nr = SWAPFILE_CLUSTER - 1 ;
2009-01-07 01:39:53 +03:00
si - > lowest_alloc = 0 ;
2005-04-17 02:20:36 +04:00
}
2005-09-04 02:54:38 +04:00
2009-01-07 01:39:50 +03:00
checks :
if ( ! ( si - > flags & SWP_WRITEOK ) )
[PATCH] swap: scan_swap_map drop swap_device_lock
get_swap_page has often shown up on latency traces, doing lengthy scans while
holding two spinlocks. swap_list_lock is already dropped, now scan_swap_map
drop swap_device_lock before scanning the swap_map.
While scanning for an empty cluster, don't worry that racing tasks may
allocate what was free and free what was allocated; but when allocating an
entry, check it's still free after retaking the lock. Avoid dropping the lock
in the expected common path. No barriers beyond the locks, just let the
cookie crumble; highest_bit limit is volatile, but benign.
Guard against swapoff: must check SWP_WRITEOK before allocating, must raise
SWP_SCANNING reference count while in scan_swap_map, swapoff wait for that to
fall - just use schedule_timeout, we don't want to burden scan_swap_map
itself, and it's very unlikely that anyone can really still be in
scan_swap_map once swapoff gets this far.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:39 +04:00
goto no_page ;
2005-09-04 02:54:38 +04:00
if ( ! si - > highest_bit )
goto no_page ;
2009-01-07 01:39:50 +03:00
if ( offset > si - > highest_bit )
2009-01-07 01:39:55 +03:00
scan_base = offset = si - > lowest_bit ;
2009-06-17 02:32:54 +04:00
/* reuse swap entry of cache-only swap if not busy. */
if ( vm_swap_full ( ) & & si - > swap_map [ offset ] = = SWAP_HAS_CACHE ) {
int swap_was_freed ;
spin_unlock ( & swap_lock ) ;
swap_was_freed = __try_to_reclaim_swap ( si , offset ) ;
spin_lock ( & swap_lock ) ;
/* entry was freed successfully, try to use this again */
if ( swap_was_freed )
goto checks ;
goto scan ; /* check next one */
}
2009-01-07 01:39:50 +03:00
if ( si - > swap_map [ offset ] )
goto scan ;
if ( offset = = si - > lowest_bit )
si - > lowest_bit + + ;
if ( offset = = si - > highest_bit )
si - > highest_bit - - ;
si - > inuse_pages + + ;
if ( si - > inuse_pages = = si - > pages ) {
si - > lowest_bit = si - > max ;
si - > highest_bit = 0 ;
2005-04-17 02:20:36 +04:00
}
2009-12-15 04:58:44 +03:00
si - > swap_map [ offset ] = usage ;
2009-01-07 01:39:50 +03:00
si - > cluster_next = offset + 1 ;
si - > flags - = SWP_SCANNING ;
2009-01-07 01:39:53 +03:00
if ( si - > lowest_alloc ) {
/*
* Only set when SWP_DISCARDABLE , and there ' s a scan
* for a free cluster in progress or just completed .
*/
if ( found_free_cluster ) {
/*
* To optimize wear - levelling , discard the
* old data of the cluster , taking care not to
* discard any of its pages that have already
* been allocated by racing tasks ( offset has
* already stepped over any at the beginning ) .
*/
if ( offset < si - > highest_alloc & &
si - > lowest_alloc < = last_in_cluster )
last_in_cluster = si - > lowest_alloc - 1 ;
si - > flags | = SWP_DISCARDING ;
spin_unlock ( & swap_lock ) ;
if ( offset < last_in_cluster )
discard_swap_cluster ( si , offset ,
last_in_cluster - offset + 1 ) ;
spin_lock ( & swap_lock ) ;
si - > lowest_alloc = 0 ;
si - > flags & = ~ SWP_DISCARDING ;
smp_mb ( ) ; /* wake_up_bit advises this */
wake_up_bit ( & si - > flags , ilog2 ( SWP_DISCARDING ) ) ;
} else if ( si - > flags & SWP_DISCARDING ) {
/*
* Delay using pages allocated by racing tasks
* until the whole discard has been issued . We
* could defer that delay until swap_writepage ,
* but it ' s easier to keep this self - contained .
*/
spin_unlock ( & swap_lock ) ;
wait_on_bit ( & si - > flags , ilog2 ( SWP_DISCARDING ) ,
wait_for_discard , TASK_UNINTERRUPTIBLE ) ;
spin_lock ( & swap_lock ) ;
} else {
/*
* Note pages allocated by racing tasks while
* scan for a free cluster is in progress , so
* that its final discard can exclude them .
*/
if ( offset < si - > lowest_alloc )
si - > lowest_alloc = offset ;
if ( offset > si - > highest_alloc )
si - > highest_alloc = offset ;
}
}
2009-01-07 01:39:50 +03:00
return offset ;
2005-09-04 02:54:38 +04:00
2009-01-07 01:39:50 +03:00
scan :
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-09-04 02:54:38 +04:00
while ( + + offset < = si - > highest_bit ) {
[PATCH] swap: scan_swap_map drop swap_device_lock
get_swap_page has often shown up on latency traces, doing lengthy scans while
holding two spinlocks. swap_list_lock is already dropped, now scan_swap_map
drop swap_device_lock before scanning the swap_map.
While scanning for an empty cluster, don't worry that racing tasks may
allocate what was free and free what was allocated; but when allocating an
entry, check it's still free after retaking the lock. Avoid dropping the lock
in the expected common path. No barriers beyond the locks, just let the
cookie crumble; highest_bit limit is volatile, but benign.
Guard against swapoff: must check SWP_WRITEOK before allocating, must raise
SWP_SCANNING reference count while in scan_swap_map, swapoff wait for that to
fall - just use schedule_timeout, we don't want to burden scan_swap_map
itself, and it's very unlikely that anyone can really still be in
scan_swap_map once swapoff gets this far.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:39 +04:00
if ( ! si - > swap_map [ offset ] ) {
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
[PATCH] swap: scan_swap_map drop swap_device_lock
get_swap_page has often shown up on latency traces, doing lengthy scans while
holding two spinlocks. swap_list_lock is already dropped, now scan_swap_map
drop swap_device_lock before scanning the swap_map.
While scanning for an empty cluster, don't worry that racing tasks may
allocate what was free and free what was allocated; but when allocating an
entry, check it's still free after retaking the lock. Avoid dropping the lock
in the expected common path. No barriers beyond the locks, just let the
cookie crumble; highest_bit limit is volatile, but benign.
Guard against swapoff: must check SWP_WRITEOK before allocating, must raise
SWP_SCANNING reference count while in scan_swap_map, swapoff wait for that to
fall - just use schedule_timeout, we don't want to burden scan_swap_map
itself, and it's very unlikely that anyone can really still be in
scan_swap_map once swapoff gets this far.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:39 +04:00
goto checks ;
}
2009-06-17 02:32:54 +04:00
if ( vm_swap_full ( ) & & si - > swap_map [ offset ] = = SWAP_HAS_CACHE ) {
spin_lock ( & swap_lock ) ;
goto checks ;
}
2005-09-04 02:54:40 +04:00
if ( unlikely ( - - latency_ration < 0 ) ) {
cond_resched ( ) ;
latency_ration = LATENCY_LIMIT ;
}
2005-09-04 02:54:38 +04:00
}
2009-01-07 01:39:55 +03:00
offset = si - > lowest_bit ;
while ( + + offset < scan_base ) {
if ( ! si - > swap_map [ offset ] ) {
spin_lock ( & swap_lock ) ;
goto checks ;
}
2009-06-17 02:32:54 +04:00
if ( vm_swap_full ( ) & & si - > swap_map [ offset ] = = SWAP_HAS_CACHE ) {
spin_lock ( & swap_lock ) ;
goto checks ;
}
2009-01-07 01:39:55 +03:00
if ( unlikely ( - - latency_ration < 0 ) ) {
cond_resched ( ) ;
latency_ration = LATENCY_LIMIT ;
}
}
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
2005-09-04 02:54:38 +04:00
no_page :
[PATCH] swap: scan_swap_map drop swap_device_lock
get_swap_page has often shown up on latency traces, doing lengthy scans while
holding two spinlocks. swap_list_lock is already dropped, now scan_swap_map
drop swap_device_lock before scanning the swap_map.
While scanning for an empty cluster, don't worry that racing tasks may
allocate what was free and free what was allocated; but when allocating an
entry, check it's still free after retaking the lock. Avoid dropping the lock
in the expected common path. No barriers beyond the locks, just let the
cookie crumble; highest_bit limit is volatile, but benign.
Guard against swapoff: must check SWP_WRITEOK before allocating, must raise
SWP_SCANNING reference count while in scan_swap_map, swapoff wait for that to
fall - just use schedule_timeout, we don't want to burden scan_swap_map
itself, and it's very unlikely that anyone can really still be in
scan_swap_map once swapoff gets this far.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:39 +04:00
si - > flags - = SWP_SCANNING ;
2005-04-17 02:20:36 +04:00
return 0 ;
}
swp_entry_t get_swap_page ( void )
{
2005-09-04 02:54:37 +04:00
struct swap_info_struct * si ;
pgoff_t offset ;
int type , next ;
int wrapped = 0 ;
2005-04-17 02:20:36 +04:00
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
if ( nr_swap_pages < = 0 )
2005-09-04 02:54:37 +04:00
goto noswap ;
nr_swap_pages - - ;
for ( type = swap_list . next ; type > = 0 & & wrapped < 2 ; type = next ) {
2009-12-15 04:58:41 +03:00
si = swap_info [ type ] ;
2005-09-04 02:54:37 +04:00
next = si - > next ;
if ( next < 0 | |
2009-12-15 04:58:41 +03:00
( ! wrapped & & si - > prio ! = swap_info [ next ] - > prio ) ) {
2005-09-04 02:54:37 +04:00
next = swap_list . head ;
wrapped + + ;
2005-04-17 02:20:36 +04:00
}
2005-09-04 02:54:37 +04:00
if ( ! si - > highest_bit )
continue ;
if ( ! ( si - > flags & SWP_WRITEOK ) )
continue ;
swap_list . next = next ;
2009-06-17 02:32:53 +04:00
/* This is called for allocating swap entry for cache */
2009-12-15 04:58:44 +03:00
offset = scan_swap_map ( si , SWAP_HAS_CACHE ) ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
if ( offset ) {
spin_unlock ( & swap_lock ) ;
2005-09-04 02:54:37 +04:00
return swp_entry ( type , offset ) ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
}
2005-09-04 02:54:37 +04:00
next = swap_list . next ;
2005-04-17 02:20:36 +04:00
}
2005-09-04 02:54:37 +04:00
nr_swap_pages + + ;
noswap :
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-09-04 02:54:37 +04:00
return ( swp_entry_t ) { 0 } ;
2005-04-17 02:20:36 +04:00
}
2009-06-17 02:32:53 +04:00
/* The only caller of this function is now susupend routine */
2006-01-06 11:16:37 +03:00
swp_entry_t get_swap_page_of_type ( int type )
{
struct swap_info_struct * si ;
pgoff_t offset ;
spin_lock ( & swap_lock ) ;
2009-12-15 04:58:41 +03:00
si = swap_info [ type ] ;
if ( si & & ( si - > flags & SWP_WRITEOK ) ) {
2006-01-06 11:16:37 +03:00
nr_swap_pages - - ;
2009-06-17 02:32:53 +04:00
/* This is called for allocating swap entry, not cache */
2009-12-15 04:58:44 +03:00
offset = scan_swap_map ( si , 1 ) ;
2006-01-06 11:16:37 +03:00
if ( offset ) {
spin_unlock ( & swap_lock ) ;
return swp_entry ( type , offset ) ;
}
nr_swap_pages + + ;
}
spin_unlock ( & swap_lock ) ;
return ( swp_entry_t ) { 0 } ;
}
2009-12-15 04:58:43 +03:00
static struct swap_info_struct * swap_info_get ( swp_entry_t entry )
2005-04-17 02:20:36 +04:00
{
2009-12-15 04:58:43 +03:00
struct swap_info_struct * p ;
2005-04-17 02:20:36 +04:00
unsigned long offset , type ;
if ( ! entry . val )
goto out ;
type = swp_type ( entry ) ;
if ( type > = nr_swapfiles )
goto bad_nofile ;
2009-12-15 04:58:41 +03:00
p = swap_info [ type ] ;
2005-04-17 02:20:36 +04:00
if ( ! ( p - > flags & SWP_USED ) )
goto bad_device ;
offset = swp_offset ( entry ) ;
if ( offset > = p - > max )
goto bad_offset ;
if ( ! p - > swap_map [ offset ] )
goto bad_free ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
return p ;
bad_free :
printk ( KERN_ERR " swap_free: %s%08lx \n " , Unused_offset , entry . val ) ;
goto out ;
bad_offset :
printk ( KERN_ERR " swap_free: %s%08lx \n " , Bad_offset , entry . val ) ;
goto out ;
bad_device :
printk ( KERN_ERR " swap_free: %s%08lx \n " , Unused_file , entry . val ) ;
goto out ;
bad_nofile :
printk ( KERN_ERR " swap_free: %s%08lx \n " , Bad_file , entry . val ) ;
out :
return NULL ;
2009-01-07 01:39:48 +03:00
}
2005-04-17 02:20:36 +04:00
2009-12-15 04:58:45 +03:00
static unsigned char swap_entry_free ( struct swap_info_struct * p ,
swp_entry_t entry , unsigned char usage )
2005-04-17 02:20:36 +04:00
{
2009-12-15 04:58:44 +03:00
unsigned long offset = swp_offset ( entry ) ;
2009-12-15 04:58:45 +03:00
unsigned char count ;
unsigned char has_cache ;
2009-06-17 02:32:53 +04:00
2009-12-15 04:58:44 +03:00
count = p - > swap_map [ offset ] ;
has_cache = count & SWAP_HAS_CACHE ;
count & = ~ SWAP_HAS_CACHE ;
2009-06-17 02:32:53 +04:00
2009-12-15 04:58:44 +03:00
if ( usage = = SWAP_HAS_CACHE ) {
2009-06-17 02:32:53 +04:00
VM_BUG_ON ( ! has_cache ) ;
2009-12-15 04:58:44 +03:00
has_cache = 0 ;
2009-12-15 04:58:47 +03:00
} else if ( count = = SWAP_MAP_SHMEM ) {
/*
* Or we could insist on shmem . c using a special
* swap_shmem_free ( ) and free_shmem_swap_and_cache ( ) . . .
*/
count = 0 ;
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
} else if ( ( count & ~ COUNT_CONTINUED ) < = SWAP_MAP_MAX ) {
if ( count = = COUNT_CONTINUED ) {
if ( swap_count_continued ( p , offset , count ) )
count = SWAP_MAP_MAX | COUNT_CONTINUED ;
else
count = SWAP_MAP_MAX ;
} else
count - - ;
}
2009-12-15 04:58:44 +03:00
if ( ! count )
mem_cgroup_uncharge_swap ( entry ) ;
usage = count | has_cache ;
p - > swap_map [ offset ] = usage ;
2009-06-17 02:32:53 +04:00
/* free if no reference */
2009-12-15 04:58:44 +03:00
if ( ! usage ) {
2009-06-17 02:32:53 +04:00
if ( offset < p - > lowest_bit )
p - > lowest_bit = offset ;
if ( offset > p - > highest_bit )
p - > highest_bit = offset ;
2009-12-15 04:58:41 +03:00
if ( swap_list . next > = 0 & &
p - > prio > swap_info [ swap_list . next ] - > prio )
swap_list . next = p - > type ;
2009-06-17 02:32:53 +04:00
nr_swap_pages + + ;
p - > inuse_pages - - ;
2005-04-17 02:20:36 +04:00
}
2009-12-15 04:58:44 +03:00
return usage ;
2005-04-17 02:20:36 +04:00
}
/*
* Caller has made sure that the swapdevice corresponding to entry
* is still around or has not been recycled .
*/
void swap_free ( swp_entry_t entry )
{
2009-12-15 04:58:43 +03:00
struct swap_info_struct * p ;
2005-04-17 02:20:36 +04:00
p = swap_info_get ( entry ) ;
if ( p ) {
2009-12-15 04:58:44 +03:00
swap_entry_free ( p , entry , 1 ) ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
}
}
2009-06-17 02:32:52 +04:00
/*
* Called after dropping swapcache to decrease refcnt to swap entries .
*/
void swapcache_free ( swp_entry_t entry , struct page * page )
{
2009-06-17 02:32:53 +04:00
struct swap_info_struct * p ;
2009-12-15 04:58:45 +03:00
unsigned char count ;
2009-06-17 02:32:53 +04:00
p = swap_info_get ( entry ) ;
if ( p ) {
2009-12-15 04:58:44 +03:00
count = swap_entry_free ( p , entry , SWAP_HAS_CACHE ) ;
if ( page )
mem_cgroup_uncharge_swapcache ( page , entry , count ! = 0 ) ;
2009-06-17 02:32:53 +04:00
spin_unlock ( & swap_lock ) ;
}
2009-06-17 02:32:52 +04:00
}
2005-04-17 02:20:36 +04:00
/*
[PATCH] can_share_swap_page: use page_mapcount
Remember that ironic get_user_pages race? when the raised page_count on a
page swapped out led do_wp_page to decide that it had to copy on write, so
substituted a different page into userspace. 2.6.7 onwards have Andrea's
solution, where try_to_unmap_one backs out if it finds page_count raised.
Which works, but is unsatisfying (rmap.c has no other page_count heuristics),
and was found a few months ago to hang an intensive page migration test. A
year ago I was hesitant to engage page_mapcount, now it seems the right fix.
So remove the page_count hack from try_to_unmap_one; and use activate_page in
unuse_mm when dropping lock, to replace its secondary effect of helping
swapoff to make progress in that case.
Simplify can_share_swap_page (now called only on anonymous pages) to check
page_mapcount + page_swapcount == 1: still needs the page lock to stabilize
their (pessimistic) sum, but does not need swapper_space.tree_lock for that.
In do_swap_page, move swap_free and unlock_page below page_add_anon_rmap, to
keep sum on the high side, and correct when can_share_swap_page called.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-22 04:15:12 +04:00
* How many references to page are currently swapped out ?
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
* This does not give an exact answer when swap count is continued ,
* but does include the high COUNT_CONTINUED flag to allow for that .
2005-04-17 02:20:36 +04:00
*/
[PATCH] can_share_swap_page: use page_mapcount
Remember that ironic get_user_pages race? when the raised page_count on a
page swapped out led do_wp_page to decide that it had to copy on write, so
substituted a different page into userspace. 2.6.7 onwards have Andrea's
solution, where try_to_unmap_one backs out if it finds page_count raised.
Which works, but is unsatisfying (rmap.c has no other page_count heuristics),
and was found a few months ago to hang an intensive page migration test. A
year ago I was hesitant to engage page_mapcount, now it seems the right fix.
So remove the page_count hack from try_to_unmap_one; and use activate_page in
unuse_mm when dropping lock, to replace its secondary effect of helping
swapoff to make progress in that case.
Simplify can_share_swap_page (now called only on anonymous pages) to check
page_mapcount + page_swapcount == 1: still needs the page lock to stabilize
their (pessimistic) sum, but does not need swapper_space.tree_lock for that.
In do_swap_page, move swap_free and unlock_page below page_add_anon_rmap, to
keep sum on the high side, and correct when can_share_swap_page called.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-22 04:15:12 +04:00
static inline int page_swapcount ( struct page * page )
2005-04-17 02:20:36 +04:00
{
[PATCH] can_share_swap_page: use page_mapcount
Remember that ironic get_user_pages race? when the raised page_count on a
page swapped out led do_wp_page to decide that it had to copy on write, so
substituted a different page into userspace. 2.6.7 onwards have Andrea's
solution, where try_to_unmap_one backs out if it finds page_count raised.
Which works, but is unsatisfying (rmap.c has no other page_count heuristics),
and was found a few months ago to hang an intensive page migration test. A
year ago I was hesitant to engage page_mapcount, now it seems the right fix.
So remove the page_count hack from try_to_unmap_one; and use activate_page in
unuse_mm when dropping lock, to replace its secondary effect of helping
swapoff to make progress in that case.
Simplify can_share_swap_page (now called only on anonymous pages) to check
page_mapcount + page_swapcount == 1: still needs the page lock to stabilize
their (pessimistic) sum, but does not need swapper_space.tree_lock for that.
In do_swap_page, move swap_free and unlock_page below page_add_anon_rmap, to
keep sum on the high side, and correct when can_share_swap_page called.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-22 04:15:12 +04:00
int count = 0 ;
struct swap_info_struct * p ;
2005-04-17 02:20:36 +04:00
swp_entry_t entry ;
[PATCH] mm: split page table lock
Christoph Lameter demonstrated very poor scalability on the SGI 512-way, with
a many-threaded application which concurrently initializes different parts of
a large anonymous area.
This patch corrects that, by using a separate spinlock per page table page, to
guard the page table entries in that page, instead of using the mm's single
page_table_lock. (But even then, page_table_lock is still used to guard page
table allocation, and anon_vma allocation.)
In this implementation, the spinlock is tucked inside the struct page of the
page table page: with a BUILD_BUG_ON in case it overflows - which it would in
the case of 32-bit PA-RISC with spinlock debugging enabled.
Splitting the lock is not quite for free: another cacheline access. Ideally,
I suppose we would use split ptlock only for multi-threaded processes on
multi-cpu machines; but deciding that dynamically would have its own costs.
So for now enable it by config, at some number of cpus - since the Kconfig
language doesn't support inequalities, let preprocessor compare that with
NR_CPUS. But I don't think it's worth being user-configurable: for good
testing of both split and unsplit configs, split now at 4 cpus, and perhaps
change that to 8 later.
There is a benefit even for singly threaded processes: kswapd can be attacking
one part of the mm while another part is busy faulting.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-30 04:16:40 +03:00
entry . val = page_private ( page ) ;
2005-04-17 02:20:36 +04:00
p = swap_info_get ( entry ) ;
if ( p ) {
2009-06-17 02:32:53 +04:00
count = swap_count ( p - > swap_map [ swp_offset ( entry ) ] ) ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
}
[PATCH] can_share_swap_page: use page_mapcount
Remember that ironic get_user_pages race? when the raised page_count on a
page swapped out led do_wp_page to decide that it had to copy on write, so
substituted a different page into userspace. 2.6.7 onwards have Andrea's
solution, where try_to_unmap_one backs out if it finds page_count raised.
Which works, but is unsatisfying (rmap.c has no other page_count heuristics),
and was found a few months ago to hang an intensive page migration test. A
year ago I was hesitant to engage page_mapcount, now it seems the right fix.
So remove the page_count hack from try_to_unmap_one; and use activate_page in
unuse_mm when dropping lock, to replace its secondary effect of helping
swapoff to make progress in that case.
Simplify can_share_swap_page (now called only on anonymous pages) to check
page_mapcount + page_swapcount == 1: still needs the page lock to stabilize
their (pessimistic) sum, but does not need swapper_space.tree_lock for that.
In do_swap_page, move swap_free and unlock_page below page_add_anon_rmap, to
keep sum on the high side, and correct when can_share_swap_page called.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-22 04:15:12 +04:00
return count ;
2005-04-17 02:20:36 +04:00
}
/*
2009-01-07 01:39:34 +03:00
* We can write to an anon page without COW if there are no other references
* to it . And as a side - effect , free up its swap : because the old content
* on disk will never be read , and seeking back there to write new content
* later would only waste time away from clustering .
2005-04-17 02:20:36 +04:00
*/
2009-01-07 01:39:34 +03:00
int reuse_swap_page ( struct page * page )
2005-04-17 02:20:36 +04:00
{
[PATCH] can_share_swap_page: use page_mapcount
Remember that ironic get_user_pages race? when the raised page_count on a
page swapped out led do_wp_page to decide that it had to copy on write, so
substituted a different page into userspace. 2.6.7 onwards have Andrea's
solution, where try_to_unmap_one backs out if it finds page_count raised.
Which works, but is unsatisfying (rmap.c has no other page_count heuristics),
and was found a few months ago to hang an intensive page migration test. A
year ago I was hesitant to engage page_mapcount, now it seems the right fix.
So remove the page_count hack from try_to_unmap_one; and use activate_page in
unuse_mm when dropping lock, to replace its secondary effect of helping
swapoff to make progress in that case.
Simplify can_share_swap_page (now called only on anonymous pages) to check
page_mapcount + page_swapcount == 1: still needs the page lock to stabilize
their (pessimistic) sum, but does not need swapper_space.tree_lock for that.
In do_swap_page, move swap_free and unlock_page below page_add_anon_rmap, to
keep sum on the high side, and correct when can_share_swap_page called.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-22 04:15:12 +04:00
int count ;
2009-01-07 01:39:25 +03:00
VM_BUG_ON ( ! PageLocked ( page ) ) ;
ksm: let shared pages be swappable
Initial implementation for swapping out KSM's shared pages: add
page_referenced_ksm() and try_to_unmap_ksm(), which rmap.c calls when
faced with a PageKsm page.
Most of what's needed can be got from the rmap_items listed from the
stable_node of the ksm page, without discovering the actual vma: so in
this patch just fake up a struct vma for page_referenced_one() or
try_to_unmap_one(), then refine that in the next patch.
Add VM_NONLINEAR to ksm_madvise()'s list of exclusions: it has always been
implicit there (being only set with VM_SHARED, already excluded), but
let's make it explicit, to help justify the lack of nonlinear unmap.
Rely on the page lock to protect against concurrent modifications to that
page's node of the stable tree.
The awkward part is not swapout but swapin: do_swap_page() and
page_add_anon_rmap() now have to allow for new possibilities - perhaps a
ksm page still in swapcache, perhaps a swapcache page associated with one
location in one anon_vma now needed for another location or anon_vma.
(And the vma might even be no longer VM_MERGEABLE when that happens.)
ksm_might_need_to_copy() checks for that case, and supplies a duplicate
page when necessary, simply leaving it to a subsequent pass of ksmd to
rediscover the identity and merge them back into one ksm page.
Disappointingly primitive: but the alternative would have to accumulate
unswappable info about the swapped out ksm pages, limiting swappability.
Remove page_add_ksm_rmap(): page_add_anon_rmap() now has to allow for the
particular case it was handling, so just use it instead.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: Izik Eidus <ieidus@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Chris Wright <chrisw@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:59:24 +03:00
if ( unlikely ( PageKsm ( page ) ) )
return 0 ;
[PATCH] can_share_swap_page: use page_mapcount
Remember that ironic get_user_pages race? when the raised page_count on a
page swapped out led do_wp_page to decide that it had to copy on write, so
substituted a different page into userspace. 2.6.7 onwards have Andrea's
solution, where try_to_unmap_one backs out if it finds page_count raised.
Which works, but is unsatisfying (rmap.c has no other page_count heuristics),
and was found a few months ago to hang an intensive page migration test. A
year ago I was hesitant to engage page_mapcount, now it seems the right fix.
So remove the page_count hack from try_to_unmap_one; and use activate_page in
unuse_mm when dropping lock, to replace its secondary effect of helping
swapoff to make progress in that case.
Simplify can_share_swap_page (now called only on anonymous pages) to check
page_mapcount + page_swapcount == 1: still needs the page lock to stabilize
their (pessimistic) sum, but does not need swapper_space.tree_lock for that.
In do_swap_page, move swap_free and unlock_page below page_add_anon_rmap, to
keep sum on the high side, and correct when can_share_swap_page called.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-22 04:15:12 +04:00
count = page_mapcount ( page ) ;
2009-01-07 01:39:34 +03:00
if ( count < = 1 & & PageSwapCache ( page ) ) {
[PATCH] can_share_swap_page: use page_mapcount
Remember that ironic get_user_pages race? when the raised page_count on a
page swapped out led do_wp_page to decide that it had to copy on write, so
substituted a different page into userspace. 2.6.7 onwards have Andrea's
solution, where try_to_unmap_one backs out if it finds page_count raised.
Which works, but is unsatisfying (rmap.c has no other page_count heuristics),
and was found a few months ago to hang an intensive page migration test. A
year ago I was hesitant to engage page_mapcount, now it seems the right fix.
So remove the page_count hack from try_to_unmap_one; and use activate_page in
unuse_mm when dropping lock, to replace its secondary effect of helping
swapoff to make progress in that case.
Simplify can_share_swap_page (now called only on anonymous pages) to check
page_mapcount + page_swapcount == 1: still needs the page lock to stabilize
their (pessimistic) sum, but does not need swapper_space.tree_lock for that.
In do_swap_page, move swap_free and unlock_page below page_add_anon_rmap, to
keep sum on the high side, and correct when can_share_swap_page called.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-22 04:15:12 +04:00
count + = page_swapcount ( page ) ;
2009-01-07 01:39:34 +03:00
if ( count = = 1 & & ! PageWriteback ( page ) ) {
delete_from_swap_cache ( page ) ;
SetPageDirty ( page ) ;
}
}
ksm: let shared pages be swappable
Initial implementation for swapping out KSM's shared pages: add
page_referenced_ksm() and try_to_unmap_ksm(), which rmap.c calls when
faced with a PageKsm page.
Most of what's needed can be got from the rmap_items listed from the
stable_node of the ksm page, without discovering the actual vma: so in
this patch just fake up a struct vma for page_referenced_one() or
try_to_unmap_one(), then refine that in the next patch.
Add VM_NONLINEAR to ksm_madvise()'s list of exclusions: it has always been
implicit there (being only set with VM_SHARED, already excluded), but
let's make it explicit, to help justify the lack of nonlinear unmap.
Rely on the page lock to protect against concurrent modifications to that
page's node of the stable tree.
The awkward part is not swapout but swapin: do_swap_page() and
page_add_anon_rmap() now have to allow for new possibilities - perhaps a
ksm page still in swapcache, perhaps a swapcache page associated with one
location in one anon_vma now needed for another location or anon_vma.
(And the vma might even be no longer VM_MERGEABLE when that happens.)
ksm_might_need_to_copy() checks for that case, and supplies a duplicate
page when necessary, simply leaving it to a subsequent pass of ksmd to
rediscover the identity and merge them back into one ksm page.
Disappointingly primitive: but the alternative would have to accumulate
unswappable info about the swapped out ksm pages, limiting swappability.
Remove page_add_ksm_rmap(): page_add_anon_rmap() now has to allow for the
particular case it was handling, so just use it instead.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: Izik Eidus <ieidus@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Chris Wright <chrisw@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:59:24 +03:00
return count < = 1 ;
2005-04-17 02:20:36 +04:00
}
/*
2009-01-07 01:39:36 +03:00
* If swap is getting full , or if there are no more mappings of this page ,
* then try_to_free_swap is called to free its swap space .
2005-04-17 02:20:36 +04:00
*/
2009-01-07 01:39:36 +03:00
int try_to_free_swap ( struct page * page )
2005-04-17 02:20:36 +04:00
{
2009-01-07 01:39:25 +03:00
VM_BUG_ON ( ! PageLocked ( page ) ) ;
2005-04-17 02:20:36 +04:00
if ( ! PageSwapCache ( page ) )
return 0 ;
if ( PageWriteback ( page ) )
return 0 ;
2009-01-07 01:39:36 +03:00
if ( page_swapcount ( page ) )
2005-04-17 02:20:36 +04:00
return 0 ;
2009-01-07 01:39:36 +03:00
delete_from_swap_cache ( page ) ;
SetPageDirty ( page ) ;
return 1 ;
2008-10-19 07:26:23 +04:00
}
2005-04-17 02:20:36 +04:00
/*
* Free the swap entry like above , but also try to
* free the page cache entry if it is the last user .
*/
2009-01-07 01:40:10 +03:00
int free_swap_and_cache ( swp_entry_t entry )
2005-04-17 02:20:36 +04:00
{
2009-01-07 01:40:10 +03:00
struct swap_info_struct * p ;
2005-04-17 02:20:36 +04:00
struct page * page = NULL ;
2009-09-16 13:50:05 +04:00
if ( non_swap_entry ( entry ) )
2009-01-07 01:40:10 +03:00
return 1 ;
[PATCH] Swapless page migration: add R/W migration entries
Implement read/write migration ptes
We take the upper two swapfiles for the two types of migration ptes and define
a series of macros in swapops.h.
The VM is modified to handle the migration entries. migration entries can
only be encountered when the page they are pointing to is locked. This limits
the number of places one has to fix. We also check in copy_pte_range and in
mprotect_pte_range() for migration ptes.
We check for migration ptes in do_swap_cache and call a function that will
then wait on the page lock. This allows us to effectively stop all accesses
to apge.
Migration entries are created by try_to_unmap if called for migration and
removed by local functions in migrate.c
From: Hugh Dickins <hugh@veritas.com>
Several times while testing swapless page migration (I've no NUMA, just
hacking it up to migrate recklessly while running load), I've hit the
BUG_ON(!PageLocked(p)) in migration_entry_to_page.
This comes from an orphaned migration entry, unrelated to the current
correctly locked migration, but hit by remove_anon_migration_ptes as it
checks an address in each vma of the anon_vma list.
Such an orphan may be left behind if an earlier migration raced with fork:
copy_one_pte can duplicate a migration entry from parent to child, after
remove_anon_migration_ptes has checked the child vma, but before it has
removed it from the parent vma. (If the process were later to fault on this
orphaned entry, it would hit the same BUG from migration_entry_wait.)
This could be fixed by locking anon_vma in copy_one_pte, but we'd rather
not. There's no such problem with file pages, because vma_prio_tree_add
adds child vma after parent vma, and the page table locking at each end is
enough to serialize. Follow that example with anon_vma: add new vmas to the
tail instead of the head.
(There's no corresponding problem when inserting migration entries,
because a missed pte will leave the page count and mapcount high, which is
allowed for. And there's no corresponding problem when migrating via swap,
because a leftover swap entry will be correctly faulted. But the swapless
method has no refcounting of its entries.)
From: Ingo Molnar <mingo@elte.hu>
pte_unmap_unlock() takes the pte pointer as an argument.
From: Hugh Dickins <hugh@veritas.com>
Several times while testing swapless page migration, gcc has tried to exec
a pointer instead of a string: smells like COW mappings are not being
properly write-protected on fork.
The protection in copy_one_pte looks very convincing, until at last you
realize that the second arg to make_migration_entry is a boolean "write",
and SWP_MIGRATION_READ is 30.
Anyway, it's better done like in change_pte_range, using
is_write_migration_entry and make_migration_entry_read.
From: Hugh Dickins <hugh@veritas.com>
Remove unnecessary obfuscation from sys_swapon's range check on swap type,
which blew up causing memory corruption once swapless migration made
MAX_SWAPFILES no longer 2 ^ MAX_SWAPFILES_SHIFT.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Christoph Lameter <clameter@engr.sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
From: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 13:03:35 +04:00
2005-04-17 02:20:36 +04:00
p = swap_info_get ( entry ) ;
if ( p ) {
2009-12-15 04:58:44 +03:00
if ( swap_entry_free ( p , entry , 1 ) = = SWAP_HAS_CACHE ) {
2006-03-31 14:29:56 +04:00
page = find_get_page ( & swapper_space , entry . val ) ;
2008-10-19 07:26:59 +04:00
if ( page & & ! trylock_page ( page ) ) {
2006-03-31 14:29:56 +04:00
page_cache_release ( page ) ;
page = NULL ;
}
}
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
}
if ( page ) {
2009-01-07 01:39:36 +03:00
/*
* Not mapped elsewhere , or swap space full ? Free it !
* Also recheck PageSwapCache now page is locked ( above ) .
*/
2006-03-31 14:29:56 +04:00
if ( PageSwapCache ( page ) & & ! PageWriteback ( page ) & &
2009-01-07 01:39:36 +03:00
( ! page_mapped ( page ) | | vm_swap_full ( ) ) ) {
2005-04-17 02:20:36 +04:00
delete_from_swap_cache ( page ) ;
SetPageDirty ( page ) ;
}
unlock_page ( page ) ;
page_cache_release ( page ) ;
}
2009-01-07 01:40:10 +03:00
return p ! = NULL ;
2005-04-17 02:20:36 +04:00
}
2010-03-11 02:22:17 +03:00
# ifdef CONFIG_CGROUP_MEM_RES_CTLR
/**
* mem_cgroup_count_swap_user - count the user of a swap entry
* @ ent : the swap entry to be checked
* @ pagep : the pointer for the swap cache page of the entry to be stored
*
* Returns the number of the user of the swap entry . The number is valid only
* for swaps of anonymous pages .
* If the entry is found on swap cache , the page is stored to pagep with
* refcount of it being incremented .
*/
int mem_cgroup_count_swap_user ( swp_entry_t ent , struct page * * pagep )
{
struct page * page ;
struct swap_info_struct * p ;
int count = 0 ;
page = find_get_page ( & swapper_space , ent . val ) ;
if ( page )
count + = page_mapcount ( page ) ;
p = swap_info_get ( ent ) ;
if ( p ) {
count + = swap_count ( p - > swap_map [ swp_offset ( ent ) ] ) ;
spin_unlock ( & swap_lock ) ;
}
* pagep = page ;
return count ;
}
# endif
2007-07-30 01:24:36 +04:00
# ifdef CONFIG_HIBERNATION
2006-03-23 13:59:59 +03:00
/*
2006-12-07 07:34:07 +03:00
* Find the swap type that corresponds to given device ( if any ) .
2006-03-23 13:59:59 +03:00
*
2006-12-07 07:34:07 +03:00
* @ offset - number of the PAGE_SIZE - sized block of the device , starting
* from 0 , in which the swap header is expected to be located .
*
* This is needed for the suspend to disk ( aka swsusp ) .
2006-03-23 13:59:59 +03:00
*/
2007-01-06 03:36:28 +03:00
int swap_type_of ( dev_t device , sector_t offset , struct block_device * * bdev_p )
2006-03-23 13:59:59 +03:00
{
2006-12-07 07:34:07 +03:00
struct block_device * bdev = NULL ;
2009-12-15 04:58:41 +03:00
int type ;
2006-03-23 13:59:59 +03:00
2006-12-07 07:34:07 +03:00
if ( device )
bdev = bdget ( device ) ;
2006-03-23 13:59:59 +03:00
spin_lock ( & swap_lock ) ;
2009-12-15 04:58:41 +03:00
for ( type = 0 ; type < nr_swapfiles ; type + + ) {
struct swap_info_struct * sis = swap_info [ type ] ;
2006-03-23 13:59:59 +03:00
2006-12-07 07:34:07 +03:00
if ( ! ( sis - > flags & SWP_WRITEOK ) )
2006-03-23 13:59:59 +03:00
continue ;
2006-08-27 12:23:25 +04:00
2006-12-07 07:34:07 +03:00
if ( ! bdev ) {
2007-01-06 03:36:28 +03:00
if ( bdev_p )
2009-07-29 23:07:55 +04:00
* bdev_p = bdgrab ( sis - > bdev ) ;
2007-01-06 03:36:28 +03:00
2006-03-23 14:00:03 +03:00
spin_unlock ( & swap_lock ) ;
2009-12-15 04:58:41 +03:00
return type ;
2006-03-23 14:00:03 +03:00
}
2006-12-07 07:34:07 +03:00
if ( bdev = = sis - > bdev ) {
2009-12-15 04:58:42 +03:00
struct swap_extent * se = & sis - > first_swap_extent ;
2006-12-07 07:34:07 +03:00
if ( se - > start_block = = offset ) {
2007-01-06 03:36:28 +03:00
if ( bdev_p )
2009-07-29 23:07:55 +04:00
* bdev_p = bdgrab ( sis - > bdev ) ;
2007-01-06 03:36:28 +03:00
2006-12-07 07:34:07 +03:00
spin_unlock ( & swap_lock ) ;
bdput ( bdev ) ;
2009-12-15 04:58:41 +03:00
return type ;
2006-12-07 07:34:07 +03:00
}
2006-03-23 13:59:59 +03:00
}
}
spin_unlock ( & swap_lock ) ;
2006-12-07 07:34:07 +03:00
if ( bdev )
bdput ( bdev ) ;
2006-03-23 13:59:59 +03:00
return - ENODEV ;
}
2009-12-15 04:58:43 +03:00
/*
* Get the ( PAGE_SIZE ) block corresponding to given offset on the swapdev
* corresponding to given index in swap_info ( swap type ) .
*/
sector_t swapdev_block ( int type , pgoff_t offset )
{
struct block_device * bdev ;
if ( ( unsigned int ) type > = nr_swapfiles )
return 0 ;
if ( ! ( swap_info [ type ] - > flags & SWP_WRITEOK ) )
return 0 ;
2009-12-15 04:58:49 +03:00
return map_swap_entry ( swp_entry ( type , offset ) , & bdev ) ;
2009-12-15 04:58:43 +03:00
}
2006-03-23 13:59:59 +03:00
/*
* Return either the total number of swap pages of given type , or the number
* of free pages of that type ( depending on @ free )
*
* This is needed for software suspend
*/
unsigned int count_swap_pages ( int type , int free )
{
unsigned int n = 0 ;
2009-12-15 04:58:41 +03:00
spin_lock ( & swap_lock ) ;
if ( ( unsigned int ) type < nr_swapfiles ) {
struct swap_info_struct * sis = swap_info [ type ] ;
if ( sis - > flags & SWP_WRITEOK ) {
n = sis - > pages ;
2006-03-23 13:59:59 +03:00
if ( free )
2009-12-15 04:58:41 +03:00
n - = sis - > inuse_pages ;
2006-03-23 13:59:59 +03:00
}
}
2009-12-15 04:58:41 +03:00
spin_unlock ( & swap_lock ) ;
2006-03-23 13:59:59 +03:00
return n ;
}
2009-12-15 04:58:43 +03:00
# endif /* CONFIG_HIBERNATION */
2006-03-23 13:59:59 +03:00
2005-04-17 02:20:36 +04:00
/*
2005-10-30 04:15:55 +03:00
* No need to decide whether this PTE shares the swap entry with others ,
* just let do_wp_page work it out if a write is requested later - to
* force COW , vm_page_prot omits write permission from any private vma .
2005-04-17 02:20:36 +04:00
*/
2008-02-07 11:14:04 +03:00
static int unuse_pte ( struct vm_area_struct * vma , pmd_t * pmd ,
2005-04-17 02:20:36 +04:00
unsigned long addr , swp_entry_t entry , struct page * page )
{
2009-01-08 05:07:48 +03:00
struct mem_cgroup * ptr = NULL ;
2008-02-07 11:14:04 +03:00
spinlock_t * ptl ;
pte_t * pte ;
int ret = 1 ;
2009-01-30 01:25:13 +03:00
if ( mem_cgroup_try_charge_swapin ( vma - > vm_mm , page , GFP_KERNEL , & ptr ) ) {
2008-02-07 11:14:04 +03:00
ret = - ENOMEM ;
2009-01-30 01:25:13 +03:00
goto out_nolock ;
}
2008-02-07 11:14:04 +03:00
pte = pte_offset_map_lock ( vma - > vm_mm , pmd , addr , & ptl ) ;
if ( unlikely ( ! pte_same ( * pte , swp_entry_to_pte ( entry ) ) ) ) {
if ( ret > 0 )
2009-01-08 05:07:48 +03:00
mem_cgroup_cancel_charge_swapin ( ptr ) ;
2008-02-07 11:14:04 +03:00
ret = 0 ;
goto out ;
}
2008-02-07 11:13:53 +03:00
2010-03-06 00:41:42 +03:00
dec_mm_counter ( vma - > vm_mm , MM_SWAPENTS ) ;
2010-03-06 00:41:39 +03:00
inc_mm_counter ( vma - > vm_mm , MM_ANONPAGES ) ;
2005-04-17 02:20:36 +04:00
get_page ( page ) ;
set_pte_at ( vma - > vm_mm , addr , pte ,
pte_mkold ( mk_pte ( page , vma - > vm_page_prot ) ) ) ;
page_add_anon_rmap ( page , vma , addr ) ;
2009-01-08 05:07:48 +03:00
mem_cgroup_commit_charge_swapin ( page , ptr ) ;
2005-04-17 02:20:36 +04:00
swap_free ( entry ) ;
/*
* Move the page to the active list so it is not
* immediately swapped out again after swapon .
*/
activate_page ( page ) ;
2008-02-07 11:14:04 +03:00
out :
pte_unmap_unlock ( pte , ptl ) ;
2009-01-30 01:25:13 +03:00
out_nolock :
2008-02-07 11:14:04 +03:00
return ret ;
2005-04-17 02:20:36 +04:00
}
static int unuse_pte_range ( struct vm_area_struct * vma , pmd_t * pmd ,
unsigned long addr , unsigned long end ,
swp_entry_t entry , struct page * page )
{
pte_t swp_pte = swp_entry_to_pte ( entry ) ;
2005-10-30 04:16:27 +03:00
pte_t * pte ;
2008-02-07 11:13:53 +03:00
int ret = 0 ;
2005-04-17 02:20:36 +04:00
2008-02-07 11:14:04 +03:00
/*
* We don ' t actually need pte lock while scanning for swp_pte : since
* we hold page lock and mmap_sem , swp_pte cannot be inserted into the
* page table while we ' re scanning ; though it could get zapped , and on
* some architectures ( e . g . x86_32 with PAE ) we might catch a glimpse
* of unmatched parts which look like swp_pte , so unuse_pte must
* recheck under pte lock . Scanning without pte lock lets it be
* preemptible whenever CONFIG_PREEMPT but not CONFIG_HIGHPTE .
*/
pte = pte_offset_map ( pmd , addr ) ;
2005-04-17 02:20:36 +04:00
do {
/*
* swapoff spends a _lot_ of time in this loop !
* Test inline before going to call unuse_pte .
*/
if ( unlikely ( pte_same ( * pte , swp_pte ) ) ) {
2008-02-07 11:14:04 +03:00
pte_unmap ( pte ) ;
ret = unuse_pte ( vma , pmd , addr , entry , page ) ;
if ( ret )
goto out ;
pte = pte_offset_map ( pmd , addr ) ;
2005-04-17 02:20:36 +04:00
}
} while ( pte + + , addr + = PAGE_SIZE , addr ! = end ) ;
2008-02-07 11:14:04 +03:00
pte_unmap ( pte - 1 ) ;
out :
2008-02-07 11:13:53 +03:00
return ret ;
2005-04-17 02:20:36 +04:00
}
static inline int unuse_pmd_range ( struct vm_area_struct * vma , pud_t * pud ,
unsigned long addr , unsigned long end ,
swp_entry_t entry , struct page * page )
{
pmd_t * pmd ;
unsigned long next ;
2008-02-07 11:13:53 +03:00
int ret ;
2005-04-17 02:20:36 +04:00
pmd = pmd_offset ( pud , addr ) ;
do {
next = pmd_addr_end ( addr , end ) ;
if ( pmd_none_or_clear_bad ( pmd ) )
continue ;
2008-02-07 11:13:53 +03:00
ret = unuse_pte_range ( vma , pmd , addr , next , entry , page ) ;
if ( ret )
return ret ;
2005-04-17 02:20:36 +04:00
} while ( pmd + + , addr = next , addr ! = end ) ;
return 0 ;
}
static inline int unuse_pud_range ( struct vm_area_struct * vma , pgd_t * pgd ,
unsigned long addr , unsigned long end ,
swp_entry_t entry , struct page * page )
{
pud_t * pud ;
unsigned long next ;
2008-02-07 11:13:53 +03:00
int ret ;
2005-04-17 02:20:36 +04:00
pud = pud_offset ( pgd , addr ) ;
do {
next = pud_addr_end ( addr , end ) ;
if ( pud_none_or_clear_bad ( pud ) )
continue ;
2008-02-07 11:13:53 +03:00
ret = unuse_pmd_range ( vma , pud , addr , next , entry , page ) ;
if ( ret )
return ret ;
2005-04-17 02:20:36 +04:00
} while ( pud + + , addr = next , addr ! = end ) ;
return 0 ;
}
static int unuse_vma ( struct vm_area_struct * vma ,
swp_entry_t entry , struct page * page )
{
pgd_t * pgd ;
unsigned long addr , end , next ;
2008-02-07 11:13:53 +03:00
int ret ;
2005-04-17 02:20:36 +04:00
2009-12-15 04:58:57 +03:00
if ( page_anon_vma ( page ) ) {
2005-04-17 02:20:36 +04:00
addr = page_address_in_vma ( page , vma ) ;
if ( addr = = - EFAULT )
return 0 ;
else
end = addr + PAGE_SIZE ;
} else {
addr = vma - > vm_start ;
end = vma - > vm_end ;
}
pgd = pgd_offset ( vma - > vm_mm , addr ) ;
do {
next = pgd_addr_end ( addr , end ) ;
if ( pgd_none_or_clear_bad ( pgd ) )
continue ;
2008-02-07 11:13:53 +03:00
ret = unuse_pud_range ( vma , pgd , addr , next , entry , page ) ;
if ( ret )
return ret ;
2005-04-17 02:20:36 +04:00
} while ( pgd + + , addr = next , addr ! = end ) ;
return 0 ;
}
static int unuse_mm ( struct mm_struct * mm ,
swp_entry_t entry , struct page * page )
{
struct vm_area_struct * vma ;
2008-02-07 11:13:53 +03:00
int ret = 0 ;
2005-04-17 02:20:36 +04:00
if ( ! down_read_trylock ( & mm - > mmap_sem ) ) {
/*
2008-07-30 09:33:41 +04:00
* Activate page so shrink_inactive_list is unlikely to unmap
* its ptes while lock is dropped , so swapoff can make progress .
2005-04-17 02:20:36 +04:00
*/
[PATCH] can_share_swap_page: use page_mapcount
Remember that ironic get_user_pages race? when the raised page_count on a
page swapped out led do_wp_page to decide that it had to copy on write, so
substituted a different page into userspace. 2.6.7 onwards have Andrea's
solution, where try_to_unmap_one backs out if it finds page_count raised.
Which works, but is unsatisfying (rmap.c has no other page_count heuristics),
and was found a few months ago to hang an intensive page migration test. A
year ago I was hesitant to engage page_mapcount, now it seems the right fix.
So remove the page_count hack from try_to_unmap_one; and use activate_page in
unuse_mm when dropping lock, to replace its secondary effect of helping
swapoff to make progress in that case.
Simplify can_share_swap_page (now called only on anonymous pages) to check
page_mapcount + page_swapcount == 1: still needs the page lock to stabilize
their (pessimistic) sum, but does not need swapper_space.tree_lock for that.
In do_swap_page, move swap_free and unlock_page below page_add_anon_rmap, to
keep sum on the high side, and correct when can_share_swap_page called.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-22 04:15:12 +04:00
activate_page ( page ) ;
2005-04-17 02:20:36 +04:00
unlock_page ( page ) ;
down_read ( & mm - > mmap_sem ) ;
lock_page ( page ) ;
}
for ( vma = mm - > mmap ; vma ; vma = vma - > vm_next ) {
2008-02-07 11:13:53 +03:00
if ( vma - > anon_vma & & ( ret = unuse_vma ( vma , entry , page ) ) )
2005-04-17 02:20:36 +04:00
break ;
}
up_read ( & mm - > mmap_sem ) ;
2008-02-07 11:13:53 +03:00
return ( ret < 0 ) ? ret : 0 ;
2005-04-17 02:20:36 +04:00
}
/*
* Scan swap_map from current position to next entry still in use .
* Recycle to start on reaching the end , returning 0 when empty .
*/
2005-09-04 02:54:35 +04:00
static unsigned int find_next_to_unuse ( struct swap_info_struct * si ,
unsigned int prev )
2005-04-17 02:20:36 +04:00
{
2005-09-04 02:54:35 +04:00
unsigned int max = si - > max ;
unsigned int i = prev ;
2009-12-15 04:58:45 +03:00
unsigned char count ;
2005-04-17 02:20:36 +04:00
/*
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
* No need for swap_lock here : we ' re just looking
2005-04-17 02:20:36 +04:00
* for whether an entry is in use , not modifying it ; false
* hits are okay , and sys_swapoff ( ) has already prevented new
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
* allocations from this area ( while holding swap_lock ) .
2005-04-17 02:20:36 +04:00
*/
for ( ; ; ) {
if ( + + i > = max ) {
if ( ! prev ) {
i = 0 ;
break ;
}
/*
* No entries in use at top of swap_map ,
* loop back to start and recheck there .
*/
max = prev + 1 ;
prev = 0 ;
i = 1 ;
}
count = si - > swap_map [ i ] ;
2009-06-17 02:32:53 +04:00
if ( count & & swap_count ( count ) ! = SWAP_MAP_BAD )
2005-04-17 02:20:36 +04:00
break ;
}
return i ;
}
/*
* We completely avoid races by reading each swap page in advance ,
* and then search for the process using it . All the necessary
* page table adjustments can then be made atomically .
*/
static int try_to_unuse ( unsigned int type )
{
2009-12-15 04:58:41 +03:00
struct swap_info_struct * si = swap_info [ type ] ;
2005-04-17 02:20:36 +04:00
struct mm_struct * start_mm ;
2009-12-15 04:58:45 +03:00
unsigned char * swap_map ;
unsigned char swcount ;
2005-04-17 02:20:36 +04:00
struct page * page ;
swp_entry_t entry ;
2005-09-04 02:54:35 +04:00
unsigned int i = 0 ;
2005-04-17 02:20:36 +04:00
int retval = 0 ;
/*
* When searching mms for an entry , a good strategy is to
* start at the first mm we freed the previous entry from
* ( though actually we don ' t notice whether we or coincidence
* freed the entry ) . Initialize this start_mm with a hold .
*
* A simpler strategy would be to start at the last mm we
* freed the previous entry from ; but that would take less
* advantage of mmlist ordering , which clusters forked mms
* together , child after parent . If we race with dup_mmap ( ) , we
* prefer to resolve parent before child , lest we miss entries
* duplicated after we scanned child : using last mm would invert
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
* that .
2005-04-17 02:20:36 +04:00
*/
start_mm = & init_mm ;
atomic_inc ( & init_mm . mm_users ) ;
/*
* Keep on scanning until all entries have gone . Usually ,
* one pass through swap_map is enough , but not necessarily :
* there are races when an instance of an entry might be missed .
*/
while ( ( i = find_next_to_unuse ( si , i ) ) ! = 0 ) {
if ( signal_pending ( current ) ) {
retval = - EINTR ;
break ;
}
2009-01-07 01:39:48 +03:00
/*
2005-04-17 02:20:36 +04:00
* Get a page for the entry , using the existing swap
* cache page if there is one . Otherwise , get a clean
2009-01-07 01:39:48 +03:00
* page and read the swap into it .
2005-04-17 02:20:36 +04:00
*/
swap_map = & si - > swap_map [ i ] ;
entry = swp_entry ( type , i ) ;
swapin needs gfp_mask for loop on tmpfs
Building in a filesystem on a loop device on a tmpfs file can hang when
swapping, the loop thread caught in that infamous throttle_vm_writeout.
In theory this is a long standing problem, which I've either never seen in
practice, or long ago suppressed the recollection, after discounting my load
and my tmpfs size as unrealistically high. But now, with the new aops, it has
become easy to hang on one machine.
Loop used to grab_cache_page before the old prepare_write to tmpfs, which
seems to have been enough to free up some memory for any swapin needed; but
the new write_begin lets tmpfs find or allocate the page (much nicer, since
grab_cache_page missed tmpfs pages in swapcache).
When allocating a fresh page, tmpfs respects loop's mapping_gfp_mask, which
has __GFP_IO|__GFP_FS stripped off, and throttle_vm_writeout is designed to
break out when __GFP_IO or GFP_FS is unset; but when tmfps swaps in,
read_swap_cache_async allocates with GFP_HIGHUSER_MOVABLE regardless of the
mapping_gfp_mask - hence the hang.
So, pass gfp_mask down the line from shmem_getpage to shmem_swapin to
swapin_readahead to read_swap_cache_async to add_to_swap_cache.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: Rik van Riel <riel@redhat.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-02-05 09:28:42 +03:00
page = read_swap_cache_async ( entry ,
GFP_HIGHUSER_MOVABLE , NULL , 0 ) ;
2005-04-17 02:20:36 +04:00
if ( ! page ) {
/*
* Either swap_duplicate ( ) failed because entry
* has been freed independently , and will not be
* reused since sys_swapoff ( ) already disabled
* allocation from here , or alloc_page ( ) failed .
*/
if ( ! * swap_map )
continue ;
retval = - ENOMEM ;
break ;
}
/*
* Don ' t hold on to start_mm if it looks like exiting .
*/
if ( atomic_read ( & start_mm - > mm_users ) = = 1 ) {
mmput ( start_mm ) ;
start_mm = & init_mm ;
atomic_inc ( & init_mm . mm_users ) ;
}
/*
* Wait for and lock page . When do_swap_page races with
* try_to_unuse , do_swap_page can handle the fault much
* faster than try_to_unuse can locate the entry . This
* apparently redundant " wait_on_page_locked " lets try_to_unuse
* defer to do_swap_page in such a case - in some tests ,
* do_swap_page and try_to_unuse repeatedly compete .
*/
wait_on_page_locked ( page ) ;
wait_on_page_writeback ( page ) ;
lock_page ( page ) ;
wait_on_page_writeback ( page ) ;
/*
* Remove all references to entry .
*/
swcount = * swap_map ;
2009-12-15 04:58:47 +03:00
if ( swap_count ( swcount ) = = SWAP_MAP_SHMEM ) {
retval = shmem_unuse ( entry , page ) ;
/* page has already been unlocked and released */
if ( retval < 0 )
break ;
continue ;
2005-04-17 02:20:36 +04:00
}
2009-12-15 04:58:47 +03:00
if ( swap_count ( swcount ) & & start_mm ! = & init_mm )
retval = unuse_mm ( start_mm , entry , page ) ;
2009-06-17 02:32:53 +04:00
if ( swap_count ( * swap_map ) ) {
2005-04-17 02:20:36 +04:00
int set_start_mm = ( * swap_map > = swcount ) ;
struct list_head * p = & start_mm - > mmlist ;
struct mm_struct * new_start_mm = start_mm ;
struct mm_struct * prev_mm = start_mm ;
struct mm_struct * mm ;
atomic_inc ( & new_start_mm - > mm_users ) ;
atomic_inc ( & prev_mm - > mm_users ) ;
spin_lock ( & mmlist_lock ) ;
2009-12-15 04:58:47 +03:00
while ( swap_count ( * swap_map ) & & ! retval & &
2005-04-17 02:20:36 +04:00
( p = p - > next ) ! = & start_mm - > mmlist ) {
mm = list_entry ( p , struct mm_struct , mmlist ) ;
2006-06-23 13:03:44 +04:00
if ( ! atomic_inc_not_zero ( & mm - > mm_users ) )
2005-04-17 02:20:36 +04:00
continue ;
spin_unlock ( & mmlist_lock ) ;
mmput ( prev_mm ) ;
prev_mm = mm ;
cond_resched ( ) ;
swcount = * swap_map ;
2009-06-17 02:32:53 +04:00
if ( ! swap_count ( swcount ) ) /* any usage ? */
2005-04-17 02:20:36 +04:00
;
2009-12-15 04:58:47 +03:00
else if ( mm = = & init_mm )
2005-04-17 02:20:36 +04:00
set_start_mm = 1 ;
2009-12-15 04:58:47 +03:00
else
2005-04-17 02:20:36 +04:00
retval = unuse_mm ( mm , entry , page ) ;
2009-06-17 02:32:53 +04:00
2009-11-02 19:50:33 +03:00
if ( set_start_mm & & * swap_map < swcount ) {
2005-04-17 02:20:36 +04:00
mmput ( new_start_mm ) ;
atomic_inc ( & mm - > mm_users ) ;
new_start_mm = mm ;
set_start_mm = 0 ;
}
spin_lock ( & mmlist_lock ) ;
}
spin_unlock ( & mmlist_lock ) ;
mmput ( prev_mm ) ;
mmput ( start_mm ) ;
start_mm = new_start_mm ;
}
if ( retval ) {
unlock_page ( page ) ;
page_cache_release ( page ) ;
break ;
}
/*
* If a reference remains ( rare ) , we would like to leave
* the page in the swap cache ; but try_to_unmap could
* then re - duplicate the entry once we drop page lock ,
* so we might loop indefinitely ; also , that page could
* not be swapped out to other storage meanwhile . So :
* delete from cache even if there ' s another reference ,
* after ensuring that the data has been saved to disk -
* since if the reference remains ( rarer ) , it will be
* read from disk into another page . Splitting into two
* pages would be incorrect if swap supported " shared
* private " pages, but they are handled by tmpfs files.
ksm: let shared pages be swappable
Initial implementation for swapping out KSM's shared pages: add
page_referenced_ksm() and try_to_unmap_ksm(), which rmap.c calls when
faced with a PageKsm page.
Most of what's needed can be got from the rmap_items listed from the
stable_node of the ksm page, without discovering the actual vma: so in
this patch just fake up a struct vma for page_referenced_one() or
try_to_unmap_one(), then refine that in the next patch.
Add VM_NONLINEAR to ksm_madvise()'s list of exclusions: it has always been
implicit there (being only set with VM_SHARED, already excluded), but
let's make it explicit, to help justify the lack of nonlinear unmap.
Rely on the page lock to protect against concurrent modifications to that
page's node of the stable tree.
The awkward part is not swapout but swapin: do_swap_page() and
page_add_anon_rmap() now have to allow for new possibilities - perhaps a
ksm page still in swapcache, perhaps a swapcache page associated with one
location in one anon_vma now needed for another location or anon_vma.
(And the vma might even be no longer VM_MERGEABLE when that happens.)
ksm_might_need_to_copy() checks for that case, and supplies a duplicate
page when necessary, simply leaving it to a subsequent pass of ksmd to
rediscover the identity and merge them back into one ksm page.
Disappointingly primitive: but the alternative would have to accumulate
unswappable info about the swapped out ksm pages, limiting swappability.
Remove page_add_ksm_rmap(): page_add_anon_rmap() now has to allow for the
particular case it was handling, so just use it instead.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: Izik Eidus <ieidus@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Chris Wright <chrisw@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:59:24 +03:00
*
* Given how unuse_vma ( ) targets one particular offset
* in an anon_vma , once the anon_vma has been determined ,
* this splitting happens to be just what is needed to
* handle where KSM pages have been swapped out : re - reading
* is unnecessarily slow , but we can fix that later on .
2005-04-17 02:20:36 +04:00
*/
2009-06-17 02:32:53 +04:00
if ( swap_count ( * swap_map ) & &
PageDirty ( page ) & & PageSwapCache ( page ) ) {
2005-04-17 02:20:36 +04:00
struct writeback_control wbc = {
. sync_mode = WB_SYNC_NONE ,
} ;
swap_writepage ( page , & wbc ) ;
lock_page ( page ) ;
wait_on_page_writeback ( page ) ;
}
2009-01-07 01:39:37 +03:00
/*
* It is conceivable that a racing task removed this page from
* swap cache just before we acquired the page lock at the top ,
* or while we dropped it in unuse_mm ( ) . The page might even
* be back in swap cache on another swap area : that we must not
* delete , since it may not have been written out to swap yet .
*/
if ( PageSwapCache ( page ) & &
likely ( page_private ( page ) = = entry . val ) )
2008-02-05 09:28:53 +03:00
delete_from_swap_cache ( page ) ;
2005-04-17 02:20:36 +04:00
/*
* So we could skip searching mms once swap count went
* to 1 , we did not mark any present ptes as dirty : must
2007-07-16 10:38:09 +04:00
* mark page dirty so shrink_page_list will preserve it .
2005-04-17 02:20:36 +04:00
*/
SetPageDirty ( page ) ;
unlock_page ( page ) ;
page_cache_release ( page ) ;
/*
* Make sure that we aren ' t completely killing
* interactive performance .
*/
cond_resched ( ) ;
}
mmput ( start_mm ) ;
return retval ;
}
/*
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
* After a successful try_to_unuse , if no swap is now in use , we know
* we can empty the mmlist . swap_lock must be held on entry and exit .
* Note that mmlist_lock nests inside swap_lock , and an mm must be
2005-04-17 02:20:36 +04:00
* added to the mmlist just after page_duplicate - before would be racy .
*/
static void drain_mmlist ( void )
{
struct list_head * p , * next ;
2009-12-15 04:58:41 +03:00
unsigned int type ;
2005-04-17 02:20:36 +04:00
2009-12-15 04:58:41 +03:00
for ( type = 0 ; type < nr_swapfiles ; type + + )
if ( swap_info [ type ] - > inuse_pages )
2005-04-17 02:20:36 +04:00
return ;
spin_lock ( & mmlist_lock ) ;
list_for_each_safe ( p , next , & init_mm . mmlist )
list_del_init ( p ) ;
spin_unlock ( & mmlist_lock ) ;
}
/*
* Use this swapdev ' s extent info to locate the ( PAGE_SIZE ) block which
2009-12-15 04:58:49 +03:00
* corresponds to page offset for the specified swap entry .
* Note that the type of this function is sector_t , but it returns page offset
* into the bdev , not sector offset .
2005-04-17 02:20:36 +04:00
*/
2009-12-15 04:58:49 +03:00
static sector_t map_swap_entry ( swp_entry_t entry , struct block_device * * bdev )
2005-04-17 02:20:36 +04:00
{
2009-12-15 04:58:40 +03:00
struct swap_info_struct * sis ;
struct swap_extent * start_se ;
struct swap_extent * se ;
pgoff_t offset ;
2009-12-15 04:58:41 +03:00
sis = swap_info [ swp_type ( entry ) ] ;
2009-12-15 04:58:40 +03:00
* bdev = sis - > bdev ;
offset = swp_offset ( entry ) ;
start_se = sis - > curr_swap_extent ;
se = start_se ;
2005-04-17 02:20:36 +04:00
for ( ; ; ) {
struct list_head * lh ;
if ( se - > start_page < = offset & &
offset < ( se - > start_page + se - > nr_pages ) ) {
return se - > start_block + ( offset - se - > start_page ) ;
}
2005-09-04 02:54:34 +04:00
lh = se - > list . next ;
2005-04-17 02:20:36 +04:00
se = list_entry ( lh , struct swap_extent , list ) ;
sis - > curr_swap_extent = se ;
BUG_ON ( se = = start_se ) ; /* It *must* be present */
}
}
2009-12-15 04:58:49 +03:00
/*
* Returns the page offset into bdev for the specified page ' s swap entry .
*/
sector_t map_swap_page ( struct page * page , struct block_device * * bdev )
{
swp_entry_t entry ;
entry . val = page_private ( page ) ;
return map_swap_entry ( entry , bdev ) ;
}
2005-04-17 02:20:36 +04:00
/*
* Free all of a swapdev ' s extent information
*/
static void destroy_swap_extents ( struct swap_info_struct * sis )
{
2009-12-15 04:58:42 +03:00
while ( ! list_empty ( & sis - > first_swap_extent . list ) ) {
2005-04-17 02:20:36 +04:00
struct swap_extent * se ;
2009-12-15 04:58:42 +03:00
se = list_entry ( sis - > first_swap_extent . list . next ,
2005-04-17 02:20:36 +04:00
struct swap_extent , list ) ;
list_del ( & se - > list ) ;
kfree ( se ) ;
}
}
/*
* Add a block range ( and the corresponding page range ) into this swapdev ' s
2005-09-04 02:54:34 +04:00
* extent list . The extent list is kept sorted in page order .
2005-04-17 02:20:36 +04:00
*
2005-09-04 02:54:34 +04:00
* This function rather assumes that it is called in ascending page order .
2005-04-17 02:20:36 +04:00
*/
static int
add_swap_extent ( struct swap_info_struct * sis , unsigned long start_page ,
unsigned long nr_pages , sector_t start_block )
{
struct swap_extent * se ;
struct swap_extent * new_se ;
struct list_head * lh ;
2009-12-15 04:58:42 +03:00
if ( start_page = = 0 ) {
se = & sis - > first_swap_extent ;
sis - > curr_swap_extent = se ;
se - > start_page = 0 ;
se - > nr_pages = nr_pages ;
se - > start_block = start_block ;
return 1 ;
} else {
lh = sis - > first_swap_extent . list . prev ; /* Highest extent */
2005-04-17 02:20:36 +04:00
se = list_entry ( lh , struct swap_extent , list ) ;
2005-09-04 02:54:34 +04:00
BUG_ON ( se - > start_page + se - > nr_pages ! = start_page ) ;
if ( se - > start_block + se - > nr_pages = = start_block ) {
2005-04-17 02:20:36 +04:00
/* Merge it */
se - > nr_pages + = nr_pages ;
return 0 ;
}
}
/*
* No merge . Insert a new extent , preserving ordering .
*/
new_se = kmalloc ( sizeof ( * se ) , GFP_KERNEL ) ;
if ( new_se = = NULL )
return - ENOMEM ;
new_se - > start_page = start_page ;
new_se - > nr_pages = nr_pages ;
new_se - > start_block = start_block ;
2009-12-15 04:58:42 +03:00
list_add_tail ( & new_se - > list , & sis - > first_swap_extent . list ) ;
2005-09-04 02:54:34 +04:00
return 1 ;
2005-04-17 02:20:36 +04:00
}
/*
* A ` swap extent ' is a simple thing which maps a contiguous range of pages
* onto a contiguous range of disk blocks . An ordered list of swap extents
* is built at swapon time and is then used at swap_writepage / swap_readpage
* time for locating where on disk a page belongs .
*
* If the swapfile is an S_ISBLK block device , a single extent is installed .
* This is done so that the main operating code can treat S_ISBLK and S_ISREG
* swap files identically .
*
* Whether the swapdev is an S_ISREG file or an S_ISBLK blockdev , the swap
* extent list operates in PAGE_SIZE disk blocks . Both S_ISREG and S_ISBLK
* swapfiles are handled * identically * after swapon time .
*
* For S_ISREG swapfiles , setup_swap_extents ( ) will walk all the file ' s blocks
* and will parse them into an ordered extent list , in PAGE_SIZE chunks . If
* some stray blocks are found which do not fall within the PAGE_SIZE alignment
* requirements , they are simply tossed out - we will never use those blocks
* for swapping .
*
2005-09-04 02:54:31 +04:00
* For S_ISREG swapfiles we set S_SWAPFILE across the life of the swapon . This
2005-04-17 02:20:36 +04:00
* prevents root from shooting her foot off by ftruncating an in - use swapfile ,
* which will scribble on the fs .
*
* The amount of disk space which a single swap extent represents varies .
* Typically it is in the 1 - 4 megabyte range . So we can have hundreds of
* extents in the list . To avoid much list walking , we cache the previous
* search location in ` curr_swap_extent ' , and start new searches from there .
* This is extremely effective . The average number of iterations in
* map_swap_page ( ) has been measured at about 0.3 per page . - akpm .
*/
2005-09-04 02:54:34 +04:00
static int setup_swap_extents ( struct swap_info_struct * sis , sector_t * span )
2005-04-17 02:20:36 +04:00
{
struct inode * inode ;
unsigned blocks_per_page ;
unsigned long page_no ;
unsigned blkbits ;
sector_t probe_block ;
sector_t last_block ;
2005-09-04 02:54:34 +04:00
sector_t lowest_block = - 1 ;
sector_t highest_block = 0 ;
int nr_extents = 0 ;
2005-04-17 02:20:36 +04:00
int ret ;
inode = sis - > swap_file - > f_mapping - > host ;
if ( S_ISBLK ( inode - > i_mode ) ) {
ret = add_swap_extent ( sis , 0 , sis - > max , 0 ) ;
2005-09-04 02:54:34 +04:00
* span = sis - > pages ;
2009-12-15 04:58:42 +03:00
goto out ;
2005-04-17 02:20:36 +04:00
}
blkbits = inode - > i_blkbits ;
blocks_per_page = PAGE_SIZE > > blkbits ;
/*
* Map all the blocks into the extent list . This code doesn ' t try
* to be very smart .
*/
probe_block = 0 ;
page_no = 0 ;
last_block = i_size_read ( inode ) > > blkbits ;
while ( ( probe_block + blocks_per_page ) < = last_block & &
page_no < sis - > max ) {
unsigned block_in_page ;
sector_t first_block ;
first_block = bmap ( inode , probe_block ) ;
if ( first_block = = 0 )
goto bad_bmap ;
/*
* It must be PAGE_SIZE aligned on - disk
*/
if ( first_block & ( blocks_per_page - 1 ) ) {
probe_block + + ;
goto reprobe ;
}
for ( block_in_page = 1 ; block_in_page < blocks_per_page ;
block_in_page + + ) {
sector_t block ;
block = bmap ( inode , probe_block + block_in_page ) ;
if ( block = = 0 )
goto bad_bmap ;
if ( block ! = first_block + block_in_page ) {
/* Discontiguity */
probe_block + + ;
goto reprobe ;
}
}
2005-09-04 02:54:34 +04:00
first_block > > = ( PAGE_SHIFT - blkbits ) ;
if ( page_no ) { /* exclude the header page */
if ( first_block < lowest_block )
lowest_block = first_block ;
if ( first_block > highest_block )
highest_block = first_block ;
}
2005-04-17 02:20:36 +04:00
/*
* We found a PAGE_SIZE - length , PAGE_SIZE - aligned run of blocks
*/
2005-09-04 02:54:34 +04:00
ret = add_swap_extent ( sis , page_no , 1 , first_block ) ;
if ( ret < 0 )
2005-04-17 02:20:36 +04:00
goto out ;
2005-09-04 02:54:34 +04:00
nr_extents + = ret ;
2005-04-17 02:20:36 +04:00
page_no + + ;
probe_block + = blocks_per_page ;
reprobe :
continue ;
}
2005-09-04 02:54:34 +04:00
ret = nr_extents ;
* span = 1 + highest_block - lowest_block ;
2005-04-17 02:20:36 +04:00
if ( page_no = = 0 )
2005-09-04 02:54:32 +04:00
page_no = 1 ; /* force Empty message */
2005-04-17 02:20:36 +04:00
sis - > max = page_no ;
2005-09-04 02:54:32 +04:00
sis - > pages = page_no - 1 ;
2005-04-17 02:20:36 +04:00
sis - > highest_bit = page_no - 1 ;
2009-12-15 04:58:42 +03:00
out :
return ret ;
2005-04-17 02:20:36 +04:00
bad_bmap :
printk ( KERN_ERR " swapon: swapfile has holes \n " ) ;
ret = - EINVAL ;
2009-12-15 04:58:42 +03:00
goto out ;
2005-04-17 02:20:36 +04:00
}
2009-01-14 16:14:28 +03:00
SYSCALL_DEFINE1 ( swapoff , const char __user * , specialfile )
2005-04-17 02:20:36 +04:00
{
2009-12-15 04:58:43 +03:00
struct swap_info_struct * p = NULL ;
2009-12-15 04:58:45 +03:00
unsigned char * swap_map ;
2005-04-17 02:20:36 +04:00
struct file * swap_file , * victim ;
struct address_space * mapping ;
struct inode * inode ;
2009-12-15 04:58:43 +03:00
char * pathname ;
2005-04-17 02:20:36 +04:00
int i , type , prev ;
int err ;
2009-01-07 01:39:48 +03:00
2005-04-17 02:20:36 +04:00
if ( ! capable ( CAP_SYS_ADMIN ) )
return - EPERM ;
pathname = getname ( specialfile ) ;
err = PTR_ERR ( pathname ) ;
if ( IS_ERR ( pathname ) )
goto out ;
victim = filp_open ( pathname , O_RDWR | O_LARGEFILE , 0 ) ;
putname ( pathname ) ;
err = PTR_ERR ( victim ) ;
if ( IS_ERR ( victim ) )
goto out ;
mapping = victim - > f_mapping ;
prev = - 1 ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
2009-12-15 04:58:41 +03:00
for ( type = swap_list . head ; type > = 0 ; type = swap_info [ type ] - > next ) {
p = swap_info [ type ] ;
2009-01-07 01:39:48 +03:00
if ( p - > flags & SWP_WRITEOK ) {
2005-04-17 02:20:36 +04:00
if ( p - > swap_file - > f_mapping = = mapping )
break ;
}
prev = type ;
}
if ( type < 0 ) {
err = - EINVAL ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
goto out_dput ;
}
if ( ! security_vm_enough_memory ( p - > pages ) )
vm_unacct_memory ( p - > pages ) ;
else {
err = - ENOMEM ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
goto out_dput ;
}
2009-12-15 04:58:41 +03:00
if ( prev < 0 )
2005-04-17 02:20:36 +04:00
swap_list . head = p - > next ;
2009-12-15 04:58:41 +03:00
else
swap_info [ prev ] - > next = p - > next ;
2005-04-17 02:20:36 +04:00
if ( type = = swap_list . next ) {
/* just pick something that's safe... */
swap_list . next = swap_list . head ;
}
mm: fix ever-decreasing swap priority
Vegard Nossum has noticed the ever-decreasing negative priority in a
swapon /swapoff loop, which eventually would misprioritize when int wraps
positive. Not worth spending much code on, but probably better fixed.
It's easy to handle the swapping on and off of just one area, but there's
not much point if a pair or more still misbehave. To handle the general
case, swapoff should compact negative priorities, keeping them always from
-1 to -MAX_SWAPFILES. That's a change, but should cause no regression,
since these negative (unspecified) priorities are disjoint from the the
positive specified priorities 0 to 32767.
One small functional difference, which seems appropriate: when swapoff
fails to free all swap from a negative priority area, that area is now
reinserted at lowest priority, rather than at its original priority.
In moving down swapon's setting of priority, I notice that an area is
visible to /proc/swaps when it has swap_map set, yet that was being set
before all the visible fields were properly filled in: corrected.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-24 08:28:23 +04:00
if ( p - > prio < 0 ) {
2009-12-15 04:58:41 +03:00
for ( i = p - > next ; i > = 0 ; i = swap_info [ i ] - > next )
swap_info [ i ] - > prio = p - > prio - - ;
mm: fix ever-decreasing swap priority
Vegard Nossum has noticed the ever-decreasing negative priority in a
swapon /swapoff loop, which eventually would misprioritize when int wraps
positive. Not worth spending much code on, but probably better fixed.
It's easy to handle the swapping on and off of just one area, but there's
not much point if a pair or more still misbehave. To handle the general
case, swapoff should compact negative priorities, keeping them always from
-1 to -MAX_SWAPFILES. That's a change, but should cause no regression,
since these negative (unspecified) priorities are disjoint from the the
positive specified priorities 0 to 32767.
One small functional difference, which seems appropriate: when swapoff
fails to free all swap from a negative priority area, that area is now
reinserted at lowest priority, rather than at its original priority.
In moving down swapon's setting of priority, I notice that an area is
visible to /proc/swaps when it has swap_map set, yet that was being set
before all the visible fields were properly filled in: corrected.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-24 08:28:23 +04:00
least_priority + + ;
}
2005-04-17 02:20:36 +04:00
nr_swap_pages - = p - > pages ;
total_swap_pages - = p - > pages ;
p - > flags & = ~ SWP_WRITEOK ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-09-04 02:54:37 +04:00
2009-09-22 04:02:27 +04:00
current - > flags | = PF_OOM_ORIGIN ;
2005-04-17 02:20:36 +04:00
err = try_to_unuse ( type ) ;
2009-09-22 04:02:27 +04:00
current - > flags & = ~ PF_OOM_ORIGIN ;
2005-04-17 02:20:36 +04:00
if ( err ) {
/* re-insert swap space back into swap_list */
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
mm: fix ever-decreasing swap priority
Vegard Nossum has noticed the ever-decreasing negative priority in a
swapon /swapoff loop, which eventually would misprioritize when int wraps
positive. Not worth spending much code on, but probably better fixed.
It's easy to handle the swapping on and off of just one area, but there's
not much point if a pair or more still misbehave. To handle the general
case, swapoff should compact negative priorities, keeping them always from
-1 to -MAX_SWAPFILES. That's a change, but should cause no regression,
since these negative (unspecified) priorities are disjoint from the the
positive specified priorities 0 to 32767.
One small functional difference, which seems appropriate: when swapoff
fails to free all swap from a negative priority area, that area is now
reinserted at lowest priority, rather than at its original priority.
In moving down swapon's setting of priority, I notice that an area is
visible to /proc/swaps when it has swap_map set, yet that was being set
before all the visible fields were properly filled in: corrected.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-24 08:28:23 +04:00
if ( p - > prio < 0 )
p - > prio = - - least_priority ;
prev = - 1 ;
2009-12-15 04:58:41 +03:00
for ( i = swap_list . head ; i > = 0 ; i = swap_info [ i ] - > next ) {
if ( p - > prio > = swap_info [ i ] - > prio )
2005-04-17 02:20:36 +04:00
break ;
mm: fix ever-decreasing swap priority
Vegard Nossum has noticed the ever-decreasing negative priority in a
swapon /swapoff loop, which eventually would misprioritize when int wraps
positive. Not worth spending much code on, but probably better fixed.
It's easy to handle the swapping on and off of just one area, but there's
not much point if a pair or more still misbehave. To handle the general
case, swapoff should compact negative priorities, keeping them always from
-1 to -MAX_SWAPFILES. That's a change, but should cause no regression,
since these negative (unspecified) priorities are disjoint from the the
positive specified priorities 0 to 32767.
One small functional difference, which seems appropriate: when swapoff
fails to free all swap from a negative priority area, that area is now
reinserted at lowest priority, rather than at its original priority.
In moving down swapon's setting of priority, I notice that an area is
visible to /proc/swaps when it has swap_map set, yet that was being set
before all the visible fields were properly filled in: corrected.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-24 08:28:23 +04:00
prev = i ;
}
2005-04-17 02:20:36 +04:00
p - > next = i ;
if ( prev < 0 )
2009-12-15 04:58:41 +03:00
swap_list . head = swap_list . next = type ;
2005-04-17 02:20:36 +04:00
else
2009-12-15 04:58:41 +03:00
swap_info [ prev ] - > next = type ;
2005-04-17 02:20:36 +04:00
nr_swap_pages + = p - > pages ;
total_swap_pages + = p - > pages ;
p - > flags | = SWP_WRITEOK ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
goto out_dput ;
}
[PATCH] swap: scan_swap_map drop swap_device_lock
get_swap_page has often shown up on latency traces, doing lengthy scans while
holding two spinlocks. swap_list_lock is already dropped, now scan_swap_map
drop swap_device_lock before scanning the swap_map.
While scanning for an empty cluster, don't worry that racing tasks may
allocate what was free and free what was allocated; but when allocating an
entry, check it's still free after retaking the lock. Avoid dropping the lock
in the expected common path. No barriers beyond the locks, just let the
cookie crumble; highest_bit limit is volatile, but benign.
Guard against swapoff: must check SWP_WRITEOK before allocating, must raise
SWP_SCANNING reference count while in scan_swap_map, swapoff wait for that to
fall - just use schedule_timeout, we don't want to burden scan_swap_map
itself, and it's very unlikely that anyone can really still be in
scan_swap_map once swapoff gets this far.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:39 +04:00
/* wait for any unplug function to finish */
down_write ( & swap_unplug_sem ) ;
up_write ( & swap_unplug_sem ) ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
destroy_swap_extents ( p ) ;
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
if ( p - > flags & SWP_CONTINUED )
free_swap_count_continuations ( p ) ;
2006-01-19 04:42:33 +03:00
mutex_lock ( & swapon_mutex ) ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
drain_mmlist ( ) ;
[PATCH] swap: scan_swap_map drop swap_device_lock
get_swap_page has often shown up on latency traces, doing lengthy scans while
holding two spinlocks. swap_list_lock is already dropped, now scan_swap_map
drop swap_device_lock before scanning the swap_map.
While scanning for an empty cluster, don't worry that racing tasks may
allocate what was free and free what was allocated; but when allocating an
entry, check it's still free after retaking the lock. Avoid dropping the lock
in the expected common path. No barriers beyond the locks, just let the
cookie crumble; highest_bit limit is volatile, but benign.
Guard against swapoff: must check SWP_WRITEOK before allocating, must raise
SWP_SCANNING reference count while in scan_swap_map, swapoff wait for that to
fall - just use schedule_timeout, we don't want to burden scan_swap_map
itself, and it's very unlikely that anyone can really still be in
scan_swap_map once swapoff gets this far.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:39 +04:00
/* wait for anyone still in scan_swap_map */
p - > highest_bit = 0 ; /* cuts scans short */
while ( p - > flags > = SWP_SCANNING ) {
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-09-10 11:27:25 +04:00
schedule_timeout_uninterruptible ( 1 ) ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
[PATCH] swap: scan_swap_map drop swap_device_lock
get_swap_page has often shown up on latency traces, doing lengthy scans while
holding two spinlocks. swap_list_lock is already dropped, now scan_swap_map
drop swap_device_lock before scanning the swap_map.
While scanning for an empty cluster, don't worry that racing tasks may
allocate what was free and free what was allocated; but when allocating an
entry, check it's still free after retaking the lock. Avoid dropping the lock
in the expected common path. No barriers beyond the locks, just let the
cookie crumble; highest_bit limit is volatile, but benign.
Guard against swapoff: must check SWP_WRITEOK before allocating, must raise
SWP_SCANNING reference count while in scan_swap_map, swapoff wait for that to
fall - just use schedule_timeout, we don't want to burden scan_swap_map
itself, and it's very unlikely that anyone can really still be in
scan_swap_map once swapoff gets this far.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:39 +04:00
}
2005-04-17 02:20:36 +04:00
swap_file = p - > swap_file ;
p - > swap_file = NULL ;
p - > max = 0 ;
swap_map = p - > swap_map ;
p - > swap_map = NULL ;
p - > flags = 0 ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2006-01-19 04:42:33 +03:00
mutex_unlock ( & swapon_mutex ) ;
2005-04-17 02:20:36 +04:00
vfree ( swap_map ) ;
2009-01-08 05:07:58 +03:00
/* Destroy swap account informatin */
swap_cgroup_swapoff ( type ) ;
2005-04-17 02:20:36 +04:00
inode = mapping - > host ;
if ( S_ISBLK ( inode - > i_mode ) ) {
struct block_device * bdev = I_BDEV ( inode ) ;
set_blocksize ( bdev , p - > old_block_size ) ;
bd_release ( bdev ) ;
} else {
2006-01-10 02:59:24 +03:00
mutex_lock ( & inode - > i_mutex ) ;
2005-04-17 02:20:36 +04:00
inode - > i_flags & = ~ S_SWAPFILE ;
2006-01-10 02:59:24 +03:00
mutex_unlock ( & inode - > i_mutex ) ;
2005-04-17 02:20:36 +04:00
}
filp_close ( swap_file , NULL ) ;
err = 0 ;
out_dput :
filp_close ( victim , NULL ) ;
out :
return err ;
}
# ifdef CONFIG_PROC_FS
/* iterator */
static void * swap_start ( struct seq_file * swap , loff_t * pos )
{
2009-12-15 04:58:41 +03:00
struct swap_info_struct * si ;
int type ;
2005-04-17 02:20:36 +04:00
loff_t l = * pos ;
2006-01-19 04:42:33 +03:00
mutex_lock ( & swapon_mutex ) ;
2005-04-17 02:20:36 +04:00
2006-12-07 07:32:28 +03:00
if ( ! l )
return SEQ_START_TOKEN ;
2009-12-15 04:58:41 +03:00
for ( type = 0 ; type < nr_swapfiles ; type + + ) {
smp_rmb ( ) ; /* read nr_swapfiles before swap_info[type] */
si = swap_info [ type ] ;
if ( ! ( si - > flags & SWP_USED ) | | ! si - > swap_map )
2005-04-17 02:20:36 +04:00
continue ;
2006-12-07 07:32:28 +03:00
if ( ! - - l )
2009-12-15 04:58:41 +03:00
return si ;
2005-04-17 02:20:36 +04:00
}
return NULL ;
}
static void * swap_next ( struct seq_file * swap , void * v , loff_t * pos )
{
2009-12-15 04:58:41 +03:00
struct swap_info_struct * si = v ;
int type ;
2005-04-17 02:20:36 +04:00
2006-12-07 07:32:28 +03:00
if ( v = = SEQ_START_TOKEN )
2009-12-15 04:58:41 +03:00
type = 0 ;
else
type = si - > type + 1 ;
2006-12-07 07:32:28 +03:00
2009-12-15 04:58:41 +03:00
for ( ; type < nr_swapfiles ; type + + ) {
smp_rmb ( ) ; /* read nr_swapfiles before swap_info[type] */
si = swap_info [ type ] ;
if ( ! ( si - > flags & SWP_USED ) | | ! si - > swap_map )
2005-04-17 02:20:36 +04:00
continue ;
+ + * pos ;
2009-12-15 04:58:41 +03:00
return si ;
2005-04-17 02:20:36 +04:00
}
return NULL ;
}
static void swap_stop ( struct seq_file * swap , void * v )
{
2006-01-19 04:42:33 +03:00
mutex_unlock ( & swapon_mutex ) ;
2005-04-17 02:20:36 +04:00
}
static int swap_show ( struct seq_file * swap , void * v )
{
2009-12-15 04:58:41 +03:00
struct swap_info_struct * si = v ;
2005-04-17 02:20:36 +04:00
struct file * file ;
int len ;
2009-12-15 04:58:41 +03:00
if ( si = = SEQ_START_TOKEN ) {
2006-12-07 07:32:28 +03:00
seq_puts ( swap , " Filename \t \t \t \t Type \t \t Size \t Used \t Priority \n " ) ;
return 0 ;
}
2005-04-17 02:20:36 +04:00
2009-12-15 04:58:41 +03:00
file = si - > swap_file ;
2008-02-15 06:38:43 +03:00
len = seq_path ( swap , & file - > f_path , " \t \n \\ " ) ;
2005-09-04 02:54:35 +04:00
seq_printf ( swap , " %*s%s \t %u \t %u \t %d \n " ,
2009-01-07 01:39:48 +03:00
len < 40 ? 40 - len : 1 , " " ,
S_ISBLK ( file - > f_path . dentry - > d_inode - > i_mode ) ?
2005-04-17 02:20:36 +04:00
" partition " : " file \t " ,
2009-12-15 04:58:41 +03:00
si - > pages < < ( PAGE_SHIFT - 10 ) ,
si - > inuse_pages < < ( PAGE_SHIFT - 10 ) ,
si - > prio ) ;
2005-04-17 02:20:36 +04:00
return 0 ;
}
2006-12-07 07:40:36 +03:00
static const struct seq_operations swaps_op = {
2005-04-17 02:20:36 +04:00
. start = swap_start ,
. next = swap_next ,
. stop = swap_stop ,
. show = swap_show
} ;
static int swaps_open ( struct inode * inode , struct file * file )
{
return seq_open ( file , & swaps_op ) ;
}
2006-12-07 07:40:36 +03:00
static const struct file_operations proc_swaps_operations = {
2005-04-17 02:20:36 +04:00
. open = swaps_open ,
. read = seq_read ,
. llseek = seq_lseek ,
. release = seq_release ,
} ;
static int __init procswaps_init ( void )
{
2008-04-29 12:02:13 +04:00
proc_create ( " swaps " , 0 , NULL , & proc_swaps_operations ) ;
2005-04-17 02:20:36 +04:00
return 0 ;
}
__initcall ( procswaps_init ) ;
# endif /* CONFIG_PROC_FS */
2008-12-16 14:35:24 +03:00
# ifdef MAX_SWAPFILES_CHECK
static int __init max_swapfiles_check ( void )
{
MAX_SWAPFILES_CHECK ( ) ;
return 0 ;
}
late_initcall ( max_swapfiles_check ) ;
# endif
2005-04-17 02:20:36 +04:00
/*
* Written 01 / 25 / 92 by Simmule Turner , heavily changed by Linus .
*
* The swapon system call
*/
2009-01-14 16:14:28 +03:00
SYSCALL_DEFINE2 ( swapon , const char __user * , specialfile , int , swap_flags )
2005-04-17 02:20:36 +04:00
{
2009-12-15 04:58:43 +03:00
struct swap_info_struct * p ;
2005-04-17 02:20:36 +04:00
char * name = NULL ;
struct block_device * bdev = NULL ;
struct file * swap_file = NULL ;
struct address_space * mapping ;
unsigned int type ;
int i , prev ;
int error ;
2010-03-06 00:42:12 +03:00
union swap_header * swap_header ;
unsigned int nr_good_pages ;
2005-09-04 02:54:35 +04:00
int nr_extents = 0 ;
2005-09-04 02:54:34 +04:00
sector_t span ;
2010-03-06 00:42:12 +03:00
unsigned long maxpages ;
2009-01-07 01:39:47 +03:00
unsigned long swapfilepages ;
2009-12-15 04:58:45 +03:00
unsigned char * swap_map = NULL ;
2005-04-17 02:20:36 +04:00
struct page * page = NULL ;
struct inode * inode = NULL ;
int did_down = 0 ;
if ( ! capable ( CAP_SYS_ADMIN ) )
return - EPERM ;
2009-12-15 04:58:41 +03:00
p = kzalloc ( sizeof ( * p ) , GFP_KERNEL ) ;
if ( ! p )
return - ENOMEM ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
2009-12-15 04:58:41 +03:00
for ( type = 0 ; type < nr_swapfiles ; type + + ) {
if ( ! ( swap_info [ type ] - > flags & SWP_USED ) )
2005-04-17 02:20:36 +04:00
break ;
2009-12-15 04:58:41 +03:00
}
2005-04-17 02:20:36 +04:00
error = - EPERM ;
[PATCH] Swapless page migration: add R/W migration entries
Implement read/write migration ptes
We take the upper two swapfiles for the two types of migration ptes and define
a series of macros in swapops.h.
The VM is modified to handle the migration entries. migration entries can
only be encountered when the page they are pointing to is locked. This limits
the number of places one has to fix. We also check in copy_pte_range and in
mprotect_pte_range() for migration ptes.
We check for migration ptes in do_swap_cache and call a function that will
then wait on the page lock. This allows us to effectively stop all accesses
to apge.
Migration entries are created by try_to_unmap if called for migration and
removed by local functions in migrate.c
From: Hugh Dickins <hugh@veritas.com>
Several times while testing swapless page migration (I've no NUMA, just
hacking it up to migrate recklessly while running load), I've hit the
BUG_ON(!PageLocked(p)) in migration_entry_to_page.
This comes from an orphaned migration entry, unrelated to the current
correctly locked migration, but hit by remove_anon_migration_ptes as it
checks an address in each vma of the anon_vma list.
Such an orphan may be left behind if an earlier migration raced with fork:
copy_one_pte can duplicate a migration entry from parent to child, after
remove_anon_migration_ptes has checked the child vma, but before it has
removed it from the parent vma. (If the process were later to fault on this
orphaned entry, it would hit the same BUG from migration_entry_wait.)
This could be fixed by locking anon_vma in copy_one_pte, but we'd rather
not. There's no such problem with file pages, because vma_prio_tree_add
adds child vma after parent vma, and the page table locking at each end is
enough to serialize. Follow that example with anon_vma: add new vmas to the
tail instead of the head.
(There's no corresponding problem when inserting migration entries,
because a missed pte will leave the page count and mapcount high, which is
allowed for. And there's no corresponding problem when migrating via swap,
because a leftover swap entry will be correctly faulted. But the swapless
method has no refcounting of its entries.)
From: Ingo Molnar <mingo@elte.hu>
pte_unmap_unlock() takes the pte pointer as an argument.
From: Hugh Dickins <hugh@veritas.com>
Several times while testing swapless page migration, gcc has tried to exec
a pointer instead of a string: smells like COW mappings are not being
properly write-protected on fork.
The protection in copy_one_pte looks very convincing, until at last you
realize that the second arg to make_migration_entry is a boolean "write",
and SWP_MIGRATION_READ is 30.
Anyway, it's better done like in change_pte_range, using
is_write_migration_entry and make_migration_entry_read.
From: Hugh Dickins <hugh@veritas.com>
Remove unnecessary obfuscation from sys_swapon's range check on swap type,
which blew up causing memory corruption once swapless migration made
MAX_SWAPFILES no longer 2 ^ MAX_SWAPFILES_SHIFT.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Christoph Lameter <clameter@engr.sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
From: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 13:03:35 +04:00
if ( type > = MAX_SWAPFILES ) {
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2009-12-15 04:58:41 +03:00
kfree ( p ) ;
2005-04-17 02:20:36 +04:00
goto out ;
}
2009-12-15 04:58:41 +03:00
if ( type > = nr_swapfiles ) {
p - > type = type ;
swap_info [ type ] = p ;
/*
* Write swap_info [ type ] before nr_swapfiles , in case a
* racing procfs swap_start ( ) or swap_next ( ) is reading them .
* ( We never shrink nr_swapfiles , we never free this entry . )
*/
smp_wmb ( ) ;
nr_swapfiles + + ;
} else {
kfree ( p ) ;
p = swap_info [ type ] ;
/*
* Do not memset this entry : a racing procfs swap_next ( )
* would be relying on p - > type to remain valid .
*/
}
2009-12-15 04:58:42 +03:00
INIT_LIST_HEAD ( & p - > first_swap_extent . list ) ;
2005-04-17 02:20:36 +04:00
p - > flags = SWP_USED ;
p - > next = - 1 ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2009-12-15 04:58:41 +03:00
2005-04-17 02:20:36 +04:00
name = getname ( specialfile ) ;
error = PTR_ERR ( name ) ;
if ( IS_ERR ( name ) ) {
name = NULL ;
goto bad_swap_2 ;
}
swap_file = filp_open ( name , O_RDWR | O_LARGEFILE , 0 ) ;
error = PTR_ERR ( swap_file ) ;
if ( IS_ERR ( swap_file ) ) {
swap_file = NULL ;
goto bad_swap_2 ;
}
p - > swap_file = swap_file ;
mapping = swap_file - > f_mapping ;
inode = mapping - > host ;
error = - EBUSY ;
for ( i = 0 ; i < nr_swapfiles ; i + + ) {
2009-12-15 04:58:41 +03:00
struct swap_info_struct * q = swap_info [ i ] ;
2005-04-17 02:20:36 +04:00
if ( i = = type | | ! q - > swap_file )
continue ;
if ( mapping = = q - > swap_file - > f_mapping )
goto bad_swap ;
}
error = - EINVAL ;
if ( S_ISBLK ( inode - > i_mode ) ) {
bdev = I_BDEV ( inode ) ;
error = bd_claim ( bdev , sys_swapon ) ;
if ( error < 0 ) {
bdev = NULL ;
[PATCH] Fix bd_claim() error code.
Problem: In some circumstances, bd_claim() is returning the wrong error
code.
If we try to swapon an unused block device that isn't swap formatted, we
get -EINVAL. But if that same block device is already mounted, we instead
get -EBUSY, even though it still isn't a valid swap device.
This issue came up on the busybox list trying to get the error message
from "swapon -a" right. If a swap device is already enabled, we get -EBUSY,
and we shouldn't report this as an error. But we can't distinguish the two
-EBUSY conditions, which are very different errors.
In the code, bd_claim() returns either 0 or -EBUSY, but in this case busy
means "somebody other than sys_swapon has already claimed this", and
_that_ means this block device can't be a valid swap device. So return
-EINVAL there.
Signed-off-by: Rob Landley <rob@landley.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-23 08:44:27 +04:00
error = - EINVAL ;
2005-04-17 02:20:36 +04:00
goto bad_swap ;
}
p - > old_block_size = block_size ( bdev ) ;
error = set_blocksize ( bdev , PAGE_SIZE ) ;
if ( error < 0 )
goto bad_swap ;
p - > bdev = bdev ;
2010-05-17 09:32:42 +04:00
p - > flags | = SWP_BLKDEV ;
2005-04-17 02:20:36 +04:00
} else if ( S_ISREG ( inode - > i_mode ) ) {
p - > bdev = inode - > i_sb - > s_bdev ;
2006-01-10 02:59:24 +03:00
mutex_lock ( & inode - > i_mutex ) ;
2005-04-17 02:20:36 +04:00
did_down = 1 ;
if ( IS_SWAPFILE ( inode ) ) {
error = - EBUSY ;
goto bad_swap ;
}
} else {
goto bad_swap ;
}
2009-01-07 01:39:47 +03:00
swapfilepages = i_size_read ( inode ) > > PAGE_SHIFT ;
2005-04-17 02:20:36 +04:00
/*
* Read the swap header .
*/
if ( ! mapping - > a_ops - > readpage ) {
error = - EINVAL ;
goto bad_swap ;
}
2006-06-23 13:05:08 +04:00
page = read_mapping_page ( mapping , 0 , swap_file ) ;
2005-04-17 02:20:36 +04:00
if ( IS_ERR ( page ) ) {
error = PTR_ERR ( page ) ;
goto bad_swap ;
}
2009-01-07 01:39:49 +03:00
swap_header = kmap ( page ) ;
2005-04-17 02:20:36 +04:00
2009-01-07 01:39:49 +03:00
if ( memcmp ( " SWAPSPACE2 " , swap_header - > magic . magic , 10 ) ) {
2006-01-11 03:50:28 +03:00
printk ( KERN_ERR " Unable to find swap-space signature \n " ) ;
2005-04-17 02:20:36 +04:00
error = - EINVAL ;
goto bad_swap ;
}
2009-01-07 01:39:48 +03:00
2009-01-07 01:39:49 +03:00
/* swap partition endianess hack... */
if ( swab32 ( swap_header - > info . version ) = = 1 ) {
swab32s ( & swap_header - > info . version ) ;
swab32s ( & swap_header - > info . last_page ) ;
swab32s ( & swap_header - > info . nr_badpages ) ;
for ( i = 0 ; i < swap_header - > info . nr_badpages ; i + + )
swab32s ( & swap_header - > info . badpages [ i ] ) ;
}
/* Check the swap header's sub-version */
if ( swap_header - > info . version ! = 1 ) {
printk ( KERN_WARNING
" Unable to handle swap header version %d \n " ,
swap_header - > info . version ) ;
2005-04-17 02:20:36 +04:00
error = - EINVAL ;
goto bad_swap ;
2009-01-07 01:39:49 +03:00
}
2005-04-17 02:20:36 +04:00
2009-01-07 01:39:49 +03:00
p - > lowest_bit = 1 ;
p - > cluster_next = 1 ;
2009-12-15 04:58:41 +03:00
p - > cluster_nr = 0 ;
[PATCH] swap: scan_swap_map drop swap_device_lock
get_swap_page has often shown up on latency traces, doing lengthy scans while
holding two spinlocks. swap_list_lock is already dropped, now scan_swap_map
drop swap_device_lock before scanning the swap_map.
While scanning for an empty cluster, don't worry that racing tasks may
allocate what was free and free what was allocated; but when allocating an
entry, check it's still free after retaking the lock. Avoid dropping the lock
in the expected common path. No barriers beyond the locks, just let the
cookie crumble; highest_bit limit is volatile, but benign.
Guard against swapoff: must check SWP_WRITEOK before allocating, must raise
SWP_SCANNING reference count while in scan_swap_map, swapoff wait for that to
fall - just use schedule_timeout, we don't want to burden scan_swap_map
itself, and it's very unlikely that anyone can really still be in
scan_swap_map once swapoff gets this far.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:39 +04:00
2009-01-07 01:39:49 +03:00
/*
* Find out how many pages are allowed for a single swap
* device . There are two limiting factors : 1 ) the number of
* bits for the swap offset in the swp_entry_t type and
* 2 ) the number of bits in the a swap pte as defined by
* the different architectures . In order to find the
* largest possible bit mask a swap entry with swap type 0
* and swap offset ~ 0UL is created , encoded to a swap pte ,
* decoded to a swp_entry_t again and finally the swap
* offset is extracted . This will mask all the bits from
* the initial ~ 0UL mask that can ' t be encoded in either
* the swp_entry_t or the architecture definition of a
* swap pte .
*/
maxpages = swp_offset ( pte_to_swp_entry (
2010-03-06 00:42:12 +03:00
swp_entry_to_pte ( swp_entry ( 0 , ~ 0UL ) ) ) ) + 1 ;
if ( maxpages > swap_header - > info . last_page ) {
maxpages = swap_header - > info . last_page + 1 ;
/* p->max is an unsigned int: don't overflow it */
if ( ( unsigned int ) maxpages = = 0 )
maxpages = UINT_MAX ;
}
2009-01-07 01:39:49 +03:00
p - > highest_bit = maxpages - 1 ;
2005-04-17 02:20:36 +04:00
2009-01-07 01:39:49 +03:00
error = - EINVAL ;
if ( ! maxpages )
goto bad_swap ;
if ( swapfilepages & & maxpages > swapfilepages ) {
printk ( KERN_WARNING
" Swap area shorter than signature indicates \n " ) ;
goto bad_swap ;
}
if ( swap_header - > info . nr_badpages & & S_ISREG ( inode - > i_mode ) )
goto bad_swap ;
if ( swap_header - > info . nr_badpages > MAX_SWAP_BADPAGES )
goto bad_swap ;
2006-01-08 12:00:59 +03:00
2009-01-07 01:39:49 +03:00
/* OK, set up the swap map and apply the bad block list */
2009-12-15 04:58:45 +03:00
swap_map = vmalloc ( maxpages ) ;
2009-01-07 01:39:49 +03:00
if ( ! swap_map ) {
error = - ENOMEM ;
goto bad_swap ;
}
2005-04-17 02:20:36 +04:00
2009-12-15 04:58:45 +03:00
memset ( swap_map , 0 , maxpages ) ;
2010-03-06 00:42:12 +03:00
nr_good_pages = maxpages - 1 ; /* omit header page */
2009-01-07 01:39:49 +03:00
for ( i = 0 ; i < swap_header - > info . nr_badpages ; i + + ) {
2010-03-06 00:42:12 +03:00
unsigned int page_nr = swap_header - > info . badpages [ i ] ;
if ( page_nr = = 0 | | page_nr > swap_header - > info . last_page ) {
2009-01-07 01:39:49 +03:00
error = - EINVAL ;
2005-04-17 02:20:36 +04:00
goto bad_swap ;
2009-01-07 01:39:49 +03:00
}
2010-03-06 00:42:12 +03:00
if ( page_nr < maxpages ) {
swap_map [ page_nr ] = SWAP_MAP_BAD ;
nr_good_pages - - ;
}
2005-04-17 02:20:36 +04:00
}
2009-01-08 05:07:58 +03:00
error = swap_cgroup_swapon ( type , maxpages ) ;
if ( error )
goto bad_swap ;
2005-09-04 02:54:32 +04:00
if ( nr_good_pages ) {
mm: fix ever-decreasing swap priority
Vegard Nossum has noticed the ever-decreasing negative priority in a
swapon /swapoff loop, which eventually would misprioritize when int wraps
positive. Not worth spending much code on, but probably better fixed.
It's easy to handle the swapping on and off of just one area, but there's
not much point if a pair or more still misbehave. To handle the general
case, swapoff should compact negative priorities, keeping them always from
-1 to -MAX_SWAPFILES. That's a change, but should cause no regression,
since these negative (unspecified) priorities are disjoint from the the
positive specified priorities 0 to 32767.
One small functional difference, which seems appropriate: when swapoff
fails to free all swap from a negative priority area, that area is now
reinserted at lowest priority, rather than at its original priority.
In moving down swapon's setting of priority, I notice that an area is
visible to /proc/swaps when it has swap_map set, yet that was being set
before all the visible fields were properly filled in: corrected.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-24 08:28:23 +04:00
swap_map [ 0 ] = SWAP_MAP_BAD ;
2005-09-04 02:54:32 +04:00
p - > max = maxpages ;
p - > pages = nr_good_pages ;
2005-09-04 02:54:34 +04:00
nr_extents = setup_swap_extents ( p , & span ) ;
if ( nr_extents < 0 ) {
error = nr_extents ;
2005-09-04 02:54:32 +04:00
goto bad_swap ;
2005-09-04 02:54:34 +04:00
}
2005-09-04 02:54:32 +04:00
nr_good_pages = p - > pages ;
}
2005-04-17 02:20:36 +04:00
if ( ! nr_good_pages ) {
printk ( KERN_WARNING " Empty swap-file \n " ) ;
error = - EINVAL ;
goto bad_swap ;
}
2009-09-30 12:53:48 +04:00
if ( p - > bdev ) {
if ( blk_queue_nonrot ( bdev_get_queue ( p - > bdev ) ) ) {
p - > flags | = SWP_SOLIDSTATE ;
p - > cluster_next = 1 + ( random32 ( ) % p - > highest_bit ) ;
}
if ( discard_swap ( p ) = = 0 )
p - > flags | = SWP_DISCARDABLE ;
2009-01-07 01:39:54 +03:00
}
2009-01-07 01:39:51 +03:00
2006-01-19 04:42:33 +03:00
mutex_lock ( & swapon_mutex ) ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
mm: fix ever-decreasing swap priority
Vegard Nossum has noticed the ever-decreasing negative priority in a
swapon /swapoff loop, which eventually would misprioritize when int wraps
positive. Not worth spending much code on, but probably better fixed.
It's easy to handle the swapping on and off of just one area, but there's
not much point if a pair or more still misbehave. To handle the general
case, swapoff should compact negative priorities, keeping them always from
-1 to -MAX_SWAPFILES. That's a change, but should cause no regression,
since these negative (unspecified) priorities are disjoint from the the
positive specified priorities 0 to 32767.
One small functional difference, which seems appropriate: when swapoff
fails to free all swap from a negative priority area, that area is now
reinserted at lowest priority, rather than at its original priority.
In moving down swapon's setting of priority, I notice that an area is
visible to /proc/swaps when it has swap_map set, yet that was being set
before all the visible fields were properly filled in: corrected.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-24 08:28:23 +04:00
if ( swap_flags & SWAP_FLAG_PREFER )
p - > prio =
( swap_flags & SWAP_FLAG_PRIO_MASK ) > > SWAP_FLAG_PRIO_SHIFT ;
else
p - > prio = - - least_priority ;
p - > swap_map = swap_map ;
2009-01-07 01:39:48 +03:00
p - > flags | = SWP_WRITEOK ;
2005-04-17 02:20:36 +04:00
nr_swap_pages + = nr_good_pages ;
total_swap_pages + = nr_good_pages ;
2005-09-04 02:54:34 +04:00
2005-09-04 02:54:35 +04:00
printk ( KERN_INFO " Adding %uk swap on %s. "
2009-01-07 01:39:54 +03:00
" Priority:%d extents:%d across:%lluk %s%s \n " ,
2005-09-04 02:54:34 +04:00
nr_good_pages < < ( PAGE_SHIFT - 10 ) , name , p - > prio ,
2009-01-07 01:39:51 +03:00
nr_extents , ( unsigned long long ) span < < ( PAGE_SHIFT - 10 ) ,
2009-01-07 01:39:54 +03:00
( p - > flags & SWP_SOLIDSTATE ) ? " SS " : " " ,
( p - > flags & SWP_DISCARDABLE ) ? " D " : " " ) ;
2005-04-17 02:20:36 +04:00
/* insert swap space into swap_list: */
prev = - 1 ;
2009-12-15 04:58:41 +03:00
for ( i = swap_list . head ; i > = 0 ; i = swap_info [ i ] - > next ) {
if ( p - > prio > = swap_info [ i ] - > prio )
2005-04-17 02:20:36 +04:00
break ;
prev = i ;
}
p - > next = i ;
2009-12-15 04:58:41 +03:00
if ( prev < 0 )
swap_list . head = swap_list . next = type ;
else
swap_info [ prev ] - > next = type ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2006-01-19 04:42:33 +03:00
mutex_unlock ( & swapon_mutex ) ;
2005-04-17 02:20:36 +04:00
error = 0 ;
goto out ;
bad_swap :
if ( bdev ) {
set_blocksize ( bdev , p - > old_block_size ) ;
bd_release ( bdev ) ;
}
2005-09-04 02:54:33 +04:00
destroy_swap_extents ( p ) ;
2009-01-08 05:07:58 +03:00
swap_cgroup_swapoff ( type ) ;
2005-04-17 02:20:36 +04:00
bad_swap_2 :
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
p - > swap_file = NULL ;
p - > flags = 0 ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
vfree ( swap_map ) ;
if ( swap_file )
filp_close ( swap_file , NULL ) ;
out :
if ( page & & ! IS_ERR ( page ) ) {
kunmap ( page ) ;
page_cache_release ( page ) ;
}
if ( name )
putname ( name ) ;
if ( did_down ) {
if ( ! error )
inode - > i_flags | = S_SWAPFILE ;
2006-01-10 02:59:24 +03:00
mutex_unlock ( & inode - > i_mutex ) ;
2005-04-17 02:20:36 +04:00
}
return error ;
}
void si_swapinfo ( struct sysinfo * val )
{
2009-12-15 04:58:41 +03:00
unsigned int type ;
2005-04-17 02:20:36 +04:00
unsigned long nr_to_be_unused = 0 ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
2009-12-15 04:58:41 +03:00
for ( type = 0 ; type < nr_swapfiles ; type + + ) {
struct swap_info_struct * si = swap_info [ type ] ;
if ( ( si - > flags & SWP_USED ) & & ! ( si - > flags & SWP_WRITEOK ) )
nr_to_be_unused + = si - > inuse_pages ;
2005-04-17 02:20:36 +04:00
}
val - > freeswap = nr_swap_pages + nr_to_be_unused ;
val - > totalswap = total_swap_pages + nr_to_be_unused ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
}
/*
* Verify that a swap entry is valid and increment its swap map count .
*
2009-06-17 02:32:53 +04:00
* Returns error code in following case .
* - success - > 0
* - swp_entry is invalid - > EINVAL
* - swp_entry is migration entry - > EINVAL
* - swap - cache reference is requested but there is already one . - > EEXIST
* - swap - cache reference is requested but the entry is not used . - > ENOENT
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
* - swap - mapped reference requested but needs continued swap count . - > ENOMEM
2005-04-17 02:20:36 +04:00
*/
2009-12-15 04:58:45 +03:00
static int __swap_duplicate ( swp_entry_t entry , unsigned char usage )
2005-04-17 02:20:36 +04:00
{
2009-12-15 04:58:43 +03:00
struct swap_info_struct * p ;
2005-04-17 02:20:36 +04:00
unsigned long offset , type ;
2009-12-15 04:58:45 +03:00
unsigned char count ;
unsigned char has_cache ;
2009-12-15 04:58:44 +03:00
int err = - EINVAL ;
2005-04-17 02:20:36 +04:00
2009-09-16 13:50:05 +04:00
if ( non_swap_entry ( entry ) )
2009-12-15 04:58:44 +03:00
goto out ;
[PATCH] Swapless page migration: add R/W migration entries
Implement read/write migration ptes
We take the upper two swapfiles for the two types of migration ptes and define
a series of macros in swapops.h.
The VM is modified to handle the migration entries. migration entries can
only be encountered when the page they are pointing to is locked. This limits
the number of places one has to fix. We also check in copy_pte_range and in
mprotect_pte_range() for migration ptes.
We check for migration ptes in do_swap_cache and call a function that will
then wait on the page lock. This allows us to effectively stop all accesses
to apge.
Migration entries are created by try_to_unmap if called for migration and
removed by local functions in migrate.c
From: Hugh Dickins <hugh@veritas.com>
Several times while testing swapless page migration (I've no NUMA, just
hacking it up to migrate recklessly while running load), I've hit the
BUG_ON(!PageLocked(p)) in migration_entry_to_page.
This comes from an orphaned migration entry, unrelated to the current
correctly locked migration, but hit by remove_anon_migration_ptes as it
checks an address in each vma of the anon_vma list.
Such an orphan may be left behind if an earlier migration raced with fork:
copy_one_pte can duplicate a migration entry from parent to child, after
remove_anon_migration_ptes has checked the child vma, but before it has
removed it from the parent vma. (If the process were later to fault on this
orphaned entry, it would hit the same BUG from migration_entry_wait.)
This could be fixed by locking anon_vma in copy_one_pte, but we'd rather
not. There's no such problem with file pages, because vma_prio_tree_add
adds child vma after parent vma, and the page table locking at each end is
enough to serialize. Follow that example with anon_vma: add new vmas to the
tail instead of the head.
(There's no corresponding problem when inserting migration entries,
because a missed pte will leave the page count and mapcount high, which is
allowed for. And there's no corresponding problem when migrating via swap,
because a leftover swap entry will be correctly faulted. But the swapless
method has no refcounting of its entries.)
From: Ingo Molnar <mingo@elte.hu>
pte_unmap_unlock() takes the pte pointer as an argument.
From: Hugh Dickins <hugh@veritas.com>
Several times while testing swapless page migration, gcc has tried to exec
a pointer instead of a string: smells like COW mappings are not being
properly write-protected on fork.
The protection in copy_one_pte looks very convincing, until at last you
realize that the second arg to make_migration_entry is a boolean "write",
and SWP_MIGRATION_READ is 30.
Anyway, it's better done like in change_pte_range, using
is_write_migration_entry and make_migration_entry_read.
From: Hugh Dickins <hugh@veritas.com>
Remove unnecessary obfuscation from sys_swapon's range check on swap type,
which blew up causing memory corruption once swapless migration made
MAX_SWAPFILES no longer 2 ^ MAX_SWAPFILES_SHIFT.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Christoph Lameter <clameter@engr.sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
From: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 13:03:35 +04:00
2005-04-17 02:20:36 +04:00
type = swp_type ( entry ) ;
if ( type > = nr_swapfiles )
goto bad_file ;
2009-12-15 04:58:41 +03:00
p = swap_info [ type ] ;
2005-04-17 02:20:36 +04:00
offset = swp_offset ( entry ) ;
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
2009-06-17 02:32:53 +04:00
if ( unlikely ( offset > = p - > max ) )
goto unlock_out ;
2009-12-15 04:58:44 +03:00
count = p - > swap_map [ offset ] ;
has_cache = count & SWAP_HAS_CACHE ;
count & = ~ SWAP_HAS_CACHE ;
err = 0 ;
2009-06-17 02:32:53 +04:00
2009-12-15 04:58:44 +03:00
if ( usage = = SWAP_HAS_CACHE ) {
2009-06-17 02:32:53 +04:00
/* set SWAP_HAS_CACHE if there is no cache and entry is used */
2009-12-15 04:58:44 +03:00
if ( ! has_cache & & count )
has_cache = SWAP_HAS_CACHE ;
else if ( has_cache ) /* someone else added cache */
err = - EEXIST ;
else /* no users remaining */
err = - ENOENT ;
2009-06-17 02:32:53 +04:00
} else if ( count | | has_cache ) {
2009-12-15 04:58:44 +03:00
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
if ( ( count & ~ COUNT_CONTINUED ) < SWAP_MAP_MAX )
count + = usage ;
else if ( ( count & ~ COUNT_CONTINUED ) > SWAP_MAP_MAX )
2009-12-15 04:58:44 +03:00
err = - EINVAL ;
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
else if ( swap_count_continued ( p , offset , count ) )
count = COUNT_CONTINUED ;
else
err = - ENOMEM ;
2009-06-17 02:32:53 +04:00
} else
2009-12-15 04:58:44 +03:00
err = - ENOENT ; /* unused swap entry */
p - > swap_map [ offset ] = count | has_cache ;
2009-06-17 02:32:53 +04:00
unlock_out :
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2005-04-17 02:20:36 +04:00
out :
2009-12-15 04:58:44 +03:00
return err ;
2005-04-17 02:20:36 +04:00
bad_file :
printk ( KERN_ERR " swap_dup: %s%08lx \n " , Bad_file , entry . val ) ;
goto out ;
}
2009-12-15 04:58:44 +03:00
2009-12-15 04:58:47 +03:00
/*
* Help swapoff by noting that swap entry belongs to shmem / tmpfs
* ( in which case its reference count is never incremented ) .
*/
void swap_shmem_alloc ( swp_entry_t entry )
{
__swap_duplicate ( entry , SWAP_MAP_SHMEM ) ;
}
2009-06-17 02:32:53 +04:00
/*
2010-03-06 00:42:25 +03:00
* Increase reference count of swap entry by 1.
* Returns 0 for success , or - ENOMEM if a swap_count_continuation is required
* but could not be atomically allocated . Returns 0 , just as if it succeeded ,
* if __swap_duplicate ( ) fails for another reason ( - EINVAL or - ENOENT ) , which
* might occur if a page table entry has got corrupted .
2009-06-17 02:32:53 +04:00
*/
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
int swap_duplicate ( swp_entry_t entry )
2009-06-17 02:32:53 +04:00
{
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
int err = 0 ;
while ( ! err & & __swap_duplicate ( entry , 1 ) = = - ENOMEM )
err = add_swap_count_continuation ( entry , GFP_ATOMIC ) ;
return err ;
2009-06-17 02:32:53 +04:00
}
2005-04-17 02:20:36 +04:00
2009-06-17 02:32:52 +04:00
/*
2009-06-17 02:32:53 +04:00
* @ entry : swap entry for which we allocate swap cache .
*
2009-12-15 04:58:43 +03:00
* Called when allocating swap cache for existing swap entry ,
2009-06-17 02:32:53 +04:00
* This can return error codes . Returns 0 at success .
* - EBUSY means there is a swap cache .
* Note : return code is different from swap_duplicate ( ) .
2009-06-17 02:32:52 +04:00
*/
int swapcache_prepare ( swp_entry_t entry )
{
2009-12-15 04:58:44 +03:00
return __swap_duplicate ( entry , SWAP_HAS_CACHE ) ;
2009-06-17 02:32:52 +04:00
}
2005-04-17 02:20:36 +04:00
/*
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
* swap_lock prevents swap_map being freed . Don ' t grab an extra
2005-04-17 02:20:36 +04:00
* reference on the swaphandle , it doesn ' t matter if it becomes unused .
*/
int valid_swaphandles ( swp_entry_t entry , unsigned long * offset )
{
2008-02-05 09:28:45 +03:00
struct swap_info_struct * si ;
2006-09-29 13:01:26 +04:00
int our_page_cluster = page_cluster ;
2008-02-05 09:28:45 +03:00
pgoff_t target , toff ;
pgoff_t base , end ;
int nr_pages = 0 ;
2005-04-17 02:20:36 +04:00
2006-09-29 13:01:26 +04:00
if ( ! our_page_cluster ) /* no readahead */
2005-04-17 02:20:36 +04:00
return 0 ;
2008-02-05 09:28:45 +03:00
2009-12-15 04:58:41 +03:00
si = swap_info [ swp_type ( entry ) ] ;
2008-02-05 09:28:45 +03:00
target = swp_offset ( entry ) ;
base = ( target > > our_page_cluster ) < < our_page_cluster ;
end = base + ( 1 < < our_page_cluster ) ;
if ( ! base ) /* first page is swap header */
base + + ;
2005-04-17 02:20:36 +04:00
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_lock ( & swap_lock ) ;
2008-02-05 09:28:45 +03:00
if ( end > si - > max ) /* don't go beyond end of map */
end = si - > max ;
/* Count contiguous allocated slots above our target */
for ( toff = target ; + + toff < end ; nr_pages + + ) {
/* Don't read in free or bad pages */
if ( ! si - > swap_map [ toff ] )
break ;
2009-06-17 02:32:53 +04:00
if ( swap_count ( si - > swap_map [ toff ] ) = = SWAP_MAP_BAD )
2005-04-17 02:20:36 +04:00
break ;
2008-02-05 09:28:45 +03:00
}
/* Count contiguous allocated slots below our target */
for ( toff = target ; - - toff > = base ; nr_pages + + ) {
2005-04-17 02:20:36 +04:00
/* Don't read in free or bad pages */
2008-02-05 09:28:45 +03:00
if ( ! si - > swap_map [ toff ] )
2005-04-17 02:20:36 +04:00
break ;
2009-06-17 02:32:53 +04:00
if ( swap_count ( si - > swap_map [ toff ] ) = = SWAP_MAP_BAD )
2005-04-17 02:20:36 +04:00
break ;
2008-02-05 09:28:45 +03:00
}
[PATCH] swap: swap_lock replace list+device
The idea of a swap_device_lock per device, and a swap_list_lock over them all,
is appealing; but in practice almost every holder of swap_device_lock must
already hold swap_list_lock, which defeats the purpose of the split.
The only exceptions have been swap_duplicate, valid_swaphandles and an
untrodden path in try_to_unuse (plus a few places added in this series).
valid_swaphandles doesn't show up high in profiles, but swap_duplicate does
demand attention. However, with the hold time in get_swap_pages so much
reduced, I've not yet found a load and set of swap device priorities to show
even swap_duplicate benefitting from the split. Certainly the split is mere
overhead in the common case of a single swap device.
So, replace swap_list_lock and swap_device_lock by spinlock_t swap_lock
(generally we seem to prefer an _ in the name, and not hide in a macro).
If someone can show a regression in swap_duplicate, then probably we should
add a hashlock for the swap_map entries alone (shorts being anatomic), so as
to help the case of the single swap device too.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-04 02:54:41 +04:00
spin_unlock ( & swap_lock ) ;
2008-02-05 09:28:45 +03:00
/*
* Indicate starting offset , and return number of pages to get :
* if only 1 , say 0 , since there ' s then no readahead to be done .
*/
* offset = + + toff ;
return nr_pages ? + + nr_pages : 0 ;
2005-04-17 02:20:36 +04:00
}
swap_info: swap count continuations
Swap is duplicated (reference count incremented by one) whenever the same
swap page is inserted into another mm (when forking finds a swap entry in
place of a pte, or when reclaim unmaps a pte to insert the swap entry).
swap_info_struct's vmalloc'ed swap_map is the array of these reference
counts: but what happens when the unsigned short (or unsigned char since
the preceding patch) is full? (and its high bit is kept for a cache flag)
We then lose track of it, never freeing, leaving it in use until swapoff:
at which point we _hope_ that a single pass will have found all instances,
assume there are no more, and will lose user data if we're wrong.
Swapping of KSM pages has not yet been enabled; but it is implemented,
and makes it very easy for a user to overflow the maximum swap count:
possible with ordinary process pages, but unlikely, even when pid_max
has been raised from PID_MAX_DEFAULT.
This patch implements swap count continuations: when the count overflows,
a continuation page is allocated and linked to the original vmalloc'ed
map page, and this used to hold the continuation counts for that entry
and its neighbours. These continuation pages are seldom referenced:
the common paths all work on the original swap_map, only referring to
a continuation page when the low "digit" of a count is incremented or
decremented through SWAP_MAP_MAX.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 04:58:46 +03:00
/*
* add_swap_count_continuation - called when a swap count is duplicated
* beyond SWAP_MAP_MAX , it allocates a new page and links that to the entry ' s
* page of the original vmalloc ' ed swap_map , to hold the continuation count
* ( for that entry and for its neighbouring PAGE_SIZE swap entries ) . Called
* again when count is duplicated beyond SWAP_MAP_MAX * SWAP_CONT_MAX , etc .
*
* These continuation pages are seldom referenced : the common paths all work
* on the original swap_map , only referring to a continuation page when the
* low " digit " of a count is incremented or decremented through SWAP_MAP_MAX .
*
* add_swap_count_continuation ( , GFP_ATOMIC ) can be called while holding
* page table locks ; if it fails , add_swap_count_continuation ( , GFP_KERNEL )
* can be called after dropping locks .
*/
int add_swap_count_continuation ( swp_entry_t entry , gfp_t gfp_mask )
{
struct swap_info_struct * si ;
struct page * head ;
struct page * page ;
struct page * list_page ;
pgoff_t offset ;
unsigned char count ;
/*
* When debugging , it ' s easier to use __GFP_ZERO here ; but it ' s better
* for latency not to zero a page while GFP_ATOMIC and holding locks .
*/
page = alloc_page ( gfp_mask | __GFP_HIGHMEM ) ;
si = swap_info_get ( entry ) ;
if ( ! si ) {
/*
* An acceptable race has occurred since the failing
* __swap_duplicate ( ) : the swap entry has been freed ,
* perhaps even the whole swap_map cleared for swapoff .
*/
goto outer ;
}
offset = swp_offset ( entry ) ;
count = si - > swap_map [ offset ] & ~ SWAP_HAS_CACHE ;
if ( ( count & ~ COUNT_CONTINUED ) ! = SWAP_MAP_MAX ) {
/*
* The higher the swap count , the more likely it is that tasks
* will race to add swap count continuation : we need to avoid
* over - provisioning .
*/
goto out ;
}
if ( ! page ) {
spin_unlock ( & swap_lock ) ;
return - ENOMEM ;
}
/*
* We are fortunate that although vmalloc_to_page uses pte_offset_map ,
* no architecture is using highmem pages for kernel pagetables : so it
* will not corrupt the GFP_ATOMIC caller ' s atomic pagetable kmaps .
*/
head = vmalloc_to_page ( si - > swap_map + offset ) ;
offset & = ~ PAGE_MASK ;
/*
* Page allocation does not initialize the page ' s lru field ,
* but it does always reset its private field .
*/
if ( ! page_private ( head ) ) {
BUG_ON ( count & COUNT_CONTINUED ) ;
INIT_LIST_HEAD ( & head - > lru ) ;
set_page_private ( head , SWP_CONTINUED ) ;
si - > flags | = SWP_CONTINUED ;
}
list_for_each_entry ( list_page , & head - > lru , lru ) {
unsigned char * map ;
/*
* If the previous map said no continuation , but we ' ve found
* a continuation page , free our allocation and use this one .
*/
if ( ! ( count & COUNT_CONTINUED ) )
goto out ;
map = kmap_atomic ( list_page , KM_USER0 ) + offset ;
count = * map ;
kunmap_atomic ( map , KM_USER0 ) ;
/*
* If this continuation count now has some space in it ,
* free our allocation and use this one .
*/
if ( ( count & ~ COUNT_CONTINUED ) ! = SWAP_CONT_MAX )
goto out ;
}
list_add_tail ( & page - > lru , & head - > lru ) ;
page = NULL ; /* now it's attached, don't free it */
out :
spin_unlock ( & swap_lock ) ;
outer :
if ( page )
__free_page ( page ) ;
return 0 ;
}
/*
* swap_count_continued - when the original swap_map count is incremented
* from SWAP_MAP_MAX , check if there is already a continuation page to carry
* into , carry if so , or else fail until a new continuation page is allocated ;
* when the original swap_map count is decremented from 0 with continuation ,
* borrow from the continuation and report whether it still holds more .
* Called while __swap_duplicate ( ) or swap_entry_free ( ) holds swap_lock .
*/
static bool swap_count_continued ( struct swap_info_struct * si ,
pgoff_t offset , unsigned char count )
{
struct page * head ;
struct page * page ;
unsigned char * map ;
head = vmalloc_to_page ( si - > swap_map + offset ) ;
if ( page_private ( head ) ! = SWP_CONTINUED ) {
BUG_ON ( count & COUNT_CONTINUED ) ;
return false ; /* need to add count continuation */
}
offset & = ~ PAGE_MASK ;
page = list_entry ( head - > lru . next , struct page , lru ) ;
map = kmap_atomic ( page , KM_USER0 ) + offset ;
if ( count = = SWAP_MAP_MAX ) /* initial increment from swap_map */
goto init_map ; /* jump over SWAP_CONT_MAX checks */
if ( count = = ( SWAP_MAP_MAX | COUNT_CONTINUED ) ) { /* incrementing */
/*
* Think of how you add 1 to 999
*/
while ( * map = = ( SWAP_CONT_MAX | COUNT_CONTINUED ) ) {
kunmap_atomic ( map , KM_USER0 ) ;
page = list_entry ( page - > lru . next , struct page , lru ) ;
BUG_ON ( page = = head ) ;
map = kmap_atomic ( page , KM_USER0 ) + offset ;
}
if ( * map = = SWAP_CONT_MAX ) {
kunmap_atomic ( map , KM_USER0 ) ;
page = list_entry ( page - > lru . next , struct page , lru ) ;
if ( page = = head )
return false ; /* add count continuation */
map = kmap_atomic ( page , KM_USER0 ) + offset ;
init_map : * map = 0 ; /* we didn't zero the page */
}
* map + = 1 ;
kunmap_atomic ( map , KM_USER0 ) ;
page = list_entry ( page - > lru . prev , struct page , lru ) ;
while ( page ! = head ) {
map = kmap_atomic ( page , KM_USER0 ) + offset ;
* map = COUNT_CONTINUED ;
kunmap_atomic ( map , KM_USER0 ) ;
page = list_entry ( page - > lru . prev , struct page , lru ) ;
}
return true ; /* incremented */
} else { /* decrementing */
/*
* Think of how you subtract 1 from 1000
*/
BUG_ON ( count ! = COUNT_CONTINUED ) ;
while ( * map = = COUNT_CONTINUED ) {
kunmap_atomic ( map , KM_USER0 ) ;
page = list_entry ( page - > lru . next , struct page , lru ) ;
BUG_ON ( page = = head ) ;
map = kmap_atomic ( page , KM_USER0 ) + offset ;
}
BUG_ON ( * map = = 0 ) ;
* map - = 1 ;
if ( * map = = 0 )
count = 0 ;
kunmap_atomic ( map , KM_USER0 ) ;
page = list_entry ( page - > lru . prev , struct page , lru ) ;
while ( page ! = head ) {
map = kmap_atomic ( page , KM_USER0 ) + offset ;
* map = SWAP_CONT_MAX | count ;
count = COUNT_CONTINUED ;
kunmap_atomic ( map , KM_USER0 ) ;
page = list_entry ( page - > lru . prev , struct page , lru ) ;
}
return count = = COUNT_CONTINUED ;
}
}
/*
* free_swap_count_continuations - swapoff free all the continuation pages
* appended to the swap_map , after swap_map is quiesced , before vfree ' ing it .
*/
static void free_swap_count_continuations ( struct swap_info_struct * si )
{
pgoff_t offset ;
for ( offset = 0 ; offset < si - > max ; offset + = PAGE_SIZE ) {
struct page * head ;
head = vmalloc_to_page ( si - > swap_map + offset ) ;
if ( page_private ( head ) ) {
struct list_head * this , * next ;
list_for_each_safe ( this , next , & head - > lru ) {
struct page * page ;
page = list_entry ( this , struct page , lru ) ;
list_del ( this ) ;
__free_page ( page ) ;
}
}
}
}