erofs: shouldn't churn the mapping page for duplicated copies
PATCH 1/1 erofs: shouldn't churn the mapping page for duplicated copies
If other duplicated copies exist in one decompression shot, should leave the old page as is rather than replace it with the new duplicated one. Otherwise, the following cold path to deal with duplicated copies will use the invalid bvec. It impacts compressed data deduplication.
Also, shift the onlinepage EIO bit to avoid touching the signed bit.
--- fs/erofs/zdata.c | 8 +++----- fs/erofs/zdata.h | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-)
fs/erofs/zdata.c +3 -5
@@ -887,15 +887,13 @@ static void z_erofs_do_decompressed_bvec(struct z_erofs_decompress_backend *be,if (!((bvec->offset + be->pcl->pageofs_out) & ~PAGE_MASK )) {unsigned int pgnr; -struct page *oldpage; pgnr = (bvec->offset + be->pcl->pageofs_out) >>PAGE_SHIFT ;DBG_BUGON (pgnr >= be->nr_pages); - oldpage = be->decompressed_pages[pgnr]; - be->decompressed_pages[pgnr] = bvec->page; - -if (!oldpage) +if (!be->decompressed_pages[pgnr]) { + be->decompressed_pages[pgnr] = bvec->page;return ; + } }/* (cold path) one pcluster is requested multiple times */
fs/erofs/zdata.h +3 -3
@@ -126,10 +126,10 @@ static inline unsigned int z_erofs_pclusterpages(struct z_erofs_pcluster *pcl) }/* -* bit 31: I/O error occurred on this page -* bit 0 - 30: remaining parts to complete this page +* bit 30: I/O error occurred on this page +* bit 0 - 29: remaining parts to complete this page */ -#define Z_EROFS_PAGE_EIO (1 << 31) +#define Z_EROFS_PAGE_EIO (1 << 30)static inline void z_erofs_onlinepage_init (struct page *page) {
Signature · 1 line
2.24.4
Quoted 9 lines · Gao Xiang
If other duplicated copies exist in one decompression shot, should leave the old page as is rather than replace it with the new duplicated one. Otherwise, the following cold path to deal with duplicated copies will use the invalid bvec. It impacts compressed data deduplication.
Also, shift the onlinepage EIO bit to avoid touching the signed bit.
Fixes 267f2492c8f7 ("erofs: introduce multi-reference pclusters (fully-referenced)")Signed-off-by Gao Xiang <[email protected]>
Thanks,