All of lore.kernel.org
 help / color / mirror / Atom feed
From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Josef Bacik <josef@toxicpanda.com>
Subject: [PATCH v3 08/31] btrfs: make process_one_page() to handle subpage locking
Date: Fri, 21 May 2021 14:40:27 +0800	[thread overview]
Message-ID: <20210521064050.191164-9-wqu@suse.com> (raw)
In-Reply-To: <20210521064050.191164-1-wqu@suse.com>

Introduce a new data inodes specific subpage member, writers, to record
how many sectors are under page lock for delalloc writing.

This member acts pretty much the same as readers, except it's only for
delalloc writes.

This is important for delalloc code to trace which page can really be
freed, as we have cases like run_delalloc_nocow() where we may exit
processing nocow range inside a page, but need to exit to do cow half
way.
In that case, we need a way to determine if we can really unlock a full
page.

With the new btrfs_subpage::writers, there is a new requirement:
- Page locked by process_one_page() must be unlocked by
  process_one_page()
  There are still tons of call sites manually lock and unlock a page,
  without updating btrfs_subpage::writers.
  So if we lock a page through process_one_page() then it must be
  unlocked by process_one_page() to keep btrfs_subpage::writers
  consistent.

  This will be handled in next patch.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
---
 fs/btrfs/extent_io.c | 10 +++--
 fs/btrfs/subpage.c   | 89 ++++++++++++++++++++++++++++++++++++++------
 fs/btrfs/subpage.h   | 10 +++++
 3 files changed, 94 insertions(+), 15 deletions(-)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index d16c84430981..8f32c2e64936 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1841,14 +1841,18 @@ static int process_one_page(struct btrfs_fs_info *fs_info,
 	if (page_ops & PAGE_END_WRITEBACK)
 		btrfs_page_clamp_clear_writeback(fs_info, page, start, len);
 	if (page_ops & PAGE_LOCK) {
-		lock_page(page);
+		int ret;
+
+		ret = btrfs_page_start_writer_lock(fs_info, page, start, len);
+		if (ret)
+			return ret;
 		if (!PageDirty(page) || page->mapping != mapping) {
-			unlock_page(page);
+			btrfs_page_end_writer_lock(fs_info, page, start, len);
 			return -EAGAIN;
 		}
 	}
 	if (page_ops & PAGE_UNLOCK)
-		unlock_page(page);
+		btrfs_page_end_writer_lock(fs_info, page, start, len);
 	return 0;
 }
 
diff --git a/fs/btrfs/subpage.c b/fs/btrfs/subpage.c
index a6cf1776f3f9..f728e5009487 100644
--- a/fs/btrfs/subpage.c
+++ b/fs/btrfs/subpage.c
@@ -110,10 +110,12 @@ int btrfs_alloc_subpage(const struct btrfs_fs_info *fs_info,
 	if (!*ret)
 		return -ENOMEM;
 	spin_lock_init(&(*ret)->lock);
-	if (type == BTRFS_SUBPAGE_METADATA)
+	if (type == BTRFS_SUBPAGE_METADATA) {
 		atomic_set(&(*ret)->eb_refs, 0);
-	else
+	} else {
 		atomic_set(&(*ret)->readers, 0);
+		atomic_set(&(*ret)->writers, 0);
+	}
 	return 0;
 }
 
@@ -203,6 +205,79 @@ void btrfs_subpage_end_reader(const struct btrfs_fs_info *fs_info,
 		unlock_page(page);
 }
 
