Skip to content

fuse: invalidate page cache after sync and async direct writes (for redfs-rhel10_0) #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cding-ddn wants to merge 1 commit into
base: redfs-rhel10_0
Choose a base branch
from
Open

fuse: invalidate page cache after sync and async direct writes (for redfs-rhel10_0) #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 48 additions & 11 deletions fs/fuse/file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include <linux/filelock.h>
#include <linux/splice.h>

int sb_init_dio_done_wq(struct super_block *sb);

/*
* Helper function to initialize fuse_args for OPEN/OPENDIR operations
*/
Expand Down Expand Up @@ -717,6 +719,19 @@ static ssize_t fuse_get_res_by_io(struct fuse_io_priv *io)
return io->bytes < 0 ? io->size : io->bytes;
}

static void fuse_aio_invalidate_worker(struct work_struct *work)
{
struct fuse_io_priv *io = container_of(work, struct fuse_io_priv, work);
struct address_space *mapping = io->iocb->ki_filp->f_mapping;
ssize_t res = fuse_get_res_by_io(io);
pgoff_t start = io->offset >> PAGE_SHIFT;
pgoff_t end = (io->offset + res - 1) >> PAGE_SHIFT;

invalidate_inode_pages2_range(mapping, start, end);
io->iocb->ki_complete(io->iocb, res);
kref_put(&io->refcnt, fuse_io_release);
}

/*
* In case of short read, the caller sets 'pos' to the position of
* actual end of fuse request in IO request. Otherwise, if bytes_requested
Expand Down Expand Up @@ -749,10 +764,11 @@ static void fuse_aio_complete(struct fuse_io_priv *io, int err, ssize_t pos)
spin_unlock(&io->lock);

if (!left && !io->blocking) {
struct inode *inode = file_inode(io->iocb->ki_filp);
struct address_space *mapping = io->iocb->ki_filp->f_mapping;
ssize_t res = fuse_get_res_by_io(io);

if (res >= 0) {
struct inode *inode = file_inode(io->iocb->ki_filp);
struct fuse_conn *fc = get_fuse_conn(inode);
struct fuse_inode *fi = get_fuse_inode(inode);

Expand All @@ -761,6 +777,17 @@ static void fuse_aio_complete(struct fuse_io_priv *io, int err, ssize_t pos)
spin_unlock(&fi->lock);
}

if (io->write && res > 0 && mapping->nrpages) {
/*
* As in generic_file_direct_write(), invalidate after the
* write, to invalidate read-ahead cache that may have competed
* with the write.
*/
INIT_WORK(&io->work, fuse_aio_invalidate_worker);
queue_work(inode->i_sb->s_dio_done_wq, &io->work);
return;
}

io->iocb->ki_complete(io->iocb, res);
}

Expand Down Expand Up @@ -1697,15 +1724,6 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,
if (res > 0)
*ppos = pos;

if (res > 0 && write && fopen_direct_io) {
/*
* As in generic_file_direct_write(), invalidate after the
* write, to invalidate read-ahead cache that may have competed
* with the write.
*/
invalidate_inode_pages2_range(mapping, idx_from, idx_to);
}

return res > 0 ? res : err;
}
EXPORT_SYMBOL_GPL(fuse_direct_io);
Expand Down Expand Up @@ -1745,6 +1763,8 @@ static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from)
{
struct inode *inode = file_inode(iocb->ki_filp);
struct fuse_io_priv io = FUSE_IO_PRIV_SYNC(iocb);
struct address_space *mapping = inode->i_mapping;
loff_t pos = iocb->ki_pos;
ssize_t res;
bool exclusive;

Expand All @@ -1759,6 +1779,16 @@ static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from)
FUSE_DIO_WRITE);
fuse_write_update_attr(inode, iocb->ki_pos, res);
}
if (res > 0 && mapping->nrpages) {
/*
* As in generic_file_direct_write(), invalidate after
* write, to invalidate read-ahead cache that may have
* with the write.
*/
invalidate_inode_pages2_range(mapping,
pos >> PAGE_SHIFT,
(pos + res - 1) >> PAGE_SHIFT);
}
}
fuse_dio_unlock(iocb, exclusive);

Expand Down Expand Up @@ -2957,6 +2987,7 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
size_t count = iov_iter_count(iter), shortened = 0;
loff_t offset = iocb->ki_pos;
struct fuse_io_priv *io;
bool async = ff->fm->fc->async_dio;

pos = offset;
inode = file->f_mapping->host;
Expand All @@ -2965,6 +2996,12 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
if ((iov_iter_rw(iter) == READ) && (offset >= i_size))
return 0;

if ((iov_iter_rw(iter) == WRITE) && async && !inode->i_sb->s_dio_done_wq) {
ret = sb_init_dio_done_wq(inode->i_sb);
if (ret < 0)
return ret;
}

io = kmalloc(sizeof(struct fuse_io_priv), GFP_KERNEL);
if (!io)
return -ENOMEM;
Expand All @@ -2980,7 +3017,7 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
* By default, we want to optimize all I/Os with async request
* submission to the client filesystem if supported.
*/
io->async = ff->fm->fc->async_dio;
io->async = async;
io->iocb = iocb;
io->blocking = is_sync_kiocb(iocb);

Expand Down
1 change: 1 addition & 0 deletions fs/fuse/fuse_i.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ union fuse_file_args {
/** The request IO state (for asynchronous processing) */
struct fuse_io_priv {
struct kref refcnt;
struct work_struct work;
int async;
spinlock_t lock;
unsigned reqs;
Expand Down
Loading