From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Leonard Lausen <leonard@lausen.nl>
Subject: [PATCH v2 5/5] btrfs: Do mandatory tree block check before submitting bio
Date: Thu, 17 Jan 2019 18:15:28 +0800 [thread overview]
Message-ID: <20190117101528.8675-6-wqu@suse.com> (raw)
In-Reply-To: <20190117101528.8675-1-wqu@suse.com>
There are at least 2 reports about memory bit flip sneaking into on-disk
data.
Currently we only have a relaxed check triggered at
btrfs_mark_buffer_dirty() time, as it's not mandatory, only for
CONFIG_BTRFS_FS_CHECK_INTEGRITY enabled build.
This patch will address the hole by triggering comprehensive check on
tree blocks before writing it back to disk.
The timing is set to csum_tree_block() where @verify == 0.
At that timing, we're generation csum for tree blocks before submitting
the metadata bio, so we could avoid all the unnecessary calls at
btrfs_mark_buffer_dirty(), but still catch enough error.
The example error output will be something like:
BTRFS critical (device dm-3): corrupt leaf: root=2 block=1350630375424 slot=68, bad key order, prev (10510212874240 169 0) current (1714119868416 169 0)
BTRFS error (device dm-3): write time tree block corruption detected
BTRFS critical (device dm-3): corrupt leaf: root=2 block=1350630375424 slot=68, bad key order, prev (10510212874240 169 0) current (1714119868416 169 0)
BTRFS error (device dm-3): write time tree block corruption detected
BTRFS: error (device dm-3) in btrfs_commit_transaction:2220: errno=-5 IO failure (Error while writing out transaction)
BTRFS info (device dm-3): forced readonly
BTRFS warning (device dm-3): Skipping commit of aborted transaction.
BTRFS: error (device dm-3) in cleanup_transaction:1839: errno=-5 IO failure
BTRFS info (device dm-3): delayed_refs has NO entry
Reported-by: Leonard Lausen <leonard@lausen.nl>
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/disk-io.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index bc2379cb2091..d95716847870 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -313,6 +313,15 @@ static int csum_tree_block(struct btrfs_fs_info *fs_info,
return -EUCLEAN;
}
} else {
+ if (btrfs_header_level(buf))
+ err = btrfs_check_node(fs_info, buf);
+ else
+ err = btrfs_check_leaf_full(fs_info, buf);
+ if (err < 0) {
+ btrfs_err(fs_info,
+ "write time tree block corruption detected");
+ return err;
+ }
write_extent_buffer(buf, result, 0, csum_size);
}
--
2.20.1
prev parent reply other threads:[~2019-01-17 10:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-17 10:15 [PATCH v2 0/5] btrfs: Enhancement to tree block validation Qu Wenruo
2019-01-17 10:15 ` [PATCH v2 1/5] btrfs: Always output error message when key/level verification fails Qu Wenruo
2019-01-17 13:14 ` Johannes Thumshirn
2019-01-17 13:25 ` Qu Wenruo
2019-01-17 10:15 ` [PATCH v2 2/5] btrfs: extent_io: Kill the forward declaration of flush_write_bio() Qu Wenruo
2019-01-17 13:22 ` Johannes Thumshirn
2019-01-17 10:15 ` [PATCH v2 3/5] btrfs: extent_io: Kill the BUG_ON() in flush_write_bio() Qu Wenruo
2019-01-17 10:15 ` [PATCH v2 4/5] btrfs: disk-io: Show the timing of corrupted tree block explicitly Qu Wenruo
2019-01-17 13:36 ` Johannes Thumshirn
2019-01-17 13:42 ` Qu Wenruo
2019-01-17 14:08 ` Johannes Thumshirn
2019-01-17 14:29 ` Qu Wenruo
2019-01-17 10:15 ` Qu Wenruo [this message]
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=20190117101528.8675-6-wqu@suse.com \
--to=wqu@suse.com \
--cc=leonard@lausen.nl \
--cc=linux-btrfs@vger.kernel.org \
/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).