move_from_swap_cache and add_to_page_cache_lru are using GFP_ATOMIC,
which can easily fail in an intermittent way. Rude if shmem_getpage
then fails with -ENOMEM: cond_resched to let kswapd in, and repeat.
--- swap09/mm/shmem.c Tue Mar 25 20:44:24 2003
+++ swap10/mm/shmem.c Tue Mar 25 20:44:35 2003
@@ -838,8 +838,7 @@
SetPageUptodate(filepage);
set_page_dirty(filepage);
swap_free(swap);
- } else if (!(error = move_from_swap_cache(
- swappage, idx, mapping))) {
+ } else if (move_from_swap_cache(swappage, idx, mapping) == 0) {
shmem_swp_set(info, entry, 0);
shmem_swp_unmap(entry);
spin_unlock(&info->lock);
@@ -850,8 +849,8 @@
spin_unlock(&info->lock);
unlock_page(swappage);
page_cache_release(swappage);
- if (error != -EEXIST)
- goto failed;
+ /* let kswapd refresh zone for GFP_ATOMICs */
+ cond_resched();
goto repeat;
}
} else if (sgp == SGP_READ && !filepage) {
@@ -897,15 +896,16 @@
swap = *entry;
shmem_swp_unmap(entry);
}
- if (error || swap.val ||
- (error = add_to_page_cache_lru(
- filepage, mapping, idx, GFP_ATOMIC))) {
+ if (error || swap.val || 0 != add_to_page_cache_lru(
+ filepage, mapping, idx, GFP_ATOMIC)) {
spin_unlock(&info->lock);
page_cache_release(filepage);
shmem_free_block(inode);
filepage = NULL;
- if (error != -EEXIST)
+ if (error)
goto failed;
+ /* let kswapd refresh zone for GFP_ATOMICs */
+ cond_resched();
goto repeat;
}
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Mar 31 2003 - 22:00:21 EST