aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorMel Gorman <mgorman@suse.de>2012-01-12 20:19:34 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-01 15:27:17 -0400
commit397d9c507ff1c9c5afc80c80ee245c2455d6a1db (patch)
tree7dd25dcfbda01ac207f42941f7386f74ac213470 /fs/btrfs/disk-io.c
parentec46a9e8767b9fa37c5d18b18b24ea96a5d2695d (diff)
mm: compaction: determine if dirty pages can be migrated without blocking within ->migratepage
commit b969c4ab9f182a6e1b2a0848be349f99714947b0 upstream. Stable note: Not tracked in Bugzilla. A fix aimed at preserving page aging information by reducing LRU list churning had the side-effect of reducing THP allocation success rates. This was part of a series to restore the success rates while preserving the reclaim fix. Asynchronous compaction is used when allocating transparent hugepages to avoid blocking for long periods of time. Due to reports of stalling, there was a debate on disabling synchronous compaction but this severely impacted allocation success rates. Part of the reason was that many dirty pages are skipped in asynchronous compaction by the following check; if (PageDirty(page) && !sync && mapping->a_ops->migratepage != migrate_page) rc = -EBUSY; This skips over all mapping aops using buffer_migrate_page() even though it is possible to migrate some of these pages without blocking. This patch updates the ->migratepage callback with a "sync" parameter. It is the responsibility of the callback to fail gracefully if migration would block. Signed-off-by: Mel Gorman <mgorman@suse.de> Reviewed-by: Rik van Riel <riel@redhat.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Minchan Kim <minchan.kim@gmail.com> Cc: Dave Jones <davej@redhat.com> Cc: Jan Kara <jack@suse.cz> Cc: Andy Isaacson <adi@hexapodia.org> Cc: Nai Xia <nai.xia@gmail.com> Cc: Johannes Weiner <jweiner@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Mel Gorman <mgorman@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 1ac8db5dc0a..522cb2a6cb1 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -801,7 +801,7 @@ static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio,
801 801
802#ifdef CONFIG_MIGRATION 802#ifdef CONFIG_MIGRATION
803static int btree_migratepage(struct address_space *mapping, 803static int btree_migratepage(struct address_space *mapping,
804 struct page *newpage, struct page *page) 804 struct page *newpage, struct page *page, bool sync)
805{ 805{
806 /* 806 /*
807 * we can't safely write a btree page from here, 807 * we can't safely write a btree page from here,
@@ -816,7 +816,7 @@ static int btree_migratepage(struct address_space *mapping,
816 if (page_has_private(page) && 816 if (page_has_private(page) &&
817 !try_to_release_page(page, GFP_KERNEL)) 817 !try_to_release_page(page, GFP_KERNEL))
818 return -EAGAIN; 818 return -EAGAIN;
819 return migrate_page(mapping, newpage, page); 819 return migrate_page(mapping, newpage, page, sync);
820} 820}
821#endif 821#endif
822 822