From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E940851AED7 for ; Thu, 1 Oct 2026 15:09:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790867398; cv=none; b=LjAfRS12SIeIx8MvJb64k+rGN57FupRVfHEjHrpp84inbAzBLMqKoxHELkGDBBWcDplJeBiTP8pAd2RludCPaeR6bXLoz7R0JsjzEe943QF4NGU9uSBx1GSFULtfUhzwAYKBaootmvcI1C2jWEg2cqSE2+sMUrP1Ye5NQxxDyBc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790867398; c=relaxed/simple; bh=a7NX8i8cnRw/BwgIOLymP2xVFIiwQVZrzam3KVQw7ks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=ixPjrn1BfxUg09NxqYQyw6iZ7LBZD7O/tb4AimKWh34g7FHi1A6AbXLPxhgyFMMn7GweYhxdrDjQrbbHO/skR9J81yfE19bp7JJDN6AEeIotNu/cHhQRSy4mt1Nz4zZQWUgsTC0Jrwa+hbwUl8xhFknGKByDrLQKpGhZ1XQ+8UU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=DwljEVMD; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DwljEVMD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790867394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ub7kJ1kOji3/4j8cpaMtCaCLuZXodtNfr3Sh+GMfOWk=; b=DwljEVMDAe7KiGjLN2m4FuM9oLvpazRM6uj5TWHu/i4ZlCfDOXB9bu4SKmCJmVDm4tylT3 QG6dh2CcUg/gziQWBdJ/2gjfe3MXXRQxtsh4DBVSirEbTZUuGmMUfaea6p6rD/E38pyWXh 2lTVmX5Ow6ctFNFwjiy7iBxbBZWaQ6I= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-HmkU1IYkNfeBrJFJBmfT6g-1; Thu, 01 Oct 2026 11:09:53 -0400 X-MC-Unique: HmkU1IYkNfeBrJFJBmfT6g-1 X-Mimecast-MFC-AGG-ID: HmkU1IYkNfeBrJFJBmfT6g_1790867392 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-c293e604f0eso652554866b.3 for ; Thu, 01 Oct 2026 08:09:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790867392; x=1791472192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ub7kJ1kOji3/4j8cpaMtCaCLuZXodtNfr3Sh+GMfOWk=; b=aB3Cp8nHaSLkNMMrHigWuxMVm2klxsLly+mjaxfed5otmzuT3axOh2yA5H7zPJ4kqE /gMV2hTETJlgf/GhDwqFatnEsHa9aSOj/fJsJSrQt5e5BCnFjLz0Vt8Hwfk02aAP8KEA iR654KX3jmccSUjhjcp3yxIr2yTg1gUzJqP/fE7kUr9xRYyRrDKAO4SA4f15czL5kcEF +hiPRVjrO9lDZQB/nNX9z6ECOglRBS6LZhI1DzN4+mEudhCmGjLvvFQ/Bg0c7HEHMPlY 4jssMSYwXWU3OekVLNuWJkQ0lQxIEJfMBRePDoCqjqaAax/pAA2iiR+/LuGH2+Qzle8+ /BaA== X-Forwarded-Encrypted: i=1; AKwUvBzUp5NjKKH1056uGRPq8BRk93MY50M67iVWaB3JT9fHcV5FwebvqYlusZvsy3uJbqFFO2j/AL99/pg=@vger.kernel.org X-Gm-Message-State: AFuF++lXvZsQyqsfmdljzJ+cQbkNpXznl21GEy7QwTrv56r1FpEp+2yh WCrMsaS6suZk2pYoCML5cUJ6gcYxcLgDiccqYdOnUTpw1hBw33pT4hddM+CT31DadIdqLqvaoKp L9FInsChdzNoTUE3NwZvxtwNbn0gFZtrwhr7SUGQpWv9LnA5qvZoq0xGCYKPAgQ== X-Gm-Gg: AYBFou2/RNAqms3hXZdIAWN24BTRInYD5ae57ytWBzv2iQxyqG1vb4aRQ5TXe/eL7Ub 2ek3KS6FXSvdFHk3y881822ulSsrATf7jFxegp+o3798+r8fMlu3tFt9y6cqJgGvDRNXi25x1kU sbLgfuyw1TD+M9uBMIOjpw5fCaPYSdJYAzwL3RwmcJ3Njlcp8EhHG7lE4FldQ5Ww7SceL9sI/Fp D62eKtdMjkd4n6/0vh53666fCBqeN0qPwtjUrDE6lDNjtuN9ce3+EM3nF1Y3SudwCplUFfQkTQG skwKCbHc+odjvCYV94OYHRc9RcnhJG706RDAQBcbZTuvcx5smUw8BplhPRPcBCbl+eEQOe28fMo 4U7WI+L4+1oMoku+NmLIv+dAVQhTej9BFhzsuw1QcuuU0o24kuVMjx64TwkE= X-Received: by 2002:a17:907:6095:b0:c25:2c70:50ed with SMTP id a640c23a62f3a-c2e23751e12mr416248466b.5.1790867392276; Thu, 01 Oct 2026 08:09:52 -0700 (PDT) X-Received: by 2002:a17:907:6095:b0:c25:2c70:50ed with SMTP id a640c23a62f3a-c2e23751e12mr416246666b.5.1790867391825; Thu, 01 Oct 2026 08:09:51 -0700 (PDT) Received: from maszat.piliscsaba.szeredi.hu (193-226-245-188.pool.digikabel.hu. [193.226.245.188]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2e31d86372sm177735166b.56.2026.10.01.08.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2026 08:09:51 -0700 (PDT) From: Miklos Szeredi To: fuse-devel@lists.linux.dev Cc: John Groves , Amir Goldstein , "Darrick J . Wong" , Vishal Verma , Dave Jiang , Alison Schofield , nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org Subject: [PATCH v2 7/8] fuse: add extent map I/O support Date: Thu, 1 Oct 2026 17:07:25 +0200 Message-ID: <20261001150935.655979-8-mszeredi@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261001150935.655979-1-mszeredi@redhat.com> References: <20261001150935.655979-1-mszeredi@redhat.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KnynTpRKtSSbNqqREPJhTxmtvclu6yPtJf_LzSuz57s_1790867392 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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. Reviewed-by: Amir Goldstein Signed-off-by: Miklos Szeredi --- fs/fuse/backing.c | 15 +++++ fs/fuse/ext_map.c | 149 ++++++++++++++++++++++++++++++++++++++++++ fs/fuse/fuse_i.h | 4 ++ fs/fuse/notify.c | 3 + fs/fuse/passthrough.c | 29 ++++++-- 5 files changed, 194 insertions(+), 6 deletions(-) diff --git a/fs/fuse/backing.c b/fs/fuse/backing.c index e954391d696d..2708f140b94f 100644 --- a/fs/fuse/backing.c +++ b/fs/fuse/backing.c @@ -278,6 +278,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; diff --git a/fs/fuse/ext_map.c b/fs/fuse/ext_map.c index ab01d678d08e..61cb22e821b6 100644 --- a/fs/fuse/ext_map.c +++ b/fs/fuse/ext_map.c @@ -3,6 +3,8 @@ #include "fuse_i.h" #include #include +#include +#include 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) { @@ -76,6 +96,135 @@ 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 (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) +{ + ssize_t res; + + fuse_rw_clamp(iocb, to); + + if (!iov_iter_count(to)) + return 0; + + 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; + + fuse_rw_clamp(iocb, from); + + res = generic_write_checks(iocb, from); + if (res <= 0) + return res; + + res = kiocb_modified(iocb); + if (res) + return res; + + 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; diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 5a20f3863ee2..7248588b45c4 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -1316,6 +1316,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); @@ -1369,6 +1370,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); diff --git a/fs/fuse/notify.c b/fs/fuse/notify.c index 7c427f88bbc5..3bfedd0cdbdd 100644 --- a/fs/fuse/notify.c +++ b/fs/fuse/notify.c @@ -448,6 +448,9 @@ static int fuse_notify_map(struct fuse_conn *fc, unsigned int size, if (err) return err; + if (!fc->backing_id_64) + return -EINVAL; + if (outarg.num_extents > FUSE_MAX_EXTENTS) return -EINVAL; diff --git a/fs/fuse/passthrough.c b/fs/fuse/passthrough.c index e9ab1aea34e2..040817ad76e9 100644 --- a/fs/fuse/passthrough.c +++ b/fs/fuse/passthrough.c @@ -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); } @@ -156,6 +167,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"); -- 2.54.0