From 672e54761025997b088d3b8e6c3bb20a71fb32f6 Mon Sep 17 00:00:00 2001 From: Gao Xiang Date: Sat, 8 Dec 2018 00:19:14 +0800 Subject: [PATCH] staging: erofs: localize UNALLOCATED_CACHED_PAGE placeholder In practice, in order to do cached decompression rather than reuse them for in-place decompression and make full use of pages in page_pool instead of allocating as much as possible, an unallocated placeholder was introduce to mark all in compressed_pages[] and they will be replaced at the time of submission. Previously EROFS_UNALLOCATED_CACHED_PAGE was included in internal.h, which is unnecessary since it's only internally used in decompression subsystem, move it to unzip_vle.c and rename it to PAGE_UNALLOCATED. Reviewed-by: Chao Yu Signed-off-by: Gao Xiang Signed-off-by: Greg Kroah-Hartman --- drivers/staging/erofs/internal.h | 2 -- drivers/staging/erofs/unzip_vle.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h index b78d6e4c12ab..e049d00c087a 100644 --- a/drivers/staging/erofs/internal.h +++ b/drivers/staging/erofs/internal.h @@ -289,8 +289,6 @@ static inline void erofs_workstation_cleanup_all(struct super_block *sb) } #ifdef EROFS_FS_HAS_MANAGED_CACHE -#define EROFS_UNALLOCATED_CACHED_PAGE ((void *)0x5F0EF00D) - extern int erofs_try_to_free_all_cached_pages(struct erofs_sb_info *sbi, struct erofs_workgroup *egrp); extern int erofs_try_to_free_cached_page(struct address_space *mapping, diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c index ac2e30474520..f39e495f4369 100644 --- a/drivers/staging/erofs/unzip_vle.c +++ b/drivers/staging/erofs/unzip_vle.c @@ -15,6 +15,12 @@ #include +/* + * a compressed_pages[] placeholder in order to avoid + * being filled with file pages for in-place decompression. + */ +#define PAGE_UNALLOCATED ((void *)0x5F0E4B1D) + static struct workqueue_struct *z_erofs_workqueue __read_mostly; static struct kmem_cache *z_erofs_workgroup_cachep __read_mostly; @@ -147,7 +153,7 @@ static bool grab_managed_cache_pages(struct address_space *mapping, noio = false; if (!reserve_allocation) continue; - page = EROFS_UNALLOCATED_CACHED_PAGE; + page = PAGE_UNALLOCATED; } if (!cmpxchg(compressed_pages + i, NULL, page)) @@ -1180,7 +1186,7 @@ repeat: #ifdef EROFS_FS_HAS_MANAGED_CACHE cachemngd = false; - if (page == EROFS_UNALLOCATED_CACHED_PAGE) { + if (page == PAGE_UNALLOCATED) { cachemngd = true; goto do_allocpage; } else if (page) { -- 2.30.2