xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: erofs: complete a missing case for inplace I/O

Browse Source 
Add a missing case which could cause unnecessary page allocation but
not directly use inplace I/O instead, which increases runtime extra
memory footprint.

The detail is, considering an online file-backed page, the right half
of the page is chosen to be cached (e.g. the end page of a readahead
request) and some of its data doesn't exist in managed cache, so the
pcluster will be definitely kept in the submission chain. (IOWs, it
cannot be decompressed without I/O, e.g., due to the bypass queue).

Currently, DELAYEDALLOC/TRYALLOC cases can be downgraded as NOINPLACE,
and stop online pages from inplace I/O. After this patch, unneeded page
allocations won't be observed in pickup_page_for_submission() then.

Link: https://lore.kernel.org/r/20210321183227.5182-1-hsiangkao@aol.com
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>

Bug: 201372112
Change-Id: I639279e87b749b8625d2a8e77055a9fc52073542
(cherry picked from commit 0b964600d3aae56ff9d5bdd710a79f39a44c572c)
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
This commit is contained in:
Gao Xiang
2021-03-22 02:32:27 +08:00
committed by Jianan Huang
parent a9ac6ae90e
commit 384b2cdaf8
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
fs/erofs/zdata.c
View File

@@ -104,6 +104,12 @@ enum z_erofs_collectmode {
* |_______PRIMARY_FOLLOWED_______|________PRIMARY_HOOKED___________| * |_______PRIMARY_FOLLOWED_______|________PRIMARY_HOOKED___________|
*/ */
COLLECT_PRIMARY_HOOKED, COLLECT_PRIMARY_HOOKED,
/*
* a weak form of COLLECT_PRIMARY_FOLLOWED, the difference is that it
* could be dispatched into bypass queue later due to uptodated managed
* pages. All related online pages cannot be reused for inplace I/O (or
* pagevec) since it can be directly decoded without I/O submission.
*/
COLLECT_PRIMARY_FOLLOWED_NOINPLACE, COLLECT_PRIMARY_FOLLOWED_NOINPLACE,
/* /*
* The current collection has been linked with the owned chain, and * The current collection has been linked with the owned chain, and
@@ -186,21 +192,25 @@ static void preload_compressed_pages(struct z_erofs_collector *clt,
if (page) { if (page) {
t = tag_compressed_page_justfound(page); t = tag_compressed_page_justfound(page);
} else if (type == DELAYEDALLOC) { } else {
t = tagptr_init(compressed_page_t, PAGE_UNALLOCATED); /* I/O is needed, no possible to decompress directly */
} else if (type == TRYALLOC) { standalone = false;
switch (type) {
case DELAYEDALLOC:
t = tagptr_init(compressed_page_t,
PAGE_UNALLOCATED);
break;
case TRYALLOC:
newpage = erofs_allocpage(pagepool, gfp); newpage = erofs_allocpage(pagepool, gfp);
if (!newpage) if (!newpage)
goto dontalloc;
set_page_private(newpage, Z_EROFS_PREALLOCATED_PAGE);
t = tag_compressed_page_justfound(newpage);
} else { /* DONTALLOC */
dontalloc:
if (standalone)
clt->compressedpages = pages;
standalone = false;
continue; continue;
set_page_private(newpage,
Z_EROFS_PREALLOCATED_PAGE);
t = tag_compressed_page_justfound(newpage);
break;
default: /* DONTALLOC */
continue;
}
} }
if (!cmpxchg_relaxed(pages, NULL, tagptr_cast_ptr(t))) if (!cmpxchg_relaxed(pages, NULL, tagptr_cast_ptr(t)))
@@ -214,7 +224,11 @@ dontalloc:
} }
} }
if (standalone) /* downgrade to PRIMARY_FOLLOWED_NOINPLACE */ /*
* don't do inplace I/O if all compressed pages are available in
* managed cache since it can be moved to the bypass queue instead.
*/
if (standalone)
clt->mode = COLLECT_PRIMARY_FOLLOWED_NOINPLACE; clt->mode = COLLECT_PRIMARY_FOLLOWED_NOINPLACE;
} }