niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

f2fs: fix iostat related lock protection

Browse source 
Made iostat related locks safe to be called from irq context again.

Cc: <stable@vger.kernel.org>
Fixes: a1e09b03e6 ("f2fs: use iomap for direct I/O")
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Tested-by: Eddie Huang <eddie.huang@mediatek.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Daeho Jeong 2022-06-10 11:32:40 -07:00 • committed by Jaegeuk Kim
parent 4cde00d507
commit 61803e9843
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fs/f2fs/iostat.c
View file

@ -91,8 +91,9 @@ static inline void __record_iostat_latency(struct f2fs_sb_info *sbi)
unsigned int cnt; unsigned int cnt;
struct f2fs_iostat_latency iostat_lat[MAX_IO_TYPE][NR_PAGE_TYPE]; struct f2fs_iostat_latency iostat_lat[MAX_IO_TYPE][NR_PAGE_TYPE];
struct iostat_lat_info *io_lat = sbi->iostat_io_lat; 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 (idx = 0; idx < MAX_IO_TYPE; idx++) {
for (io = 0; io < NR_PAGE_TYPE; io++) { for (io = 0; io < NR_PAGE_TYPE; io++) {
cnt = io_lat->bio_cnt[idx][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; 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); 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]; unsigned long long iostat_diff[NR_IO_TYPE];
int i; int i;
unsigned long flags;
if (time_is_after_jiffies(sbi->iostat_next_period)) if (time_is_after_jiffies(sbi->iostat_next_period))
return; return;
/* Need double check under the lock */ /* 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)) { if (time_is_after_jiffies(sbi->iostat_next_period)) {
spin_unlock_bh(&sbi->iostat_lock); spin_unlock_irqrestore(&sbi->iostat_lock, flags);
return; return;
} }
sbi->iostat_next_period = jiffies + 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->prev_rw_iostat[i] = sbi->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); 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; struct iostat_lat_info *io_lat = sbi->iostat_io_lat;
int i; int i;
spin_lock_bh(&sbi->iostat_lock); spin_lock_irq(&sbi->iostat_lock);
for (i = 0; i < NR_IO_TYPE; i++) { for (i = 0; i < NR_IO_TYPE; i++) {
sbi->rw_iostat[i] = 0; sbi->rw_iostat[i] = 0;
sbi->prev_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)); 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, void f2fs_update_iostat(struct f2fs_sb_info *sbi,
enum iostat_type type, unsigned long long io_bytes) enum iostat_type type, unsigned long long io_bytes)
{ {
unsigned long flags;
if (!sbi->iostat_enable) if (!sbi->iostat_enable)
return; return;
spin_lock_bh(&sbi->iostat_lock); spin_lock_irqsave(&sbi->iostat_lock, flags);
sbi->rw_iostat[type] += io_bytes; sbi->rw_iostat[type] += io_bytes;
if (type == APP_BUFFERED_IO || type == APP_DIRECT_IO) 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) if (type == APP_BUFFERED_READ_IO || type == APP_DIRECT_READ_IO)
sbi->rw_iostat[APP_READ_IO] += io_bytes; 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); 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 f2fs_sb_info *sbi = iostat_ctx->sbi;
struct iostat_lat_info *io_lat = sbi->iostat_io_lat; struct iostat_lat_info *io_lat = sbi->iostat_io_lat;
int idx; int idx;
unsigned long flags;
if (!sbi->iostat_enable) if (!sbi->iostat_enable)
return; return;
@ -202,12 +207,12 @@ static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx,
idx = WRITE_ASYNC_IO; 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->sum_lat[idx][iotype] += ts_diff;
io_lat->bio_cnt[idx][iotype]++; io_lat->bio_cnt[idx][iotype]++;
if (ts_diff > io_lat->peak_lat[idx][iotype]) if (ts_diff > io_lat->peak_lat[idx][iotype])
io_lat->peak_lat[idx][iotype] = ts_diff; 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) void iostat_update_and_unbind_ctx(struct bio *bio, int rw)