From bbb14d40a4be6a9172b80ed3208f81be2f1d1b66 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Mon, 15 Jun 2020 13:46:07 -0600 Subject: [PATCH] LU-13680 osd-ldiskfs: handle large allocations Use OBD_ALLOC_PAGE_ARRAY_LARGE() for oti_dio_pages, as this allocation can be as large as 512KB due to large PTLRPC_MAX_BRW_PAGES. Test-Parameters: trivial Fixes: 72372486a5e9 ("LU-11347 osd: do not use pagecache for I/O") Signed-off-by: Andreas Dilger Change-Id: I0a0557e42bb5db5612c78e6d9b87f366a23ebbe5 Reviewed-on: https://review.whamcloud.com/38943 Tested-by: jenkins Reviewed-by: Alex Zhuravlev Reviewed-by: Yang Sheng Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/osd-ldiskfs/osd_handler.c | 3 ++- lustre/osd-ldiskfs/osd_io.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c index 58a8cc2..da20b66 100644 --- a/lustre/osd-ldiskfs/osd_handler.c +++ b/lustre/osd-ldiskfs/osd_handler.c @@ -7477,7 +7477,8 @@ static void osd_key_fini(const struct lu_context *ctx, __free_page(page); } } - OBD_FREE_PTR_ARRAY(info->oti_dio_pages, PTLRPC_MAX_BRW_PAGES); + OBD_FREE_PTR_ARRAY_LARGE(info->oti_dio_pages, + PTLRPC_MAX_BRW_PAGES); } if (info->oti_inode != NULL) diff --git a/lustre/osd-ldiskfs/osd_io.c b/lustre/osd-ldiskfs/osd_io.c index 7880dec..d40117c 100644 --- a/lustre/osd-ldiskfs/osd_io.c +++ b/lustre/osd-ldiskfs/osd_io.c @@ -857,7 +857,8 @@ static int osd_bufs_get(const struct lu_env *env, struct dt_object *dt, bypass_checks: if (!cache && unlikely(!oti->oti_dio_pages)) { - OBD_ALLOC_PTR_ARRAY(oti->oti_dio_pages, PTLRPC_MAX_BRW_PAGES); + OBD_ALLOC_PTR_ARRAY_LARGE(oti->oti_dio_pages, + PTLRPC_MAX_BRW_PAGES); if (!oti->oti_dio_pages) return -ENOMEM; } -- 1.8.3.1