xfs: Remove "committed" argument of xfs_dir_ialloc
PATCH v2 1/2 xfs: Remove "committed" argument of xfs_dir_ialloc
xfs_dir_ialloc() rolls the current transaction when allocation of a new inode required the space manager to perform an allocation and replinish the Inode btree.
None of the callers of xfs_dir_ialloc() need to know if the transaction was committed. Hence this commit removes the "committed" argument of xfs_dir_ialloc.
---
Changelog:
v1 -> v2:
1. Add a patch to remove the "commited" argument of xfs_dir_ialloc. Hence the second patch now has xfs_dir_ialloc() invoking xfs_trans_roll() by passing NULL as the second argument.
fs/xfs/xfs_inode.c | 14 +++----------- fs/xfs/xfs_inode.h | 2 +- fs/xfs/xfs_qm.c | 4 +--- fs/xfs/xfs_symlink.c | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-)
fs/xfs/xfs_inode.c +3 -11
@@ -972,10 +972,8 @@ xfs_dir_ialloc(xfs_nlink_t nlink, dev_t rdev, prid_t prid, /* project id */ - xfs_inode_t **ipp, /* pointer to inode; it will be + xfs_inode_t **ipp) /* pointer to inode; it will be locked. */ - int *committed) - { xfs_trans_t *tp;xfs_inode_t *ip;
@@ -1050,8 +1048,6 @@ xfs_dir_ialloc( } code =xfs_trans_roll (&tp); -if (committed !=NULL ) - *committed =1 ;/* * Re-attach the quota info that we detached from prev trx.
@@ -1088,9 +1084,6 @@ xfs_dir_ialloc( }ASSERT (!ialloc_context && ip); - }else { -if (committed !=NULL ) - *committed =0 ; } *ipp = ip;
@@ -1217,8 +1210,7 @@ xfs_create(* entry pointing to them, but a directory also the "." entry * pointing to itself. */ - error =xfs_dir_ialloc (&tp, dp, mode, is_dir ?2 :1 , rdev, prid, &ip, -NULL ); + error =xfs_dir_ialloc (&tp, dp, mode, is_dir ?2 :1 , rdev, prid, &ip);if (error) goto out_trans_cancel;
@@ -1351,7 +1343,7 @@ xfs_create_tmpfile(if (error) goto out_trans_cancel; - error =xfs_dir_ialloc (&tp, dp, mode,1 ,0 , prid, &ip,NULL ); + error =xfs_dir_ialloc (&tp, dp, mode,1 ,0 , prid, &ip);if (error) goto out_trans_cancel;
fs/xfs/xfs_inode.h +1 -1
@@ -431,7 +431,7 @@ xfs_extlen_t xfs_get_cowextsz_hint(struct xfs_inode *ip);int xfs_dir_ialloc (struct xfs_trans **,struct xfs_inode *,umode_t ,xfs_nlink_t ,dev_t ,prid_t , -struct xfs_inode **,int *); +struct xfs_inode **);/* from xfs_file.c */ enum xfs_prealloc_flags {
fs/xfs/xfs_qm.c +1 -3
@@ -748,7 +748,6 @@ xfs_qm_qino_alloc( {xfs_trans_t *tp;int error; -int committed;bool need_alloc = true; *ip =NULL ;
@@ -788,8 +787,7 @@ xfs_qm_qino_alloc(return error;if (need_alloc) { - error =xfs_dir_ialloc (&tp,NULL ,S_IFREG ,1 ,0 ,0 , ip, - &committed); + error =xfs_dir_ialloc (&tp,NULL ,S_IFREG ,1 ,0 ,0 , ip);if (error) {xfs_trans_cancel (tp);return error;
fs/xfs/xfs_symlink.c +1 -1
@@ -264,7 +264,7 @@ xfs_symlink(* Allocate an inode for the symlink. */ error =xfs_dir_ialloc (&tp, dp,S_IFLNK | (mode & ~S_IFMT ),1 ,0 , - prid, &ip,NULL ); + prid, &ip);if (error) goto out_trans_cancel;
Signature · 1 line
2.9.5
PATCH v2 2/2 xfs: Fix "use after free" of intent items
generic/388 can cause the following "use after free" error to occur,
=============================================================================
BUG xfs_efi_item (Not tainted): Poison overwritten
-----------------------------------------------------------------------------
Disabling lock debugging due to kernel taint
INFO: 0x00000000292c4bd4-0x00000000292c4bd4. First byte 0x6a instead of 0x6b
INFO: Allocated in .kmem_zone_alloc+0xcc/0x190 age=79 cpu=0 pid=12436
.__slab_alloc+0x54/0x80
.kmem_cache_alloc+0x124/0x350
.kmem_zone_alloc+0xcc/0x190
.xfs_efi_init+0x48/0xf0
.xfs_extent_free_create_intent+0x40/0x130
.xfs_defer_intake_work+0x74/0x1e0
.xfs_defer_finish+0xac/0x5c0
.xfs_itruncate_extents+0x170/0x590
.xfs_inactive_truncate+0xcc/0x170
.xfs_inactive+0x1d8/0x2f0
.xfs_fs_destroy_inode+0xe4/0x3d0
.destroy_inode+0x68/0xb0
.do_unlinkat+0x1e8/0x390
system_call+0x58/0x6c
INFO: Freed in .xfs_efi_item_free+0x44/0x80 age=79 cpu=0 pid=12436
.kmem_cache_free+0x120/0x2b0
.xfs_efi_item_free+0x44/0x80
.xfs_trans_free_items+0xd4/0x130
.__xfs_trans_commit+0xd0/0x350
.xfs_trans_roll+0x4c/0x90
.xfs_defer_trans_roll+0xa4/0x2b0
.xfs_defer_finish+0xb8/0x5c0
.xfs_itruncate_extents+0x170/0x590
.xfs_inactive_truncate+0xcc/0x170
.xfs_inactive+0x1d8/0x2f0
.xfs_fs_destroy_inode+0xe4/0x3d0
.destroy_inode+0x68/0xb0
.do_unlinkat+0x1e8/0x390
system_call+0x58/0x6cThis happens due to the following interaction,
1. xfs_defer_finish() creates "extent free" intent item and adds it to the per-transction list of log items.
2. xfs_defer_trans_roll() invokes __xfs_trans_commit(). Here, if the XFS_MOUNT_FS_SHUTDOWN flag is set, we invoke io_unlock() operation for each of the log items in the per-transction list. For "extent free" log items xfs_efi_item_unlock() gets invoked which then frees the xfs_efi_log_item.
3. xfs_defer_trans_roll() then invokes xfs_defer_trans_abort(). Since the xfs_defer_pending->dfp_intent is still set to the "extent free" intent item, we invoke xfs_extent_free_abort_intent(). This accesses the previously freed xfs_efi_log_item to decrement the ref count.
This commit fixes the bug by invoking xfs_defer_trans_abort() only when the log items in the per-transaction list have been committed to the CIL. The log item "committed" status is being tracked by xfs_defer_ops->dop_committed. This was the behaviour prior to commit 3ab78df2a59a485f479d26852a060acfd8c4ecd7 (xfs: rework xfs_bmap_free callers to use xfs_defer_ops).
--- fs/xfs/libxfs/xfs_defer.c | 6 +++--- fs/xfs/xfs_bmap_util.c | 2 +- fs/xfs/xfs_inode.c | 2 +- fs/xfs/xfs_trans.c | 8 +++++++- fs/xfs/xfs_trans.h | 2 +- fs/xfs/xfs_trans_inode.c | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-)
fs/xfs/libxfs/xfs_defer.c +3 -3
@@ -256,13 +256,13 @@ xfs_defer_trans_roll(trace_xfs_defer_trans_roll ((*tp)->t_mountp, dop);/* Roll the transaction. */ - error =xfs_trans_roll (tp); + error =xfs_trans_roll (tp, &dop->dop_committed);if (error) {trace_xfs_defer_trans_roll_error ((*tp)->t_mountp, dop, error); -xfs_defer_trans_abort (*tp, dop, error); +if (dop->dop_committed == true) +xfs_defer_trans_abort (*tp, dop, error);return error; } - dop->dop_committed = true;/* Rejoin the joined inodes. */ for (i =0 ; i <XFS_DEFER_OPS_NR_INODES && dop->dop_inodes[i]; i++)
fs/xfs/xfs_bmap_util.c +1 -1
@@ -1830,7 +1830,7 @@ xfs_swap_change_owner(if (error != -EAGAIN )break ; - error =xfs_trans_roll (tpp); + error =xfs_trans_roll (tpp,NULL );if (error)break ; tp = *tpp;
fs/xfs/xfs_inode.c +1 -1
@@ -1047,7 +1047,7 @@ xfs_dir_ialloc( tp->t_flags &= ~(XFS_TRANS_DQ_DIRTY ); } - code =xfs_trans_roll (&tp); + code =xfs_trans_roll (&tp,NULL );/* * Re-attach the quota info that we detached from prev trx.
fs/xfs/xfs_trans.c +7 -1
@@ -1057,12 +1057,15 @@ xfs_trans_cancel(*/ int xfs_trans_roll ( -struct xfs_trans **tpp) +struct xfs_trans **tpp, +bool *committed) {struct xfs_trans *trans = *tpp;struct xfs_trans_res tres;int error; +if (committed) + *committed = false;/* * Copy the critical parameters from one trans to the next. */
@@ -1082,6 +1085,9 @@ xfs_trans_roll(if (error)return error; +if (committed) + *committed = true; +/* * Reserve space in the log for the next transaction. * This also pushes items in the "AIL", the list of logged items,
fs/xfs/xfs_trans.h +1 -1
@@ -230,7 +230,7 @@ int xfs_trans_free_extent(struct xfs_trans *, struct xfs_efd_log_item *, xfs_fsblock_t, xfs_extlen_t, struct xfs_owner_info *);int xfs_trans_commit (struct xfs_trans *); -int xfs_trans_roll (struct xfs_trans **); +int xfs_trans_roll (struct xfs_trans **,bool *);int xfs_trans_roll_inode (struct xfs_trans **,struct xfs_inode *);void xfs_trans_cancel (xfs_trans_t *);int xfs_trans_ail_init (struct xfs_mount *);
fs/xfs/xfs_trans_inode.c +1 -1
@@ -147,7 +147,7 @@ xfs_trans_roll_inode(int error;xfs_trans_log_inode (*tpp, ip,XFS_ILOG_CORE ); - error =xfs_trans_roll (tpp); + error =xfs_trans_roll (tpp,NULL );if (!error)xfs_trans_ijoin (*tpp, ip,0 );return error;
Signature · 1 line
2.9.5
Re: [PATCH V2 2/2] xfs: Fix "use after free" of intent items
Quoted 39 lines · Chandan Rajendra
generic/388 can cause the following "use after free" error to occur,
=============================================================================
BUGxfs_efi_item(Not tainted): Poison overwritten
-----------------------------------------------------------------------------Disabling lock debugging due to kernel taint
INFO: 0x00000000292c4bd4-0x00000000292c4bd4. First byte0x6ainstead of0x6b
INFO: Allocated in .kmem_zone_alloc+0xcc/0x190 age=79 cpu=0 pid=12436.__slab_alloc+0x54/0x80 .kmem_cache_alloc+0x124/0x350 .kmem_zone_alloc+0xcc/0x190 .xfs_efi_init+0x48/0xf0 .xfs_extent_free_create_intent+0x40/0x130 .xfs_defer_intake_work+0x74/0x1e0 .xfs_defer_finish+0xac/0x5c0 .xfs_itruncate_extents+0x170/0x590 .xfs_inactive_truncate+0xcc/0x170 .xfs_inactive+0x1d8/0x2f0 .xfs_fs_destroy_inode+0xe4/0x3d0 .destroy_inode+0x68/0xb0 .do_unlinkat+0x1e8/0x390 system_call+0x58/0x6c INFO: Freed in .xfs_efi_item_free+0x44/0x80 age=79 cpu=0 pid=12436 .kmem_cache_free+0x120/0x2b0 .xfs_efi_item_free+0x44/0x80 .xfs_trans_free_items+0xd4/0x130 .__xfs_trans_commit+0xd0/0x350 .xfs_trans_roll+0x4c/0x90 .xfs_defer_trans_roll+0xa4/0x2b0 .xfs_defer_finish+0xb8/0x5c0 .xfs_itruncate_extents+0x170/0x590 .xfs_inactive_truncate+0xcc/0x170 .xfs_inactive+0x1d8/0x2f0 .xfs_fs_destroy_inode+0xe4/0x3d0 .destroy_inode+0x68/0xb0 .do_unlinkat+0x1e8/0x390 system_call+0x58/0x6c
Quoted 8 lines
This happens due to the following interaction,
1.xfs_defer_finish()creates "extent free" intent item and adds it to the per-transction list of log items.
2.xfs_defer_trans_roll()invokes__xfs_trans_commit(). Here, if theXFS_MOUNT_FS_SHUTDOWNflag is set, we invokeio_unlock()operation for each of the log items in the per-transction list. For "extent free" log itemsxfs_efi_item_unlock()gets invoked which then frees thexfs_efi_log_item.
Isn't this the problem? i.e. it's freeing the EFI item because the abort flag is set, but there are still other references to it? Isn't this wrong now that we have a cleanup function that will free the EFI is the commit fails? i.e: this ....
Quoted 4 lines
3.
xfs_defer_trans_roll()then invokesxfs_defer_trans_abort(). Since thexfs_defer_pending->dfp_intentis still set to the "extent free" intent item, we invokexfs_extent_free_abort_intent(). This accesses the previously freedxfs_efi_log_itemto decrement the ref count.
... will free the EFI correctly on transaction commit failure and so we should be able to remove the "free immediately" hack from the iop_unlock() code that we used to need because there was no external reference that could free the EFI on commit failure....
Quoted 6 lines
This commit fixes the bug by invoking
xfs_defer_trans_abort()only when the log items in the per-transaction list have been committed to the CIL. The log item "committed" status is being tracked byxfs_defer_ops->dop_committed. This was the behaviour prior to commit3ab78df2a59a485f479d26852a060acfd8c4ecd7(xfs: reworkxfs_bmap_freecallers to usexfs_defer_ops).
Freeing in ->iop_unlock was always troublesome. We should get rid of it, not go back to it.
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Re: [PATCH V2 2/2] xfs: Fix "use after free" of intent items
Quoted 59 lines · IST Dave Chinner
Quoted 39 lines · Chandan Rajendra
generic/388 can cause the following "use after free" error to occur,
=============================================================================
BUGxfs_efi_item(Not tainted): Poison overwritten
-----------------------------------------------------------------------------Disabling lock debugging due to kernel taint
INFO: 0x00000000292c4bd4-0x00000000292c4bd4. First byte0x6ainstead of0x6b
INFO: Allocated in .kmem_zone_alloc+0xcc/0x190 age=79 cpu=0 pid=12436.__slab_alloc+0x54/0x80 .kmem_cache_alloc+0x124/0x350 .kmem_zone_alloc+0xcc/0x190 .xfs_efi_init+0x48/0xf0 .xfs_extent_free_create_intent+0x40/0x130 .xfs_defer_intake_work+0x74/0x1e0 .xfs_defer_finish+0xac/0x5c0 .xfs_itruncate_extents+0x170/0x590 .xfs_inactive_truncate+0xcc/0x170 .xfs_inactive+0x1d8/0x2f0 .xfs_fs_destroy_inode+0xe4/0x3d0 .destroy_inode+0x68/0xb0 .do_unlinkat+0x1e8/0x390 system_call+0x58/0x6c INFO: Freed in .xfs_efi_item_free+0x44/0x80 age=79 cpu=0 pid=12436 .kmem_cache_free+0x120/0x2b0 .xfs_efi_item_free+0x44/0x80 .xfs_trans_free_items+0xd4/0x130 .__xfs_trans_commit+0xd0/0x350 .xfs_trans_roll+0x4c/0x90 .xfs_defer_trans_roll+0xa4/0x2b0 .xfs_defer_finish+0xb8/0x5c0 .xfs_itruncate_extents+0x170/0x590 .xfs_inactive_truncate+0xcc/0x170 .xfs_inactive+0x1d8/0x2f0 .xfs_fs_destroy_inode+0xe4/0x3d0 .destroy_inode+0x68/0xb0 .do_unlinkat+0x1e8/0x390 system_call+0x58/0x6cQuoted 8 lines
This happens due to the following interaction,
1.xfs_defer_finish()creates "extent free" intent item and adds it to the per-transction list of log items.
2.xfs_defer_trans_roll()invokes__xfs_trans_commit(). Here, if theXFS_MOUNT_FS_SHUTDOWNflag is set, we invokeio_unlock()operation for each of the log items in the per-transction list. For "extent free" log itemsxfs_efi_item_unlock()gets invoked which then frees thexfs_efi_log_item.Isn't this the problem? i.e. it's freeing the EFI item because the abort flag is set, but there are still other references to it? Isn't this wrong now that we have a cleanup function that will free the EFI is the commit fails? i.e: this ....
Quoted 4 lines
3.
xfs_defer_trans_roll()then invokesxfs_defer_trans_abort(). Since thexfs_defer_pending->dfp_intentis still set to the "extent free" intent item, we invokexfs_extent_free_abort_intent(). This accesses the previously freedxfs_efi_log_itemto decrement the ref count.
Quoted 4 lines
... will free the EFI correctly on transaction commit failure and so we should be able to remove the "free immediately" hack from the
iop_unlock()code that we used to need because there was no external reference that could free the EFI on commit failure....
The EFI log item would have its ref count initialized to 2 (One for the CIL/AIL and one for EFD). In the "use after free" case the EFI was not committed to the CIL. At this point, we don't have any entity owning a reference to the log item since the EFI was not committed to the CIL nor was the EFD created. Hence IMHO, freeing the log item is the right approach.
Also, the cleanup function (i.e. xfs_extent_free_abort_intent()) would decrement the ref count by 1 i.e. Its refcount would go from the initial value of 2 to 1. Hence the cleanup function won't free the EFI log item causing a memory leak.
Quoted 15 lines
Quoted 7 lines
This commit fixes the bug by invoking
xfs_defer_trans_abort()only when the log items in the per-transaction list have been committed to the CIL. The log item "committed" status is being tracked byxfs_defer_ops->dop_committed. This was the behaviour prior to commit3ab78df2a59a485f479d26852a060acfd8c4ecd7(xfs: reworkxfs_bmap_freecallers to usexfs_defer_ops).Freeing in ->iop_unlock was always troublesome. We should get rid of it, not go back to it.
Cheers,
Dave.
Signature · 1 line
chandan
Re: [PATCH V2 2/2] xfs: Fix "use after free" of intent items
Quoted 60 lines · Chandan Rajendra
Quoted 59 lines · IST Dave Chinner
Quoted 39 lines · Chandan Rajendra
generic/388 can cause the following "use after free" error to occur,
=============================================================================
BUGxfs_efi_item(Not tainted): Poison overwritten
-----------------------------------------------------------------------------Disabling lock debugging due to kernel taint
INFO: 0x00000000292c4bd4-0x00000000292c4bd4. First byte0x6ainstead of0x6b
INFO: Allocated in .kmem_zone_alloc+0xcc/0x190 age=79 cpu=0 pid=12436.__slab_alloc+0x54/0x80 .kmem_cache_alloc+0x124/0x350 .kmem_zone_alloc+0xcc/0x190 .xfs_efi_init+0x48/0xf0 .xfs_extent_free_create_intent+0x40/0x130 .xfs_defer_intake_work+0x74/0x1e0 .xfs_defer_finish+0xac/0x5c0 .xfs_itruncate_extents+0x170/0x590 .xfs_inactive_truncate+0xcc/0x170 .xfs_inactive+0x1d8/0x2f0 .xfs_fs_destroy_inode+0xe4/0x3d0 .destroy_inode+0x68/0xb0 .do_unlinkat+0x1e8/0x390 system_call+0x58/0x6c INFO: Freed in .xfs_efi_item_free+0x44/0x80 age=79 cpu=0 pid=12436 .kmem_cache_free+0x120/0x2b0 .xfs_efi_item_free+0x44/0x80 .xfs_trans_free_items+0xd4/0x130 .__xfs_trans_commit+0xd0/0x350 .xfs_trans_roll+0x4c/0x90 .xfs_defer_trans_roll+0xa4/0x2b0 .xfs_defer_finish+0xb8/0x5c0 .xfs_itruncate_extents+0x170/0x590 .xfs_inactive_truncate+0xcc/0x170 .xfs_inactive+0x1d8/0x2f0 .xfs_fs_destroy_inode+0xe4/0x3d0 .destroy_inode+0x68/0xb0 .do_unlinkat+0x1e8/0x390 system_call+0x58/0x6cQuoted 8 lines
This happens due to the following interaction,
1.xfs_defer_finish()creates "extent free" intent item and adds it to the per-transction list of log items.
2.xfs_defer_trans_roll()invokes__xfs_trans_commit(). Here, if theXFS_MOUNT_FS_SHUTDOWNflag is set, we invokeio_unlock()operation for each of the log items in the per-transction list. For "extent free" log itemsxfs_efi_item_unlock()gets invoked which then frees thexfs_efi_log_item.Isn't this the problem? i.e. it's freeing the EFI item because the abort flag is set, but there are still other references to it? Isn't this wrong now that we have a cleanup function that will free the EFI is the commit fails? i.e: this ....
Quoted 4 lines
3.
xfs_defer_trans_roll()then invokesxfs_defer_trans_abort(). Since thexfs_defer_pending->dfp_intentis still set to the "extent free" intent item, we invokexfs_extent_free_abort_intent(). This accesses the previously freedxfs_efi_log_itemto decrement the ref count.
Quoted 7 lines
Quoted 4 lines
... will free the EFI correctly on transaction commit failure and so we should be able to remove the "free immediately" hack from the
iop_unlock()code that we used to need because there was no external reference that could free the EFI on commit failure....The EFI log item would have its ref count initialized to 2 (One for the CIL/AIL and one for EFD).
And that's part of what has always been wrong with this code - it takes references for things that don't really have references yet, instead of taking them when the EFI is actually referenced. Hence we have to hack around that with things like ignoring the reference count when we get an abort signal, because we haven't reference counted the object properly.
Quoted 4 lines
In the "use after free" case the EFI was not
committed to the CIL. At this point, we don't have any entity owning a reference to the log item since the EFI was not committed to the CIL nor was the EFD created. Hence IMHO, freeing the log item is the right approach.
No, we clearly have a reference - the deferops structure has a reference to it. If it didn't have a reference, then we wouldn't have a use after free situation....
Quoted 4 lines
Also, the cleanup function (i.e.
xfs_extent_free_abort_intent()) would decrement the ref count by 1 i.e. Its refcount would go from the initial value of 2 to 1. Hence the cleanup function won't free the EFI log item causing a memory leak.
No, then the xfs_extent_free_abort_intent() call releases it, dropping the remaining reference that was intended for the EFD which, because we aborted, will never take over control of that reference.
i.e. the two references that are created at initialisation are for the EFI itself as it passes through the CIL and journal commit, and the second reference is used by the defer_ops it is attached to and then handed to the EFD for it's pass through the CIL and journal commit.
If we never commit the EFI, then we need to release that reference (on abort), and then we need to clean up the extra reference that is destined for the EFD which is held by the deferops. That's done by xfs_extent_free_abort_intent().
And I'm guessing that we need to make sure the same fix goes through all the other items that are used as deferops intents that were modeled on the EFI/EFD infrastructure, too.
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Re: [PATCH V2 2/2] xfs: Fix "use after free" of intent items
Quoted 101 lines · IST Dave Chinner
Quoted 60 lines · Chandan Rajendra
Quoted 59 lines · IST Dave Chinner
Quoted 39 lines · Chandan Rajendra
generic/388 can cause the following "use after free" error to occur,
=============================================================================
BUGxfs_efi_item(Not tainted): Poison overwritten
-----------------------------------------------------------------------------Disabling lock debugging due to kernel taint
INFO: 0x00000000292c4bd4-0x00000000292c4bd4. First byte0x6ainstead of0x6b
INFO: Allocated in .kmem_zone_alloc+0xcc/0x190 age=79 cpu=0 pid=12436.__slab_alloc+0x54/0x80 .kmem_cache_alloc+0x124/0x350 .kmem_zone_alloc+0xcc/0x190 .xfs_efi_init+0x48/0xf0 .xfs_extent_free_create_intent+0x40/0x130 .xfs_defer_intake_work+0x74/0x1e0 .xfs_defer_finish+0xac/0x5c0 .xfs_itruncate_extents+0x170/0x590 .xfs_inactive_truncate+0xcc/0x170 .xfs_inactive+0x1d8/0x2f0 .xfs_fs_destroy_inode+0xe4/0x3d0 .destroy_inode+0x68/0xb0 .do_unlinkat+0x1e8/0x390 system_call+0x58/0x6c INFO: Freed in .xfs_efi_item_free+0x44/0x80 age=79 cpu=0 pid=12436 .kmem_cache_free+0x120/0x2b0 .xfs_efi_item_free+0x44/0x80 .xfs_trans_free_items+0xd4/0x130 .__xfs_trans_commit+0xd0/0x350 .xfs_trans_roll+0x4c/0x90 .xfs_defer_trans_roll+0xa4/0x2b0 .xfs_defer_finish+0xb8/0x5c0 .xfs_itruncate_extents+0x170/0x590 .xfs_inactive_truncate+0xcc/0x170 .xfs_inactive+0x1d8/0x2f0 .xfs_fs_destroy_inode+0xe4/0x3d0 .destroy_inode+0x68/0xb0 .do_unlinkat+0x1e8/0x390 system_call+0x58/0x6cQuoted 8 lines
This happens due to the following interaction,
1.xfs_defer_finish()creates "extent free" intent item and adds it to the per-transction list of log items.
2.xfs_defer_trans_roll()invokes__xfs_trans_commit(). Here, if theXFS_MOUNT_FS_SHUTDOWNflag is set, we invokeio_unlock()operation for each of the log items in the per-transction list. For "extent free" log itemsxfs_efi_item_unlock()gets invoked which then frees thexfs_efi_log_item.Isn't this the problem? i.e. it's freeing the EFI item because the abort flag is set, but there are still other references to it? Isn't this wrong now that we have a cleanup function that will free the EFI is the commit fails? i.e: this ....
Quoted 4 lines
3.
xfs_defer_trans_roll()then invokesxfs_defer_trans_abort(). Since thexfs_defer_pending->dfp_intentis still set to the "extent free" intent item, we invokexfs_extent_free_abort_intent(). This accesses the previously freedxfs_efi_log_itemto decrement the ref count.Quoted 7 lines
Quoted 4 lines
... will free the EFI correctly on transaction commit failure and so we should be able to remove the "free immediately" hack from the
iop_unlock()code that we used to need because there was no external reference that could free the EFI on commit failure....The EFI log item would have its ref count initialized to 2 (One for the CIL/AIL and one for EFD).
And that's part of what has always been wrong with this code - it takes references for things that don't really have references yet, instead of taking them when the EFI is actually referenced. Hence we have to hack around that with things like ignoring the reference count when we get an abort signal, because we haven't reference counted the object properly.
Quoted 4 lines
In the "use after free" case the EFI was not
committed to the CIL. At this point, we don't have any entity owning a reference to the log item since the EFI was not committed to the CIL nor was the EFD created. Hence IMHO, freeing the log item is the right approach.No, we clearly have a reference - the deferops structure has a reference to it. If it didn't have a reference, then we wouldn't have a use after free situation....
Quoted 4 lines
Also, the cleanup function (i.e.
xfs_extent_free_abort_intent()) would decrement the ref count by 1 i.e. Its refcount would go from the initial value of 2 to 1. Hence the cleanup function won't free the EFI log item causing a memory leak.No, then the
xfs_extent_free_abort_intent()call releases it, dropping the remaining reference that was intended for the EFD which, because we aborted, will never take over control of that reference.i.e. the two references that are created at initialisation are for the EFI itself as it passes through the CIL and journal commit, and the second reference is used by the
defer_opsit is attached to and then handed to the EFD for it's pass through the CIL and journal commit.
Quoted 9 lines
If we never commit the EFI, then we need to release that reference (on abort), and then we need to clean up the extra reference that is destined for the EFD which is held by the deferops. That's done by
xfs_extent_free_abort_intent().And I'm guessing that we need to make sure the same fix goes through all the other items that are used as deferops intents that were modeled on the EFI/EFD infrastructure, too.
I agree. Thanks for the explaination. I will work on writing up a patch to fix this issue for all the log items which have corresponding intent and done items.
Signature · 1 line
chandan
Quoted 9 lines · Chandan Rajendra
xfs_dir_ialloc()rolls the current transaction when allocation of a new inode required the space manager to perform an allocation and replinish the Inode btree.None of the callers of
xfs_dir_ialloc()need to know if the transaction was committed. Hence this commit removes the "committed" argument ofxfs_dir_ialloc.Signed-off-by Chandan Rajendra <[email protected]>
This first patch looks ok,
--D
Quoted 122 lines
---
Changelog:
v1 -> v2:
1. Add a patch to remove the "commited" argument ofxfs_dir_ialloc. Hence the second patch now hasxfs_dir_ialloc()invokingxfs_trans_roll()by passing NULL as the second argument.fs/xfs/xfs_inode.c | 14 +++----------- fs/xfs/xfs_inode.h | 2 +- fs/xfs/xfs_qm.c | 4 +--- fs/xfs/xfs_symlink.c | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-)fs/xfs/xfs_inode.c +3
-11@@ -972,10 +972,8 @@ xfs_dir_ialloc(xfs_nlink_t nlink, dev_t rdev, prid_t prid, /* project id */ - xfs_inode_t **ipp, /* pointer to inode; it will be + xfs_inode_t **ipp) /* pointer to inode; it will be locked. */ - int *committed) - { xfs_trans_t *tp;xfs_inode_t *ip;@@ -1050,8 +1048,6 @@ xfs_dir_ialloc( } code =xfs_trans_roll (&tp); -if (committed !=NULL ) - *committed =1 ;/* * Re-attach the quota info that we detached from prev trx. @@ -1088,9 +1084,6 @@ xfs_dir_ialloc( }ASSERT (!ialloc_context && ip); - }else { -if (committed !=NULL ) - *committed =0 ; } *ipp = ip;@@ -1217,8 +1210,7 @@ xfs_create(* entry pointing to them, but a directory also the "." entry * pointing to itself. */ - error =xfs_dir_ialloc (&tp, dp, mode, is_dir ?2 :1 , rdev, prid, &ip, -NULL ); + error =xfs_dir_ialloc (&tp, dp, mode, is_dir ?2 :1 , rdev, prid, &ip);if (error) goto out_trans_cancel;@@ -1351,7 +1343,7 @@ xfs_create_tmpfile(if (error) goto out_trans_cancel; - error =xfs_dir_ialloc (&tp, dp, mode,1 ,0 , prid, &ip,NULL ); + error =xfs_dir_ialloc (&tp, dp, mode,1 ,0 , prid, &ip);if (error) goto out_trans_cancel;fs/xfs/xfs_inode.h +1
-1@@ -431,7 +431,7 @@ xfs_extlen_t xfs_get_cowextsz_hint(struct xfs_inode *ip);int xfs_dir_ialloc (struct xfs_trans **,struct xfs_inode *,umode_t ,xfs_nlink_t ,dev_t ,prid_t , -struct xfs_inode **,int *); +struct xfs_inode **);/* from xfs_file.c */ enum xfs_prealloc_flags {fs/xfs/xfs_qm.c +1
-3@@ -748,7 +748,6 @@ xfs_qm_qino_alloc( {xfs_trans_t *tp;int error; -int committed;bool need_alloc = true; *ip =NULL ;@@ -788,8 +787,7 @@ xfs_qm_qino_alloc(return error;if (need_alloc) { - error =xfs_dir_ialloc (&tp,NULL ,S_IFREG ,1 ,0 ,0 , ip, - &committed); + error =xfs_dir_ialloc (&tp,NULL ,S_IFREG ,1 ,0 ,0 , ip);if (error) {xfs_trans_cancel (tp);return error;fs/xfs/xfs_symlink.c +1
-1@@ -264,7 +264,7 @@ xfs_symlink(* Allocate an inode for the symlink. */ error =xfs_dir_ialloc (&tp, dp,S_IFLNK | (mode & ~S_IFMT ),1 ,0 , - prid, &ip,NULL ); + prid, &ip);if (error) goto out_trans_cancel;Signature · 6 lines
2.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html