Commit c83617db authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Theodore Ts'o

ext4: Don't do GFP_NOFS allocations after taking ext4_lock_group

We can't do GFP_NOFS allocation after taking ext4_lock_group

BUG: sleeping function called from invalid context at mm/slab.c:3054
in_atomic():1, irqs_disabled():0
1 lock held by vi/2426:
#0:  (&ei->i_data_sem){----}, at: [<c01cf665>] ext4_release_file+0x23/0x66
Pid: 2426, comm: vi Not tainted 2.6.25-rc7 #24
[<c011a3dc>] __might_sleep+0xbe/0xc5
[<c01620c9>] kmem_cache_alloc+0x22/0xa6
[<c01e382a>] ext4_mb_release_inode_pa+0x73/0x1b3
[<c01e6adf>] ext4_mb_discard_inode_preallocations+0x22d/0x2d4
[<c013000a>] ? param_set_ushort+0x32/0x39
[<c01ceba1>] ext4_discard_reservation+0x27/0x6a
[<c01cf66c>] ext4_release_file+0x2a/0x66
[<c0165bd6>] __fput+0xae/0x155
[<c0165e46>] fput+0x17/0x19
[<c0163756>] filp_close+0x50/0x5a
[<c01647c0>] sys_close+0x71/0xad
[<c0104aba>] sysenter_past_esp+0x5f/0xa5
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 3dcf5451
...@@ -3730,9 +3730,9 @@ static int ext4_mb_new_preallocation(struct ext4_allocation_context *ac) ...@@ -3730,9 +3730,9 @@ static int ext4_mb_new_preallocation(struct ext4_allocation_context *ac)
*/ */
static noinline_for_stack int static noinline_for_stack int
ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
struct ext4_prealloc_space *pa) struct ext4_prealloc_space *pa,
struct ext4_allocation_context *ac)
{ {
struct ext4_allocation_context *ac;
struct super_block *sb = e4b->bd_sb; struct super_block *sb = e4b->bd_sb;
struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_sb_info *sbi = EXT4_SB(sb);
unsigned long end; unsigned long end;
...@@ -3748,8 +3748,6 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, ...@@ -3748,8 +3748,6 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
BUG_ON(group != e4b->bd_group && pa->pa_len != 0); BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
end = bit + pa->pa_len; end = bit + pa->pa_len;
ac = kmem_cache_alloc(ext4_ac_cachep, GFP_NOFS);
if (ac) { if (ac) {
ac->ac_sb = sb; ac->ac_sb = sb;
ac->ac_inode = pa->pa_inode; ac->ac_inode = pa->pa_inode;
...@@ -3794,23 +3792,19 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, ...@@ -3794,23 +3792,19 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
*/ */
} }
atomic_add(free, &sbi->s_mb_discarded); atomic_add(free, &sbi->s_mb_discarded);
if (ac)
kmem_cache_free(ext4_ac_cachep, ac);
return err; return err;
} }
static noinline_for_stack int static noinline_for_stack int
ext4_mb_release_group_pa(struct ext4_buddy *e4b, ext4_mb_release_group_pa(struct ext4_buddy *e4b,
struct ext4_prealloc_space *pa) struct ext4_prealloc_space *pa,
struct ext4_allocation_context *ac)
{ {
struct ext4_allocation_context *ac;
struct super_block *sb = e4b->bd_sb; struct super_block *sb = e4b->bd_sb;
ext4_group_t group; ext4_group_t group;
ext4_grpblk_t bit; ext4_grpblk_t bit;
ac = kmem_cache_alloc(ext4_ac_cachep, GFP_NOFS);
if (ac) if (ac)
ac->ac_op = EXT4_MB_HISTORY_DISCARD; ac->ac_op = EXT4_MB_HISTORY_DISCARD;
...@@ -3828,7 +3822,6 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b, ...@@ -3828,7 +3822,6 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
ac->ac_b_ex.fe_len = pa->pa_len; ac->ac_b_ex.fe_len = pa->pa_len;
ac->ac_b_ex.fe_logical = 0; ac->ac_b_ex.fe_logical = 0;
ext4_mb_store_history(ac); ext4_mb_store_history(ac);
kmem_cache_free(ext4_ac_cachep, ac);
} }
return 0; return 0;
...@@ -3850,6 +3843,7 @@ ext4_mb_discard_group_preallocations(struct super_block *sb, ...@@ -3850,6 +3843,7 @@ ext4_mb_discard_group_preallocations(struct super_block *sb,
struct ext4_group_info *grp = ext4_get_group_info(sb, group); struct ext4_group_info *grp = ext4_get_group_info(sb, group);
struct buffer_head *bitmap_bh = NULL; struct buffer_head *bitmap_bh = NULL;
struct ext4_prealloc_space *pa, *tmp; struct ext4_prealloc_space *pa, *tmp;
struct ext4_allocation_context *ac;
struct list_head list; struct list_head list;
struct ext4_buddy e4b; struct ext4_buddy e4b;
int err; int err;
...@@ -3877,6 +3871,7 @@ ext4_mb_discard_group_preallocations(struct super_block *sb, ...@@ -3877,6 +3871,7 @@ ext4_mb_discard_group_preallocations(struct super_block *sb,
grp = ext4_get_group_info(sb, group); grp = ext4_get_group_info(sb, group);
INIT_LIST_HEAD(&list); INIT_LIST_HEAD(&list);
ac = kmem_cache_alloc(ext4_ac_cachep, GFP_NOFS);
repeat: repeat:
ext4_lock_group(sb, group); ext4_lock_group(sb, group);
list_for_each_entry_safe(pa, tmp, list_for_each_entry_safe(pa, tmp,
...@@ -3931,9 +3926,9 @@ ext4_mb_discard_group_preallocations(struct super_block *sb, ...@@ -3931,9 +3926,9 @@ ext4_mb_discard_group_preallocations(struct super_block *sb,
spin_unlock(pa->pa_obj_lock); spin_unlock(pa->pa_obj_lock);
if (pa->pa_linear) if (pa->pa_linear)
ext4_mb_release_group_pa(&e4b, pa); ext4_mb_release_group_pa(&e4b, pa, ac);
else else
ext4_mb_release_inode_pa(&e4b, bitmap_bh, pa); ext4_mb_release_inode_pa(&e4b, bitmap_bh, pa, ac);
list_del(&pa->u.pa_tmp_list); list_del(&pa->u.pa_tmp_list);
call_rcu(&(pa)->u.pa_rcu, ext4_mb_pa_callback); call_rcu(&(pa)->u.pa_rcu, ext4_mb_pa_callback);
...@@ -3941,6 +3936,8 @@ ext4_mb_discard_group_preallocations(struct super_block *sb, ...@@ -3941,6 +3936,8 @@ ext4_mb_discard_group_preallocations(struct super_block *sb,
out: out:
ext4_unlock_group(sb, group); ext4_unlock_group(sb, group);
if (ac)
kmem_cache_free(ext4_ac_cachep, ac);
ext4_mb_release_desc(&e4b); ext4_mb_release_desc(&e4b);
put_bh(bitmap_bh); put_bh(bitmap_bh);
return free; return free;
...@@ -3961,6 +3958,7 @@ void ext4_mb_discard_inode_preallocations(struct inode *inode) ...@@ -3961,6 +3958,7 @@ void ext4_mb_discard_inode_preallocations(struct inode *inode)
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
struct buffer_head *bitmap_bh = NULL; struct buffer_head *bitmap_bh = NULL;
struct ext4_prealloc_space *pa, *tmp; struct ext4_prealloc_space *pa, *tmp;
struct ext4_allocation_context *ac;
ext4_group_t group = 0; ext4_group_t group = 0;
struct list_head list; struct list_head list;
struct ext4_buddy e4b; struct ext4_buddy e4b;
...@@ -3975,6 +3973,7 @@ void ext4_mb_discard_inode_preallocations(struct inode *inode) ...@@ -3975,6 +3973,7 @@ void ext4_mb_discard_inode_preallocations(struct inode *inode)
INIT_LIST_HEAD(&list); INIT_LIST_HEAD(&list);
ac = kmem_cache_alloc(ext4_ac_cachep, GFP_NOFS);
repeat: repeat:
/* first, collect all pa's in the inode */ /* first, collect all pa's in the inode */
spin_lock(&ei->i_prealloc_lock); spin_lock(&ei->i_prealloc_lock);
...@@ -4039,7 +4038,7 @@ void ext4_mb_discard_inode_preallocations(struct inode *inode) ...@@ -4039,7 +4038,7 @@ void ext4_mb_discard_inode_preallocations(struct inode *inode)
ext4_lock_group(sb, group); ext4_lock_group(sb, group);
list_del(&pa->pa_group_list); list_del(&pa->pa_group_list);
ext4_mb_release_inode_pa(&e4b, bitmap_bh, pa); ext4_mb_release_inode_pa(&e4b, bitmap_bh, pa, ac);
ext4_unlock_group(sb, group); ext4_unlock_group(sb, group);
ext4_mb_release_desc(&e4b); ext4_mb_release_desc(&e4b);
...@@ -4048,6 +4047,8 @@ void ext4_mb_discard_inode_preallocations(struct inode *inode) ...@@ -4048,6 +4047,8 @@ void ext4_mb_discard_inode_preallocations(struct inode *inode)
list_del(&pa->u.pa_tmp_list); list_del(&pa->u.pa_tmp_list);
call_rcu(&(pa)->u.pa_rcu, ext4_mb_pa_callback); call_rcu(&(pa)->u.pa_rcu, ext4_mb_pa_callback);
} }
if (ac)
kmem_cache_free(ext4_ac_cachep, ac);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment