From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E68DC433EF for ; Wed, 15 Jun 2022 16:54:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345426AbiFOQyq (ORCPT ); Wed, 15 Jun 2022 12:54:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235833AbiFOQyo (ORCPT ); Wed, 15 Jun 2022 12:54:44 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0907545511 for ; Wed, 15 Jun 2022 09:54:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 1B3E9CE21D2 for ; Wed, 15 Jun 2022 16:54:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2972C34115; Wed, 15 Jun 2022 16:54:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655312079; bh=qigodSyMpeM2qgbpnbxrP+CBwYu821HecBtHR6HbIjg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=hRPkT2S4uVm3NNJNzHPYdKgpPnfMac/5SqGkLr5WDeitqfmBKfdNlPWhyykH9ukok hQAp+46CROGXu+ze7gVks7gLWuMbLYyfenqlPpwQ0lWxylNy6qnwkpZ5pp6gV99QBf MxqTq7mQAleB1279I6VbqkgfQxzWj0dMm1bA2oGFUP/MWpY5PWfyFB893xQlVjNTv2 CQs89IRahCcpSn2AtOy6XPJ65GewLluvThhzSIgWWonejWMIGOqYm9kvncLvpUfOVa cTksbBN8X388BAQCHWzXdJu3vqUZxyEQQPxG0qFBIE7QVdiXa6JaRgeFSmKgqbAk9M xUXzNFh2zpFUQ== Date: Wed, 15 Jun 2022 09:54:37 -0700 From: Jaegeuk Kim To: Chao Yu Cc: Daeho Jeong , linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com, Daeho Jeong Subject: Re: [f2fs-dev] [PATCH] f2fs: fix iostat related lock protection Message-ID: References: <20220610183240.2269085-1-daeho43@gmail.com> <1815f3c2-0802-5b3f-7e98-9f89c5b9e07d@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1815f3c2-0802-5b3f-7e98-9f89c5b9e07d@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/15, Chao Yu wrote: > On 2022/6/11 2:32, Daeho Jeong wrote: > > From: Daeho Jeong > > > > Made iostat related locks safe to be called from irq context again. > > > > Will be better to add a 'Fixes' line? Added some tags. Thanks, https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=f8ed39ad779fbc5d37d08e83643384fc06e4bae4 > > Thanks, > > > Signed-off-by: Daeho Jeong > > --- > > fs/f2fs/iostat.c | 31 ++++++++++++++++++------------- > > 1 file changed, 18 insertions(+), 13 deletions(-) > > > > diff --git a/fs/f2fs/iostat.c b/fs/f2fs/iostat.c > > index be599f31d3c4..d84c5f6cc09d 100644 > > --- a/fs/f2fs/iostat.c > > +++ b/fs/f2fs/iostat.c > > @@ -91,8 +91,9 @@ static inline void __record_iostat_latency(struct f2fs_sb_info *sbi) > > unsigned int cnt; > > struct f2fs_iostat_latency iostat_lat[MAX_IO_TYPE][NR_PAGE_TYPE]; > > struct iostat_lat_info *io_lat = sbi->iostat_io_lat; > > + unsigned long flags; > > - spin_lock_bh(&sbi->iostat_lat_lock); > > + spin_lock_irqsave(&sbi->iostat_lat_lock, flags); > > for (idx = 0; idx < MAX_IO_TYPE; idx++) { > > for (io = 0; io < NR_PAGE_TYPE; io++) { > > cnt = io_lat->bio_cnt[idx][io]; > > @@ -106,7 +107,7 @@ static inline void __record_iostat_latency(struct f2fs_sb_info *sbi) > > io_lat->bio_cnt[idx][io] = 0; > > } > > } > > - spin_unlock_bh(&sbi->iostat_lat_lock); > > + spin_unlock_irqrestore(&sbi->iostat_lat_lock, flags); > > trace_f2fs_iostat_latency(sbi, iostat_lat); > > } > > @@ -115,14 +116,15 @@ static inline void f2fs_record_iostat(struct f2fs_sb_info *sbi) > > { > > unsigned long long iostat_diff[NR_IO_TYPE]; > > int i; > > + unsigned long flags; > > if (time_is_after_jiffies(sbi->iostat_next_period)) > > return; > > /* Need double check under the lock */ > > - spin_lock_bh(&sbi->iostat_lock); > > + spin_lock_irqsave(&sbi->iostat_lock, flags); > > if (time_is_after_jiffies(sbi->iostat_next_period)) { > > - spin_unlock_bh(&sbi->iostat_lock); > > + spin_unlock_irqrestore(&sbi->iostat_lock, flags); > > return; > > } > > sbi->iostat_next_period = jiffies + > > @@ -133,7 +135,7 @@ static inline void f2fs_record_iostat(struct f2fs_sb_info *sbi) > > sbi->prev_rw_iostat[i]; > > sbi->prev_rw_iostat[i] = sbi->rw_iostat[i]; > > } > > - spin_unlock_bh(&sbi->iostat_lock); > > + spin_unlock_irqrestore(&sbi->iostat_lock, flags); > > trace_f2fs_iostat(sbi, iostat_diff); > > @@ -145,25 +147,27 @@ void f2fs_reset_iostat(struct f2fs_sb_info *sbi) > > struct iostat_lat_info *io_lat = sbi->iostat_io_lat; > > int i; > > - spin_lock_bh(&sbi->iostat_lock); > > + spin_lock_irq(&sbi->iostat_lock); > > for (i = 0; i < NR_IO_TYPE; i++) { > > sbi->rw_iostat[i] = 0; > > sbi->prev_rw_iostat[i] = 0; > > } > > - spin_unlock_bh(&sbi->iostat_lock); > > + spin_unlock_irq(&sbi->iostat_lock); > > - spin_lock_bh(&sbi->iostat_lat_lock); > > + spin_lock_irq(&sbi->iostat_lat_lock); > > memset(io_lat, 0, sizeof(struct iostat_lat_info)); > > - spin_unlock_bh(&sbi->iostat_lat_lock); > > + spin_unlock_irq(&sbi->iostat_lat_lock); > > } > > void f2fs_update_iostat(struct f2fs_sb_info *sbi, > > enum iostat_type type, unsigned long long io_bytes) > > { > > + unsigned long flags; > > + > > if (!sbi->iostat_enable) > > return; > > - spin_lock_bh(&sbi->iostat_lock); > > + spin_lock_irqsave(&sbi->iostat_lock, flags); > > sbi->rw_iostat[type] += io_bytes; > > if (type == APP_BUFFERED_IO || type == APP_DIRECT_IO) > > @@ -172,7 +176,7 @@ void f2fs_update_iostat(struct f2fs_sb_info *sbi, > > if (type == APP_BUFFERED_READ_IO || type == APP_DIRECT_READ_IO) > > sbi->rw_iostat[APP_READ_IO] += io_bytes; > > - spin_unlock_bh(&sbi->iostat_lock); > > + spin_unlock_irqrestore(&sbi->iostat_lock, flags); > > f2fs_record_iostat(sbi); > > } > > @@ -185,6 +189,7 @@ static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx, > > struct f2fs_sb_info *sbi = iostat_ctx->sbi; > > struct iostat_lat_info *io_lat = sbi->iostat_io_lat; > > int idx; > > + unsigned long flags; > > if (!sbi->iostat_enable) > > return; > > @@ -202,12 +207,12 @@ static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx, > > idx = WRITE_ASYNC_IO; > > } > > - spin_lock_bh(&sbi->iostat_lat_lock); > > + spin_lock_irqsave(&sbi->iostat_lat_lock, flags); > > io_lat->sum_lat[idx][iotype] += ts_diff; > > io_lat->bio_cnt[idx][iotype]++; > > if (ts_diff > io_lat->peak_lat[idx][iotype]) > > io_lat->peak_lat[idx][iotype] = ts_diff; > > - spin_unlock_bh(&sbi->iostat_lat_lock); > > + spin_unlock_irqrestore(&sbi->iostat_lat_lock, flags); > > } > > void iostat_update_and_unbind_ctx(struct bio *bio, int rw) > > > _______________________________________________ > Linux-f2fs-devel mailing list > Linux-f2fs-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel