Re: [PATCH 1/3] f2fs: split wio_mutex

[Chao Yu]

On 2017/5/12 2:37, Jaegeuk Kim wrote:
> On 05/09, Chao Yu wrote:
>> From: Chao Yu <yuchao0@xxxxxxxxxx>
>>
>> Split wio_mutex to adjust different temperature bio cache.
> 
> This can be rephrased like:

Yup, let me resend this patch.

Thanks,

> 
> Signed-off-by: Chao Yu <yuchao0@xxxxxxxxxx>
> Signed-off-by: Jaegeuk Kim <jaegeuk@xxxxxxxxxx>
> ---
>  fs/f2fs/f2fs.h    | 3 ++-
>  fs/f2fs/segment.c | 4 ++--
>  fs/f2fs/super.c   | 7 ++++---
>  3 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index c6643783adff..fb710bfbe215 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -888,7 +888,8 @@ struct f2fs_sb_info {
>  
>  	/* for bio operations */
>  	struct f2fs_bio_info *write_io[NR_PAGE_TYPE];	/* for write bios */
> -	struct mutex wio_mutex[NODE + 1];	/* bio ordering for NODE/DATA */
> +	struct mutex wio_mutex[NR_PAGE_TYPE - 1][NR_TEMP_TYPE];
> +						/* bio ordering for NODE/DATA */
>  	int write_io_size_bits;			/* Write IO size bits */
>  	mempool_t *write_io_dummy;		/* Dummy pages */
>  
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index da4fd2c29e86..cc2edaf36e55 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -2156,7 +2156,7 @@ static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio)
>  	int err;
>  
>  	if (fio->type == NODE || fio->type == DATA)
> -		mutex_lock(&fio->sbi->wio_mutex[fio->type]);
> +		mutex_lock(&fio->sbi->wio_mutex[fio->type][fio->temp]);
>  reallocate:
>  	allocate_data_block(fio->sbi, fio->page, fio->old_blkaddr,
>  					&fio->new_blkaddr, sum, type);
> @@ -2169,7 +2169,7 @@ static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio)
>  	}
>  
>  	if (fio->type == NODE || fio->type == DATA)
> -		mutex_unlock(&fio->sbi->wio_mutex[fio->type]);
> +		mutex_unlock(&fio->sbi->wio_mutex[fio->type][fio->temp]);
>  }
>  
>  void write_meta_page(struct f2fs_sb_info *sbi, struct page *page)
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index fea563bff0c1..df19902282f2 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -1555,7 +1555,7 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi)
>  static void init_sb_info(struct f2fs_sb_info *sbi)
>  {
>  	struct f2fs_super_block *raw_super = sbi->raw_super;
> -	int i;
> +	int i, j;
>  
>  	sbi->log_sectors_per_block =
>  		le32_to_cpu(raw_super->log_sectors_per_block);
> @@ -1587,8 +1587,9 @@ static void init_sb_info(struct f2fs_sb_info *sbi)
>  
>  	INIT_LIST_HEAD(&sbi->s_list);
>  	mutex_init(&sbi->umount_mutex);
> -	mutex_init(&sbi->wio_mutex[NODE]);
> -	mutex_init(&sbi->wio_mutex[DATA]);
> +	for (i = 0; i < NR_PAGE_TYPE - 1; i++)
> +		for (j = HOT; j < NR_TEMP_TYPE; j++)
> +			mutex_init(&sbi->wio_mutex[i][j]);
>  	spin_lock_init(&sbi->cp_lock);
>  }
>  
>