All of lore.kernel.org
 help / color / mirror / Atom feed
From: Goldwyn Rodrigues <rgoldwyn@suse.de>
To: linux-btrfs@vger.kernel.org
Cc: kilobyte@angband.pl, linux-fsdevel@vger.kernel.org, jack@suse.cz,
	david@fromorbit.com, willy@infradead.org, hch@lst.de,
	darrick.wong@oracle.com, dsterba@suse.cz, nborisov@suse.com,
	linux-nvdimm@lists.01.org, Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: [PATCH 15/18] btrfs: handle dax page zeroing
Date: Mon, 29 Apr 2019 12:26:46 -0500	[thread overview]
Message-ID: <20190429172649.8288-16-rgoldwyn@suse.de> (raw)
In-Reply-To: <20190429172649.8288-1-rgoldwyn@suse.de>

From: Goldwyn Rodrigues <rgoldwyn@suse.com>

btrfs_dax_zero_block() zeros part of the page, either from the
front or the regular rest of the block.

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
 fs/btrfs/ctree.h |  1 +
 fs/btrfs/dax.c   | 27 ++++++++++++++++++++++++++-
 fs/btrfs/inode.c |  4 ++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index d3d044125619..ee1ed18f8b3c 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3806,6 +3806,7 @@ vm_fault_t btrfs_dax_fault(struct vm_fault *vmf);
 int btrfs_dax_file_range_compare(struct inode *src, loff_t srcoff,
 		struct inode *dest, loff_t destoff, loff_t len,
 		bool *is_same);
