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> Subject: [PATCH v6 11/22] Replace ext2_clear_xip_target with dax_clear_blocks Date: Tue, 25 Feb 2014 09:18:27 -0500 [thread overview] Message-ID: <1393337918-28265-12-git-send-email-matthew.r.wilcox@intel.com> (raw) In-Reply-To: <1393337918-28265-1-git-send-email-matthew.r.wilcox@intel.com> This is practically generic code; other filesystems will want to call it from other places, but there's nothing ext2-specific about it. Make it a little more generic by allowing it to take a count of the number of bytes to zero rather than fixing it to a single page. Thanks to Dave Hansen for suggesting that I need to call cond_resched() if zeroing more than one page. Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com> --- fs/dax.c | 34 ++++++++++++++++++++++++++++++++++ fs/ext2/inode.c | 8 +++++--- fs/ext2/xip.c | 23 ----------------------- fs/ext2/xip.h | 3 --- include/linux/fs.h | 6 ++++++ 5 files changed, 45 insertions(+), 29 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index a6a1adc..75328bf 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -22,8 +22,42 @@ #include <linux/highmem.h> #include <linux/mm.h> #include <linux/mutex.h> +#include <linux/sched.h> #include <linux/uio.h> +int dax_clear_blocks(struct inode *inode, sector_t block, long size) +{ + struct block_device *bdev = inode->i_sb->s_bdev; + const struct block_device_operations *ops = bdev->bd_disk->fops; + sector_t sector = block << (inode->i_blkbits - 9); + unsigned long pfn; + + might_sleep(); + do { + void *addr; + long count = ops->direct_access(bdev, sector, &addr, &pfn, + size); + if (count < 0) + return count; + while (count >= PAGE_SIZE) { + clear_page(addr); + addr += PAGE_SIZE; + size -= PAGE_SIZE; + count -= PAGE_SIZE; + sector += PAGE_SIZE / 512; + cond_resched(); + } + if (count > 0) { + memset(addr, 0, count); + sector += count / 512; + size -= count; + } + } while (size); + + return 0; +} +EXPORT_SYMBOL_GPL(dax_clear_blocks); + static long dax_get_addr(struct inode *inode, struct buffer_head *bh, void **addr) { diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index b156fe8..a9346a9 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -733,10 +733,12 @@ static int ext2_get_blocks(struct inode *inode, if (IS_DAX(inode)) { /* - * we need to clear the block + * block must be initialised before we put it in the tree + * so that it's not found by another thread before it's + * initialised */ - err = ext2_clear_xip_target (inode, - le32_to_cpu(chain[depth-1].key)); + err = dax_clear_blocks(inode, le32_to_cpu(chain[depth-1].key), + count << inode->i_blkbits); if (err) { mutex_unlock(&ei->truncate_mutex); goto cleanup; diff --git a/fs/ext2/xip.c b/fs/ext2/xip.c index ca745ff..132d4da 100644 --- a/fs/ext2/xip.c +++ b/fs/ext2/xip.c @@ -13,29 +13,6 @@ #include "ext2.h" #include "xip.h" -static inline long __inode_direct_access(struct inode *inode, sector_t block, - void **kaddr, unsigned long *pfn, long size) -{ - struct block_device *bdev = inode->i_sb->s_bdev; - const struct block_device_operations *ops = bdev->bd_disk->fops; - sector_t sector = block * (PAGE_SIZE / 512); - return ops->direct_access(bdev, sector, kaddr, pfn, size); -} - -int -ext2_clear_xip_target(struct inode *inode, sector_t block) -{ - void *kaddr; - unsigned long pfn; - long size; - - size = __inode_direct_access(inode, block, &kaddr, &pfn, PAGE_SIZE); - if (size < 0) - return size; - clear_page(kaddr); - return 0; -} - void ext2_xip_verify_sb(struct super_block *sb) { struct ext2_sb_info *sbi = EXT2_SB(sb); diff --git a/fs/ext2/xip.h b/fs/ext2/xip.h index 0fa8b7f..e7b9f0a 100644 --- a/fs/ext2/xip.h +++ b/fs/ext2/xip.h @@ -7,8 +7,6 @@ #ifdef CONFIG_EXT2_FS_XIP extern void ext2_xip_verify_sb (struct super_block *); -extern int ext2_clear_xip_target (struct inode *, sector_t); - static inline int ext2_use_xip (struct super_block *sb) { struct ext2_sb_info *sbi = EXT2_SB(sb); @@ -17,5 +15,4 @@ static inline int ext2_use_xip (struct super_block *sb) #else #define ext2_xip_verify_sb(sb) do { } while (0) #define ext2_use_xip(sb) 0 -#define ext2_clear_xip_target(inode, chain) 0 #endif diff --git a/include/linux/fs.h b/include/linux/fs.h index c7945fd..6f7f445 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2516,12 +2516,18 @@ extern int generic_file_open(struct inode * inode, struct file * filp); extern int nonseekable_open(struct inode * inode, struct file * filp); #ifdef CONFIG_FS_XIP +int dax_clear_blocks(struct inode *, sector_t block, long size); 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); int dax_fault(struct vm_area_struct *, struct vm_fault *, get_block_t); int dax_mkwrite(struct vm_area_struct *, struct vm_fault *, get_block_t); #else +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) { return 0; -- 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> Subject: [PATCH v6 11/22] Replace ext2_clear_xip_target with dax_clear_blocks Date: Tue, 25 Feb 2014 09:18:27 -0500 [thread overview] Message-ID: <1393337918-28265-12-git-send-email-matthew.r.wilcox@intel.com> (raw) In-Reply-To: <1393337918-28265-1-git-send-email-matthew.r.wilcox@intel.com> This is practically generic code; other filesystems will want to call it from other places, but there's nothing ext2-specific about it. Make it a little more generic by allowing it to take a count of the number of bytes to zero rather than fixing it to a single page. Thanks to Dave Hansen for suggesting that I need to call cond_resched() if zeroing more than one page. Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com> --- fs/dax.c | 34 ++++++++++++++++++++++++++++++++++ fs/ext2/inode.c | 8 +++++--- fs/ext2/xip.c | 23 ----------------------- fs/ext2/xip.h | 3 --- include/linux/fs.h | 6 ++++++ 5 files changed, 45 insertions(+), 29 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index a6a1adc..75328bf 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -22,8 +22,42 @@ #include <linux/highmem.h> #include <linux/mm.h> #include <linux/mutex.h> +#include <linux/sched.h> #include <linux/uio.h> +int dax_clear_blocks(struct inode *inode, sector_t block, long size) +{ + struct block_device *bdev = inode->i_sb->s_bdev; + const struct block_device_operations *ops = bdev->bd_disk->fops; + sector_t sector = block << (inode->i_blkbits - 9); + unsigned long pfn; + + might_sleep(); + do { + void *addr; + long count = ops->direct_access(bdev, sector, &addr, &pfn, + size); + if (count < 0) + return count; + while (count >= PAGE_SIZE) { + clear_page(addr); + addr += PAGE_SIZE; + size -= PAGE_SIZE; + count -= PAGE_SIZE; + sector += PAGE_SIZE / 512; + cond_resched(); + } + if (count > 0) { + memset(addr, 0, count); + sector += count / 512; + size -= count; + } + } while (size); + + return 0; +} +EXPORT_SYMBOL_GPL(dax_clear_blocks); + static long dax_get_addr(struct inode *inode, struct buffer_head *bh, void **addr) { diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index b156fe8..a9346a9 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -733,10 +733,12 @@ static int ext2_get_blocks(struct inode *inode, if (IS_DAX(inode)) { /* - * we need to clear the block + * block must be initialised before we put it in the tree + * so that it's not found by another thread before it's + * initialised */ - err = ext2_clear_xip_target (inode, - le32_to_cpu(chain[depth-1].key)); + err = dax_clear_blocks(inode, le32_to_cpu(chain[depth-1].key), + count << inode->i_blkbits); if (err) { mutex_unlock(&ei->truncate_mutex); goto cleanup; diff --git a/fs/ext2/xip.c b/fs/ext2/xip.c index ca745ff..132d4da 100644 --- a/fs/ext2/xip.c +++ b/fs/ext2/xip.c @@ -13,29 +13,6 @@ #include "ext2.h" #include "xip.h" -static inline long __inode_direct_access(struct inode *inode, sector_t block, - void **kaddr, unsigned long *pfn, long size) -{ - struct block_device *bdev = inode->i_sb->s_bdev; - const struct block_device_operations *ops = bdev->bd_disk->fops; - sector_t sector = block * (PAGE_SIZE / 512); - return ops->direct_access(bdev, sector, kaddr, pfn, size); -} - -int -ext2_clear_xip_target(struct inode *inode, sector_t block) -{ - void *kaddr; - unsigned long pfn; - long size; - - size = __inode_direct_access(inode, block, &kaddr, &pfn, PAGE_SIZE); - if (size < 0) - return size; - clear_page(kaddr); - return 0; -} - void ext2_xip_verify_sb(struct super_block *sb) { struct ext2_sb_info *sbi = EXT2_SB(sb); diff --git a/fs/ext2/xip.h b/fs/ext2/xip.h index 0fa8b7f..e7b9f0a 100644 --- a/fs/ext2/xip.h +++ b/fs/ext2/xip.h @@ -7,8 +7,6 @@ #ifdef CONFIG_EXT2_FS_XIP extern void ext2_xip_verify_sb (struct super_block *); -extern int ext2_clear_xip_target (struct inode *, sector_t); - static inline int ext2_use_xip (struct super_block *sb) { struct ext2_sb_info *sbi = EXT2_SB(sb); @@ -17,5 +15,4 @@ static inline int ext2_use_xip (struct super_block *sb) #else #define ext2_xip_verify_sb(sb) do { } while (0) #define ext2_use_xip(sb) 0 -#define ext2_clear_xip_target(inode, chain) 0 #endif diff --git a/include/linux/fs.h b/include/linux/fs.h index c7945fd..6f7f445 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2516,12 +2516,18 @@ extern int generic_file_open(struct inode * inode, struct file * filp); extern int nonseekable_open(struct inode * inode, struct file * filp); #ifdef CONFIG_FS_XIP +int dax_clear_blocks(struct inode *, sector_t block, long size); 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); int dax_fault(struct vm_area_struct *, struct vm_fault *, get_block_t); int dax_mkwrite(struct vm_area_struct *, struct vm_fault *, get_block_t); #else +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) { return 0; -- 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:19 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 ` Matthew Wilcox [this message] 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 ` [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 ` [PATCH v6 18/22] xip: Add xip_zero_page_range Matthew Wilcox 2014-02-25 14:18 ` 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-12-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=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.