Lin Feng <linf...@cn.fujitsu.com> writes:

> 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 <b...@kvack.org>
> Cc: Alexander Viro <v...@zeniv.linux.org.uk>
> Cc: Andrew Morton <a...@linux-foundation.org>
> 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 | 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

Can't you hide this in your 1/1 patch, by providing this function as
just a static inline wrapper around get_user_pages when
CONFIG_MEMORY_HOTREMOVE is not enabled?

Cheers,
Jeff
--
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