From: Zhang Yi <yi.zhang@huawei.com>
To: <linux-ext4@vger.kernel.org>, <linux-fsdevel@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <cluster-devel@redhat.com>,
<ntfs3@lists.linux.dev>, <ocfs2-devel@oss.oracle.com>,
<reiserfs-devel@vger.kernel.org>
Cc: <jack@suse.cz>, <tytso@mit.edu>, <akpm@linux-foundation.org>,
<axboe@kernel.dk>, <viro@zeniv.linux.org.uk>,
<rpeterso@redhat.com>, <agruenba@redhat.com>,
<almaz.alexandrovich@paragon-software.com>, <mark@fasheh.com>,
<dushistov@mail.ru>, <hch@infradead.org>, <yi.zhang@huawei.com>,
<chengzhihao1@huawei.com>, <yukuai3@huawei.com>
Subject: [PATCH 06/14] jbd2: replace ll_rw_block()
Date: Wed, 31 Aug 2022 15:21:03 +0800 [thread overview]
Message-ID: <20220831072111.3569680-7-yi.zhang@huawei.com> (raw)
In-Reply-To: <20220831072111.3569680-1-yi.zhang@huawei.com>
ll_rw_block() is not safe for the sync read path because it cannot
guarantee that submitting read IO if the buffer has been locked. We
could get false positive EIO after wait_on_buffer() if the buffer has
been locked by others. So stop using ll_rw_block() in
journal_get_superblock(). We also switch to new bh_readahead_batch()
for the buffer array readahead path.
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
---
fs/jbd2/journal.c | 7 +++----
fs/jbd2/recovery.c | 16 ++++++++++------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 6350d3857c89..5a903aae6aad 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1893,15 +1893,14 @@ static int journal_get_superblock(journal_t *journal)
{
struct buffer_head *bh;
journal_superblock_t *sb;
- int err = -EIO;
+ int err;
bh = journal->j_sb_buffer;
J_ASSERT(bh != NULL);
if (!buffer_uptodate(bh)) {
- ll_rw_block(REQ_OP_READ, 1, &bh);
- wait_on_buffer(bh);
- if (!buffer_uptodate(bh)) {
+ err = bh_read(bh, 0);
+ if (err) {
printk(KERN_ERR
"JBD2: IO error reading journal superblock\n");
goto out;
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
index f548479615c6..ee56a30b71cf 100644
--- a/fs/jbd2/recovery.c
+++ b/fs/jbd2/recovery.c
@@ -100,7 +100,7 @@ static int do_readahead(journal_t *journal, unsigned int start)
if (!buffer_uptodate(bh) && !buffer_locked(bh)) {
bufs[nbufs++] = bh;
if (nbufs == MAXBUF) {
- ll_rw_block(REQ_OP_READ, nbufs, bufs);
+ bh_readahead_batch(bufs, nbufs, 0);
journal_brelse_array(bufs, nbufs);
nbufs = 0;
}
@@ -109,7 +109,7 @@ static int do_readahead(journal_t *journal, unsigned int start)
}
if (nbufs)
- ll_rw_block(REQ_OP_READ, nbufs, bufs);
+ bh_readahead_batch(bufs, nbufs, 0);
err = 0;
failed:
@@ -152,9 +152,14 @@ static int jread(struct buffer_head **bhp, journal_t *journal,
return -ENOMEM;
if (!buffer_uptodate(bh)) {
- /* If this is a brand new buffer, start readahead.
- Otherwise, we assume we are already reading it. */
- if (!buffer_req(bh))
+ /*
+ * If this is a brand new buffer, start readahead.
+ * Otherwise, we assume we are already reading it.
+ */
+ bool need_readahead = !buffer_req(bh);
+
+ bh_read_nowait(bh, 0);
+ if (need_readahead)
do_readahead(journal, offset);
wait_on_buffer(bh);
}
@@ -687,7 +692,6 @@ static int do_one_pass(journal_t *journal,
mark_buffer_dirty(nbh);
BUFFER_TRACE(nbh, "marking uptodate");
++info->nr_replays;
- /* ll_rw_block(WRITE, 1, &nbh); */
unlock_buffer(nbh);
brelse(obh);
brelse(nbh);
--
2.31.1
next prev parent reply other threads:[~2022-08-31 7:10 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 7:20 [PATCH 00/14] buffer: remove ll_rw_block() Zhang Yi
2022-08-31 7:20 ` [PATCH 01/14] fs/buffer: remove __breadahead_gfp() Zhang Yi
2022-08-31 10:39 ` Jan Kara
2022-08-31 7:20 ` [PATCH 02/14] fs/buffer: add some new buffer read helpers Zhang Yi
2022-08-31 11:30 ` Jan Kara
2022-08-31 13:11 ` Zhang Yi
2022-08-31 7:21 ` [PATCH 03/14] fs/buffer: replace ll_rw_block() Zhang Yi
2022-08-31 10:51 ` Jan Kara
2022-08-31 7:21 ` [PATCH 04/14] gfs2: " Zhang Yi
2022-08-31 10:52 ` Jan Kara
2022-08-31 7:21 ` [PATCH 05/14] isofs: " Zhang Yi
2022-08-31 10:53 ` Jan Kara
2022-08-31 7:21 ` Zhang Yi [this message]
2022-08-31 10:58 ` [PATCH 06/14] jbd2: " Jan Kara
2022-08-31 7:21 ` [PATCH 07/14] ntfs3: " Zhang Yi
2022-08-31 10:59 ` Jan Kara
2022-08-31 7:21 ` [PATCH 08/14] ocfs2: " Zhang Yi
2022-08-31 11:31 ` Jan Kara
2022-08-31 7:21 ` [PATCH 09/14] reiserfs: " Zhang Yi
2022-08-31 11:04 ` Jan Kara
2022-08-31 7:21 ` [PATCH 10/14] udf: " Zhang Yi
2022-08-31 11:05 ` Jan Kara
2022-08-31 7:21 ` [PATCH 11/14] ufs: " Zhang Yi
2022-08-31 11:06 ` Jan Kara
2022-08-31 7:21 ` [PATCH 12/14] fs/buffer: remove ll_rw_block() helper Zhang Yi
2022-08-31 11:06 ` Jan Kara
2022-08-31 7:21 ` [PATCH 13/14] ext2: replace bh_submit_read() helper with bh_read_locked() Zhang Yi
2022-08-31 11:15 ` Jan Kara
2022-08-31 7:21 ` [PATCH 14/14] fs/buffer: remove bh_submit_read() helper Zhang Yi
2022-08-31 11:16 ` Jan Kara
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=20220831072111.3569680-7-yi.zhang@huawei.com \
--to=yi.zhang@huawei.com \
--cc=agruenba@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=almaz.alexandrovich@paragon-software.com \
--cc=axboe@kernel.dk \
--cc=chengzhihao1@huawei.com \
--cc=cluster-devel@redhat.com \
--cc=dushistov@mail.ru \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark@fasheh.com \
--cc=ntfs3@lists.linux.dev \
--cc=ocfs2-devel@oss.oracle.com \
--cc=reiserfs-devel@vger.kernel.org \
--cc=rpeterso@redhat.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=yukuai3@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).