From: Matthew Wilcox <matthew.r.wilcox@intel.com> To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, willy@linux.intel.com Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>, Ross Zwisler <ross.zwisler@linux.intel.com> Subject: [PATCH v6 18/22] xip: Add xip_zero_page_range Date: Tue, 25 Feb 2014 09:18:34 -0500 [thread overview] Message-ID: <1393337918-28265-19-git-send-email-matthew.r.wilcox@intel.com> (raw) In-Reply-To: <1393337918-28265-1-git-send-email-matthew.r.wilcox@intel.com> This new function allows us to support hole-punch for XIP files by zeroing a partial page, as opposed to the xip_truncate_page() function which can only truncate to the end of the page. Reimplement xip_truncate_page() as a macro that calls xip_zero_page_range(). Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com> [ported to 3.13-rc2] Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> --- Documentation/filesystems/dax.txt | 1 + fs/dax.c | 22 +++++++++++++++------- include/linux/fs.h | 9 ++++++++- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Documentation/filesystems/dax.txt b/Documentation/filesystems/dax.txt index 06f84e5..e5706cc 100644 --- a/Documentation/filesystems/dax.txt +++ b/Documentation/filesystems/dax.txt @@ -55,6 +55,7 @@ Filesystem support consists of for fault and page_mkwrite (which should probably call dax_fault() and dax_mkwrite(), passing the appropriate get_block() callback) - calling dax_truncate_page() instead of block_truncate_page() for DAX files +- calling dax_zero_page_range() instead of zero_user() for DAX files - ensuring that there is sufficient locking between reads, writes, truncates and page faults diff --git a/fs/dax.c b/fs/dax.c index 75328bf..cdc8012 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -393,13 +393,16 @@ int dax_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, EXPORT_SYMBOL_GPL(dax_mkwrite); /** - * dax_truncate_page - handle a partial page being truncated in a DAX file + * dax_zero_page_range - zero a range within a page of a DAX file * @inode: The file being truncated * @from: The file offset that is being truncated to + * @length: The number of bytes to zero * @get_block: The filesystem method used to translate file offsets to blocks * - * Similar to block_truncate_page(), this function can be called by a - * filesystem when it is truncating an DAX file to handle the partial page. + * This function can be called by a filesystem when it is zeroing part of a + * page in a DAX file. This is intended for hole-punch operations. If + * you are truncating a file, the helper function dax_truncate_page() may be + * more convenient. * * We work in terms of PAGE_CACHE_SIZE here for commonality with * block_truncate_page(), but we could go down to PAGE_SIZE if the filesystem @@ -407,12 +410,12 @@ EXPORT_SYMBOL_GPL(dax_mkwrite); * block size is smaller than PAGE_SIZE, we have to zero the rest of the page * since the file might be mmaped. */ -int dax_truncate_page(struct inode *inode, loff_t from, get_block_t get_block) +int dax_zero_page_range(struct inode *inode, loff_t from, unsigned length, + get_block_t get_block) { struct buffer_head bh; pgoff_t index = from >> PAGE_CACHE_SHIFT; unsigned offset = from & (PAGE_CACHE_SIZE-1); - unsigned length = PAGE_CACHE_ALIGN(from) - from; int err; /* Block boundary? Nothing to do */ @@ -427,11 +430,16 @@ int dax_truncate_page(struct inode *inode, loff_t from, get_block_t get_block) if (buffer_written(&bh)) { void *addr; err = dax_get_addr(inode, &bh, &addr); - if (err) + if (err < 0) return err; + /* + * ext4 sometimes asks to zero past the end of a block. It + * really just wants to zero to the end of the block. + */ + length = min_t(unsigned, length, PAGE_CACHE_SIZE - offset); memset(addr + offset, 0, length); } return 0; } -EXPORT_SYMBOL_GPL(dax_truncate_page); +EXPORT_SYMBOL_GPL(dax_zero_page_range); diff --git a/include/linux/fs.h b/include/linux/fs.h index 19abdb1..6a5091a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2517,6 +2517,7 @@ extern int nonseekable_open(struct inode * inode, struct file * filp); #ifdef CONFIG_FS_DAX int dax_clear_blocks(struct inode *, sector_t block, long size); +int dax_zero_page_range(struct inode *, loff_t from, unsigned len, get_block_t); int dax_truncate_page(struct inode *, loff_t from, get_block_t); ssize_t dax_do_io(int rw, struct kiocb *, struct inode *, const struct iovec *, loff_t, unsigned segs, get_block_t, dio_iodone_t, int flags); @@ -2528,7 +2529,8 @@ static inline int dax_clear_blocks(struct inode *i, sector_t blk, long sz) return 0; } -static inline int dax_truncate_page(struct inode *i, loff_t frm, get_block_t gb) +static inline int dax_zero_page_range(struct inode *inode, loff_t from, + unsigned len, get_block_t gb) { return 0; } @@ -2541,6 +2543,11 @@ static inline ssize_t dax_do_io(int rw, struct kiocb *iocb, struct inode *inode, } #endif +/* Can't be a function because PAGE_CACHE_SIZE is defined in pagemap.h */ +#define dax_truncate_page(inode, from, get_block) \ + dax_zero_page_range(inode, from, PAGE_CACHE_SIZE, get_block) + + #ifdef CONFIG_BLOCK typedef void (dio_submit_t)(int rw, struct bio *bio, struct inode *inode, loff_t file_offset); -- 1.8.5.3
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Wilcox <matthew.r.wilcox@intel.com> To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, willy@linux.intel.com Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>, Ross Zwisler <ross.zwisler@linux.intel.com> Subject: [PATCH v6 18/22] xip: Add xip_zero_page_range Date: Tue, 25 Feb 2014 09:18:34 -0500 [thread overview] Message-ID: <1393337918-28265-19-git-send-email-matthew.r.wilcox@intel.com> (raw) In-Reply-To: <1393337918-28265-1-git-send-email-matthew.r.wilcox@intel.com> This new function allows us to support hole-punch for XIP files by zeroing a partial page, as opposed to the xip_truncate_page() function which can only truncate to the end of the page. Reimplement xip_truncate_page() as a macro that calls xip_zero_page_range(). Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com> [ported to 3.13-rc2] Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> --- Documentation/filesystems/dax.txt | 1 + fs/dax.c | 22 +++++++++++++++------- include/linux/fs.h | 9 ++++++++- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Documentation/filesystems/dax.txt b/Documentation/filesystems/dax.txt index 06f84e5..e5706cc 100644 --- a/Documentation/filesystems/dax.txt +++ b/Documentation/filesystems/dax.txt @@ -55,6 +55,7 @@ Filesystem support consists of for fault and page_mkwrite (which should probably call dax_fault() and dax_mkwrite(), passing the appropriate get_block() callback) - calling dax_truncate_page() instead of block_truncate_page() for DAX files +- calling dax_zero_page_range() instead of zero_user() for DAX files - ensuring that there is sufficient locking between reads, writes, truncates and page faults diff --git a/fs/dax.c b/fs/dax.c index 75328bf..cdc8012 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -393,13 +393,16 @@ int dax_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, EXPORT_SYMBOL_GPL(dax_mkwrite); /** - * dax_truncate_page - handle a partial page being truncated in a DAX file + * dax_zero_page_range - zero a range within a page of a DAX file * @inode: The file being truncated * @from: The file offset that is being truncated to + * @length: The number of bytes to zero * @get_block: The filesystem method used to translate file offsets to blocks * - * Similar to block_truncate_page(), this function can be called by a - * filesystem when it is truncating an DAX file to handle the partial page. + * This function can be called by a filesystem when it is zeroing part of a + * page in a DAX file. This is intended for hole-punch operations. If + * you are truncating a file, the helper function dax_truncate_page() may be + * more convenient. * * We work in terms of PAGE_CACHE_SIZE here for commonality with * block_truncate_page(), but we could go down to PAGE_SIZE if the filesystem @@ -407,12 +410,12 @@ EXPORT_SYMBOL_GPL(dax_mkwrite); * block size is smaller than PAGE_SIZE, we have to zero the rest of the page * since the file might be mmaped. */ -int dax_truncate_page(struct inode *inode, loff_t from, get_block_t get_block) +int dax_zero_page_range(struct inode *inode, loff_t from, unsigned length, + get_block_t get_block) { struct buffer_head bh; pgoff_t index = from >> PAGE_CACHE_SHIFT; unsigned offset = from & (PAGE_CACHE_SIZE-1); - unsigned length = PAGE_CACHE_ALIGN(from) - from; int err; /* Block boundary? Nothing to do */ @@ -427,11 +430,16 @@ int dax_truncate_page(struct inode *inode, loff_t from, get_block_t get_block) if (buffer_written(&bh)) { void *addr; err = dax_get_addr(inode, &bh, &addr); - if (err) + if (err < 0) return err; + /* + * ext4 sometimes asks to zero past the end of a block. It + * really just wants to zero to the end of the block. + */ + length = min_t(unsigned, length, PAGE_CACHE_SIZE - offset); memset(addr + offset, 0, length); } return 0; } -EXPORT_SYMBOL_GPL(dax_truncate_page); +EXPORT_SYMBOL_GPL(dax_zero_page_range); diff --git a/include/linux/fs.h b/include/linux/fs.h index 19abdb1..6a5091a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2517,6 +2517,7 @@ extern int nonseekable_open(struct inode * inode, struct file * filp); #ifdef CONFIG_FS_DAX int dax_clear_blocks(struct inode *, sector_t block, long size); +int dax_zero_page_range(struct inode *, loff_t from, unsigned len, get_block_t); int dax_truncate_page(struct inode *, loff_t from, get_block_t); ssize_t dax_do_io(int rw, struct kiocb *, struct inode *, const struct iovec *, loff_t, unsigned segs, get_block_t, dio_iodone_t, int flags); @@ -2528,7 +2529,8 @@ static inline int dax_clear_blocks(struct inode *i, sector_t blk, long sz) return 0; } -static inline int dax_truncate_page(struct inode *i, loff_t frm, get_block_t gb) +static inline int dax_zero_page_range(struct inode *inode, loff_t from, + unsigned len, get_block_t gb) { return 0; } @@ -2541,6 +2543,11 @@ static inline ssize_t dax_do_io(int rw, struct kiocb *iocb, struct inode *inode, } #endif +/* Can't be a function because PAGE_CACHE_SIZE is defined in pagemap.h */ +#define dax_truncate_page(inode, from, get_block) \ + dax_zero_page_range(inode, from, PAGE_CACHE_SIZE, get_block) + + #ifdef CONFIG_BLOCK typedef void (dio_submit_t)(int rw, struct bio *bio, struct inode *inode, loff_t file_offset); -- 1.8.5.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2014-02-25 14:21 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-02-25 14:18 [PATCH v6 00/22] Support ext4 on NV-DIMMs Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 01/22] Fix XIP fault vs truncate race Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 02/22] Allow page fault handlers to perform the COW Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 03/22] axonram: Fix bug in direct_access Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 04/22] Change direct_access calling convention Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 05/22] Introduce IS_DAX(inode) Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 06/22] Replace XIP read and write with DAX I/O Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-03-11 0:32 ` Toshi Kani 2014-03-11 0:32 ` Toshi Kani 2014-03-11 12:53 ` Matthew Wilcox 2014-03-11 12:53 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 07/22] Replace the XIP page fault handler with the DAX page fault handler Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-28 17:49 ` Toshi Kani 2014-02-28 17:49 ` Toshi Kani 2014-02-28 20:20 ` Matthew Wilcox 2014-02-28 20:20 ` Matthew Wilcox 2014-02-28 22:18 ` Toshi Kani 2014-02-28 22:18 ` Toshi Kani 2014-02-28 22:18 ` Toshi Kani 2014-03-02 23:30 ` Dave Chinner 2014-03-02 23:30 ` Dave Chinner 2014-03-03 23:07 ` Ross Zwisler 2014-03-03 23:07 ` Ross Zwisler 2014-03-04 0:56 ` Dave Chinner 2014-03-04 0:56 ` Dave Chinner 2014-03-20 19:38 ` Matthew Wilcox 2014-03-20 19:38 ` Matthew Wilcox 2014-03-20 23:55 ` Dave Chinner 2014-03-20 23:55 ` Dave Chinner 2014-02-25 14:18 ` [PATCH v6 08/22] Replace xip_truncate_page with dax_truncate_page Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 09/22] Remove mm/filemap_xip.c Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 10/22] Remove get_xip_mem Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 11/22] Replace ext2_clear_xip_target with dax_clear_blocks Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 12/22] ext2: Remove ext2_xip_verify_sb() Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 13/22] ext2: Remove ext2_use_xip Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 14/22] ext2: Remove xip.c and xip.h Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 15/22] Remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 16/22] ext2: Remove ext2_aops_xip Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 17/22] Get rid of most mentions of XIP in ext2 Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox [this message] 2014-02-25 14:18 ` [PATCH v6 18/22] xip: Add xip_zero_page_range Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 19/22] ext4: Make ext4_block_zero_page_range static Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 20/22] ext4: Add DAX functionality Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 21/22] ext4: Fix typos Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-25 14:18 ` [PATCH v6 22/22] dax: Add reporting of major faults Matthew Wilcox 2014-02-25 14:18 ` Matthew Wilcox 2014-02-26 15:07 ` [PATCH v6 23/22] Bugfixes Matthew Wilcox 2014-02-26 15:07 ` Matthew Wilcox 2014-02-27 14:01 ` [PATCH v6 00/22] Support ext4 on NV-DIMMs Florian Weimer 2014-02-27 14:01 ` Florian Weimer 2014-02-27 16:29 ` Matthew Wilcox 2014-02-27 16:29 ` Matthew Wilcox 2014-02-27 16:36 ` Florian Weimer 2014-02-27 16:36 ` Florian Weimer 2014-03-02 8:22 ` Pavel Machek 2014-03-02 8:22 ` Pavel Machek [not found] ` <CF4DEE22.25C8F%matthew.r.wilcox@intel.com> 2014-03-18 18:45 ` [PATCH v6 20/22] ext4: Add DAX functionality Ross Zwisler 2014-03-18 18:45 ` Ross Zwisler
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=1393337918-28265-19-git-send-email-matthew.r.wilcox@intel.com \ --to=matthew.r.wilcox@intel.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=ross.zwisler@linux.intel.com \ --cc=willy@linux.intel.com \ /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: linkBe 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.