linux-f2fs-devel.lists.sourceforge.net archive mirror
 help / color / mirror / Atom feed
* [PATCH] f2fs: remove sleep from atomic lock in __try_update_largest_extent
@ 2018-09-07 17:31 Zhikang Zhang
  2018-09-07 11:05 ` Chao Yu
  0 siblings, 1 reply; 3+ messages in thread
From: Zhikang Zhang @ 2018-09-07 17:31 UTC (permalink / raw)
  To: jaegeuk, yuchao0; +Cc: miaoxie, linux-f2fs-devel

In the call trace below, we might sleep in function dput().

So we should move f2fs_mark_inode_dirty_sync to the end of
f2fs_update_extent_tree_range(out of the write_lock).

BUG: sleeping function called from invalid context at fs/dcache.c:796
Call trace:
	dump_backtrace+0x0/0x3f4
	show_stack+0x24/0x30
	dump_stack+0xe0/0x138
	___might_sleep+0x2a8/0x2c8
	__might_sleep+0x78/0x10c
	dput+0x7c/0x750
	block_dump___mark_inode_dirty+0x120/0x17c
	__mark_inode_dirty+0x344/0x11f0
	f2fs_mark_inode_dirty_sync+0x40/0x50
	__insert_extent_tree+0x2e0/0x2f4
	f2fs_update_extent_tree_range+0xcf4/0xde8
	f2fs_update_extent_cache+0x114/0x12c
	f2fs_update_data_blkaddr+0x40/0x50
	write_data_page+0x150/0x314
	do_write_data_page+0x648/0x2318
	__write_data_page+0xdb4/0x1640
	f2fs_write_cache_pages+0x768/0xafc
	__f2fs_write_data_pages+0x590/0x1218
	f2fs_write_data_pages+0x64/0x74
	do_writepages+0x74/0xe4
	__writeback_single_inode+0xdc/0x15f0
	writeback_sb_inodes+0x574/0xc98
	__writeback_inodes_wb+0x190/0x204
	wb_writeback+0x730/0xf14
	wb_check_old_data_flush+0x1bc/0x1c8
	wb_workfn+0x554/0xf74
	process_one_work+0x440/0x118c
	worker_thread+0xac/0x974
	kthread+0x1a0/0x1c8
	ret_from_fork+0x10/0x1c

Signed-off-by: Zhikang Zhang <zhangzhikang1@huawei.com>
---
 fs/f2fs/extent_cache.c | 22 ++++++++++++----------
 fs/f2fs/f2fs.h         |  8 +++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
index 231b77e..b27c27a 100644
--- a/fs/f2fs/extent_cache.c
+++ b/fs/f2fs/extent_cache.c
@@ -416,12 +416,11 @@ static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs,
 	return ret;
 }
 
-static struct extent_node *__try_merge_extent_node(struct inode *inode,
+static struct extent_node *__try_merge_extent_node(struct f2fs_sb_info *sbi,
 				struct extent_tree *et, struct extent_info *ei,
 				struct extent_node *prev_ex,
 				struct extent_node *next_ex)
 {
-	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
 	struct extent_node *en = NULL;
 
 	if (prev_ex && __is_back_mergeable(ei, &prev_ex->ei)) {
@@ -443,7 +442,7 @@ static struct extent_node *__try_merge_extent_node(struct inode *inode,
 	if (!en)
 		return NULL;
 
-	__try_update_largest_extent(inode, et, en);
+	__try_update_largest_extent(et, en);
 
 	spin_lock(&sbi->extent_lock);
 	if (!list_empty(&en->list)) {
@@ -454,12 +453,11 @@ static struct extent_node *__try_merge_extent_node(struct inode *inode,
 	return en;
 }
 
-static struct extent_node *__insert_extent_tree(struct inode *inode,
+static struct extent_node *__insert_extent_tree(struct f2fs_sb_info *sbi,
 				struct extent_tree *et, struct extent_info *ei,
 				struct rb_node **insert_p,
 				struct rb_node *insert_parent)
 {
-	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
 	struct rb_node **p;
 	struct rb_node *parent = NULL;
 	struct extent_node *en = NULL;
@@ -476,7 +474,7 @@ static struct extent_node *__insert_extent_tree(struct inode *inode,
 	if (!en)
 		return NULL;
 
-	__try_update_largest_extent(inode, et, en);
+	__try_update_largest_extent(et, en);
 
 	/* update in global extent list */
 	spin_lock(&sbi->extent_lock);
@@ -497,6 +495,7 @@ static void f2fs_update_extent_tree_range(struct inode *inode,
 	struct rb_node **insert_p = NULL, *insert_parent = NULL;
 	unsigned int end = fofs + len;
 	unsigned int pos = (unsigned int)fofs;
+	unsigned int old_largest = et->largest.len;
 
 	if (!et)
 		return;
@@ -550,7 +549,7 @@ static void f2fs_update_extent_tree_range(struct inode *inode,
 				set_extent_info(&ei, end,
 						end - dei.fofs + dei.blk,
 						org_end - end);
-				en1 = __insert_extent_tree(inode, et, &ei,
+				en1 = __insert_extent_tree(sbi, et, &ei,
 							NULL, NULL);
 				next_en = en1;
 			} else {
@@ -570,7 +569,7 @@ static void f2fs_update_extent_tree_range(struct inode *inode,
 		}
 
 		if (parts)
-			__try_update_largest_extent(inode, et, en);
+			__try_update_largest_extent(et, en);
 		else
 			__release_extent_node(sbi, et, en);
 
@@ -590,8 +589,8 @@ static void f2fs_update_extent_tree_range(struct inode *inode,
 	if (blkaddr) {
 
 		set_extent_info(&ei, fofs, blkaddr, len);
-		if (!__try_merge_extent_node(inode, et, &ei, prev_en, next_en))
-			__insert_extent_tree(inode, et, &ei,
+		if (!__try_merge_extent_node(sbi, et, &ei, prev_en, next_en))
+			__insert_extent_tree(sbi, et, &ei,
 						insert_p, insert_parent);
 
 		/* give up extent_cache, if split and small updates happen */
@@ -607,6 +606,9 @@ static void f2fs_update_extent_tree_range(struct inode *inode,
 		__free_extent_tree(sbi, et);
 
 	write_unlock(&et->lock);
+
+	if (old_largest < et->largest.len)
+		f2fs_mark_inode_dirty_sync(inode, true);
 }
 
 unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink)
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index abf9256..eef3016 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -754,13 +754,11 @@ static inline bool __is_front_mergeable(struct extent_info *cur,
 }
 
 extern void f2fs_mark_inode_dirty_sync(struct inode *inode, bool sync);
-static inline void __try_update_largest_extent(struct inode *inode,
-			struct extent_tree *et, struct extent_node *en)
+static inline void __try_update_largest_extent(struct extent_tree *et,
+						struct extent_node *en)
 {
-	if (en->ei.len > et->largest.len) {
+	if (en->ei.len > et->largest.len)
 		et->largest = en->ei;
-		f2fs_mark_inode_dirty_sync(inode, true);
-	}
 }
 
 /*
-- 
2.10.1


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] f2fs: remove sleep from atomic lock in __try_update_largest_extent
@ 2018-09-07 11:22 zhangzhikang
  0 siblings, 0 replies; 3+ messages in thread
From: zhangzhikang @ 2018-09-07 11:22 UTC (permalink / raw)
  To: Yuchao (T), jaegeuk@kernel.org
  Cc: miaoxie (A), linux-f2fs-devel@lists.sourceforge.net

Hi Chao,

I send a new patch to fix it.
Thanks!

Regards,
Zhikang

> Hi Zhikang,
> 
> On 2018/9/8 1:31, Zhikang Zhang wrote:
> > In the call trace below, we might sleep in function dput().
> >
> > So we should move f2fs_mark_inode_dirty_sync to the end of
> > f2fs_update_extent_tree_range(out of the write_lock).
> 
> I think we need to cover __drop_largest_extent as well, since it will call
> f2fs_mark_inode_dirty_sync like __try_update_largest_extent.
> 
> Thanks,
> 
> >
> > BUG: sleeping function called from invalid context at fs/dcache.c:796
> > Call trace:
> > 	dump_backtrace+0x0/0x3f4
> > 	show_stack+0x24/0x30
> > 	dump_stack+0xe0/0x138
> > 	___might_sleep+0x2a8/0x2c8
> > 	__might_sleep+0x78/0x10c
> > 	dput+0x7c/0x750
> > 	block_dump___mark_inode_dirty+0x120/0x17c
> > 	__mark_inode_dirty+0x344/0x11f0
> > 	f2fs_mark_inode_dirty_sync+0x40/0x50
> > 	__insert_extent_tree+0x2e0/0x2f4
> > 	f2fs_update_extent_tree_range+0xcf4/0xde8
> > 	f2fs_update_extent_cache+0x114/0x12c
> > 	f2fs_update_data_blkaddr+0x40/0x50
> > 	write_data_page+0x150/0x314
> > 	do_write_data_page+0x648/0x2318
> > 	__write_data_page+0xdb4/0x1640
> > 	f2fs_write_cache_pages+0x768/0xafc
> > 	__f2fs_write_data_pages+0x590/0x1218
> > 	f2fs_write_data_pages+0x64/0x74
> > 	do_writepages+0x74/0xe4
> > 	__writeback_single_inode+0xdc/0x15f0
> > 	writeback_sb_inodes+0x574/0xc98
> > 	__writeback_inodes_wb+0x190/0x204
> > 	wb_writeback+0x730/0xf14
> > 	wb_check_old_data_flush+0x1bc/0x1c8
> > 	wb_workfn+0x554/0xf74
> > 	process_one_work+0x440/0x118c
> > 	worker_thread+0xac/0x974
> > 	kthread+0x1a0/0x1c8
> > 	ret_from_fork+0x10/0x1c
> >
> > Signed-off-by: Zhikang Zhang <zhangzhikang1@huawei.com>
> > ---
> >  fs/f2fs/extent_cache.c | 22 ++++++++++++----------
> >  fs/f2fs/f2fs.h         |  8 +++-----
> >  2 files changed, 15 insertions(+), 15 deletions(-)
> >
> > diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index
> > 231b77e..b27c27a 100644
> > --- a/fs/f2fs/extent_cache.c
> > +++ b/fs/f2fs/extent_cache.c
> > @@ -416,12 +416,11 @@ static bool f2fs_lookup_extent_tree(struct inode
> *inode, pgoff_t pgofs,
> >  	return ret;
> >  }
> >
> > -static struct extent_node *__try_merge_extent_node(struct inode
> > *inode,
> > +static struct extent_node *__try_merge_extent_node(struct
> > +f2fs_sb_info *sbi,
> >  				struct extent_tree *et, struct extent_info *ei,
> >  				struct extent_node *prev_ex,
> >  				struct extent_node *next_ex)
> >  {
> > -	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
> >  	struct extent_node *en = NULL;
> >
> >  	if (prev_ex && __is_back_mergeable(ei, &prev_ex->ei)) { @@ -
> 443,7
> > +442,7 @@ static struct extent_node *__try_merge_extent_node(struct
> inode *inode,
> >  	if (!en)
> >  		return NULL;
> >
> > -	__try_update_largest_extent(inode, et, en);
> > +	__try_update_largest_extent(et, en);
> >
> >  	spin_lock(&sbi->extent_lock);
> >  	if (!list_empty(&en->list)) {
> > @@ -454,12 +453,11 @@ static struct extent_node
> *__try_merge_extent_node(struct inode *inode,
> >  	return en;
> >  }
> >
> > -static struct extent_node *__insert_extent_tree(struct inode *inode,
> > +static struct extent_node *__insert_extent_tree(struct f2fs_sb_info
> > +*sbi,
> >  				struct extent_tree *et, struct extent_info *ei,
> >  				struct rb_node **insert_p,
> >  				struct rb_node *insert_parent)
> >  {
> > -	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
> >  	struct rb_node **p;
> >  	struct rb_node *parent = NULL;
> >  	struct extent_node *en = NULL;
> > @@ -476,7 +474,7 @@ static struct extent_node
> *__insert_extent_tree(struct inode *inode,
> >  	if (!en)
> >  		return NULL;
> >
> > -	__try_update_largest_extent(inode, et, en);
> > +	__try_update_largest_extent(et, en);
> >
> >  	/* update in global extent list */
> >  	spin_lock(&sbi->extent_lock);
> > @@ -497,6 +495,7 @@ static void f2fs_update_extent_tree_range(struct
> inode *inode,
> >  	struct rb_node **insert_p = NULL, *insert_parent = NULL;
> >  	unsigned int end = fofs + len;
> >  	unsigned int pos = (unsigned int)fofs;
> > +	unsigned int old_largest = et->largest.len;
> >
> >  	if (!et)
> >  		return;
> > @@ -550,7 +549,7 @@ static void f2fs_update_extent_tree_range(struct
> inode *inode,
> >  				set_extent_info(&ei, end,
> >  						end - dei.fofs + dei.blk,
> >  						org_end - end);
> > -				en1 = __insert_extent_tree(inode, et, &ei,
> > +				en1 = __insert_extent_tree(sbi, et, &ei,
> >  							NULL, NULL);
> >  				next_en = en1;
> >  			} else {
> > @@ -570,7 +569,7 @@ static void f2fs_update_extent_tree_range(struct
> inode *inode,
> >  		}
> >
> >  		if (parts)
> > -			__try_update_largest_extent(inode, et, en);
> > +			__try_update_largest_extent(et, en);
> >  		else
> >  			__release_extent_node(sbi, et, en);
> >
> > @@ -590,8 +589,8 @@ static void f2fs_update_extent_tree_range(struct
> inode *inode,
> >  	if (blkaddr) {
> >
> >  		set_extent_info(&ei, fofs, blkaddr, len);
> > -		if (!__try_merge_extent_node(inode, et, &ei, prev_en,
> next_en))
> > -			__insert_extent_tree(inode, et, &ei,
> > +		if (!__try_merge_extent_node(sbi, et, &ei, prev_en,
> next_en))
> > +			__insert_extent_tree(sbi, et, &ei,
> >  						insert_p, insert_parent);
> >
> >  		/* give up extent_cache, if split and small updates happen */
> @@
> > -607,6 +606,9 @@ static void f2fs_update_extent_tree_range(struct inode
> *inode,
> >  		__free_extent_tree(sbi, et);
> >
> >  	write_unlock(&et->lock);
> > +
> > +	if (old_largest < et->largest.len)
> > +		f2fs_mark_inode_dirty_sync(inode, true);
> >  }
> >
> >  unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int
> > nr_shrink) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index
> > abf9256..eef3016 100644
> > --- a/fs/f2fs/f2fs.h
> > +++ b/fs/f2fs/f2fs.h
> > @@ -754,13 +754,11 @@ static inline bool __is_front_mergeable(struct
> > extent_info *cur,  }
> >
> >  extern void f2fs_mark_inode_dirty_sync(struct inode *inode, bool
> > sync); -static inline void __try_update_largest_extent(struct inode *inode,
> > -			struct extent_tree *et, struct extent_node *en)
> > +static inline void __try_update_largest_extent(struct extent_tree *et,
> > +						struct extent_node *en)
> >  {
> > -	if (en->ei.len > et->largest.len) {
> > +	if (en->ei.len > et->largest.len)
> >  		et->largest = en->ei;
> > -		f2fs_mark_inode_dirty_sync(inode, true);
> > -	}
> >  }
> >
> >  /*
> >


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-07 11:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-07 17:31 [PATCH] f2fs: remove sleep from atomic lock in __try_update_largest_extent Zhikang Zhang
2018-09-07 11:05 ` Chao Yu
  -- strict thread matches above, loose matches on Subject: below --
2018-09-07 11:22 zhangzhikang

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).