From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 10/14] btrfs: extent_io: make endio_readpage_update_page_status() to handle subpage case
Date: Wed, 18 Nov 2020 16:53:15 +0800 [thread overview]
Message-ID: <20201118085319.56668-11-wqu@suse.com> (raw)
In-Reply-To: <20201118085319.56668-1-wqu@suse.com>
To handle subpage status update, add the following new tricks:
- Set btrfs_subpage::error_bitmap
Now if we hit an error, we set the corresponding bits in error bitmap,
then call ClearPageUptodate() and SetPageError().
- Uptodate page status according to uptodate_bitmap
Now we only SetPageUptodate() when the full page contains uptodate
sectors.
Also if we cleared all error bit during read, then we also
ClearPageError()
- No page unlock for metadata
Since metadata doesn't utilize page locking at all, skip it for now.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/extent_io.c | 56 +++++++++++++++++++++++++++++++++++++++-----
fs/btrfs/extent_io.h | 1 +
2 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 35aee688d6c1..236de0b6b20a 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2847,15 +2847,59 @@ endio_readpage_release_extent(struct processed_extent *processed,
processed->uptodate = uptodate;
}
-static void endio_readpage_update_page_status(struct page *page, bool uptodate)
+static void endio_readpage_update_page_status(struct page *page, bool uptodate,
+ u64 start, u64 end)
{
- if (uptodate) {
- SetPageUptodate(page);
- } else {
+ struct btrfs_fs_info *fs_info = btrfs_sb(page->mapping->host->i_sb);
+ struct btrfs_subpage *subpage;
+ int bit_start;
+ int nbits;
+ bool all_uptodate = false;
+ bool no_error = false;
+
+ ASSERT(page_offset(page) <= start &&
+ end <= page_offset(page) + PAGE_SIZE - 1);
+
+ if (!btrfs_is_subpage(fs_info)) {
+ if (uptodate) {
+ SetPageUptodate(page);
+ } else {
+ ClearPageUptodate(page);
+ SetPageError(page);
+ }
+ unlock_page(page);
+ return;
+ }
+
+ ASSERT(PagePrivate(page) && page->private);
+ subpage = (struct btrfs_subpage *)page->private;
+ bit_start = (start - page_offset(page)) >> fs_info->sectorsize_bits;
+ nbits = fs_info->nodesize >> fs_info->sectorsize_bits;
+
+ if (!uptodate) {
+ spin_lock_bh(&subpage->lock);
+ bitmap_set(subpage->error_bitmap, bit_start, nbits);
+ spin_unlock_bh(&subpage->lock);
+
ClearPageUptodate(page);
SetPageError(page);
+ return;
}
- unlock_page(page);
+
+ spin_lock_bh(&subpage->lock);
+ bitmap_set(subpage->uptodate_bitmap, bit_start, nbits);
+ bitmap_clear(subpage->error_bitmap, bit_start, nbits);
+ if (bitmap_full(subpage->uptodate_bitmap, BTRFS_SUBPAGE_BITMAP_SIZE))
+ all_uptodate = true;
+ if (bitmap_empty(subpage->error_bitmap, BTRFS_SUBPAGE_BITMAP_SIZE))
+ no_error = true;
+ spin_unlock_bh(&subpage->lock);
+
+ if (no_error)
+ ClearPageError(page);
+ if (all_uptodate)
+ SetPageUptodate(page);
+ return;
}
/*
@@ -2985,7 +3029,7 @@ static void end_bio_extent_readpage(struct bio *bio)
}
bio_offset += len;
- endio_readpage_update_page_status(page, uptodate);
+ endio_readpage_update_page_status(page, uptodate, start, end);
endio_readpage_release_extent(&processed, BTRFS_I(inode),
start, end, uptodate);
}
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 11e1e013cb8c..b4d0e39ebceb 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -312,6 +312,7 @@ struct btrfs_subpage {
spinlock_t lock;
DECLARE_BITMAP(tree_block_bitmap, BTRFS_SUBPAGE_BITMAP_SIZE);
DECLARE_BITMAP(uptodate_bitmap, BTRFS_SUBPAGE_BITMAP_SIZE);
+ DECLARE_BITMAP(error_bitmap, BTRFS_SUBPAGE_BITMAP_SIZE);
};
int btrfs_attach_subpage(struct btrfs_fs_info *fs_info, struct page *page);
--
2.29.2
next prev parent reply other threads:[~2020-11-18 8:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 8:53 [PATCH v1 00/14] btrfs: add read-only support for subpage sector size Qu Wenruo
2020-11-18 8:53 ` [PATCH 01/14] btrfs: extent_io: Use detach_page_private() for alloc_extent_buffer() Qu Wenruo
2020-11-18 10:22 ` Johannes Thumshirn
2020-11-18 15:56 ` David Sterba
2020-11-18 8:53 ` [PATCH 02/14] btrfs: extent_io: introduce a helper to grab an existing extent buffer from a page Qu Wenruo
2020-11-18 10:26 ` Johannes Thumshirn
2020-11-18 8:53 ` [PATCH 03/14] btrfs: extent_io: introduce the skeleton of btrfs_subpage structure Qu Wenruo
2020-11-18 10:53 ` Johannes Thumshirn
2020-11-18 11:45 ` Qu Wenruo
2020-11-18 8:53 ` [PATCH 04/14] btrfs: extent_io: make attach_extent_buffer_page() to handle subpage case Qu Wenruo
2020-11-18 8:53 ` [PATCH 05/14] btrfs: extent_io: make grab_extent_buffer_from_page() " Qu Wenruo
2020-11-18 8:53 ` [PATCH 06/14] btrfs: extent_io: support subpage for extent buffer page release Qu Wenruo
2020-11-18 8:53 ` [PATCH 07/14] btrfs: extent_io: make set/clear_extent_buffer_uptodate() to support subpage size Qu Wenruo
2020-11-18 8:53 ` [PATCH 08/14] btrfs: extent_io: implement try_release_extent_buffer() for subpage metadata support Qu Wenruo
2020-11-18 8:53 ` [PATCH 09/14] btrfs: extent_io: introduce read_extent_buffer_subpage() Qu Wenruo
2020-11-18 8:53 ` Qu Wenruo [this message]
2020-11-18 8:53 ` [PATCH 11/14] btrfs: disk-io: introduce subpage metadata validation check Qu Wenruo
2020-11-18 8:53 ` [PATCH 12/14] btrfs: introduce btrfs_subpage for data inodes Qu Wenruo
2020-11-18 8:53 ` [PATCH 13/14] btrfs: integrate page status update for read path into begin/end_page_read() Qu Wenruo
2020-11-18 8:53 ` [PATCH 14/14] btrfs: allow RO mount of 4K sector size fs on 64K page system Qu Wenruo
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=20201118085319.56668-11-wqu@suse.com \
--to=wqu@suse.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.