On Wed 21-03-18 15:57:21, Dan Williams wrote:
> In preparation for the dax implementation to start associating dax pages
> to inodes via page->mapping, we need to provide a 'struct
> address_space_operations' instance for dax. Define some generic VFS aops
> helpers for dax. These noop implementations are there in the dax case to
> prevent the VFS from falling back to operations with page-cache
> assumptions, dax_writeback_mapping_range() may not be referenced in the
> FS_DAX=n case.
>
> Cc: Jeff Moyer <jmoyer@xxxxxxxxxx>
> Cc: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx>
> Suggested-by: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx>
> Suggested-by: Jan Kara <jack@xxxxxxx>
> Suggested-by: Christoph Hellwig <hch@xxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
> Suggested-by: Dave Chinner <david@xxxxxxxxxxxxx>
> Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
Looks good to me. I'm just wondering whether we should not add also some
stubs calling WARN_ON() and bailing out for stuff like ->migratepage(),
->releasepage(). But probably it is very unlikely we'll introduce bugs that
would trigger those paths so feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/libfs.c | 27 +++++++++++++++++++++++++++
> include/linux/dax.h | 12 +++++++++---
> include/linux/fs.h | 3 +++
> 3 files changed, 39 insertions(+), 3 deletions(-)
>
> diff --git a/fs/libfs.c b/fs/libfs.c
> index 7ff3cb904acd..e49d0ac6f800 100644
> --- a/fs/libfs.c
> +++ b/fs/libfs.c
> @@ -1060,6 +1060,33 @@ int noop_fsync(struct file *file, loff_t start, loff_t end, int datasync)
> }
> EXPORT_SYMBOL(noop_fsync);
>
> +int noop_set_page_dirty(struct page *page)
> +{
> + /*
> + * Unlike __set_page_dirty_no_writeback that handles dirty page
> + * tracking in the page object, dax does all dirty tracking in
> + * the inode address_space in response to mkwrite faults. In the
> + * dax case we only need to worry about potentially dirty CPU
> + * caches, not dirty page cache pages to write back.
> + *
> + * This callback is defined to prevent fallback to
> + * __set_page_dirty_buffers() in set_page_dirty().
> + */
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(noop_set_page_dirty);
> +
> +void noop_invalidatepage(struct page *page, unsigned int offset,
> + unsigned int length)
> +{
> + /*
> + * There is no page cache to invalidate in the dax case, however
> + * we need this callback defined to prevent falling back to
> + * block_invalidatepage() in do_invalidatepage().
> + */
> +}
> +EXPORT_SYMBOL_GPL(noop_invalidatepage);
> +
> /* Because kfree isn't assignment-compatible with void(void*) ;-/ */
> void kfree_link(void *p)
> {
> diff --git a/include/linux/dax.h b/include/linux/dax.h
> index 0185ecdae135..ae27a7efe7ab 100644
> --- a/include/linux/dax.h
> +++ b/include/linux/dax.h
> @@ -38,6 +38,7 @@ static inline void put_dax(struct dax_device *dax_dev)
> }
> #endif
>
> +struct writeback_control;
> int bdev_dax_pgoff(struct block_device *, sector_t, size_t, pgoff_t *pgoff);
> #if IS_ENABLED(CONFIG_FS_DAX)
> int __bdev_dax_supported(struct super_block *sb, int blocksize);
> @@ -57,6 +58,8 @@ static inline void fs_put_dax(struct dax_device *dax_dev)
> }
>
> struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev);
> +int dax_writeback_mapping_range(struct address_space *mapping,
> + struct block_device *bdev, struct writeback_control *wbc);
> #else
> static inline int bdev_dax_supported(struct super_block *sb, int blocksize)
> {
> @@ -76,6 +79,12 @@ static inline struct dax_device *fs_dax_get_by_bdev(struct block_device *bdev)
> {
> return NULL;
> }
> +
> +static inline int dax_writeback_mapping_range(struct address_space *mapping,
> + struct block_device *bdev, struct writeback_control *wbc)
> +{
> + return -EOPNOTSUPP;
> +}
> #endif
>
> int dax_read_lock(void);
> @@ -121,7 +130,4 @@ static inline bool dax_mapping(struct address_space *mapping)
> return mapping->host && IS_DAX(mapping->host);
> }
>
> -struct writeback_control;
> -int dax_writeback_mapping_range(struct address_space *mapping,
> - struct block_device *bdev, struct writeback_control *wbc);
> #endif
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index 79c413985305..b57db31d294d 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -3129,6 +3129,9 @@ extern int simple_rmdir(struct inode *, struct dentry *);
> extern int simple_rename(struct inode *, struct dentry *,
> struct inode *, struct dentry *, unsigned int);
> extern int noop_fsync(struct file *, loff_t, loff_t, int);
> +extern int noop_set_page_dirty(struct page *page);
> +extern void noop_invalidatepage(struct page *page, unsigned int offset,
> + unsigned int length);
> extern int simple_empty(struct dentry *);
> extern int simple_readpage(struct file *file, struct page *page);
> extern int simple_write_begin(struct file *file, struct address_space *mapping,
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
