On 26/03/24 03:12PM, Jonathan Cameron wrote: > On Tue, 24 Mar 2026 00:40:36 +0000 > John Groves <[email protected]> wrote: > > > From: John Groves <[email protected]> > > > > Virtio_fs now needs to determine if an inode is DAX && not famfs. > FWIW patch bundles broke sashiko > > https://sashiko.dev/#/message/0100019d1d46d094-cc0a4b79-3bd2-43e8-a08d-ab8cd21266a6-000000%40email.amazonses.com > It only reviewed the fuse part. (I was looking to see what it had found I > missed > in the DAX ones). > > This relaces the FUSE_IS_DAX() macro with FUSE_IS_VIRTIO_DAX(), > > replaces (Sashiko spell checks ;)
Derp. With v10 I will just post separate series' > > > in preparation for famfs in later commits. The dummy > > fuse_file_famfs() macro will be replaced with a working > > function. > > > > Reviewed-by: Joanne Koong <[email protected]> > > Reviewed-by: Dave Jiang <[email protected]> > > Signed-off-by: John Groves <[email protected]> > > > > > --- > > fs/fuse/dir.c | 2 +- > > fs/fuse/file.c | 13 ++++++++----- > > fs/fuse/fuse_i.h | 9 ++++++++- > > fs/fuse/inode.c | 4 ++-- > > fs/fuse/iomode.c | 2 +- > > 5 files changed, 20 insertions(+), 10 deletions(-) > > > > diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c > > index 7ac6b232ef12..c63f097bc697 100644 > > --- a/fs/fuse/dir.c > > +++ b/fs/fuse/dir.c > > @@ -2161,7 +2161,7 @@ int fuse_do_setattr(struct mnt_idmap *idmap, struct > > dentry *dentry, > > is_truncate = true; > > } > > > > - if (FUSE_IS_DAX(inode) && is_truncate) { > > + if (FUSE_IS_VIRTIO_DAX(fi) && is_truncate) { > > filemap_invalidate_lock(mapping); > > fault_blocked = true; > > err = fuse_dax_break_layouts(inode, 0, -1); > > diff --git a/fs/fuse/file.c b/fs/fuse/file.c > > index b1bb7153cb78..4ee5065737d8 100644 > > --- a/fs/fuse/file.c > > +++ b/fs/fuse/file.c > > @@ -252,7 +252,7 @@ static int fuse_open(struct inode *inode, struct file > > *file) > > int err; > > bool is_truncate = (file->f_flags & O_TRUNC) && fc->atomic_o_trunc; > > bool is_wb_truncate = is_truncate && fc->writeback_cache; > > - bool dax_truncate = is_truncate && FUSE_IS_DAX(inode); > > + bool dax_truncate = is_truncate && FUSE_IS_VIRTIO_DAX(fi); > > > > if (fuse_is_bad(inode)) > > return -EIO; > > @@ -1812,11 +1812,12 @@ static ssize_t fuse_file_read_iter(struct kiocb > > *iocb, struct iov_iter *to) > > struct file *file = iocb->ki_filp; > > struct fuse_file *ff = file->private_data; > > struct inode *inode = file_inode(file); > > + struct fuse_inode *fi = get_fuse_inode(inode); > > > > if (fuse_is_bad(inode)) > > return -EIO; > > > > - if (FUSE_IS_DAX(inode)) > > + if (FUSE_IS_VIRTIO_DAX(fi)) > > return fuse_dax_read_iter(iocb, to); > > > > /* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */ > > @@ -1833,11 +1834,12 @@ static ssize_t fuse_file_write_iter(struct kiocb > > *iocb, struct iov_iter *from) > > struct file *file = iocb->ki_filp; > > struct fuse_file *ff = file->private_data; > > struct inode *inode = file_inode(file); > > + struct fuse_inode *fi = get_fuse_inode(inode); > > > > if (fuse_is_bad(inode)) > > return -EIO; > > > > - if (FUSE_IS_DAX(inode)) > > + if (FUSE_IS_VIRTIO_DAX(fi)) > > return fuse_dax_write_iter(iocb, from); > > > > /* FOPEN_DIRECT_IO overrides FOPEN_PASSTHROUGH */ > > @@ -2370,10 +2372,11 @@ static int fuse_file_mmap(struct file *file, struct > > vm_area_struct *vma) > > struct fuse_file *ff = file->private_data; > > struct fuse_conn *fc = ff->fm->fc; > > struct inode *inode = file_inode(file); > > + struct fuse_inode *fi = get_fuse_inode(inode); > > int rc; > > > > /* DAX mmap is superior to direct_io mmap */ > > - if (FUSE_IS_DAX(inode)) > > + if (FUSE_IS_VIRTIO_DAX(fi)) > > return fuse_dax_mmap(file, vma); > > > > /* > > @@ -2934,7 +2937,7 @@ static long fuse_file_fallocate(struct file *file, > > int mode, loff_t offset, > > .mode = mode > > }; > > int err; > > - bool block_faults = FUSE_IS_DAX(inode) && > > + bool block_faults = FUSE_IS_VIRTIO_DAX(fi) && > > (!(mode & FALLOC_FL_KEEP_SIZE) || > > (mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_ZERO_RANGE))); > > > > diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h > > index 7f16049387d1..45e108dec771 100644 > > --- a/fs/fuse/fuse_i.h > > +++ b/fs/fuse/fuse_i.h > > @@ -1508,7 +1508,14 @@ void fuse_free_conn(struct fuse_conn *fc); > > > > /* dax.c */ > > > > -#define FUSE_IS_DAX(inode) (IS_ENABLED(CONFIG_FUSE_DAX) && IS_DAX(inode)) > > +static inline bool fuse_file_famfs(struct fuse_inode *fuse_inode) /* Will > > be superseded */ > > +{ > > + (void)fuse_inode; > > + return false; > > +} > > +#define FUSE_IS_VIRTIO_DAX(fuse_inode) (IS_ENABLED(CONFIG_FUSE_DAX) > > \ > > + && IS_DAX(&fuse_inode->inode) \ > > + && !fuse_file_famfs(fuse_inode)) > > The AI overlord pointed out you should probably have a few more brackets > just in case someone passes something odd in as fuse_inode. Lets assume > they don't pass things with side effects in. > > #define FUSE_IS_VIRTIO_DAX(fuse_inode) (IS_ENABLED(CONFIG_FUSE_DAX) \ > && IS_DAX(&(fuse_inode)->inode) \ > && !fuse_file_famfs(fuse_inode)) > Thank you for your tokens ;) Fixed - and now there is a change for the v10 fuse series John
