2013/8/1, Ben Myers <bpm@xxxxxxx>: > Hey Namjae, > > On Wed, Jul 31, 2013 at 11:42:14PM +0900, Namjae Jeon wrote: >> From: Namjae Jeon <namjae.jeon@xxxxxxxxxxx> >> >> New fallocate flag FALLOC_FL_COLLAPSE_RANGE implementation for XFS. >> >> Signed-off-by: Namjae Jeon <namjae.jeon@xxxxxxxxxxx> >> Signed-off-by: Ashish Sangwan <a.sangwan@xxxxxxxxxxx> > Hi Ben. > Very cool feature! ;) Thank you :) > > I have a couple initial suggestions/questions: > >> --- >> fs/xfs/xfs_bmap.c | 92 >> +++++++++++++++++++++++++++++++++++++++++++++++++ >> fs/xfs/xfs_bmap.h | 3 ++ >> fs/xfs/xfs_file.c | 26 ++++++++++++-- >> fs/xfs/xfs_iops.c | 35 +++++++++++++++++++ >> fs/xfs/xfs_vnodeops.c | 62 +++++++++++++++++++++++++++++++++ >> fs/xfs/xfs_vnodeops.h | 2 ++ >> 6 files changed, 217 insertions(+), 3 deletions(-) >> >> diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c >> index 05c698c..ae677b1 100644 >> --- a/fs/xfs/xfs_bmap.c >> +++ b/fs/xfs/xfs_bmap.c >> @@ -6145,3 +6145,95 @@ next_block: >> >> return error; >> } >> + >> +/* >> + * xfs_update_logical() >> + * Updates starting logical block of extents by subtracting >> + * shift from them. At max XFS_LINEAR_EXTS number extents >> + * will be updated and *current_ext is the extent number which >> + * is currently being updated. >> + */ >> +int >> +xfs_update_logical( >> + xfs_trans_t *tp, >> + struct xfs_inode *ip, >> + int *done, >> + xfs_fileoff_t start_fsb, >> + xfs_fileoff_t shift, >> + xfs_extnum_t *current_ext) > > Could we find a better name for this function? Maybe something like > xfs_shift_extent_startblocks or xfs_shift_extent_offsets? Sure, Dave suggessted xfs_bmbt_shift_rec_offsets(). > > Also, is there also a case for being able to shift extent offsets upward in > the > file's address space so that you can splice in a chunk of data? For that I > think maybe you'd want to be able to shift on sub-block boundaries too, and > there would be some copying and zeroing involved on the boundary block. Not > sure. Currently no such case where we need to shift extents upward. Also, no need to zero out anything as the offsets are fs block size aligned. However, for Ext4, previously we submitted this ioctl which moves extent blocks between files. https://lkml.org/lkml/2013/6/23/10 This ioctl moves a range of data blocks from one file and appends them at the end of other file. This (appending at the end) seems a limitation, as we could easily insert metadata blocks anywhere in the extent tree of second file. This operation of inserting new extents in the middle will surely require the extents of the second file to be moved upward. We are planning to work on it. > >> +{ >> + xfs_btree_cur_t *cur; >> + xfs_bmbt_rec_host_t *gotp; >> + xfs_mount_t *mp; >> + xfs_ifork_t *ifp; >> + xfs_extnum_t nexts = 0; >> + xfs_fileoff_t startoff; >> + int error = 0; >> + int i; >> + >> + ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK); >> + mp = ip->i_mount; >> + >> + if (!(ifp->if_flags & XFS_IFEXTENTS) && >> + (error = xfs_iread_extents(tp, ip, XFS_DATA_FORK))) >> + return error; >> + >> + if (!*current_ext) { >> + gotp = xfs_iext_bno_to_ext(ifp, start_fsb, current_ext); >> + /* >> + * gotp can be null in 2 cases: 1) if there are no extents >> + * or 2) start_fsb lies in a hole beyond which there are >> + * no extents. Either way, we are done. >> + */ >> + if (!gotp) { >> + *done = 1; >> + return 0; >> + } >> + } >> + >> + if (ifp->if_flags & XFS_IFBROOT) >> + cur = xfs_bmbt_init_cursor(mp, tp, ip, XFS_DATA_FORK); >> + else >> + cur = NULL; >> + >> + while (nexts++ < XFS_LINEAR_EXTS && >> + *current_ext < XFS_IFORK_NEXTENTS(ip, XFS_DATA_FORK)) { >> + gotp = xfs_iext_get_ext(ifp, (*current_ext)++); >> + startoff = xfs_bmbt_get_startoff(gotp); >> + if (cur) { >> + if ((error = xfs_bmbt_lookup_eq(cur, >> + startoff, >> + xfs_bmbt_get_startblock(gotp), >> + xfs_bmbt_get_blockcount(gotp), >> + &i))) >> + goto del_cursor; >> + XFS_WANT_CORRUPTED_GOTO(i == 1, del_cursor); >> + } >> + startoff -= shift; >> + xfs_bmbt_set_startoff(gotp, startoff); >> + if (cur) { >> + error = xfs_bmbt_update(cur, startoff, >> + xfs_bmbt_get_startblock(gotp), >> + xfs_bmbt_get_blockcount(gotp), >> + xfs_bmbt_get_state(gotp)); >> + if (error) >> + goto del_cursor; >> + } >> + } >> + >> + /* Check if we are done */ >> + if (*current_ext == XFS_IFORK_NEXTENTS(ip, XFS_DATA_FORK)) >> + *done = 1; >> + >> +del_cursor: >> + if (cur) { >> + if (!error) >> + cur->bc_private.b.allocated = 0; >> + xfs_btree_del_cursor(cur, >> + error ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR); >> + } >> + >> + xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE | XFS_ILOG_DEXT); >> + >> + return error; >> +} >> diff --git a/fs/xfs/xfs_bmap.h b/fs/xfs/xfs_bmap.h >> index 1cf1292..f923734 100644 >> --- a/fs/xfs/xfs_bmap.h >> +++ b/fs/xfs/xfs_bmap.h >> @@ -204,6 +204,9 @@ int xfs_bunmapi(struct xfs_trans *tp, struct xfs_inode >> *ip, >> int xfs_check_nostate_extents(struct xfs_ifork *ifp, xfs_extnum_t idx, >> xfs_extnum_t num); >> uint xfs_default_attroffset(struct xfs_inode *ip); >> +int xfs_update_logical(xfs_trans_t *tp, struct xfs_inode *ip, int *done, >> + xfs_fileoff_t start_fsb, xfs_fileoff_t shift, >> + xfs_extnum_t *current_ext); >> >> #ifdef __KERNEL__ >> /* bmap to userspace formatter - copy to user & advance pointer */ >> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c >> index de3dc98..7d871bc 100644 >> --- a/fs/xfs/xfs_file.c >> +++ b/fs/xfs/xfs_file.c >> @@ -817,7 +817,12 @@ xfs_file_fallocate( >> int cmd = XFS_IOC_RESVSP; >> int attr_flags = XFS_ATTR_NOLOCK; >> >> - if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) >> + if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | >> + FALLOC_FL_COLLAPSE_RANGE)) >> + return -EOPNOTSUPP; >> + >> + /* not just yet for rt inodes */ >> + if ((mode & FALLOC_FL_COLLAPSE_RANGE) && XFS_IS_REALTIME_INODE(ip)) >> return -EOPNOTSUPP; >> >> bf.l_whence = 0; >> @@ -826,11 +831,11 @@ xfs_file_fallocate( >> >> xfs_ilock(ip, XFS_IOLOCK_EXCL); >> >> - if (mode & FALLOC_FL_PUNCH_HOLE) >> + if (mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_COLLAPSE_RANGE)) >> cmd = XFS_IOC_UNRESVSP; >> >> /* check the new inode size is valid before allocating */ >> - if (!(mode & FALLOC_FL_KEEP_SIZE) && >> + if (!(mode & (FALLOC_FL_KEEP_SIZE | FALLOC_FL_COLLAPSE_RANGE)) && >> offset + len > i_size_read(inode)) { >> new_size = offset + len; >> error = inode_newsize_ok(inode, new_size); >> @@ -845,6 +850,21 @@ xfs_file_fallocate( >> if (error) >> goto out_unlock; >> >> + if (mode & FALLOC_FL_COLLAPSE_RANGE) { >> + error = -xfs_collapse_file_space(ip, offset + len, len); >> + if (error || offset >= i_size_read(inode)) >> + goto out_unlock; >> + >> + /* Shrink size in case of FALLOC_FL_COLLAPSE_RANGE */ >> + if ((offset + len) > i_size_read(inode)) >> + new_size = offset; >> + else >> + new_size = i_size_read(inode) - len; >> + error = -xfs_update_file_size(ip, new_size); >> + >> + goto out_unlock; >> + } >> + > > Since you're not implementing an XFS_IOC_COLLAPSE_RANGE flag for the > xfs_change_file_space interface, it might be cleaner not to use change_space > at > all... e.g. call xfs_free_file_space directly from xfs_collapse_file_space > or > in the above conditional (making the conditional exclusive with the > change_space call). > > Alternatively, you could implement this fully through > xfs_change_file_space. > > Either way I think it would be best for it to be all or nothing with respect > to > the xfs_change_file_space interface, and my preference is that you > implement > this through xfs_collapse_file_space interface just as the rest of these > operations are implemented in xfs. OK, we will try to call xfs_change_file_space interface from within collapse space. All or nothing approach makes sense, but its just for avoiding code duplicacy we decided to uses XFS_IOC_UNRESVSP. > >> /* Change file size if needed */ >> if (new_size) { >> struct iattr iattr; >> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c >> index 96dda62..16b20f1 100644 >> --- a/fs/xfs/xfs_iops.c >> +++ b/fs/xfs/xfs_iops.c >> @@ -1236,3 +1236,38 @@ xfs_setup_inode( >> >> unlock_new_inode(inode); >> } >> + >> +/* >> + * xfs_update_file_size() >> + * Just a simple disk size and time update >> + */ >> +int >> +xfs_update_file_size( >> + struct xfs_inode *ip, >> + loff_t newsize) >> +{ >> + xfs_mount_t *mp = ip->i_mount; >> + struct inode *inode = VFS_I(ip); >> + struct xfs_trans *tp; >> + int error; >> + >> + tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE); >> + >> + error = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0); >> + if (error) >> + return error; >> + >> + xfs_trans_ijoin(tp, ip, 0); >> + truncate_setsize(inode, newsize); >> + ip->i_d.di_size = newsize; >> + >> + xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG); >> + >> + xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); >> + >> + if (mp->m_flags & XFS_MOUNT_WSYNC) >> + xfs_trans_set_sync(tp); >> + >> + return xfs_trans_commit(tp, 0); >> + >> +} > > Did you consider xfs_setattr_size for this? Yeah we did, but it will also truncate any preallocated extent beyond EOF. Thanks for review! > > Thanks, > Ben > -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
