linux-f2fs-devel.lists.sourceforge.net archive mirror
 help / color / mirror / Atom feed
* [f2fs-dev] [PATCH] f2fs: replace blk_finish_plug() with blk_flush_plug()
@ 2023-08-30  3:52 Chunhai Guo via Linux-f2fs-devel
  2023-08-30 14:05 ` Chao Yu
  0 siblings, 1 reply; 3+ messages in thread
From: Chunhai Guo via Linux-f2fs-devel @ 2023-08-30  3:52 UTC (permalink / raw)
  To: chao, jaegeuk; +Cc: Chunhai Guo, linux-f2fs-devel

The commit 344150999b7f ("f2fs: fix to avoid potential deadlock") only
requires unplugging current->plug. Using blk_finish_plug() is unnecessary
as it sets current->plug as NULL and prevents wb_writeback() from using
plug in subsequent loops. Instead, use blk_flush_plug() as a replacement.

Signed-off-by: Chunhai Guo <guochunhai@vivo.com>
---
 fs/f2fs/data.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 5d9697717353..936a95464186 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3343,8 +3343,7 @@ static int __f2fs_write_data_pages(struct address_space *mapping,
 		atomic_inc(&sbi->wb_sync_req[DATA]);
 	else if (atomic_read(&sbi->wb_sync_req[DATA])) {
 		/* to avoid potential deadlock */
-		if (current->plug)
-			blk_finish_plug(current->plug);
+		blk_flush_plug(current->plug, false);
 		goto skip_write;
 	}
 
-- 
2.25.1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [f2fs-dev] [PATCH] f2fs: replace blk_finish_plug() with blk_flush_plug()
  2023-08-30  3:52 [f2fs-dev] [PATCH] f2fs: replace blk_finish_plug() with blk_flush_plug() Chunhai Guo via Linux-f2fs-devel
@ 2023-08-30 14:05 ` Chao Yu
  2023-08-31  7:14   ` Chunhai Guo via Linux-f2fs-devel
  0 siblings, 1 reply; 3+ messages in thread
From: Chao Yu @ 2023-08-30 14:05 UTC (permalink / raw)
  To: Chunhai Guo, jaegeuk; +Cc: linux-f2fs-devel

On 2023/8/30 11:52, Chunhai Guo wrote:
> The commit 344150999b7f ("f2fs: fix to avoid potential deadlock") only
> requires unplugging current->plug. Using blk_finish_plug() is unnecessary
> as it sets current->plug as NULL and prevents wb_writeback() from using
> plug in subsequent loops. Instead, use blk_flush_plug() as a replacement.
> 
> Signed-off-by: Chunhai Guo <guochunhai@vivo.com>
> ---
>   fs/f2fs/data.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index 5d9697717353..936a95464186 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -3343,8 +3343,7 @@ static int __f2fs_write_data_pages(struct address_space *mapping,

It missed to cover f2fs_write_node_pages()?

Thanks,

>   		atomic_inc(&sbi->wb_sync_req[DATA]);
>   	else if (atomic_read(&sbi->wb_sync_req[DATA])) {
>   		/* to avoid potential deadlock */
> -		if (current->plug)
> -			blk_finish_plug(current->plug);
> +		blk_flush_plug(current->plug, false);
>   		goto skip_write;
>   	}
>   


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [f2fs-dev] [PATCH] f2fs: replace blk_finish_plug() with blk_flush_plug()
  2023-08-30 14:05 ` Chao Yu
@ 2023-08-31  7:14   ` Chunhai Guo via Linux-f2fs-devel
  0 siblings, 0 replies; 3+ messages in thread
From: Chunhai Guo via Linux-f2fs-devel @ 2023-08-31  7:14 UTC (permalink / raw)
  To: Chao Yu, jaegeuk@kernel.org; +Cc: linux-f2fs-devel@lists.sourceforge.net

在 2023/8/30 22:05, Chao Yu 写道:
> On 2023/8/30 11:52, Chunhai Guo wrote:
>> The commit 344150999b7f ("f2fs: fix to avoid potential deadlock") only
>> requires unplugging current->plug. Using blk_finish_plug() is unnecessary
>> as it sets current->plug as NULL and prevents wb_writeback() from using
>> plug in subsequent loops. Instead, use blk_flush_plug() as a replacement.
>>
>> Signed-off-by: Chunhai Guo <guochunhai@vivo.com>
>> ---
>>    fs/f2fs/data.c | 3 +--
>>    1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
>> index 5d9697717353..936a95464186 100644
>> --- a/fs/f2fs/data.c
>> +++ b/fs/f2fs/data.c
>> @@ -3343,8 +3343,7 @@ static int __f2fs_write_data_pages(struct address_space *mapping,
> 
> It missed to cover f2fs_write_node_pages()?

Yes. Sorry that I miss it. I have sent another patch with this.

Thanks.
> 
> Thanks,
> 
>>    		atomic_inc(&sbi->wb_sync_req[DATA]);
>>    	else if (atomic_read(&sbi->wb_sync_req[DATA])) {
>>    		/* to avoid potential deadlock */
>> -		if (current->plug)
>> -			blk_finish_plug(current->plug);
>> +		blk_flush_plug(current->plug, false);
>>    		goto skip_write;
>>    	}
>>    


_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-08-31  7:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-30  3:52 [f2fs-dev] [PATCH] f2fs: replace blk_finish_plug() with blk_flush_plug() Chunhai Guo via Linux-f2fs-devel
2023-08-30 14:05 ` Chao Yu
2023-08-31  7:14   ` Chunhai Guo via Linux-f2fs-devel

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