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 lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 07C7AC43334 for ; Thu, 16 Jun 2022 02:11:35 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1o1eyn-0005VX-0c; Thu, 16 Jun 2022 02:11:29 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o1eyl-0005VR-9t for linux-f2fs-devel@lists.sourceforge.net; Thu, 16 Jun 2022 02:11:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=JP9oYOQmuUnFNVjuQe3tgn0dJnaFcfIKFDWS8je+fgg=; b=Pr+G3Ojej3NC5HEvbg/NZoMwcF apUtbnE+kyHfWRR/e0Ku/snWWC8bhe/A+bwuoiwqVZc/4xZpOxui4BjcN2RejJ04Xp7a6vGvAsoY2 q3fERwo/79Sdz915ulDByeGfFZBQNIQFaKvnC9wQ758Ru5mA9cKfSlsQhjfsATfiCwrA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=JP9oYOQmuUnFNVjuQe3tgn0dJnaFcfIKFDWS8je+fgg=; b=hpEgJ3fXCRZ3Irge3nm5bdg5Hb LYiOSbiBVJYiWwfDtsKrN9reppXFe/s6Z45dnvmoWdbu3i+F2wFIh2ZJQD+qU908FoUHWjTQOTqhW wlHOs/3vRc8xMNb36X9i56x6zlpmJZC3jliGRdbgn7fk+648EOybib/BytsiwlVK9ZfI=; Received: from ams.source.kernel.org ([145.40.68.75]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1o1eyj-003VoN-OW for linux-f2fs-devel@lists.sourceforge.net; Thu, 16 Jun 2022 02:11:27 +0000 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 ams.source.kernel.org (Postfix) with ESMTPS id 9925EB821FA; Thu, 16 Jun 2022 02:11:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E49BC3411C; Thu, 16 Jun 2022 02:11:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655345468; bh=nq8HZsrxlaE0xh/Zx17kZcEjIeh+W1Og2IIy6fXRbTo=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=nIA7z+plO4PufEu4f6BdC+G9MSUqDtYSak2FZZRrknEf0ZxD54a432ZN1CcNiAHMt q9J06yCo6ocmGLsPEGD/KHUFuesGelyiR10jqdpDl8EYiQjoPbHUbQlON3+zkLdhuf OJ4KBBmALpefhVL+uXnj3ghEUp1S0M67idt6VncytLtoiFpdo6a2MIJPwEQFEWGymm LvELRsujWPEGkcf0h5ErPTXM0waivJUOpuFgNowOabG4iUjEVOcLR4PxVzEfKraRpt mMGBrh0SojtEWfmr1qcyqo+6dip0I6VOwD4PhSMdHcJ9hIDjaqDaH8fycIEg9DhaJS 9DOuRe+eZIE2g== Message-ID: Date: Thu, 16 Jun 2022 10:11:02 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Content-Language: en-US To: Jaegeuk Kim References: <20220610183240.2269085-1-daeho43@gmail.com> <1815f3c2-0802-5b3f-7e98-9f89c5b9e07d@kernel.org> From: Chao Yu In-Reply-To: X-Headers-End: 1o1eyj-003VoN-OW Subject: Re: [f2fs-dev] [PATCH] f2fs: fix iostat related lock protection X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daeho Jeong , kernel-team@android.com, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2022/6/16 0:54, Jaegeuk Kim wrote: > 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 It looks there are several patches not in mailing list? Thanks, > > >> >> 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 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel