From: Gao Xiang via Linux-erofs <linux-erofs@lists.ozlabs.org>
To: linux-erofs@lists.ozlabs.org, Chao Yu <yuchao0@huawei.com>,
Chao Yu <chao@kernel.org>
Cc: Martin DEVERA <devik@eaxlabs.cz>, linux-kernel@vger.kernel.org
Subject: [PATCH] erofs: fix bio->bi_max_vecs behavior change
Date: Sat, 6 Mar 2021 11:31:09 +0800 [thread overview]
Message-ID: <20210306033109.28466-1-hsiangkao@aol.com> (raw)
In-Reply-To: 20210306033109.28466-1-hsiangkao.ref@aol.com
From: Gao Xiang <hsiangkao@redhat.com>
Martin reported an issue that directory read could be hung on the
latest -rc kernel with some certain image. The root cause is that
commit baa2c7c97153 ("block: set .bi_max_vecs as actual allocated
vector number") changes .bi_max_vecs behavior. bio->bi_max_vecs
is set as actual allocated vector number rather than the requested
number now.
Let's avoid using .bi_max_vecs completely instead.
Reported-by: Martin DEVERA <devik@eaxlabs.cz>
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
---
Hi Chao,
Could you take some time on reviewing this patchset in advance?
I'd like to upstream this regression fix asap since it has noticable
impact on 5.12-rc kernel.
Thanks,
Gao Xiang
fs/erofs/data.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index f88851c5c250..fa25d0eab5de 100644
--- a/fs/erofs/data.c
+++ b/fs/erofs/data.c
@@ -231,14 +231,6 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio,
goto submit_bio_retry;
*last_block = current_block;
-
- /* shift in advance in case of it followed by too many gaps */
- if (bio->bi_iter.bi_size >= bio->bi_max_vecs * PAGE_SIZE) {
- /* err should reassign to 0 after submitting */
- err = 0;
- goto submit_bio_out;
- }
-
return bio;
err_out:
@@ -252,7 +244,6 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio,
/* if updated manually, continuous pages has a gap */
if (bio)
-submit_bio_out:
submit_bio(bio);
return err ? ERR_PTR(err) : NULL;
}
@@ -274,7 +265,8 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)
if (IS_ERR(bio))
return PTR_ERR(bio);
- DBG_BUGON(bio); /* since we have only one bio -- must be NULL */
+ if (bio)
+ submit_bio(bio);
return 0;
}
@@ -305,7 +297,6 @@ static void erofs_raw_access_readahead(struct readahead_control *rac)
put_page(page);
}
- /* the rare case (end in gaps) */
if (bio)
submit_bio(bio);
}
--
2.20.1
next parent reply other threads:[~2021-03-06 3:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210306033109.28466-1-hsiangkao.ref@aol.com>
2021-03-06 3:31 ` Gao Xiang via Linux-erofs [this message]
2021-03-06 4:04 ` [PATCH v2] erofs: fix bio->bi_max_vecs behavior change Gao Xiang via Linux-erofs
2021-03-08 1:29 ` Chao Yu
2021-03-08 2:36 ` Gao Xiang
2021-03-08 2:52 ` Chao Yu
2021-03-08 3:01 ` Gao Xiang
2021-03-19 2:15 ` Chao Yu
2021-03-19 4:16 ` Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210306033109.28466-1-hsiangkao@aol.com \
--to=linux-erofs@lists.ozlabs.org \
--cc=chao@kernel.org \
--cc=devik@eaxlabs.cz \
--cc=hsiangkao@aol.com \
--cc=linux-kernel@vger.kernel.org \
--cc=yuchao0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).