diff options
| author | Gao Xiang <hsiangkao@linux.alibaba.com> | 2022-07-08 18:10:01 +0800 |
|---|---|---|
| committer | Gao Xiang <hsiangkao@linux.alibaba.com> | 2022-07-09 06:35:09 +0800 |
| commit | 448b5a1548d87c246c3d0c3df8480d3c6eb6c11a (patch) | |
| tree | 4a9779d849bfbee1d32b83a19517c43775b2b838 /fs/erofs | |
| parent | 2df7c4bd7c1d2bc5ece5e9ed19dbd386810c2a65 (diff) | |
| download | lwn-448b5a1548d87c246c3d0c3df8480d3c6eb6c11a.tar.gz lwn-448b5a1548d87c246c3d0c3df8480d3c6eb6c11a.zip | |
erofs: avoid consecutive detection for Highmem memory
Currently, vmap()s are avoided if physical addresses are
consecutive for decompressed buffers.
I observed that is very common for 4KiB pclusters since the
numbers of decompressed pages are almost 2 or 3.
However, such detection doesn't work for Highmem pages on
32-bit machines, let's fix it now.
Reported-by: Liu Jinbao <liujinbao1@xiaomi.com>
Fixes: 7fc45dbc938a ("staging: erofs: introduce generic decompression backend")
Link: https://lore.kernel.org/r/20220708101001.21242-1-hsiangkao@linux.alibaba.com
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Diffstat (limited to 'fs/erofs')
| -rw-r--r-- | fs/erofs/decompressor.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c index 6dca1900c733..45be8f4aeb68 100644 --- a/fs/erofs/decompressor.c +++ b/fs/erofs/decompressor.c @@ -91,14 +91,18 @@ static int z_erofs_lz4_prepare_dstpages(struct z_erofs_lz4_decompress_ctx *ctx, if (page) { __clear_bit(j, bounced); - if (kaddr) { - if (kaddr + PAGE_SIZE == page_address(page)) + if (!PageHighMem(page)) { + if (!i) { + kaddr = page_address(page); + continue; + } + if (kaddr && + kaddr + PAGE_SIZE == page_address(page)) { kaddr += PAGE_SIZE; - else - kaddr = NULL; - } else if (!i) { - kaddr = page_address(page); + continue; + } } + kaddr = NULL; continue; } kaddr = NULL; |