fuse: add extent map I/O support

Wire up read, write, splice and mmap operations for extent-mapped
files through the iomap/DAX infrastructure.

When a passthrough file is opened with an EXTMAP backing, I/O is
dispatched to the dax devices referenced by the extent map.

If an address is not mapped, EIO is returned on the I/O operation.

Originally-by: John Groves <john@groves.net>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Miklos Szeredi 2026-09-21 13:11:44 +02:00
parent bf75733445
commit e8bc74b6ed
5 changed files with 217 additions and 6 deletions

View File

@ -288,6 +288,21 @@ int fuse_backing_close(struct fuse_conn *fc, int backing_id)
return err;
}
bool fuse_backing_is_dax(struct fuse_backing *fb)
{
switch (fb->type) {
case FUSE_BACKING_PATH:
return false;
case FUSE_BACKING_DAXDEV:
return true;
case FUSE_BACKING_EXTMAP:
return fuse_ext_map_is_dax(fb);
default:
WARN_ON(1);
return false;
}
}
struct fuse_backing *fuse_backing_lookup(struct fuse_conn *fc, u64 backing_id)
{
struct fuse_backing *fb;

View File

@ -3,6 +3,8 @@
#include "fuse_i.h"
#include <linux/rbtree.h>
#include <linux/pagemap.h>
#include <linux/iomap.h>
#include <linux/dax.h>
struct fuse_iext {
struct rb_node rb;
@ -22,6 +24,24 @@ void fuse_ext_map_destroy(struct rb_root *extents)
}
}
static struct fuse_iext *fuse_find_extent(struct rb_root *extents, u64 offset)
{
struct rb_node *node = extents->rb_node;
while (node) {
struct fuse_iext *fie = rb_entry(node, typeof(*fie), rb);
if (offset < fie->start)
node = node->rb_left;
else if (offset >= fie->end)
node = node->rb_right;
else
return fie;
}
return NULL;
}
static int fuse_add_extent(struct fuse_conn *fc, struct rb_root *extents,
struct fuse_extent *ext)
{
@ -78,6 +98,150 @@ static int fuse_add_extent(struct fuse_conn *fc, struct rb_root *extents,
return 0;
}
static int fuse_ext_map_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
unsigned int flags, struct iomap *iomap, struct iomap *srcmap)
{
struct fuse_backing *fb = fuse_inode_backing(get_fuse_inode(inode));
struct fuse_iext *fie;
loff_t ext_len;
if (!fb || fb->type != FUSE_BACKING_EXTMAP)
return fuse_EIO("missing or wrong type backing");
fie = fuse_find_extent(&fb->extents, offset);
if (!fie)
return fuse_EIO("missing mapping");
if (WARN_ON(fie->backing->type != FUSE_BACKING_DAXDEV))
return fuse_EIO("wrong type backing for extent");
if (fie->backing->dax_error) {
fuse_make_bad(inode);
return fuse_EIO("dax error");
}
ext_len = fie->end - fie->start;
iomap->offset = fie->start;
iomap->addr = fie->backing_offset;
iomap->length = ext_len;
iomap->dax_dev = fie->backing->dax_dev;
iomap->type = IOMAP_MAPPED;
iomap->flags = 0;
return 0;
}
static const struct iomap_ops fuse_ext_map_iomap_ops = {
.iomap_begin = fuse_ext_map_iomap_begin,
};
static vm_fault_t fuse_ext_map_huge_fault(struct vm_fault *vmf, unsigned int order)
{
struct inode *inode = file_inode(vmf->vma->vm_file);
bool write_fault = (vmf->flags & FAULT_FLAG_WRITE) && (vmf->vma->vm_flags & VM_SHARED);
vm_fault_t ret;
unsigned long pfn;
if (!IS_ENABLED(CONFIG_FS_DAX))
return VM_FAULT_SIGBUS;
if (WARN_ON_ONCE(!IS_DAX(inode)))
return VM_FAULT_SIGBUS;
if (write_fault) {
sb_start_pagefault(inode->i_sb);
file_update_time(vmf->vma->vm_file);
}
filemap_invalidate_lock_shared(inode->i_mapping);
ret = dax_iomap_fault(vmf, order, &pfn, NULL, &fuse_ext_map_iomap_ops);
if (ret & VM_FAULT_NEEDDSYNC)
ret = dax_finish_sync_fault(vmf, order, pfn);
filemap_invalidate_unlock_shared(inode->i_mapping);
if (write_fault)
sb_end_pagefault(inode->i_sb);
return ret;
}
static vm_fault_t fuse_ext_map_fault(struct vm_fault *vmf)
{
return fuse_ext_map_huge_fault(vmf, 0);
}
static const struct vm_operations_struct fuse_ext_map_vm_ops = {
.fault = fuse_ext_map_fault,
.huge_fault = fuse_ext_map_huge_fault,
.page_mkwrite = fuse_ext_map_fault,
.pfn_mkwrite = fuse_ext_map_fault,
};
static void fuse_rw_clamp(struct kiocb *iocb, struct iov_iter *ubuf)
{
struct inode *inode = iocb->ki_filp->f_mapping->host;
loff_t i_size = i_size_read(inode);
loff_t max_count = iocb->ki_pos >= i_size ? 0 : i_size - iocb->ki_pos;
if (iov_iter_count(ubuf) > max_count)
iov_iter_truncate(ubuf, max_count);
}
ssize_t fuse_ext_map_read_iter(struct kiocb *iocb, struct iov_iter *to)
{
struct inode *inode = iocb->ki_filp->f_mapping->host;
ssize_t res;
guard(rwsem_read)(&inode->i_rwsem);
fuse_rw_clamp(iocb, to);
if (!iov_iter_count(to))
return 0;
if (!IS_ENABLED(CONFIG_FS_DAX))
return -EIO;
res = dax_iomap_rw(iocb, to, &fuse_ext_map_iomap_ops);
file_accessed(iocb->ki_filp);
return res;
}
ssize_t fuse_ext_map_write_iter(struct kiocb *iocb, struct iov_iter *from)
{
ssize_t res;
res = generic_write_checks(iocb, from);
if (res <= 0)
return res;
fuse_rw_clamp(iocb, from);
if (!iov_iter_count(from))
return -ENOSPC;
res = kiocb_modified(iocb);
if (res)
return res;
if (!IS_ENABLED(CONFIG_FS_DAX))
return -EIO;
return dax_iomap_rw(iocb, from, &fuse_ext_map_iomap_ops);
}
int fuse_ext_map_mmap(struct file *file, struct vm_area_struct *vma)
{
file_accessed(file);
vma->vm_ops = &fuse_ext_map_vm_ops;
vm_flags_set(vma, VM_HUGEPAGE);
return 0;
}
bool fuse_ext_map_is_dax(struct fuse_backing *fb)
{
struct fuse_iext *fie;

View File

@ -555,6 +555,17 @@ static int fuse_fsync(struct file *file, loff_t start, loff_t end,
if (fuse_is_bad(inode))
return -EIO;
if (IS_DAX(inode) && !fuse_inode_vdax(inode)) {
/*
* Note: the DAX fault path calls this via dax_finish_sync_fault()
* and taking inode lock in that context is prohibited.
*
* FIXME: need to flush CPU caches for the DAX memory range
* FIXME: need to sync metadata to the server
*/
return 0;
}
inode_lock(inode);
/*

View File

@ -1321,6 +1321,7 @@ static inline void fuse_backing_put(struct fuse_backing *fb)
struct fuse_backing *fuse_backing_lookup(struct fuse_conn *fc, u64 backing_id);
int fuse_backing_add_64(struct fuse_conn *fc, struct fuse_backing *fb);
bool fuse_backing_is_dax(struct fuse_backing *fb);
void fuse_backing_files_init(struct fuse_conn *fc);
void fuse_backing_files_init_64(struct fuse_conn *fc);
void fuse_backing_files_free(struct fuse_conn *fc);
@ -1375,6 +1376,9 @@ extern void fuse_sysctl_unregister(void);
/* ext_map.c */
void fuse_ext_map_destroy(struct rb_root *extents);
ssize_t fuse_ext_map_write_iter(struct kiocb *iocb, struct iov_iter *from);
ssize_t fuse_ext_map_read_iter(struct kiocb *iocb, struct iov_iter *to);
int fuse_ext_map_mmap(struct file *file, struct vm_area_struct *vma);
bool fuse_ext_map_is_dax(struct fuse_backing *fb);
int fuse_ext_map_populate(struct fuse_conn *fc, struct fuse_notify_backing_map_out *arg,
struct fuse_extent *ext);

View File

@ -35,7 +35,6 @@ ssize_t fuse_passthrough_read_iter(struct kiocb *iocb, struct iov_iter *iter)
struct fuse_file *ff = file->private_data;
struct file *backing_file = fuse_file_passthrough(ff);
size_t count = iov_iter_count(iter);
ssize_t ret;
struct backing_file_ctx ctx = {
.cred = ff->cred,
.accessed = fuse_file_accessed,
@ -48,10 +47,10 @@ ssize_t fuse_passthrough_read_iter(struct kiocb *iocb, struct iov_iter *iter)
if (!count)
return 0;
ret = backing_file_read_iter(backing_file, iter, iocb, iocb->ki_flags,
&ctx);
if (!backing_file)
return fuse_ext_map_read_iter(iocb, iter);
return ret;
return backing_file_read_iter(backing_file, iter, iocb, iocb->ki_flags, &ctx);
}
ssize_t fuse_passthrough_write_iter(struct kiocb *iocb,
@ -74,10 +73,13 @@ ssize_t fuse_passthrough_write_iter(struct kiocb *iocb,
if (!count)
return 0;
inode_lock(inode);
guard(rwsem_write)(&inode->i_rwsem);
if (!backing_file)
return fuse_ext_map_write_iter(iocb, iter);
ret = backing_file_write_iter(backing_file, iter, iocb, iocb->ki_flags,
&ctx);
inode_unlock(inode);
return ret;
}
@ -98,6 +100,9 @@ ssize_t fuse_passthrough_splice_read(struct file *in, loff_t *ppos,
pr_debug("%s: backing_file=0x%p, pos=%lld, len=%zu, flags=0x%x\n", __func__,
backing_file, *ppos, len, flags);
if (!backing_file)
return copy_splice_read(in, ppos, pipe, len, flags);
init_sync_kiocb(&iocb, in);
iocb.ki_pos = *ppos;
ret = backing_file_splice_read(backing_file, &iocb, pipe, len, flags, &ctx);
@ -123,6 +128,9 @@ ssize_t fuse_passthrough_splice_write(struct pipe_inode_info *pipe,
pr_debug("%s: backing_file=0x%p, pos=%lld, len=%zu, flags=0x%x\n", __func__,
backing_file, *ppos, len, flags);
if (!backing_file)
return iter_file_splice_write(pipe, out, ppos, len, flags);
inode_lock(inode);
init_sync_kiocb(&iocb, out);
iocb.ki_pos = *ppos;
@ -145,6 +153,9 @@ ssize_t fuse_passthrough_mmap(struct file *file, struct vm_area_struct *vma)
pr_debug("%s: backing_file=0x%p, start=%lu, end=%lu\n", __func__,
backing_file, vma->vm_start, vma->vm_end);
if (!backing_file)
return fuse_ext_map_mmap(file, vma);
return backing_file_mmap(backing_file, vma, &ctx);
}
@ -169,6 +180,12 @@ int fuse_passthrough_open(struct file *file, struct fuse_backing *fb)
struct fuse_file *ff = file->private_data;
struct file *backing_file;
if (fb->type == FUSE_BACKING_EXTMAP) {
if (fuse_backing_is_dax(fb) != !!IS_DAX(file_inode(file)))
return fuse_EIO("dax mode mismatch");
return 0;
}
if (fb->type != FUSE_BACKING_PATH)
return fuse_EIO("invalid backing type");