Skip to contentSkip to conversation

f2fs: fix iostat related lock protection

PATCH In review Daeho Jeong 3 participants 8 messages Jun 10, 2022 – Jun 19, 2022 F2FS file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 f2fs: fix iostat related lock protection

From: Daeho Jeong <[email protected]>

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

---
 fs/f2fs/iostat.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)
fs/f2fs/iostat.c +18 -13
index be599f31d3c4..d84c5f6cc09d 100644
@@ -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)
Signature · 1 line
2.36.1.476.g0c4daa206d-goog
maintainer
#1 lore raw
Quoted 4 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

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

Will be better to add a 'Fixes' line?

Thanks,

Quoted 111 lines
---
  fs/f2fs/iostat.c | 31 ++++++++++++++++++-------------
  1 file changed, 18 insertions(+), 13 deletions(-)
fs/f2fs/iostat.c +16 -12
index be599f31d3c4..d84c5f6cc09d 100644
@@ -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);

fs/f2fs/iostat.c static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx, · line 218

Quoted 10 lines
fs/f2fs/iostat.c +2 -1
+	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
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer
#2 lore raw
Quoted 7 lines · Chao Yu
Quoted 4 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

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

Quoted 114 lines

Thanks,

Quoted 95 lines
---
  fs/f2fs/iostat.c | 31 ++++++++++++++++++-------------
  1 file changed, 18 insertions(+), 13 deletions(-)
fs/f2fs/iostat.c +16 -11
index be599f31d3c4..d84c5f6cc09d 100644
@@ -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;
  	}

fs/f2fs/iostat.c static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx, · line 216

Quoted 10 lines
fs/f2fs/iostat.c +2 -2
-	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
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer
#3 lore raw
Quoted 4 lines · Jaegeuk Kim
Quoted 3 lines · Chao Yu
Quoted 2 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

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,

Quoted 116 lines
Quoted 116 lines

Thanks,

Quoted 95 lines
---
   fs/f2fs/iostat.c | 31 ++++++++++++++++++-------------
   1 file changed, 18 insertions(+), 13 deletions(-)
fs/f2fs/iostat.c +16 -11
index be599f31d3c4..d84c5f6cc09d 100644
@@ -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;
   	}

fs/f2fs/iostat.c static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx, · line 216

Quoted 10 lines
fs/f2fs/iostat.c +2 -2
-	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
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer
#4 lore raw
Quoted 8 lines · Chao Yu
Quoted 7 lines · Jaegeuk Kim
Quoted 6 lines · Chao Yu
Quoted 4 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

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

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

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?

Which one doe you mean?

Quoted 118 lines

Thanks,

Quoted 116 lines
Quoted 116 lines

Thanks,

Quoted 95 lines
---
   fs/f2fs/iostat.c | 31 ++++++++++++++++++-------------
   1 file changed, 18 insertions(+), 13 deletions(-)
fs/f2fs/iostat.c +16 -11
index be599f31d3c4..d84c5f6cc09d 100644
@@ -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;
   	}

fs/f2fs/iostat.c static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx, · line 216

Quoted 10 lines
fs/f2fs/iostat.c +2 -2
-	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
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer
#5 lore raw
Quoted 11 lines · Jaegeuk Kim
Quoted 10 lines · Chao Yu
Quoted 9 lines · Jaegeuk Kim
Quoted 7 lines · Chao Yu
Quoted 4 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

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

Will be better to add a 'Fixes' line?

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

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?

Which one doe you mean?

f2fs: do not skip updating inode when retrying to flush node page

https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=27ef61f3bf3d15caa3f4ceef60163da3f143787d

f2fs: run GCs synchronously given user requests

https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=503bbcc92f0baba2a59b0a6cb4f12cf5d7141978

f2fs: attach inline_data after setting compression

https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=0c837862d93c8e2e0bbb6d33efa0ff10e603c0c5

And also current patch w/ Fixes line.

Thanks,

Quoted 119 lines
Quoted 119 lines

Thanks,

Quoted 116 lines
Quoted 116 lines

Thanks,

Quoted 95 lines
---
    fs/f2fs/iostat.c | 31 ++++++++++++++++++-------------
    1 file changed, 18 insertions(+), 13 deletions(-)
fs/f2fs/iostat.c +16 -11
index be599f31d3c4..d84c5f6cc09d 100644
@@ -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;
    	}

fs/f2fs/iostat.c static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx, · line 216

Quoted 10 lines
fs/f2fs/iostat.c +2 -2
-	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
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer
#6 lore raw
Quoted 27 lines · Chao Yu
Quoted 11 lines · Jaegeuk Kim
Quoted 10 lines · Chao Yu
Quoted 9 lines · Jaegeuk Kim
Quoted 7 lines · Chao Yu
Quoted 4 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

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

Will be better to add a 'Fixes' line?

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

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?

Which one doe you mean?

f2fs: do not skip updating inode when retrying to flush node page

https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=27ef61f3bf3d15caa3f4ceef60163da3f143787d

f2fs: run GCs synchronously given user requests

Quoted 7 lines

https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=503bbcc92f0baba2a59b0a6cb4f12cf5d7141978

f2fs: attach inline_data after setting compression

https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git/commit/?h=dev&id=0c837862d93c8e2e0bbb6d33efa0ff10e603c0c5

And also current patch w/ Fixes line.

Ah, I found I sent them to LKML only.

Quoted 122 lines

Thanks,

Quoted 119 lines
Quoted 119 lines

Thanks,

Quoted 116 lines
Quoted 116 lines

Thanks,

Quoted 95 lines
---
    fs/f2fs/iostat.c | 31 ++++++++++++++++++-------------
    1 file changed, 18 insertions(+), 13 deletions(-)
fs/f2fs/iostat.c +16 -11
index be599f31d3c4..d84c5f6cc09d 100644
@@ -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;
    	}

fs/f2fs/iostat.c static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx, · line 216

Quoted 10 lines
fs/f2fs/iostat.c +2 -2
-	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
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

maintainer Reviewed-by
#7 lore raw
In reply to Jaegeuk Kim
Quoted 4 lines · Jaegeuk Kim
Quoted 3 lines · Chao Yu
Quoted 2 lines · Daeho Jeong

From: Daeho Jeong <[email protected]>

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

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,

Quoted 108 lines
Quoted 108 lines

Thanks,

Quoted 103 lines
---
   fs/f2fs/iostat.c | 31 ++++++++++++++++++-------------
   1 file changed, 18 insertions(+), 13 deletions(-)
fs/f2fs/iostat.c +18 -13
index be599f31d3c4..d84c5f6cc09d 100644
@@ -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);
Quoted 8 lines
Quoted 8 lines

fs/f2fs/iostat.c static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx, · line 218

Quoted 2 lines
fs/f2fs/iostat.c +0 -0
   }
   void iostat_update_and_unbind_ctx(struct bio *bio, int rw)

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel