From: Joanne Koong <joannelkoong@gmail.com>
To: miklos@szeredi.hu, axboe@kernel.dk
Cc: bschubert@ddn.com, asml.silence@gmail.com,
io-uring@vger.kernel.org, csander@purestorage.com,
xiaobing.li@samsung.com, linux-fsdevel@vger.kernel.org
Subject: [PATCH v2 18/25] fuse: support buffer copying for kernel addresses
Date: Thu, 18 Dec 2025 00:33:12 -0800 [thread overview]
Message-ID: <20251218083319.3485503-19-joannelkoong@gmail.com> (raw)
In-Reply-To: <20251218083319.3485503-1-joannelkoong@gmail.com>
This is a preparatory patch needed to support kernel-managed ring
buffers in fuse-over-io-uring. For kernel-managed ring buffers, we get
the vmapped address of the buffer which we can directly use.
Currently, buffer copying in fuse only supports extracting underlying
pages from an iov iter and kmapping them. This commit allows buffer
copying to work directly on a kaddr.
Signed-off-by: Joanne Koong <joannelkoong@gmail.com>
---
fs/fuse/dev.c | 23 +++++++++++++++++------
fs/fuse/fuse_dev_i.h | 7 ++++++-
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 6d59cbc877c6..ceb5d6a553c0 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -848,6 +848,9 @@ void fuse_copy_init(struct fuse_copy_state *cs, bool write,
/* Unmap and put previous page of userspace buffer */
void fuse_copy_finish(struct fuse_copy_state *cs)
{
+ if (cs->is_kaddr)
+ return;
+
if (cs->currbuf) {
struct pipe_buffer *buf = cs->currbuf;
@@ -873,6 +876,9 @@ static int fuse_copy_fill(struct fuse_copy_state *cs)
struct page *page;
int err;
+ if (cs->is_kaddr)
+ return 0;
+
err = unlock_request(cs->req);
if (err)
return err;
@@ -931,15 +937,20 @@ static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)
{
unsigned ncpy = min(*size, cs->len);
if (val) {
- void *pgaddr = kmap_local_page(cs->pg);
- void *buf = pgaddr + cs->offset;
+ void *pgaddr, *buf;
+ if (!cs->is_kaddr) {
+ pgaddr = kmap_local_page(cs->pg);
+ buf = pgaddr + cs->offset;
+ } else {
+ buf = cs->kaddr + cs->offset;
+ }
if (cs->write)
memcpy(buf, *val, ncpy);
else
memcpy(*val, buf, ncpy);
-
- kunmap_local(pgaddr);
+ if (!cs->is_kaddr)
+ kunmap_local(pgaddr);
*val += ncpy;
}
*size -= ncpy;
@@ -1127,7 +1138,7 @@ static int fuse_copy_folio(struct fuse_copy_state *cs, struct folio **foliop,
}
while (count) {
- if (cs->write && cs->pipebufs && folio) {
+ if (cs->write && cs->pipebufs && folio && !cs->is_kaddr) {
/*
* Can't control lifetime of pipe buffers, so always
* copy user pages.
@@ -1139,7 +1150,7 @@ static int fuse_copy_folio(struct fuse_copy_state *cs, struct folio **foliop,
} else {
return fuse_ref_folio(cs, folio, offset, count);
}
- } else if (!cs->len) {
+ } else if (!cs->len && !cs->is_kaddr) {
if (cs->move_folios && folio &&
offset == 0 && count == size) {
err = fuse_try_move_folio(cs, foliop);
diff --git a/fs/fuse/fuse_dev_i.h b/fs/fuse/fuse_dev_i.h
index 134bf44aff0d..aa1d25421054 100644
--- a/fs/fuse/fuse_dev_i.h
+++ b/fs/fuse/fuse_dev_i.h
@@ -28,12 +28,17 @@ struct fuse_copy_state {
struct pipe_buffer *currbuf;
struct pipe_inode_info *pipe;
unsigned long nr_segs;
- struct page *pg;
+ union {
+ struct page *pg;
+ void *kaddr;
+ };
unsigned int len;
unsigned int offset;
bool write:1;
bool move_folios:1;
bool is_uring:1;
+ /* if set, use kaddr; otherwise use pg */
+ bool is_kaddr:1;
struct {
unsigned int copied_sz; /* copied size into the user buffer */
} ring;
--
2.47.3
next prev parent reply other threads:[~2025-12-18 8:35 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-18 8:32 [PATCH v2 00/25] fuse/io-uring: add kernel-managed buffer rings and zero-copy Joanne Koong
2025-12-18 8:32 ` [PATCH v2 01/25] io_uring/kbuf: refactor io_buf_pbuf_register() logic into generic helpers Joanne Koong
2025-12-18 8:32 ` [PATCH v2 02/25] io_uring/kbuf: rename io_unregister_pbuf_ring() to io_unregister_buf_ring() Joanne Koong
2025-12-18 8:32 ` [PATCH v2 03/25] io_uring/kbuf: add support for kernel-managed buffer rings Joanne Koong
2025-12-21 12:24 ` kernel test robot
2025-12-18 8:32 ` [PATCH v2 04/25] io_uring/kbuf: add mmap " Joanne Koong
2025-12-18 8:32 ` [PATCH v2 05/25] io_uring/kbuf: support kernel-managed buffer rings in buffer selection Joanne Koong
2025-12-21 13:49 ` kernel test robot
2025-12-18 8:33 ` [PATCH v2 06/25] io_uring/kbuf: add buffer ring pinning/unpinning Joanne Koong
2025-12-18 14:21 ` Joanne Koong
2025-12-18 8:33 ` [PATCH v2 07/25] io_uring/kbuf: add recycling for kernel managed buffer rings Joanne Koong
2025-12-18 8:33 ` [PATCH v2 08/25] io_uring: add io_uring_cmd_fixed_index_get() and io_uring_cmd_fixed_index_put() Joanne Koong
2025-12-18 8:33 ` [PATCH v2 09/25] io_uring/kbuf: add io_uring_cmd_is_kmbuf_ring() Joanne Koong
2025-12-18 8:33 ` [PATCH v2 10/25] io_uring/kbuf: export io_ring_buffer_select() Joanne Koong
2025-12-18 8:33 ` [PATCH v2 11/25] io_uring/kbuf: return buffer id in buffer selection Joanne Koong
2025-12-18 8:33 ` [PATCH v2 12/25] io_uring/cmd: set selected buffer index in __io_uring_cmd_done() Joanne Koong
2025-12-18 8:33 ` [PATCH v2 13/25] fuse: refactor io-uring logic for getting next fuse request Joanne Koong
2025-12-18 8:33 ` [PATCH v2 14/25] fuse: refactor io-uring header copying to ring Joanne Koong
2025-12-18 8:33 ` [PATCH v2 15/25] fuse: refactor io-uring header copying from ring Joanne Koong
2025-12-18 8:33 ` [PATCH v2 16/25] fuse: use enum types for header copying Joanne Koong
2025-12-18 8:33 ` [PATCH v2 17/25] fuse: refactor setting up copy state for payload copying Joanne Koong
2025-12-18 8:33 ` Joanne Koong [this message]
2025-12-18 8:33 ` [PATCH v2 19/25] fuse: add io-uring kernel-managed buffer ring Joanne Koong
2025-12-20 22:45 ` kernel test robot
2025-12-21 2:10 ` kernel test robot
2025-12-22 17:23 ` kernel test robot
2025-12-18 8:33 ` [PATCH v2 20/25] io_uring/rsrc: rename io_buffer_register_bvec()/io_buffer_unregister_bvec() Joanne Koong
2025-12-18 8:33 ` [PATCH v2 21/25] io_uring/rsrc: split io_buffer_register_request() logic Joanne Koong
2025-12-18 8:33 ` [PATCH v2 22/25] io_uring/rsrc: Allow buffer release callback to be optional Joanne Koong
2025-12-18 8:33 ` [PATCH v2 23/25] io_uring/rsrc: add io_buffer_register_bvec() Joanne Koong
2025-12-18 8:33 ` [PATCH v2 24/25] fuse: add zero-copy over io-uring Joanne Koong
2025-12-18 8:33 ` [PATCH v2 25/25] docs: fuse: add io-uring bufring and zero-copy documentation Joanne Koong
2025-12-21 2:28 ` kernel test robot
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=20251218083319.3485503-19-joannelkoong@gmail.com \
--to=joannelkoong@gmail.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=bschubert@ddn.com \
--cc=csander@purestorage.com \
--cc=io-uring@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=xiaobing.li@samsung.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox