The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 2c14f0ffdd30bd3d321ad5fe76fcf701746e1df6 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023071649-pushcart-bobtail-27e7@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
2c14f0ffdd30 ("btrfs: fix fsverify read error handling in end_page_read") ed9ee98ecb4f ("btrfs: factor out a btrfs_verify_page helper") 0571b6357c5e ("btrfs: remove the io_failure_record infrastructure") 7609afac6775 ("btrfs: handle checksum validation and repair at the storage layer") 7276aa7d3825 ("btrfs: save the bio iter for checksum validation in common code") d0e5cb2be770 ("btrfs: add a btrfs_inode pointer to struct btrfs_bio") e0cfbb2ccabb ("btrfs: better document struct btrfs_bio") bacf60e51586 ("btrfs: move repair_io_failure to bio.c") 103c19723c80 ("btrfs: split the bio submission path into a separate file") cb3e217bdb39 ("btrfs: use btrfs_dev_name() helper to handle missing devices better") 2c8f5e8cdf0f ("btrfs: remove leftover setting of EXTENT_UPTODATE state in an inode's io_tree") 947a629988f1 ("btrfs: move tree block parentness check into validate_extent_buffer()") 789d6a3a876e ("btrfs: concentrate all tree block parentness check parameters into one structure") 35da5a7edec3 ("btrfs: drop private_data parameter from extent_io_tree_init") 621af94af334 ("btrfs: pass btrfs_inode to btrfs_check_data_csum") bb41632ea7d2 ("btrfs: pass btrfs_inode to btrfs_submit_dio_bio") e2884c3d4456 ("btrfs: switch btrfs_dio_private::inode to btrfs_inode") d8f9268ece91 ("btrfs: pass btrfs_inode to btrfs_repair_one_sector") d781c1c315ce ("btrfs: pass btrfs_inode to btrfs_submit_dio_repair_bio") b762041629e7 ("btrfs: pass btrfs_inode to btrfs_submit_data_read_bio")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 2c14f0ffdd30bd3d321ad5fe76fcf701746e1df6 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig hch@lst.de Date: Wed, 31 May 2023 08:04:52 +0200 Subject: [PATCH] btrfs: fix fsverify read error handling in end_page_read
Also clear the uptodate bit to make sure the page isn't seen as uptodate in the page cache if fsverity verification fails.
Fixes: 146054090b08 ("btrfs: initial fsverity support") CC: stable@vger.kernel.org # 5.15+ Reviewed-by: Josef Bacik josef@toxicpanda.com Signed-off-by: Christoph Hellwig hch@lst.de Reviewed-by: David Sterba dsterba@suse.com Signed-off-by: David Sterba dsterba@suse.com
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 8e42ce48b52e..a943a6622489 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -497,12 +497,8 @@ static void end_page_read(struct page *page, bool uptodate, u64 start, u32 len) ASSERT(page_offset(page) <= start && start + len <= page_offset(page) + PAGE_SIZE);
- if (uptodate) { - if (!btrfs_verify_page(page, start)) { - btrfs_page_set_error(fs_info, page, start, len); - } else { - btrfs_page_set_uptodate(fs_info, page, start, len); - } + if (uptodate && btrfs_verify_page(page, start)) { + btrfs_page_set_uptodate(fs_info, page, start, len); } else { btrfs_page_clear_uptodate(fs_info, page, start, len); btrfs_page_set_error(fs_info, page, start, len);