* [PATCH REVIEW] udf: Fix lock inversion between iprune_mutex and alloc_mutex
@ 2008-08-14 17:49 Jan Kara
2008-08-14 18:48 ` Ingo Oeser
0 siblings, 1 reply; 3+ messages in thread
From: Jan Kara @ 2008-08-14 17:49 UTC (permalink / raw)
To: LKML; +Cc: Jan Kara
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). Make allocations inside alloc_mutex use GFP_NOFS
to avoid this problem.
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
...
Reported-by: Tibor Tajti <tibor.tajti@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/udf/ialloc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
index eb9cfa2..5bee415 100644
--- a/fs/udf/ialloc.c
+++ b/fs/udf/ialloc.c
@@ -135,12 +135,12 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
sbi->s_udfrev = UDF_VERS_USE_EXTENDED_FE;
iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize -
sizeof(struct extendedFileEntry),
- GFP_KERNEL);
+ GFP_NOFS);
} else {
iinfo->i_efe = 0;
iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize -
sizeof(struct fileEntry),
- GFP_KERNEL);
+ GFP_NOFS);
}
if (!iinfo->i_ext.i_data) {
iput(inode);
--
1.5.2.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH REVIEW] udf: Fix lock inversion between iprune_mutex and alloc_mutex
2008-08-14 17:49 [PATCH REVIEW] udf: Fix lock inversion between iprune_mutex and alloc_mutex Jan Kara
@ 2008-08-14 18:48 ` Ingo Oeser
2008-08-18 12:47 ` Jan Kara
0 siblings, 1 reply; 3+ messages in thread
From: Ingo Oeser @ 2008-08-14 18:48 UTC (permalink / raw)
To: Jan Kara; +Cc: LKML
Hi Jan,
On Thursday 14 August 2008, Jan Kara wrote:
> 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). Make allocations inside alloc_mutex use GFP_NOFS
> to avoid this problem.
What about moving the allocation before taking the mutex?
That way, we even reduce the lock contention and simplify the failure path.
Signed-off-by: Ingo Oeser <ioe-lkml@rameria.de>
diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
index eb9cfa2..76446eb 100644
--- a/fs/udf/ialloc.c
+++ b/fs/udf/ialloc.c
@@ -90,6 +90,25 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
return NULL;
}
+ 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;
+ }
+
mutex_lock(&sbi->s_alloc_mutex);
if (sbi->s_lvid_bh) {
struct logicalVolIntegrityDesc *lvid =
@@ -129,25 +148,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;
- mutex_unlock(&sbi->s_alloc_mutex);
- 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))
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH REVIEW] udf: Fix lock inversion between iprune_mutex and alloc_mutex
2008-08-14 18:48 ` Ingo Oeser
@ 2008-08-18 12:47 ` Jan Kara
0 siblings, 0 replies; 3+ messages in thread
From: Jan Kara @ 2008-08-18 12:47 UTC (permalink / raw)
To: Ingo Oeser; +Cc: LKML
On Thu 14-08-08 20:48:10, Ingo Oeser wrote:
> Hi Jan,
>
> On Thursday 14 August 2008, Jan Kara wrote:
> > 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). Make allocations inside alloc_mutex use GFP_NOFS
> > to avoid this problem.
>
> What about moving the allocation before taking the mutex?
> That way, we even reduce the lock contention and simplify the failure path.
Thanks for the idea and the review. Actually, I've checked and
i_alloc_mutex is needed only to update allocation statistics in the
superblock. So we can release i_alloc_mutex earlier before allocating
memory. Actually, I ended up moving the memory allocation as well - even
before the block allocation - to fix the error path cleanup. I'll post
resulting two patches in a moment.
Honza
> Signed-off-by: Ingo Oeser <ioe-lkml@rameria.de>
>
> diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
> index eb9cfa2..76446eb 100644
> --- a/fs/udf/ialloc.c
> +++ b/fs/udf/ialloc.c
> @@ -90,6 +90,25 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
> return NULL;
> }
>
> + 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;
> + }
> +
> mutex_lock(&sbi->s_alloc_mutex);
> if (sbi->s_lvid_bh) {
> struct logicalVolIntegrityDesc *lvid =
> @@ -129,25 +148,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;
> - mutex_unlock(&sbi->s_alloc_mutex);
> - 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))
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-08-18 12:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-08-14 17:49 [PATCH REVIEW] udf: Fix lock inversion between iprune_mutex and alloc_mutex Jan Kara
2008-08-14 18:48 ` Ingo Oeser
2008-08-18 12:47 ` Jan Kara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).