| Message ID | 20210923130814.140814-5-cgxu519@mykernel.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | implement containerized syncfs for overlayfs | expand |
On Thu, 23 Sept 2021 at 15:08, Chengguang Xu <cgxu519@mykernel.net> wrote: > > Mark overlayfs' inode dirty on modification so that > we can recognize and collect target inodes for syncfs. > > Signed-off-by: Chengguang Xu <cgxu519@mykernel.net> > --- > fs/overlayfs/inode.c | 1 + > fs/overlayfs/overlayfs.h | 4 ++++ > fs/overlayfs/util.c | 21 +++++++++++++++++++++ > 3 files changed, 26 insertions(+) > > diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c > index d854e59a3710..4a03aceaeedc 100644 > --- a/fs/overlayfs/inode.c > +++ b/fs/overlayfs/inode.c > @@ -478,6 +478,7 @@ int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags) > if (upperpath.dentry) { > touch_atime(&upperpath); > inode->i_atime = d_inode(upperpath.dentry)->i_atime; > + ovl_mark_inode_dirty(inode); > } > } > return 0; > diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h > index 3894f3347955..5a016baa06dd 100644 > --- a/fs/overlayfs/overlayfs.h > +++ b/fs/overlayfs/overlayfs.h > @@ -276,6 +276,7 @@ static inline bool ovl_allow_offline_changes(struct ovl_fs *ofs) > > > /* util.c */ > +void ovl_mark_inode_dirty(struct inode *inode); > int ovl_want_write(struct dentry *dentry); > void ovl_drop_write(struct dentry *dentry); > struct dentry *ovl_workdir(struct dentry *dentry); > @@ -529,6 +530,9 @@ static inline void ovl_copyattr(struct inode *from, struct inode *to) > to->i_mtime = from->i_mtime; > to->i_ctime = from->i_ctime; > i_size_write(to, i_size_read(from)); > + > + if (ovl_inode_upper(to) && from->i_state & I_DIRTY_ALL) > + ovl_mark_inode_dirty(to); I'd be more comfortable with calling ovl_mark_inode_dirty() unconditionally. Checking if there's an upper seems to make no sense, since we should only be copying the attributes if something was changed, and then it is an upper inode. Checking dirty flags on upper inode actually makes this racy: - upper inode dirtied through overlayfs - inode writeback starts (e.g. background writeback) on upper inode - dirty flags are cleared - check for dirty flags in upper inode above indicates not dirty, ovl inode not dirtied - syncfs called, misses this inode - inode writeback completed after syncfs > } > > /* vfs inode flags copied from real to ovl inode */ > diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c > index f48284a2a896..5441eae2e345 100644 > --- a/fs/overlayfs/util.c > +++ b/fs/overlayfs/util.c > @@ -25,7 +25,14 @@ int ovl_want_write(struct dentry *dentry) > void ovl_drop_write(struct dentry *dentry) > { > struct ovl_fs *ofs = dentry->d_sb->s_fs_info; > + struct dentry *upper; > + > mnt_drop_write(ovl_upper_mnt(ofs)); > + if (d_inode(dentry)) { > + upper = ovl_dentry_upper(dentry); > + if (upper && d_inode(upper) && d_inode(upper)->i_state & I_DIRTY_ALL) > + ovl_mark_inode_dirty(d_inode(dentry)); ovl_want_write/ovl_drop_write means modification of the upper filesystem. It may or may not be the given dentry, so this is not the right place to clall ovl_mark_inode_dirty IMO. Better check all instances of these and see if there are cases where ovl_copyattr() doesn't handle inode dirtying, and do it explicitly there. > + } > } > > struct dentry *ovl_workdir(struct dentry *dentry) > @@ -1060,3 +1067,17 @@ int ovl_sync_status(struct ovl_fs *ofs) > > return errseq_check(&mnt->mnt_sb->s_wb_err, ofs->errseq); > } > + > +/* > + * We intentionally add I_DIRTY_SYNC flag regardless dirty flag > + * of upper inode so that we have chance to invoke ->write_inode > + * to re-dirty overlayfs' inode during writeback process. > + */ > +void ovl_mark_inode_dirty(struct inode *inode) > +{ > + struct inode *upper = ovl_inode_upper(inode); > + unsigned long iflag = I_DIRTY_SYNC; > + > + iflag |= upper->i_state & I_DIRTY_ALL; > + __mark_inode_dirty(inode, iflag); > +} I think ovl_mark_inode_dirty() can just call mark_inode_dirty(). And so that can go in "overlayfs.h" file as static inline. Thanks, Miklos
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index d854e59a3710..4a03aceaeedc 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -478,6 +478,7 @@ int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags) if (upperpath.dentry) { touch_atime(&upperpath); inode->i_atime = d_inode(upperpath.dentry)->i_atime; + ovl_mark_inode_dirty(inode); } } return 0; diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h index 3894f3347955..5a016baa06dd 100644 --- a/fs/overlayfs/overlayfs.h +++ b/fs/overlayfs/overlayfs.h @@ -276,6 +276,7 @@ static inline bool ovl_allow_offline_changes(struct ovl_fs *ofs) /* util.c */ +void ovl_mark_inode_dirty(struct inode *inode); int ovl_want_write(struct dentry *dentry); void ovl_drop_write(struct dentry *dentry); struct dentry *ovl_workdir(struct dentry *dentry); @@ -529,6 +530,9 @@ static inline void ovl_copyattr(struct inode *from, struct inode *to) to->i_mtime = from->i_mtime; to->i_ctime = from->i_ctime; i_size_write(to, i_size_read(from)); + + if (ovl_inode_upper(to) && from->i_state & I_DIRTY_ALL) + ovl_mark_inode_dirty(to); } /* vfs inode flags copied from real to ovl inode */ diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index f48284a2a896..5441eae2e345 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -25,7 +25,14 @@ int ovl_want_write(struct dentry *dentry) void ovl_drop_write(struct dentry *dentry) { struct ovl_fs *ofs = dentry->d_sb->s_fs_info; + struct dentry *upper; + mnt_drop_write(ovl_upper_mnt(ofs)); + if (d_inode(dentry)) { + upper = ovl_dentry_upper(dentry); + if (upper && d_inode(upper) && d_inode(upper)->i_state & I_DIRTY_ALL) + ovl_mark_inode_dirty(d_inode(dentry)); + } } struct dentry *ovl_workdir(struct dentry *dentry) @@ -1060,3 +1067,17 @@ int ovl_sync_status(struct ovl_fs *ofs) return errseq_check(&mnt->mnt_sb->s_wb_err, ofs->errseq); } + +/* + * We intentionally add I_DIRTY_SYNC flag regardless dirty flag + * of upper inode so that we have chance to invoke ->write_inode + * to re-dirty overlayfs' inode during writeback process. + */ +void ovl_mark_inode_dirty(struct inode *inode) +{ + struct inode *upper = ovl_inode_upper(inode); + unsigned long iflag = I_DIRTY_SYNC; + + iflag |= upper->i_state & I_DIRTY_ALL; + __mark_inode_dirty(inode, iflag); +}
Mark overlayfs' inode dirty on modification so that we can recognize and collect target inodes for syncfs. Signed-off-by: Chengguang Xu <cgxu519@mykernel.net> --- fs/overlayfs/inode.c | 1 + fs/overlayfs/overlayfs.h | 4 ++++ fs/overlayfs/util.c | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+)