+static void btrfs_subpage_clamp_range(struct page *page, u64 *start, u32 *len)
+{
+	u64 orig_start = *start;
+	u32 orig_len = *len;
+
+	*start = max_t(u64, page_offset(page), orig_start);
+	*len = min_t(u64, page_offset(page) + PAGE_SIZE,
+		     orig_start + orig_len) - *start;
+}
+
+void btrfs_subpage_start_writer(const struct btrfs_fs_info *fs_info,
+		struct page *page, u64 start, u32 len)
+{
+	struct btrfs_subpage *subpage = (struct btrfs_subpage *)page->private;
+	int nbits = len >> fs_info->sectorsize_bits;
+	int ret;
+
+	btrfs_subpage_assert(fs_info, page, start, len);
+
+	ASSERT(atomic_read(&subpage->readers) == 0);
+	ret = atomic_add_return(nbits, &subpage->writers);
+	ASSERT(ret == nbits);
+}
+
+bool btrfs_subpage_end_and_test_writer(const struct btrfs_fs_info *fs_info,
+		struct page *page, u64 start, u32 len)
+{
+	struct btrfs_subpage *subpage = (struct btrfs_subpage *)page->private;
+	int nbits = len >> fs_info->sectorsize_bits;
+
+	btrfs_subpage_assert(fs_info, page, start, len);
+
+	ASSERT(atomic_read(&subpage->writers) >= nbits);
+	return atomic_sub_and_test(nbits, &subpage->writers);
+}
+
+/*
+ * To lock a page for delalloc page writeback.
+ *
+ * Return -EAGAIN if the page is not properly initialized.
+ * Return 0 with the page locked, and writer counter updated.
+ *
+ * Even with 0 returned, the page still need extra check to make sure
+ * it's really the correct page, as the caller is using
+ * find_get_pages_contig(), which can race with page invalidating.
+ */
+int btrfs_page_start_writer_lock(const struct btrfs_fs_info *fs_info,
+		struct page *page, u64 start, u32 len)
+{
+	if (unlikely(!fs_info) || fs_info->sectorsize == PAGE_SIZE) {
+		lock_page(page);
+		return 0;
+	}
+	lock_page(page);
+	if (!PagePrivate(page) || !page->private) {
+		unlock_page(page);
+		return -EAGAIN;
+	}
+	btrfs_subpage_clamp_range(page, &start, &len);
+	btrfs_subpage_start_writer(fs_info, page, start, len);
+	return 0;
+}
+
+void btrfs_page_end_writer_lock(const struct btrfs_fs_info *fs_info,
+		struct page *page, u64 start, u32 len)
+{
+	if (unlikely(!fs_info) || fs_info->sectorsize == PAGE_SIZE)
+		return unlock_page(page);
+	btrfs_subpage_clamp_range(page, &start, &len);
+	if (btrfs_subpage_end_and_test_writer(fs_info, page, start, len))
+		unlock_page(page);
+}
+
 /*
  * Convert the [start, start + len) range into a u16 bitmap
  *
@@ -354,16 +429,6 @@ void btrfs_subpage_clear_writeback(const struct btrfs_fs_info *fs_info,
 	spin_unlock_irqrestore(&subpage->lock, flags);
 }
 
-static void btrfs_subpage_clamp_range(struct page *page, u64 *start, u32 *len)
-{
-	u64 orig_start = *start;
-	u32 orig_len = *len;
-
-	*start = max_t(u64, page_offset(page), orig_start);
-	*len = min_t(u64, page_offset(page) + PAGE_SIZE,
-		     orig_start + orig_len) - *start;
-}
-
 /*
  * Unlike set/clear which is dependent on each page status, for test all bits
  * are tested in the same way.
diff --git a/fs/btrfs/subpage.h b/fs/btrfs/subpage.h
index 291cb1932f27..9d087ab3244e 100644
--- a/fs/btrfs/subpage.h
+++ b/fs/btrfs/subpage.h
@@ -33,6 +33,7 @@ struct btrfs_subpage {
 		/* Structures only used by data */
 		struct {
 			atomic_t readers;
+			atomic_t writers;
 		};
 	};
 };
