All of lore.kernel.org
 help / color / mirror / Atom feed
From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v3 17/31] btrfs: reflink: make copy_inline_to_page() to be subpage compatible
Date: Fri, 21 May 2021 14:40:36 +0800	[thread overview]
Message-ID: <20210521064050.191164-18-wqu@suse.com> (raw)
In-Reply-To: <20210521064050.191164-1-wqu@suse.com>

The modifications are:
- Page copy destination
  For subpage case, one page can contain multiple sectors, thus we can
  no longer expect the memcpy_to_page()/btrfs_decompress() to copy
  data into page offset 0.
  The correct offset is offset_in_page(file_offset) now, which should
  handle both regular sectorsize and subpage cases well.

- Page status update
  Now we need to use subpage helper to handle the page status update.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 fs/btrfs/reflink.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c
index d434dc78dadf..a6e8b8e67c80 100644
--- a/fs/btrfs/reflink.c
+++ b/fs/btrfs/reflink.c
@@ -7,6 +7,7 @@
 #include "delalloc-space.h"
 #include "reflink.h"
 #include "transaction.h"
+#include "subpage.h"
 
 #define BTRFS_MAX_DEDUPE_LEN	SZ_16M
 
@@ -52,7 +53,8 @@ static int copy_inline_to_page(struct btrfs_inode *inode,
 			       const u64 datal,
 			       const u8 comp_type)
 {
-	const u64 block_size = btrfs_inode_sectorsize(inode);
+	struct btrfs_fs_info *fs_info = inode->root->fs_info;
+	const u32 block_size = fs_info->sectorsize;
 	const u64 range_end = file_offset + block_size - 1;
 	const size_t inline_size = size - btrfs_file_extent_calc_inline_size(0);
 	char *data_start = inline_data + btrfs_file_extent_calc_inline_size(0);
@@ -106,10 +108,12 @@ static int copy_inline_to_page(struct btrfs_inode *inode,
 	set_bit(BTRFS_INODE_NO_DELALLOC_FLUSH, &inode->runtime_flags);
 
 	if (comp_type == BTRFS_COMPRESS_NONE) {
-		memcpy_to_page(page, 0, data_start, datal);
+		memcpy_to_page(page, offset_in_page(file_offset), data_start,
+			       datal);
 		flush_dcache_page(page);
 	} else {
-		ret = btrfs_decompress(comp_type, data_start, page, 0,
+		ret = btrfs_decompress(comp_type, data_start, page,
+				       offset_in_page(file_offset),
 				       inline_size, datal);
 		if (ret)
 			goto out_unlock;
@@ -133,9 +137,9 @@ static int copy_inline_to_page(struct btrfs_inode *inode,
 		flush_dcache_page(page);
 	}
 
-	SetPageUptodate(page);
+	btrfs_page_set_uptodate(fs_info, page, file_offset, block_size);
 	ClearPageChecked(page);
-	set_page_dirty(page);
+	btrfs_page_set_dirty(fs_info, page, file_offset, block_size);
 out_unlock:
 	if (page) {
 		unlock_page(page);
-- 
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 ` [PATCH v3 08/31] btrfs: make process_one_page() to handle subpage locking Qu Wenruo
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 ` Qu Wenruo [this message]
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-18-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.