Commit 84235de3 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds

fs: buffer: move allocation failure loop into the allocator

Buffer allocation has a very crude indefinite loop around waking the
flusher threads and performing global NOFS direct reclaim because it can
not handle allocation failures.

The most immediate problem with this is that the allocation may fail due
to a memory cgroup limit, where flushers + direct reclaim might not make
any progress towards resolving the situation at all.  Because unlike the
global case, a memory cgroup may not have any cache at all, only
anonymous pages but no swap.  This situation will lead to a reclaim
livelock with insane IO from waking the flushers and thrashing unrelated
filesystem cache in a tight loop.

Use __GFP_NOFAIL allocations for buffers for now.  This makes sure that
any looping happens in the page allocator, which knows how to
orchestrate kswapd, direct reclaim, and the flushers sensibly.  It also
allows memory cgroups to detect allocations that can't handle failure
and will allow them to ultimately bypass the limit if reclaim can not
make progress.
Reported-by: default avatarazurIt <azurit@pobox.sk>
Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 49426420
...@@ -1005,9 +1005,19 @@ grow_dev_page(struct block_device *bdev, sector_t block, ...@@ -1005,9 +1005,19 @@ grow_dev_page(struct block_device *bdev, sector_t block,
struct buffer_head *bh; struct buffer_head *bh;
sector_t end_block; sector_t end_block;
int ret = 0; /* Will call free_more_memory() */ int ret = 0; /* Will call free_more_memory() */
gfp_t gfp_mask;
page = find_or_create_page(inode->i_mapping, index, gfp_mask = mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS;
(mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS)|__GFP_MOVABLE); gfp_mask |= __GFP_MOVABLE;
/*
* XXX: __getblk_slow() can not really deal with failure and
* will endlessly loop on improvised global reclaim. Prefer
* looping in the allocator rather than here, at least that
* code knows what it's doing.
*/
gfp_mask |= __GFP_NOFAIL;
page = find_or_create_page(inode->i_mapping, index, gfp_mask);
if (!page) if (!page)
return ret; return ret;
......
...@@ -2766,6 +2766,8 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm, ...@@ -2766,6 +2766,8 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
return 0; return 0;
nomem: nomem:
*ptr = NULL; *ptr = NULL;
if (gfp_mask & __GFP_NOFAIL)
return 0;
return -ENOMEM; return -ENOMEM;
bypass: bypass:
*ptr = root_mem_cgroup; *ptr = root_mem_cgroup;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment