From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753641Ab3BDKFq (ORCPT ); Mon, 4 Feb 2013 05:05:46 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:63158 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751590Ab3BDKFf (ORCPT ); Mon, 4 Feb 2013 05:05:35 -0500 X-IronPort-AV: E=Sophos;i="4.84,599,1355068800"; d="scan'208";a="6687006" 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, jiang.liu@huawei.com, linux-mm@kvack.org, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Lin Feng Subject: [PATCH 2/2] fs/aio.c: use get_user_pages_non_movable() to pin ring pages when support memory hotremove Date: Mon, 4 Feb 2013 18:04:08 +0800 Message-Id: <1359972248-8722-3-git-send-email-linfeng@cn.fujitsu.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1359972248-8722-1-git-send-email-linfeng@cn.fujitsu.com> References: <1359972248-8722-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/04 18:04:17, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/04 18:04:17, Serialize complete at 2013/02/04 18:04:17 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 uses the old version of get_user_pages(). Cc: Benjamin LaHaise Cc: Alexander Viro Cc: Andrew Morton Reviewed-by: Tang Chen Reviewed-by: Gu Zheng Signed-off-by: Lin Feng --- fs/aio.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/aio.c b/fs/aio.c index 71f613c..0e9b30a 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -138,9 +138,15 @@ static int aio_setup_ring(struct kioctx *ctx) } dprintk("mmap address: 0x%08lx\n", info->mmap_base); +#ifdef CONFIG_MEMORY_HOTREMOVE + info->nr_pages = get_user_pages_non_movable(current, ctx->mm, + info->mmap_base, nr_pages, + 1, 0, info->ring_pages, NULL); +#else info->nr_pages = get_user_pages(current, ctx->mm, info->mmap_base, nr_pages, 1, 0, info->ring_pages, NULL); +#endif up_write(&ctx->mm->mmap_sem); if (unlikely(info->nr_pages != nr_pages)) { -- 1.7.11.7 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lin Feng Subject: [PATCH 2/2] fs/aio.c: use get_user_pages_non_movable() to pin ring pages when support memory hotremove Date: Mon, 4 Feb 2013 18:04:08 +0800 Message-ID: <1359972248-8722-3-git-send-email-linfeng@cn.fujitsu.com> References: <1359972248-8722-1-git-send-email-linfeng@cn.fujitsu.com> 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, jiang.liu@huawei.com, linux-mm@kvack.org, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Lin Feng To: akpm@linux-foundation.org, mgorman@suse.de, bcrl@kvack.org, viro@zeniv.linux.org.uk Return-path: In-Reply-To: <1359972248-8722-1-git-send-email-linfeng@cn.fujitsu.com> Sender: owner-linux-aio@kvack.org List-Id: linux-fsdevel.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 uses the old version of get_user_pages(). Cc: Benjamin LaHaise Cc: Alexander Viro Cc: Andrew Morton Reviewed-by: Tang Chen Reviewed-by: Gu Zheng Signed-off-by: Lin Feng --- fs/aio.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/aio.c b/fs/aio.c index 71f613c..0e9b30a 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -138,9 +138,15 @@ static int aio_setup_ring(struct kioctx *ctx) } dprintk("mmap address: 0x%08lx\n", info->mmap_base); +#ifdef CONFIG_MEMORY_HOTREMOVE + info->nr_pages = get_user_pages_non_movable(current, ctx->mm, + info->mmap_base, nr_pages, + 1, 0, info->ring_pages, NULL); +#else info->nr_pages = get_user_pages(current, ctx->mm, info->mmap_base, nr_pages, 1, 0, info->ring_pages, NULL); +#endif up_write(&ctx->mm->mmap_sem); if (unlikely(info->nr_pages != nr_pages)) { -- 1.7.11.7 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to majordomo@kvack.org. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: aart@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Lin Feng Subject: [PATCH 2/2] fs/aio.c: use get_user_pages_non_movable() to pin ring pages when support memory hotremove Date: Mon, 4 Feb 2013 18:04:08 +0800 Message-Id: <1359972248-8722-3-git-send-email-linfeng@cn.fujitsu.com> In-Reply-To: <1359972248-8722-1-git-send-email-linfeng@cn.fujitsu.com> References: <1359972248-8722-1-git-send-email-linfeng@cn.fujitsu.com> Sender: owner-linux-mm@kvack.org List-ID: 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, jiang.liu@huawei.com, linux-mm@kvack.org, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Lin Feng 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 uses the old version of get_user_pages(). Cc: Benjamin LaHaise Cc: Alexander Viro Cc: Andrew Morton Reviewed-by: Tang Chen Reviewed-by: Gu Zheng Signed-off-by: Lin Feng --- fs/aio.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/aio.c b/fs/aio.c index 71f613c..0e9b30a 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -138,9 +138,15 @@ static int aio_setup_ring(struct kioctx *ctx) } dprintk("mmap address: 0x%08lx\n", info->mmap_base); +#ifdef CONFIG_MEMORY_HOTREMOVE + info->nr_pages = get_user_pages_non_movable(current, ctx->mm, + info->mmap_base, nr_pages, + 1, 0, info->ring_pages, NULL); +#else info->nr_pages = get_user_pages(current, ctx->mm, info->mmap_base, nr_pages, 1, 0, info->ring_pages, NULL); +#endif up_write(&ctx->mm->mmap_sem); if (unlikely(info->nr_pages != nr_pages)) { -- 1.7.11.7 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org