[lkml]   [2009]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[BUGFIX][1/2] mm: add_to_swap_cache() must not sleep
    After commit 355cfa73(mm: modify swap_map and add SWAP_HAS_CACHE flag),
    read_swap_cache_async() will busy-wait while a entry doesn't on swap cache
    but it has SWAP_HAS_CACHE flag.

    Such entries can exist on add/delete path of swap cache.
    On add path, add_to_swap_cache() is called soon after SWAP_HAS_CACHE flag
    is set, and on delete path, swapcache_free() will be called (SWAP_HAS_CACHE
    flag is cleared) soon after __delete_from_swap_cache() is called.
    So, the busy-wait works well in most cases.

    But this mechanism can cause soft lockup if add_to_swap_cache() sleeps
    and read_swap_cache_async() tries to swap-in the same entry on the same cpu.

    add_to_swap() and shmem_writepage() call add_to_swap_cache() w/o __GFP_WAIT,
    but read_swap_cache_async() can call it w/ __GFP_WAIT, so it can cause
    soft lockup.

    This patch changes the gfp_mask of add_to_swap_cache() in read_swap_cache_async().

    Signed-off-by: Daisuke Nishimura <>
    mm/swap_state.c | 3 ++-
    1 files changed, 2 insertions(+), 1 deletions(-)

    diff --git a/mm/swap_state.c b/mm/swap_state.c
    index 42cd38e..3e6dd72 100644
    --- a/mm/swap_state.c
    +++ b/mm/swap_state.c
    @@ -76,6 +76,7 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask)
    + VM_BUG_ON(gfp_mask & __GFP_WAIT);

    error = radix_tree_preload(gfp_mask);
    if (!error) {
    @@ -307,7 +308,7 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
    - err = add_to_swap_cache(new_page, entry, gfp_mask & GFP_KERNEL);
    + err = add_to_swap_cache(new_page, entry, GFP_ATOMIC);
    if (likely(!err)) {
    * Initiate read into locked page and return.

     \ /
      Last update: 2009-08-10 05:01    [W:0.021 / U:7.224 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site