* [PATCH 1/2] erofs-utils: don't reuse full mapped buffer blocks [not found] <20210209191322.8902-1-hsiangkao.ref@aol.com> @ 2021-02-09 19:13 ` Gao Xiang via Linux-erofs 2021-02-09 19:13 ` [PATCH 2/2] erofs-utils: more sanity check for buffer allocation optimization Gao Xiang via Linux-erofs 0 siblings, 1 reply; 2+ messages in thread From: Gao Xiang via Linux-erofs @ 2021-02-09 19:13 UTC (permalink / raw) To: linux-erofs From: Gao Xiang <hsiangkao@aol.com> Otherwise it could cause data corruption since erofs_battach() doesn't support full buffer blocks (and oob would be misjudged.) Fixes: 185b0bcdef4b ("erofs-utils: optimize buffer allocation logic") Signed-off-by: Gao Xiang <hsiangkao@aol.com> --- lib/cache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cache.c b/lib/cache.c index 40d3b1f3f4d5..e8840ac5dd31 100644 --- a/lib/cache.c +++ b/lib/cache.c @@ -155,8 +155,8 @@ static int erofs_bfind_for_attach(int type, erofs_off_t size, struct erofs_buffer_block **bbp) { struct erofs_buffer_block *cur, *bb; - unsigned int used0, usedmax, used; - int used_before, ret; + unsigned int used0, used_before, usedmax, used; + int ret; used0 = (size + required_ext) % EROFS_BLKSIZ + inline_ext; /* inline data should be in the same fs block */ @@ -177,7 +177,7 @@ static int erofs_bfind_for_attach(int type, erofs_off_t size, used_before = rounddown(EROFS_BLKSIZ - (size + required_ext + inline_ext), alignsize); - do { + for (; used_before; --used_before) { struct list_head *bt = mapped_buckets[type] + used_before; if (list_empty(bt)) @@ -203,7 +203,7 @@ static int erofs_bfind_for_attach(int type, erofs_off_t size, bb = cur; usedmax = used; break; - } while (--used_before > 0); + } skip_mapped: /* try to start from the last mapped one, which can be expended */ -- 2.24.0 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] erofs-utils: more sanity check for buffer allocation optimization 2021-02-09 19:13 ` [PATCH 1/2] erofs-utils: don't reuse full mapped buffer blocks Gao Xiang via Linux-erofs @ 2021-02-09 19:13 ` Gao Xiang via Linux-erofs 0 siblings, 0 replies; 2+ messages in thread From: Gao Xiang via Linux-erofs @ 2021-02-09 19:13 UTC (permalink / raw) To: linux-erofs From: Gao Xiang <hsiangkao@aol.com> In case that new buffer allocation optimization logic is potentially broken. Signed-off-by: Gao Xiang <hsiangkao@aol.com> --- lib/cache.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/cache.c b/lib/cache.c index e8840ac5dd31..c4851168ede7 100644 --- a/lib/cache.c +++ b/lib/cache.c @@ -186,8 +186,13 @@ static int erofs_bfind_for_attach(int type, erofs_off_t size, mapped_list); /* last mapped block can be expended, don't handle it here */ - if (cur == last_mapped_block) + if (list_next_entry(cur, list)->blkaddr == NULL_ADDR) { + DBG_BUGON(cur != last_mapped_block); continue; + } + + DBG_BUGON(cur->type != type); + DBG_BUGON(cur->blkaddr == NULL_ADDR); ret = __erofs_battach(cur, NULL, size, alignsize, required_ext + inline_ext, true); -- 2.24.0 ^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-09 19:14 UTC | newest] Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <20210209191322.8902-1-hsiangkao.ref@aol.com> 2021-02-09 19:13 ` [PATCH 1/2] erofs-utils: don't reuse full mapped buffer blocks Gao Xiang via Linux-erofs 2021-02-09 19:13 ` [PATCH 2/2] erofs-utils: more sanity check for buffer allocation optimization Gao Xiang via Linux-erofs
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).