From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753962Ab3BULDe (ORCPT ); Thu, 21 Feb 2013 06:03:34 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:57852 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753863Ab3BULD2 (ORCPT ); Thu, 21 Feb 2013 06:03:28 -0500 X-IronPort-AV: E=Sophos;i="4.84,709,1355068800"; d="scan'208";a="6743574" From: Lin Feng To: akpm@linux-foundation.org, mgorman@suse.de, bcrl@kvack.org, viro@zeniv.linux.org.uk Cc: khlebnikov@openvz.org, walken@google.com, kamezawa.hiroyu@jp.fujitsu.com, minchan@kernel.org, riel@redhat.com, rientjes@google.com, isimatu.yasuaki@jp.fujitsu.com, wency@cn.fujitsu.com, laijs@cn.fujitsu.com, tangchen@cn.fujitsu.com, guz.fnst@cn.fujitsu.com, jiang.liu@huawei.com, zab@redhat.com, jmoyer@redhat.com, linux-mm@kvack.org, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Lin Feng Subject: [PATCH V3 2/2] fs/aio.c: use get_user_pages_non_movable() to pin ring pages when support memory hotremove Date: Thu, 21 Feb 2013 19:01:44 +0800 Message-Id: <1361444504-31888-3-git-send-email-linfeng@cn.fujitsu.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1361444504-31888-1-git-send-email-linfeng@cn.fujitsu.com> References: <1361444504-31888-1-git-send-email-linfeng@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/21 19:02:44, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/21 19:02:45, Serialize complete at 2013/02/21 19:02:45 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Alexander Viro Cc: Andrew Morton Cc: Jeff Moyer Cc: Minchan Kim Cc: Zach Brown Reviewed-by: Tang Chen Reviewed-by: Gu Zheng Signed-off-by: Lin Feng --- 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