This adds support for RWF_UNCACHED for file systems using iomap to
perform buffered writes. We use the generic infrastructure for this,
by tracking pages we created and calling write_drop_cached_pages()
to issue writeback and prune those pages.
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
---
fs/iomap/apply.c | 24 ++++++++++++++++++++++++
fs/iomap/buffered-io.c | 37 +++++++++++++++++++++++++++++--------
include/linux/iomap.h | 5 +++++
3 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/fs/iomap/apply.c b/fs/iomap/apply.c
index 562536da8a13..966826ad4bb9 100644
--- a/fs/iomap/apply.c
+++ b/fs/iomap/apply.c
@@ -90,5 +90,29 @@ iomap_apply(struct inode *inode, loff_t pos, loff_t length, unsigned flags,
flags, &iomap);
}
+ if (written && (flags & IOMAP_UNCACHED)) {
+ struct address_space *mapping = inode->i_mapping;
+
+ end = pos + written;
+ ret = filemap_write_and_wait_range(mapping, pos, end);
+ if (ret)
+ goto out;
+
+ /*
+ * No pages were created for this range, we're done
+ */
+ if (!(iomap.flags & IOMAP_F_PAGE_CREATE))
+ goto out;
+
+ /*
+ * Try to invalidate cache pages for the range we just wrote.
+ * We don't care if invalidation fails as the write has still
+ * worked and leaving clean uptodate pages in the page cache
+ * isn't a corruption vector for uncached IO.
+ */
+ invalidate_inode_pages2_range(mapping,
+ pos >> PAGE_SHIFT, end >> PAGE_SHIFT);
+ }
+out:
return written ? written : ret;
}
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 9b5b770ca4c7..09440f114506 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -566,6 +566,7 @@ EXPORT_SYMBOL_GPL(iomap_migrate_page);
enum {
IOMAP_WRITE_F_UNSHARE = (1 << 0),
+ IOMAP_WRITE_F_UNCACHED = (1 << 1),
};
static void
@@ -643,6 +644,7 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags,
struct page **pagep, struct iomap *iomap, struct iomap *srcmap)
{
const struct iomap_page_ops *page_ops = iomap->page_ops;
+ unsigned aop_flags;
struct page *page;
int status = 0;
@@ -659,8 +661,11 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags,
return status;
}
+ aop_flags = AOP_FLAG_NOFS;
+ if (flags & IOMAP_UNCACHED)
+ aop_flags |= AOP_FLAG_UNCACHED;
page = grab_cache_page_write_begin(inode->i_mapping, pos >> PAGE_SHIFT,
- AOP_FLAG_NOFS);
+ aop_flags);
if (!page) {
status = -ENOMEM;
goto out_no_page;
@@ -670,9 +675,14 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags,
iomap_read_inline_data(inode, page, srcmap);
else if (iomap->flags & IOMAP_F_BUFFER_HEAD)
status = __block_write_begin_int(page, pos, len, NULL, srcmap);
- else
- status = __iomap_write_begin(inode, pos, len, flags, page,
+ else {
+ unsigned wb_flags = 0;
+
+ if (flags & IOMAP_UNCACHED)
+ wb_flags = IOMAP_WRITE_F_UNCACHED;
+ status = __iomap_write_begin(inode, pos, len, wb_flags, page,
srcmap);
+ }
if (unlikely(status))
goto out_unlock;
@@ -832,10 +842,17 @@ iomap_write_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
break;
}
- status = iomap_write_begin(inode, pos, bytes, 0, &page, iomap,
- srcmap);
- if (unlikely(status))
+retry:
+ status = iomap_write_begin(inode, pos, bytes, flags, &page,
+ iomap, srcmap);
+ if (unlikely(status)) {
+ if (status == -ENOMEM && (flags & IOMAP_UNCACHED)) {
+ iomap->flags |= IOMAP_F_PAGE_CREATE;
+ flags &= ~IOMAP_UNCACHED;
+ goto retry;
+ }
break;
+ }
if (mapping_writably_mapped(inode->i_mapping))
flush_dcache_page(page);
@@ -882,10 +899,14 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *iter,
{
struct inode *inode = iocb->ki_filp->f_mapping->host;
loff_t pos = iocb->ki_pos, ret = 0, written = 0;
+ unsigned flags = IOMAP_WRITE;
+
+ if (iocb->ki_flags & IOCB_UNCACHED)
+ flags |= IOMAP_UNCACHED;
while (iov_iter_count(iter)) {
- ret = iomap_apply(inode, pos, iov_iter_count(iter),
- IOMAP_WRITE, ops, iter, iomap_write_actor);
+ ret = iomap_apply(inode, pos, iov_iter_count(iter), flags,
+ ops, iter, iomap_write_actor);
if (ret <= 0)
break;
pos += ret;
diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 61fcaa3904d4..b5b5cf781eea 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -48,12 +48,16 @@ struct vm_fault;
*
* IOMAP_F_BUFFER_HEAD indicates that the file system requires the use of
* buffer heads for this mapping.
+ *
+ * IOMAP_F_PAGE_CREATE indicates that pages had to be allocated to satisfy
+ * this operation.
*/
#define IOMAP_F_NEW 0x01
#define IOMAP_F_DIRTY 0x02
#define IOMAP_F_SHARED 0x04
#define IOMAP_F_MERGED 0x08
#define IOMAP_F_BUFFER_HEAD 0x10
+#define IOMAP_F_PAGE_CREATE 0x20
/*
* Flags set by the core iomap code during operations:
@@ -121,6 +125,7 @@ struct iomap_page_ops {
#define IOMAP_FAULT (1 << 3) /* mapping for page fault */
#define IOMAP_DIRECT (1 << 4) /* direct I/O */
#define IOMAP_NOWAIT (1 << 5) /* do not block */
+#define IOMAP_UNCACHED (1 << 6)
struct iomap_ops {
/*
--
2.24.0
