From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 04/14] btrfs: extent_io: make attach_extent_buffer_page() to handle subpage case
Date: Wed, 18 Nov 2020 16:53:09 +0800 [thread overview]
Message-ID: <20201118085319.56668-5-wqu@suse.com> (raw)
In-Reply-To: <20201118085319.56668-1-wqu@suse.com>
For subpage case, we need to allocate new memory for each metadata page.
So we need to:
- Allow attach_extent_buffer_page() to return int
To indicate allocation failure
- Prealloc page->private for alloc_extent_buffer()
We don't want to call memory allocation with spinlock hold, so
do preallocation before we acquire the spin lock.
- Handle subpage and regular case differently in
attach_extent_buffer_page()
For regular case, just do the usual thing.
For subpage case, allocate new memory and update the tree_block
bitmap.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/extent_io.c | 77 ++++++++++++++++++++++++++++++++++++--------
1 file changed, 63 insertions(+), 14 deletions(-)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 2eaf09ff59ca..94101d1e04eb 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3142,22 +3142,50 @@ static int submit_extent_page(unsigned int opf,
return ret;
}
-static void attach_extent_buffer_page(struct extent_buffer *eb,
+static int attach_extent_buffer_page(struct extent_buffer *eb,
struct page *page)
{
- /*
- * If the page is mapped to btree inode, we should hold the private
- * lock to prevent race.
- * For cloned or dummy extent buffers, their pages are not mapped and
- * will not race with any other ebs.
- */
- if (page->mapping)
- lockdep_assert_held(&page->mapping->private_lock);
+ struct btrfs_fs_info *fs_info = eb->fs_info;
+ struct btrfs_subpage *subpage;
+ int start;
+ int nbits;
+ int ret;
- if (!PagePrivate(page))
- attach_page_private(page, eb);
- else
- WARN_ON(page->private != (unsigned long)eb);
+ if (!btrfs_is_subpage(fs_info)) {
+ /*
+ * If the page is mapped to btree inode, we should hold the
+ * private lock to prevent race.
+ * For cloned or dummy extent buffers, their pages are not
+ * mapped and will not race with any other ebs.
+ */
+ if (page->mapping)
+ lockdep_assert_held(&page->mapping->private_lock);
+
+ if (!PagePrivate(page))
+ attach_page_private(page, eb);
+ else
+ WARN_ON(page->private != (unsigned long)eb);
+ return 0;
+ }
+
+ /* Already mapped, just update the existing range */
+ if (PagePrivate(page))
+ goto update_bitmap;
+
+ /* Do new allocation to attach subpage */
+ ret = btrfs_attach_subpage(fs_info, page);
+ if (ret < 0)
+ return ret;
+
+update_bitmap:
+ start = (eb->start - page_offset(page)) >> fs_info->sectorsize_bits;
+ nbits = eb->len >> fs_info->sectorsize_bits;
+
+ subpage = (struct btrfs_subpage *)page->private;
+ spin_lock_bh(&subpage->lock);
+ bitmap_set(subpage->tree_block_bitmap, start, nbits);
+ spin_unlock_bh(&subpage->lock);
+ return 0;
}
void set_page_extent_mapped(struct page *page)
@@ -5065,12 +5093,19 @@ struct extent_buffer *btrfs_clone_extent_buffer(const struct extent_buffer *src)
return NULL;
for (i = 0; i < num_pages; i++) {
+ int ret;
+
p = alloc_page(GFP_NOFS);
if (!p) {
btrfs_release_extent_buffer(new);
return NULL;
}
- attach_extent_buffer_page(new, p);
+ ret = attach_extent_buffer_page(new, p);
+ if (ret < 0) {
+ put_page(p);
+ btrfs_release_extent_buffer(new);
+ return NULL;
+ }
WARN_ON(PageDirty(p));
SetPageUptodate(p);
new->pages[i] = p;
@@ -5354,6 +5389,18 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
goto free_eb;
}
+ /*
+ * Preallocate page->private for subpage case, so that
+ * we won't allocate memory with private_lock hold.
+ */
+ ret = btrfs_attach_subpage(fs_info, p);
+ if (ret < 0) {
+ unlock_page(p);
+ put_page(p);
+ exists = ERR_PTR(-ENOMEM);
+ goto free_eb;
+ }
+
spin_lock(&mapping->private_lock);
exists = grab_extent_buffer_from_page(p);
if (exists) {
@@ -5362,8 +5409,10 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
put_page(p);
goto free_eb;
}
+ /* Should not fail, as we have attached the subpage already */
attach_extent_buffer_page(eb, p);
spin_unlock(&mapping->private_lock);
+
WARN_ON(PageDirty(p));
eb->pages[i] = p;
if (!PageUptodate(p))
--
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 ` Qu Wenruo [this message]
2020-11-18 8:53 ` [PATCH 05/14] btrfs: extent_io: make grab_extent_buffer_from_page() to handle subpage case 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 ` [PATCH 10/14] btrfs: extent_io: make endio_readpage_update_page_status() to handle subpage case Qu Wenruo
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-5-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 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).