lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tmpfs: fix spurious ENOSPC when racing with unswap

Browse Source 
Testing the shmem_swaplist replacements for igrab() revealed another bug:
writes to /dev/loop0 on a tmpfs file which fills its filesystem were
sometimes failing with "Buffer I/O error"s.

These came from ENOSPC failures of shmem_getpage(), when racing with
swapoff: the same could happen when racing with another shmem_getpage(),
pulling the page in from swap in between our find_lock_page() and our
taking the info->lock (though not in the single-threaded loop case).

This is unacceptable, and surprising that I've not noticed it before:
it dates back many years, but (presumably) was made a lot easier to
reproduce in 2.6.36, which sited a page preallocation in the race window.

Fix it by rechecking the page cache before settling on an ENOSPC error.

Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Hugh Dickins
2011-05-11 15:13:38 -07:00
committed by Linus Torvalds
parent 778dd893ae
commit 59a16ead57
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mm/shmem.c
View File

@@ -1407,20 +1407,14 @@ repeat:
if (sbinfo->max_blocks) { if (sbinfo->max_blocks) {
if (percpu_counter_compare(&sbinfo->used_blocks, if (percpu_counter_compare(&sbinfo->used_blocks,
sbinfo->max_blocks) >= 0 || sbinfo->max_blocks) >= 0 ||
shmem_acct_block(info->flags)) { shmem_acct_block(info->flags))
spin_unlock(&info->lock); goto nospace;
error = -ENOSPC;
goto failed;
}
percpu_counter_inc(&sbinfo->used_blocks); percpu_counter_inc(&sbinfo->used_blocks);
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
inode->i_blocks += BLOCKS_PER_PAGE; inode->i_blocks += BLOCKS_PER_PAGE;
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
} else if (shmem_acct_block(info->flags)) { } else if (shmem_acct_block(info->flags))
spin_unlock(&info->lock); goto nospace;
error = -ENOSPC;
goto failed;
}
if (!filepage) { if (!filepage) {
int ret; int ret;
@@ -1500,6 +1494,24 @@ done:
error = 0; error = 0;
goto out; goto out;
nospace:
/*
* Perhaps the page was brought in from swap between find_lock_page
* and taking info->lock? We allow for that at add_to_page_cache_lru,
* but must also avoid reporting a spurious ENOSPC while working on a
* full tmpfs. (When filepage has been passed in to shmem_getpage, it
* is already in page cache, which prevents this race from occurring.)
*/
if (!filepage) {
struct page *page = find_get_page(mapping, idx);
if (page) {
spin_unlock(&info->lock);
page_cache_release(page);
goto repeat;
}
}
spin_unlock(&info->lock);
error = -ENOSPC;
failed: failed:
if (*pagep != filepage) { if (*pagep != filepage) {
unlock_page(filepage); unlock_page(filepage);