dm-verity: consolidate the BH and normal work structs
PATCH 1/1 dm-verity: consolidate the BH and normal work structs
Since each dm_verity_io is never on both the BH and normal workqueues at the same time, there's no need for two different work_structs. Replace the 'bh_work' and 'work' fields with just 'work'.
Note: this is correct even though it means 'work' may be reused while verity_bh_work() is running. The workqueue API allows work functions to reuse or free their work_struct, and many workqueue users rely on that.
--- drivers/md/dm-verity-target.c | 8 ++++---- drivers/md/dm-verity.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/md/dm-verity-target.c +4 -4
@@ -649,11 +649,11 @@ static void verity_work(struct work_struct *w)verity_finish_io (io,errno_to_blk_status (verity_verify_io (io))); }static void verity_bh_work (struct work_struct *w) { - struct dm_verity_io *io = container_of(w, struct dm_verity_io, bh_work); + struct dm_verity_io *io = container_of(w, struct dm_verity_io, work);int err; io->in_bh = true; err =verity_verify_io (io);if (err == -EAGAIN || err == -ENOMEM ) {
@@ -688,14 +688,14 @@ static void verity_end_io(struct bio *bio) }if (static_branch_unlikely (&use_bh_wq_enabled) && io->v->use_bh_wq &&verity_use_bh (bytes, ioprio)) {if (in_hardirq () ||irqs_disabled ()) { -INIT_WORK (&io->bh_work, verity_bh_work); -queue_work (system_bh_wq, &io->bh_work); +INIT_WORK (&io->work, verity_bh_work); +queue_work (system_bh_wq, &io->work); }else { -verity_bh_work (&io->bh_work); +verity_bh_work (&io->work); } }else {INIT_WORK (&io->work, verity_work);queue_work (io->v->verify_wq, &io->work); }
drivers/md/dm-verity.h +0 -1
@@ -107,11 +107,10 @@ struct dm_verity_io {#ifdef CONFIG_DM_VERITY_FEC struct dm_verity_fec_io *fec_io;#endif struct work_struct work; -struct work_struct bh_work;u8 tmp_digest[HASH_MAX_DIGESTSIZE ];/* * This is the queue of data blocks that are pending verification. When
base-commit: 8fbb8fe75d4cf92eaa7b21828ec39c1bf79a262f
Signature · 1 line
2.52.0
Quoted 10 lines · Eric Biggers
Since each
dm_verity_iois never on both the BH and normal workqueues at the same time, there's no need for two differentwork_structs. Replace the 'bh_work' and 'work' fields with just 'work'.Note: this is correct even though it means 'work' may be reused while
verity_bh_work()is running. The workqueue API allows work functions to reuse or free theirwork_struct, and many workqueue users rely on that.Signed-off-by Eric Biggers <[email protected]>
Sami