udf: Fix lock inversion between iprune_mutex and alloc_mutex (v2)
PATCH 1/1 udf: Fix lock inversion between iprune_mutex and alloc_mutex (v2)
A memory allocation inside alloc_mutex must not recurse back into the filesystem itself because that leads to lock inversion between iprune_mutex and alloc_mutex (and thus to deadlocks - see traces below). alloc_mutex is actually needed only to update allocation statistics in the superblock so we can drop it before we start allocating memory for the inode.
tar D ffff81015b9c8c90 0 6614 6612
ffff8100d5a21a20 0000000000000086 0000000000000000 00000000ffff0000 ffff81015b9c8c90 ffff81015b8f0cd0 ffff81015b9c8ee0 0000000000000000 0000000000000003 0000000000000000 0000000000000000 0000000000000000
Call Trace: [<ffffffff803c1d8a>] __mutex_lock_slowpath+0x64/0x9b [<ffffffff803c1bef>] mutex_lock+0xa/0xb [<ffffffff8027f8c2>] shrink_icache_memory+0x38/0x200 [<ffffffff80257742>] shrink_slab+0xe3/0x15b [<ffffffff802579db>] try_to_free_pages+0x221/0x30d [<ffffffff8025657e>] isolate_pages_global+0x0/0x31 [<ffffffff8025324b>] __alloc_pages_internal+0x252/0x3ab [<ffffffff8026b08b>] cache_alloc_refill+0x22e/0x47b [<ffffffff8026ae37>] kmem_cache_alloc+0x3b/0x61 [<ffffffff8026b15b>] cache_alloc_refill+0x2fe/0x47b [<ffffffff8026b34e>] __kmalloc+0x76/0x9c [<ffffffffa00751f2>] :udf:udf_new_inode+0x202/0x2e2 [<ffffffffa007ae5e>] :udf:udf_create+0x2f/0x16d [<ffffffffa0078f27>] :udf:udf_lookup+0xa6/0xad
...
kswapd0 D ffff81015b9d9270 0 125 2
ffff81015b903c28 0000000000000046 ffffffff8028cbb0 00000000fffffffb ffff81015b9d9270 ffff81015b8f0cd0 ffff81015b9d94c0 000000000271b490 ffffe2000271b458 ffffe2000271b420 ffffe20002728dc8 ffffe20002728d90
Call Trace: [<ffffffff8028cbb0>] __set_page_dirty+0xeb/0xf5 [<ffffffff8025403a>] get_dirty_limits+0x1d/0x22f [<ffffffff803c1d8a>] __mutex_lock_slowpath+0x64/0x9b [<ffffffff803c1bef>] mutex_lock+0xa/0xb [<ffffffffa0073f58>] :udf:udf_bitmap_free_blocks+0x47/0x1eb [<ffffffffa007df31>] :udf:udf_discard_prealloc+0xc6/0x172 [<ffffffffa007875a>] :udf:udf_clear_inode+0x1e/0x48 [<ffffffff8027f121>] clear_inode+0x6d/0xc4 [<ffffffff8027f7f2>] dispose_list+0x56/0xee [<ffffffff8027fa5a>] shrink_icache_memory+0x1d0/0x200 [<ffffffff80257742>] shrink_slab+0xe3/0x15b [<ffffffff80257e93>] kswapd+0x346/0x447
...
--- fs/udf/ialloc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
fs/udf/ialloc.c +1 -2
@@ -111,6 +111,7 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) lvhd->uniqueID =cpu_to_le64 (uniqueID);mark_buffer_dirty (sbi->s_lvid_bh); } +mutex_unlock (&sbi->s_alloc_mutex); inode->i_mode = mode; inode->i_uid = current->fsuid;if (dir->i_mode &S_ISGID ) {
@@ -145,7 +146,6 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)if (!iinfo->i_ext.i_data) {iput (inode); *err = -ENOMEM ; -mutex_unlock (&sbi->s_alloc_mutex);return NULL ; }if (UDF_QUERY_FLAG (inode->i_sb,UDF_FLAG_USE_AD_IN_ICB ))
@@ -158,7 +158,6 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) iinfo->i_crtime =current_fs_time (inode->i_sb);insert_inode_hash (inode);mark_inode_dirty (inode); -mutex_unlock (&sbi->s_alloc_mutex);if (DQUOT_ALLOC_INODE (inode)) {DQUOT_DROP (inode);
Signature · 1 line
1.5.2.4
PATCH 1/1 udf: Fix error paths in udf_new_inode()
I case we failed to allocate memory for inode when creating it, we did not properly free block already allocated for this inode. Move memory allocation before the block allocation which fixes this issue. Also remove a few superfluous initializations already done in udf_alloc_inode().
--- fs/udf/ialloc.c | 41 ++++++++++++++++++----------------------- 1 files changed, 18 insertions(+), 23 deletions(-)
fs/udf/ialloc.c +18 -23
@@ -76,11 +76,24 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) *err = -ENOSPC ; iinfo =UDF_I (inode); - iinfo->i_unique =0 ; - iinfo->i_lenExtents =0 ; - iinfo->i_next_alloc_block =0 ; - iinfo->i_next_alloc_goal =0 ; - iinfo->i_strat4096 =0 ; +if (UDF_QUERY_FLAG (inode->i_sb,UDF_FLAG_USE_EXTENDED_FE )) { + iinfo->i_efe =1 ; +if (UDF_VERS_USE_EXTENDED_FE > sbi->s_udfrev) + sbi->s_udfrev =UDF_VERS_USE_EXTENDED_FE ; + iinfo->i_ext.i_data =kzalloc (inode->i_sb->s_blocksize - +sizeof (struct extendedFileEntry ), +GFP_KERNEL ); + }else { + iinfo->i_efe =0 ; + iinfo->i_ext.i_data =kzalloc (inode->i_sb->s_blocksize - +sizeof (struct fileEntry ), +GFP_KERNEL ); + } +if (!iinfo->i_ext.i_data) { +iput (inode); + *err = -ENOMEM ; +return NULL ; + } block = udf_new_block(dir->i_sb, NULL, dinfo->i_location.partitionReferenceNum,
@@ -130,24 +143,6 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) iinfo->i_lenEAttr =0 ; iinfo->i_lenAlloc =0 ; iinfo->i_use =0 ; -if (UDF_QUERY_FLAG (inode->i_sb,UDF_FLAG_USE_EXTENDED_FE )) { - iinfo->i_efe =1 ; -if (UDF_VERS_USE_EXTENDED_FE > sbi->s_udfrev) - sbi->s_udfrev =UDF_VERS_USE_EXTENDED_FE ; - iinfo->i_ext.i_data =kzalloc (inode->i_sb->s_blocksize - -sizeof (struct extendedFileEntry ), -GFP_KERNEL ); - }else { - iinfo->i_efe =0 ; - iinfo->i_ext.i_data =kzalloc (inode->i_sb->s_blocksize - -sizeof (struct fileEntry ), -GFP_KERNEL ); - } -if (!iinfo->i_ext.i_data) { -iput (inode); - *err = -ENOMEM ; -return NULL ; - }if (UDF_QUERY_FLAG (inode->i_sb,UDF_FLAG_USE_AD_IN_ICB )) iinfo->i_alloc_type =ICBTAG_FLAG_AD_IN_ICB ;else if (UDF_QUERY_FLAG (inode->i_sb,UDF_FLAG_USE_SHORT_AD ))
Signature · 1 line
1.5.2.4
Hi Jan,
Quoted 5 lines · Jan Kara
A memory allocation inside
alloc_mutexmust not recurse back into the filesystem itself because that leads to lock inversion betweeniprune_mutexandalloc_mutex(and thus to deadlocks - see traces below).alloc_mutexis actually needed only to update allocation statistics in the superblock so we can drop it before we start allocating memory for the inode.
On a quick review, this is correct.
Best Regards
Ingo Oeser