@@ -63,6 +64,15 @@ void btrfs_subpage_start_reader(const struct btrfs_fs_info *fs_info,
 void btrfs_subpage_end_reader(const struct btrfs_fs_info *fs_info,
 		struct page *page, u64 start, u32 len);
 
+void btrfs_subpage_start_writer(const struct btrfs_fs_info *fs_info,
+		struct page *page, u64 start, u32 len);
+bool btrfs_subpage_end_and_test_writer(const struct btrfs_fs_info *fs_info,
+		struct page *page, u64 start, u32 len);
+int btrfs_page_start_writer_lock(const struct btrfs_fs_info *fs_info,
+		struct page *page, u64 start, u32 len);
+void btrfs_page_end_writer_lock(const struct btrfs_fs_info *fs_info,
+		struct page *page, u64 start, u32 len);
+
 /*
  * Template for subpage related operations.
  *
-- 
2.31.1


  parent reply	other threads:[~2021-05-21  6:43 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-21  6:40 [PATCH v3 00/31] btrfs: add data write support for subpage Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 01/31] btrfs: pass bytenr directly to __process_pages_contig() Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 02/31] btrfs: refactor the page status update into process_one_page() Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 03/31] btrfs: provide btrfs_page_clamp_*() helpers Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 04/31] btrfs: only require sector size alignment for end_bio_extent_writepage() Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 05/31] btrfs: make btrfs_dirty_pages() to be subpage compatible Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 06/31] btrfs: make __process_pages_contig() to handle subpage dirty/error/writeback status Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 07/31] btrfs: make end_bio_extent_writepage() to be subpage compatible Qu Wenruo
2021-05-21  6:40 ` Qu Wenruo [this message]
2021-05-21  6:40 ` [PATCH v3 09/31] btrfs: introduce helpers for subpage ordered status Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 10/31] btrfs: make page Ordered bit to be subpage compatible Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 11/31] btrfs: update locked page dirty/writeback/error bits in __process_pages_contig Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 12/31] btrfs: prevent extent_clear_unlock_delalloc() to unlock page not locked by __process_pages_contig() Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 13/31] btrfs: make btrfs_set_range_writeback() subpage compatible Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 14/31] btrfs: make __extent_writepage_io() only submit dirty range for subpage Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 15/31] btrfs: make btrfs_truncate_block() to be subpage compatible Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 16/31] btrfs: make btrfs_page_mkwrite() " Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 17/31] btrfs: reflink: make copy_inline_to_page() " Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 18/31] btrfs: fix the filemap_range_has_page() call in btrfs_punch_hole_lock_range() Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 19/31] btrfs: don't clear page extent mapped if we're not invalidating the full page Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 20/31] btrfs: extract relocation page read and dirty part into its own function Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 21/31] btrfs: make relocate_one_page() to handle subpage case Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 22/31] btrfs: fix wild subpage writeback which does not have ordered extent Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 23/31] btrfs: disable inline extent creation for subpage Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 24/31] btrfs: allow submit_extent_page() to do bio split " Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 25/31] btrfs: make defrag to be semi subpage compatible Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 26/31] btrfs: reject raid5/6 fs for subpage Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 27/31] btrfs: fix a crash caused by race between prepare_pages() and btrfs_releasepage() Qu Wenruo
2021-05-24 10:56   ` Filipe Manana
2021-05-24 11:58     ` Qu Wenruo
2021-05-24 12:10       ` Filipe Manana
2021-05-21  6:40 ` [PATCH v3 28/31] btrfs: fix a use-after-free bug in writeback subpage helper Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 29/31] btrfs: fix a subpage false alert for relocating partial preallocated data extents Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 30/31] btrfs: fix a subpage relocation data corruption Qu Wenruo
2021-05-21  6:40 ` [PATCH v3 31/31] btrfs: allow read-write for 4K sectorsize on 64K page size systems Qu Wenruo
2021-05-30  0:12 ` [PATCH v3 00/31] btrfs: add data write support for subpage Neal Gompa
2021-05-30  0:24   ` Qu Wenruo
2021-05-31  1:32   ` Su Yue
2021-05-31  1:52     ` Neal Gompa
2021-05-31  2:26       ` 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=20210521064050.191164-9-wqu@suse.com \
    --to=wqu@suse.com \
    --cc=josef@toxicpanda.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.