This patch gets around the aio ring pages can't be migrated bug caused by
get_user_pages() via using the new function. It only works as configed with
CONFIG_MEMORY_HOTREMOVE, otherwise it falls back to use the old version
 of get_user_pages().

Cc: Benjamin LaHaise <b...@kvack.org>
Cc: Alexander Viro <v...@zeniv.linux.org.uk>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Jeff Moyer <jmo...@redhat.com>
Cc: Minchan Kim <minc...@kernel.org>
Cc: Zach Brown <z...@redhat.com>
Reviewed-by: Tang Chen <tangc...@cn.fujitsu.com>
Reviewed-by: Gu Zheng <guz.f...@cn.fujitsu.com>
Signed-off-by: Lin Feng <linf...@cn.fujitsu.com>
---
 fs/aio.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/aio.c b/fs/aio.c
index 2512232..193e145 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -210,8 +210,8 @@ static int aio_setup_ring(struct kioctx *ctx)
        }
 
        pr_debug("mmap address: 0x%08lx\n", ctx->mmap_base);
-       ctx->nr_pages = get_user_pages(current, mm, ctx->mmap_base, nr_pages,
-                                      1, 0, ctx->ring_pages, NULL);
+       ctx->nr_pages = get_user_pages_non_movable(current, mm, ctx->mmap_base,
+                                       nr_pages, 1, 0, ctx->ring_pages, NULL);
        up_write(&mm->mmap_sem);
 
        if (unlikely(ctx->nr_pages != nr_pages)) {
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to