lkml.org 
[lkml]   [2018]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.14 051/100] xfs: always free inline data before resetting inode fork during ifree
    Date
    From: "Darrick J. Wong" <darrick.wong@oracle.com>

    [ Upstream commit 98c4f78dcdd8cec112d1cbc5e9a792ee6e5ab7a6 ]

    In xfs_ifree, we reset the data/attr forks to extents format without
    bothering to free any inline data buffer that might still be around
    after all the blocks have been truncated off the file. Prior to commit
    43518812d2 ("xfs: remove support for inlining data/extents into the
    inode fork") nobody noticed because the leftover inline data after
    truncation was small enough to fit inside the inline buffer inside the
    fork itself.

    However, now that we've removed the inline buffer, we /always/ have to
    free the inline data buffer or else we leak them like crazy. This test
    was found by turning on kmemleak for generic/001 or generic/388.

    Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    fs/xfs/xfs_inode.c | 21 +++++++++++++++++++++
    1 file changed, 21 insertions(+)

    diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
    index 63350906961a..cb4833d06467 100644
    --- a/fs/xfs/xfs_inode.c
    +++ b/fs/xfs/xfs_inode.c
    @@ -2422,6 +2422,24 @@ retry:
    }

    /*
    + * Free any local-format buffers sitting around before we reset to
    + * extents format.
    + */
    +static inline void
    +xfs_ifree_local_data(
    + struct xfs_inode *ip,
    + int whichfork)
    +{
    + struct xfs_ifork *ifp;
    +
    + if (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_LOCAL)
    + return;
    +
    + ifp = XFS_IFORK_PTR(ip, whichfork);
    + xfs_idata_realloc(ip, -ifp->if_bytes, whichfork);
    +}
    +
    +/*
    * This is called to return an inode to the inode free list.
    * The inode should already be truncated to 0 length and have
    * no pages associated with it. This routine also assumes that
    @@ -2458,6 +2476,9 @@ xfs_ifree(
    if (error)
    return error;

    + xfs_ifree_local_data(ip, XFS_DATA_FORK);
    + xfs_ifree_local_data(ip, XFS_ATTR_FORK);
    +
    VFS_I(ip)->i_mode = 0; /* mark incore inode as free */
    ip->i_d.di_flags = 0;
    ip->i_d.di_dmevmask = 0;
    --
    2.11.0
    \
     
     \ /
      Last update: 2018-01-24 05:56    [W:4.087 / U:0.520 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site