[f2fs-dev,v2,2/2] f2fs: set io priority for fsverity work

Commit Message

Yi Sun July 1, 2024, 7:51 a.m. UTC

The io priority of reading the original data of the verity-file
and reading hash blocks during verification should be consistent.

If the io priority is not set, when a high-task-priority process
reads the verity-file, the kworker's io priority may be too low,
resulting in delayed reading of hash blocks, which eventually
causes the high-task-priority process to response slowly.

Signed-off-by: Yi Sun <[e-mail]>
---
 fs/f2fs/data.c   | 17 ++++++++++-------
 fs/f2fs/f2fs.h   |  1 +
 fs/f2fs/verity.c |  5 +++++
 3 files changed, 16 insertions(+), 7 deletions(-)

Patch

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index b9b0debc6b3d..7e8c56a3098b 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -110,7 +110,7 @@  enum bio_post_read_step {
 struct bio_post_read_ctx {
 	struct bio *bio;
 	struct f2fs_sb_info *sbi;
-	struct work_struct work;
+	struct io_work iowork;
 	unsigned int enabled_steps;
 	/*
 	 * decompression_attempted keeps track of whether
@@ -168,10 +168,12 @@  static void f2fs_finish_read_bio(struct bio *bio, bool in_task)
 static void f2fs_verify_bio(struct work_struct *work)
 {
 	struct bio_post_read_ctx *ctx =
-		container_of(work, struct bio_post_read_ctx, work);
+		container_of(to_io_work(work), struct bio_post_read_ctx, iowork);
 	struct bio *bio = ctx->bio;
 	bool may_have_compressed_pages = (ctx->enabled_steps & STEP_DECOMPRESS);
 
+	may_adjust_io_work_task_ioprio(to_io_work(work));
+
 	/*
 	 * fsverity_verify_bio() may call readahead() again, and while verity
 	 * will be disabled for this, decryption and/or decompression may still
@@ -204,6 +206,7 @@  static void f2fs_verify_bio(struct work_struct *work)
 	}
 
 	f2fs_finish_read_bio(bio, true);
+	restore_io_work_task_ioprio(to_io_work(work));
 }
 
 /*
@@ -220,8 +223,8 @@  static void f2fs_verify_and_finish_bio(struct bio *bio, bool in_task)
 	struct bio_post_read_ctx *ctx = bio->bi_private;
 
 	if (ctx && (ctx->enabled_steps & STEP_VERITY)) {
-		INIT_WORK(&ctx->work, f2fs_verify_bio);
-		fsverity_enqueue_verify_work(&ctx->work);
+		INIT_IO_WORK(&ctx->iowork, f2fs_verify_bio);
+		f2fs_enqueue_verify_io_work(&ctx->iowork);
 	} else {
 		f2fs_finish_read_bio(bio, in_task);
 	}
@@ -270,7 +273,7 @@  static void f2fs_handle_step_decompress(struct bio_post_read_ctx *ctx,
 static void f2fs_post_read_work(struct work_struct *work)
 {
 	struct bio_post_read_ctx *ctx =
-		container_of(work, struct bio_post_read_ctx, work);
+		container_of(to_io_work(work), struct bio_post_read_ctx, iowork);
 	struct bio *bio = ctx->bio;
 
 	if ((ctx->enabled_steps & STEP_DECRYPT) && !fscrypt_decrypt_bio(bio)) {
@@ -313,8 +316,8 @@  static void f2fs_read_end_io(struct bio *bio)
 				!f2fs_low_mem_mode(sbi)) {
 			f2fs_handle_step_decompress(ctx, intask);
 		} else if (enabled_steps) {
-			INIT_WORK(&ctx->work, f2fs_post_read_work);
-			queue_work(ctx->sbi->post_read_wq, &ctx->work);
+			INIT_IO_WORK(&ctx->iowork, f2fs_post_read_work);
+			queue_io_work(ctx->sbi->post_read_wq, &ctx->iowork);
 			return;
 		}
 	}
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 1974b6aff397..dc228c50ed30 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4234,6 +4234,7 @@  void f2fs_unregister_sysfs(struct f2fs_sb_info *sbi);
 
 /* verity.c */
 extern const struct fsverity_operations f2fs_verityops;
+void f2fs_enqueue_verify_io_work(struct io_work *iowork);
 
 /*
  * crypto support
diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c
index f7bb0c54502c..fba6aecba9b6 100644
--- a/fs/f2fs/verity.c
+++ b/fs/f2fs/verity.c
@@ -292,3 +292,8 @@  const struct fsverity_operations f2fs_verityops = {
 	.read_merkle_tree_page	= f2fs_read_merkle_tree_page,
 	.write_merkle_tree_block = f2fs_write_merkle_tree_block,
 };
+
+void f2fs_enqueue_verify_io_work(struct io_work *iowork)
+{
+	fsverity_enqueue_verify_work(&(iowork->work));
+}