+int btrfs_dax_zero_block(struct inode *inode, loff_t from, loff_t len, bool front);
 #else
 static inline ssize_t btrfs_file_dax_write(struct kiocb *iocb, struct iov_iter *from)
 {
diff --git a/fs/btrfs/dax.c b/fs/btrfs/dax.c
index af64696a5337..bf2ddac5b5a1 100644
--- a/fs/btrfs/dax.c
+++ b/fs/btrfs/dax.c
@@ -132,7 +132,8 @@ static int btrfs_iomap_begin(struct inode *inode, loff_t pos,
 	 * This will be true for reads only since we have already
 	 * allocated em
 	 */
-	if (em->block_start == EXTENT_MAP_HOLE) {
+	if (em->block_start == EXTENT_MAP_HOLE ||
+			em->flags == EXTENT_FLAG_FILLING) {
 		iomap->type = IOMAP_HOLE;
 		return 0;
 	}
@@ -235,4 +236,28 @@ int btrfs_dax_file_range_compare(struct inode *src, loff_t srcoff,
 	return dax_file_range_compare(src, srcoff, dest, destoff, len,
 				      is_same, &btrfs_iomap_ops);
 }
+
+/*
+ * zero a part of the page only. This should CoW (via iomap_begin) if required
+ */
+int btrfs_dax_zero_block(struct inode *inode, loff_t from, loff_t len, bool front)
+{
+	loff_t start = round_down(from, PAGE_SIZE);
+	loff_t end = round_up(from, PAGE_SIZE);
+	loff_t offset = from;
+	int ret = 0;
+
+	if (front) {
+		len = from - start;
+		offset = start;
+	} else	{
+		if (!len)
+			len = end - from;
+	}
+
+	if (len)
+		ret = iomap_zero_range(inode, offset, len, NULL, &btrfs_iomap_ops);
+
+	return (ret < 0) ? ret : 0;
+}
 #endif /* CONFIG_FS_DAX */
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 05714ffc4894..7e88280a2c3b 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4833,6 +4833,10 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,
 	    (!len || IS_ALIGNED(len, blocksize)))
 		goto out;
 
+#ifdef CONFIG_FS_DAX
+	if (IS_DAX(inode))
+		return btrfs_dax_zero_block(inode, from, len, front);
+#endif
 	block_start = round_down(from, blocksize);
 	block_end = block_start + blocksize - 1;
 
-- 
2.16.4

  parent reply	other threads:[~2019-04-29 17:26 UTC|newest]

Thread overview: 110+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-29 17:26 [PATCH v4 00/18] btrfs dax support Goldwyn Rodrigues
2019-04-29 17:26 ` Goldwyn Rodrigues
2019-04-29 17:26 ` [PATCH 01/18] btrfs: create a mount option for dax Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
2019-05-21 18:02   ` Darrick J. Wong
2019-05-21 18:02     ` Darrick J. Wong
2019-04-29 17:26 ` [PATCH 02/18] btrfs: Carve out btrfs_get_extent_map_write() out of btrfs_get_blocks_write() Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
2019-04-29 17:26 ` [PATCH 04/18] dax: Introduce IOMAP_DAX_COW to CoW edges during writes Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
2019-05-21 16:51   ` Darrick J. Wong
2019-05-22 20:14     ` Goldwyn Rodrigues
2019-05-22 20:14       ` Goldwyn Rodrigues
2019-05-23  2:10       ` Dave Chinner
2019-05-23  2:10         ` Dave Chinner
2019-05-23  9:05     ` Shiyang Ruan
2019-05-23  9:05       ` Shiyang Ruan
2019-05-23 11:51       ` Goldwyn Rodrigues
2019-05-23 11:51         ` Goldwyn Rodrigues
2019-05-27  8:25         ` Shiyang Ruan
2019-05-27  8:25           ` Shiyang Ruan
2019-05-28  9:17           ` Jan Kara
2019-05-28  9:17             ` Jan Kara
2019-05-29  2:01             ` Shiyang Ruan
2019-05-29  2:01               ` Shiyang Ruan
2019-05-29  2:47               ` Dave Chinner
2019-05-29  2:47                 ` Dave Chinner
2019-05-29  4:02                 ` Shiyang Ruan
2019-05-29  4:02                   ` Shiyang Ruan
2019-05-29  4:07                   ` Darrick J. Wong
2019-05-29  4:07                     ` Darrick J. Wong
2019-05-29  4:46                     ` Dave Chinner
2019-05-29  4:46                       ` Dave Chinner
2019-05-29 13:46                       ` Jan Kara
2019-05-29 13:46                         ` Jan Kara
2019-05-29 22:14                         ` Dave Chinner
2019-05-29 22:14                           ` Dave Chinner
2019-05-30 11:16                           ` Jan Kara
2019-05-30 11:16                             ` Jan Kara
2019-05-30 22:59                             ` Dave Chinner
2019-05-30 22:59                               ` Dave Chinner
2019-04-29 17:26 ` [PATCH 05/18] btrfs: return whether extent is nocow or not Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
2019-04-29 17:26 ` [PATCH 06/18] btrfs: Rename __endio_write_update_ordered() to btrfs_update_ordered_extent() Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
     [not found] ` <20190429172649.8288-1-rgoldwyn-l3A5Bk7waGM@public.gmane.org>
2019-04-29 17:26   ` [PATCH 03/18] btrfs: basic dax read Goldwyn Rodrigues
2019-04-29 17:26     ` Goldwyn Rodrigues
     [not found]     ` <20190429172649.8288-4-rgoldwyn-l3A5Bk7waGM@public.gmane.org>
2019-05-21 15:14       ` Darrick J. Wong
2019-05-21 15:14         ` Darrick J. Wong
2019-05-22 21:50         ` Goldwyn Rodrigues
2019-04-29 17:26   ` [PATCH 07/18] btrfs: add dax write support Goldwyn Rodrigues
2019-04-29 17:26     ` Goldwyn Rodrigues
     [not found]     ` <20190429172649.8288-8-rgoldwyn-l3A5Bk7waGM@public.gmane.org>
2019-05-21 17:08       ` Darrick J. Wong
2019-05-21 17:08         ` Darrick J. Wong
2019-04-29 17:26   ` [PATCH 13/18] fs: dedup file range to use a compare function Goldwyn Rodrigues
2019-04-29 17:26     ` Goldwyn Rodrigues
     [not found]     ` <20190429172649.8288-14-rgoldwyn-l3A5Bk7waGM@public.gmane.org>
2019-05-21 18:17       ` Darrick J. Wong
2019-05-21 18:17         ` Darrick J. Wong
2019-04-29 17:26   ` [PATCH 18/18] btrfs: trace functions for btrfs_iomap_begin/end Goldwyn Rodrigues
2019-04-29 17:26     ` Goldwyn Rodrigues
2019-04-29 17:26 ` [PATCH 08/18] dax: memcpy page in case of IOMAP_DAX_COW for mmap faults Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
2019-05-21 17:46   ` Darrick J. Wong
2019-05-21 17:46     ` Darrick J. Wong
2019-05-22 19:11     ` Goldwyn Rodrigues
2019-05-22 19:11       ` Goldwyn Rodrigues
2019-05-23  4:02       ` Darrick J. Wong
2019-05-23  4:02         ` Darrick J. Wong
2019-05-23 12:10     ` Jan Kara
2019-05-23 12:10       ` Jan Kara
2019-04-29 17:26 ` [PATCH 09/18] btrfs: Add dax specific address_space_operations Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
2019-04-29 17:26 ` [PATCH 10/18] dax: replace mmap entry in case of CoW Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
2019-05-21 17:35   ` Darrick J. Wong
2019-05-21 17:35     ` Darrick J. Wong
2019-05-23 13:38   ` Jan Kara
2019-05-23 13:38     ` Jan Kara
2019-04-29 17:26 ` [PATCH 11/18] btrfs: add dax mmap support Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
2019-04-29 17:26 ` [PATCH 12/18] btrfs: allow MAP_SYNC mmap Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
2019-05-10 15:32   ` [PATCH for-goldwyn] btrfs: disallow MAP_SYNC outside of DAX mounts Adam Borowski
2019-05-10 15:32     ` Adam Borowski
2019-05-10 15:41     ` Dan Williams
2019-05-10 15:41       ` Dan Williams
2019-05-10 15:59       ` Pankaj Gupta
2019-05-10 15:59         ` Pankaj Gupta
2019-05-23 13:44   ` [PATCH 12/18] btrfs: allow MAP_SYNC mmap Jan Kara
2019-05-23 13:44     ` Jan Kara
2019-05-23 16:19     ` Adam Borowski
2019-05-23 16:19       ` Adam Borowski
2019-04-29 17:26 ` [PATCH 14/18] dax: memcpy before zeroing range Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
2019-05-21 17:27   ` Darrick J. Wong
2019-05-21 17:27     ` Darrick J. Wong
2019-04-29 17:26 ` Goldwyn Rodrigues [this message]
2019-04-29 17:26 ` [PATCH 16/18] btrfs: Writeprotect mmap pages on snapshot Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
2019-05-23 14:04   ` Jan Kara
2019-05-23 14:04     ` Jan Kara
2019-05-23 15:27     ` Goldwyn Rodrigues
2019-05-23 15:27       ` Goldwyn Rodrigues
2019-05-23 19:07       ` Jan Kara
2019-05-23 19:07         ` Jan Kara
2019-05-23 21:22         ` Goldwyn Rodrigues
2019-05-23 21:22           ` Goldwyn Rodrigues
2019-04-29 17:26 ` [PATCH 17/18] btrfs: Disable dax-based defrag and send Goldwyn Rodrigues
2019-04-29 17:26   ` Goldwyn Rodrigues
  -- strict thread matches above, loose matches on Subject: below --
2019-04-16 16:41 [PATCH v3 00/18] btrfs dax support Goldwyn Rodrigues
2019-04-16 16:41 ` [PATCH 15/18] btrfs: handle dax page zeroing Goldwyn Rodrigues

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=20190429172649.8288-16-rgoldwyn@suse.de \
    --to=rgoldwyn@suse.de \
    --cc=darrick.wong@oracle.com \
    --cc=david@fromorbit.com \
    --cc=dsterba@suse.cz \
    --cc=hch@lst.de \
    --cc=jack@suse.cz \
    --cc=kilobyte@angband.pl \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=nborisov@suse.com \
    --cc=rgoldwyn@suse.com \
    --cc=willy@infradead.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.