From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 425BC10A3E for ; Mon, 21 Oct 2024 23:57:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729555022; cv=none; b=ePfyZ3R5xKAXEv9fFtzrEWGCUSrZdGkXh0XxZuwE8dq2y/FlqBP6Iu4s9RTAy0WlUv490+itdvskLGf+Ev3CKgN7QfAJ4wZQiTaGld3H5w9V4Wtz7xsTyVOK8T9bOkZLYbIMdOeblVkZs88rlxfW7wLAYhknjpF4FISbfH7Dh4E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729555022; c=relaxed/simple; bh=s18HD12MJyz0CnqaYMbmgWatQPAaFuILvIsf9zvBi2g=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=kLmobe8uQ9k78t/HagNJEMCwEUNXqM/80A9jmn7sRDnWq5i6NXxA3r0kRCPXZmEkAQ1uSTHlreBBNjPYscnpam7E0/qHC84V+9aF1SdmGIGT5l+3ysLLuFfqjPTGVc5sk+maniXHtWHW3MuKiRBhsxDrpqOJdy5G73JsGIr0A0s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MdgjnWJP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MdgjnWJP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FB43C4CEC3; Mon, 21 Oct 2024 23:57:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729555021; bh=s18HD12MJyz0CnqaYMbmgWatQPAaFuILvIsf9zvBi2g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=MdgjnWJPYysikgIUun9KWoxSrIvxfwqLvqMFo9UbeQqiZncgmTgXip7a+qAEF7pNR 7qd0LPfPXv7QQj2siK9KMHj6eAQkYD0ZvKnX/AQrj/i32B14GHouYSppZMUPeOzhMV jl7hPN3RD4eTIytO8l2ONC8rZBw2K3Et5S/f3qkVZHcqXDtmH1qgWfrU81Hz6hi89R bb9HwtKIkkysDvIyZ/eaWTvWF5pWv4zK2qi4qoqD/cyQxBBos2h++67zo3sdA+Gjl3 PJNdV5AbpfZ1kU2JQFf9clW9S8RelhfPqA9TM9Fmi0zuaIrcwO5MH7UcpZuk9D1Pmk BzjuT8ZnwfZvg== Date: Mon, 21 Oct 2024 23:56:59 +0000 From: Jaegeuk Kim To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] f2fs: fix to parse temperature correctly in f2fs_get_segment_temp() Message-ID: References: <20241017012932.1570038-1-chao@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241017012932.1570038-1-chao@kernel.org> On 10/17, Chao Yu wrote: > In __get_segment_type(), __get_segment_type_6() may return > CURSEG_COLD_DATA_PINNED or CURSEG_ALL_DATA_ATGC log type, but > following f2fs_get_segment_temp() can only handle persistent > log type, fix it. > > Signed-off-by: Chao Yu > --- > v2: > - initialize variable in f2fs_get_segment_temp() to avoid > static compilier complaint. > fs/f2fs/f2fs.h | 5 +++-- > fs/f2fs/file.c | 4 ++-- > fs/f2fs/segment.c | 33 +++++++++++++++++++++++++-------- > fs/f2fs/segment.h | 4 ---- > 4 files changed, 30 insertions(+), 16 deletions(-) > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index f3ef4dc50992..56797f8e6659 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -1019,7 +1019,7 @@ static inline void set_new_dnode(struct dnode_of_data *dn, struct inode *inode, > #define NR_CURSEG_PERSIST_TYPE (NR_CURSEG_DATA_TYPE + NR_CURSEG_NODE_TYPE) > #define NR_CURSEG_TYPE (NR_CURSEG_INMEM_TYPE + NR_CURSEG_PERSIST_TYPE) > > -enum { > +enum log_type { > CURSEG_HOT_DATA = 0, /* directory entry blocks */ > CURSEG_WARM_DATA, /* data blocks */ > CURSEG_COLD_DATA, /* multimedia or GCed data blocks */ > @@ -3758,7 +3758,8 @@ void f2fs_replace_block(struct f2fs_sb_info *sbi, struct dnode_of_data *dn, > block_t old_addr, block_t new_addr, > unsigned char version, bool recover_curseg, > bool recover_newaddr); > -int f2fs_get_segment_temp(int seg_type); > +enum temp_type f2fs_get_segment_temp(struct f2fs_sb_info *sbi, > + enum log_type seg_type); > int f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, > block_t old_blkaddr, block_t *new_blkaddr, > struct f2fs_summary *sum, int type, > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index 0e07231dc093..92d7c62eba29 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -4858,8 +4858,8 @@ static void f2fs_dio_write_submit_io(const struct iomap_iter *iter, > { > struct inode *inode = iter->inode; > struct f2fs_sb_info *sbi = F2FS_I_SB(inode); > - int seg_type = f2fs_rw_hint_to_seg_type(sbi, inode->i_write_hint); > - enum temp_type temp = f2fs_get_segment_temp(seg_type); > + enum log_type type = f2fs_rw_hint_to_seg_type(sbi, inode->i_write_hint); > + enum temp_type temp = f2fs_get_segment_temp(sbi, type); > > bio->bi_write_hint = f2fs_io_type_to_rw_hint(sbi, DATA, temp); > submit_bio(bio); > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > index 0f4408fe2b19..8e80e6620854 100644 > --- a/fs/f2fs/segment.c > +++ b/fs/f2fs/segment.c > @@ -3603,18 +3603,35 @@ static int __get_segment_type_6(struct f2fs_io_info *fio) > } > } > > -int f2fs_get_segment_temp(int seg_type) > +enum temp_type f2fs_get_segment_temp(struct f2fs_sb_info *sbi, > + enum log_type type) > { > - if (IS_HOT(seg_type)) > - return HOT; > - else if (IS_WARM(seg_type)) > - return WARM; > - return COLD; > + struct curseg_info *curseg = CURSEG_I(sbi, type); > + enum temp_type temp = COLD; > + > + switch (curseg->seg_type) { > + case CURSEG_HOT_NODE: > + case CURSEG_HOT_DATA: > + temp = HOT; > + break; > + case CURSEG_WARM_NODE: > + case CURSEG_WARM_DATA: > + temp = WARM; > + break; > + case CURSEG_COLD_NODE: > + case CURSEG_COLD_DATA: > + temp = COLD; > + break; > + default: > + f2fs_bug_on(sbi, 1); > + } > + > + return temp; > } > > static int __get_segment_type(struct f2fs_io_info *fio) > { > - int type = 0; > + enum log_type type; Here as well. > > switch (F2FS_OPTION(fio->sbi).active_logs) { > case 2: > @@ -3630,7 +3647,7 @@ static int __get_segment_type(struct f2fs_io_info *fio) > f2fs_bug_on(fio->sbi, true); > } > > - fio->temp = f2fs_get_segment_temp(type); > + fio->temp = f2fs_get_segment_temp(fio->sbi, type); > > return type; > } > diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h > index 55a01da6c4be..6a23bb1d16a2 100644 > --- a/fs/f2fs/segment.h > +++ b/fs/f2fs/segment.h > @@ -34,10 +34,6 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi, > f2fs_bug_on(sbi, seg_type >= NR_PERSISTENT_LOG); > } > > -#define IS_HOT(t) ((t) == CURSEG_HOT_NODE || (t) == CURSEG_HOT_DATA) > -#define IS_WARM(t) ((t) == CURSEG_WARM_NODE || (t) == CURSEG_WARM_DATA) > -#define IS_COLD(t) ((t) == CURSEG_COLD_NODE || (t) == CURSEG_COLD_DATA) > - > #define IS_CURSEG(sbi, seg) \ > (((seg) == CURSEG_I(sbi, CURSEG_HOT_DATA)->segno) || \ > ((seg) == CURSEG_I(sbi, CURSEG_WARM_DATA)->segno) || \ > -- > 2.40.1