On Fri, Mar 23, 2018 at 05:08:13PM +0000, Luis R. Rodriguez wrote:
> On Thu, Mar 22, 2018 at 08:41:45PM -0700, Darrick J. Wong wrote:
> > On Fri, Mar 23, 2018 at 01:30:37AM +0000, Luis R. Rodriguez wrote:
> > > On Wed, Nov 22, 2017 at 10:01:37PM -0800, Darrick J. Wong wrote:
> > > > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> > > > index 61d1cb7..8012741 100644
> > > > --- a/fs/xfs/xfs_inode.c
> > > > +++ b/fs/xfs/xfs_inode.c
> > > > @@ -2401,6 +2401,24 @@ xfs_ifree_cluster(
> > > > }
> > > >
> > > > /*
> > > > + * 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;
> > >
> > > I'm new to all this so this was a bit hard to follow. I'm confused with how
> > > commit 43518812d2 ("xfs: remove support for inlining data/extents into the
> > > inode fork") exacerbated the leak, isn't that commit about
> > > XFS_DINODE_FMT_EXTENTS?
> >
> > Not specifically _EXTENTS, merely any fork (EXTENTS or LOCAL) whose
> > incore data was small enough to fit in if_inline_ata.
>
> Got it, I thought those were XFS_DINODE_FMT_EXTENTS by definition.
>
> > > Did we have cases where the format was XFS_DINODE_FMT_LOCAL and yet
> > > ifp->if_u1.if_data == ifp->if_u2.if_inline_data ?
> >
> > An empty directory is 6 bytes, which is what you get with a fresh mkdir
> > or after deleting everything in the directory. Prior to the 43518812d2
> > patch we could get away with not even checking if we had to free if_data
> > when deleting a directory because it fit within if_inline_data.
>
> Ah got it. So your fix *is* also applicable even prior to commit 43518812d2.
You'd have to modify the patch so that it doesn't try to kmem_free
if_data if if_data == if_inline_data but otherwise (in theory) I think
that the concept applies to pre-4.15 kernels.
(YMMV, please do run this through QA/kmemleak just in case I'm wrong, etc...)
--D
> Luis
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
