[v2,23/63] dm/core: Combine request operation type and flags

Message ID	20220629233145.2779494-24-bvanassche@acm.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-block-owner@kernel.org> From: Bart Van Assche <bvanassche@acm.org> To: Jens Axboe <axboe@kernel.dk> Cc: linux-block@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Bart Van Assche <bvanassche@acm.org>, Alasdair Kergon <agk@redhat.com>, Mike Snitzer <snitzer@kernel.org> Subject: [PATCH v2 23/63] dm/core: Combine request operation type and flags Date: Wed, 29 Jun 2022 16:31:05 -0700 Message-Id: <20220629233145.2779494-24-bvanassche@acm.org> In-Reply-To: <20220629233145.2779494-1-bvanassche@acm.org> References: <20220629233145.2779494-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Improve static type checking for request flags \| expand [v2,00/63] Improve static type checking for request flags [v2,01/63] treewide: Rename enum req_opf into enum req_op [v2,02/63] block: Use enum req_op where appropriate [v2,03/63] block: Change the type of the last .rw_page() argument [v2,04/63] block: Change the type of req_op() and bio_op() into enum req_op [v2,05/63] block: Introduce the type blk_opf_t [v2,06/63] block: Use the new blk_opf_t type [v2,07/63] block/bfq: Use the new blk_opf_t type [v2,08/63] block/mq-deadline: Use the new blk_opf_t type [v2,09/63] block/kyber: Use the new blk_opf_t type [v2,10/63] blktrace: Trace remapped requests correctly [v2,11/63] blktrace: Use the new blk_opf_t type [v2,12/63] block/brd: Use the enum req_op type [v2,13/63] block/drbd: Use the enum req_op and blk_opf_t types [v2,14/63] block/drbd: Combine two drbd_submit_peer_request() arguments [v2,15/63] block/floppy: Fix a sparse warning [v2,16/63] block/rnbd: Use blk_opf_t where appropriate [v2,17/63] xen-blkback: Use the enum req_op and blk_opf_t types [v2,18/63] block/zram: Use enum req_op where appropriate [v2,19/63] nvdimm-btt: Use the enum req_op type [v2,20/63] um: Use enum req_op where appropriate [v2,21/63] dm/core: Reduce the size of struct dm_io_request [v2,22/63] dm/core: Rename kcopyd_job.rw into kcopyd.op [v2,23/63] dm/core: Combine request operation type and flags [v2,24/63] dm/ebs: Change 'int rw' into 'enum req_op op' [v2,25/63] dm/dm-flakey: Use the new blk_opf_t type [v2,26/63] dm/dm-integrity: Combine request operation and flags [v2,27/63] dm mirror log: Use the new blk_opf_t type [v2,28/63] dm-snap: Combine request operation type and flags [v2,29/63] dm/zone: Use the enum req_op type [v2,30/63] dm/dm-zoned: Use the enum req_op type [v2,31/63] md/core: Combine two sync_page_io() arguments [v2,32/63] md/bcache: Combine two uuid_io() arguments [v2,33/63] md/bcache: Combine two prio_io() arguments [v2,34/63] md/raid1: Use the new blk_opf_t type [v2,35/63] md/raid10: Use the new blk_opf_t type [v2,36/63] md/raid5: Use the enum req_op and blk_opf_t types [v2,37/63] nvme/host: Use the enum req_op and blk_opf_t types [v2,38/63] nvme/target: Use the new blk_opf_t type [v2,39/63] scsi/core: Improve static type checking [v2,40/63] scsi/core: Change the return type of scsi_noretry_cmd() into bool [v2,41/63] scsi/core: Use the new blk_opf_t type [v2,42/63] scsi/device_handlers: Use the new blk_opf_t type [v2,43/63] scsi/ufs: Rename a 'dir' argument into 'op' [v2,44/63] scsi/target: Use the new blk_opf_t type [v2,45/63] mm: Use the new blk_opf_t type [v2,46/63] fs/buffer: Use the new blk_opf_t type [v2,47/63] fs/buffer: Combine two submit_bh() and ll_rw_block() arguments [v2,48/63] fs/direct-io: Reduce the size of struct dio [v2,49/63] fs/mpage: Use the new blk_opf_t type [v2,50/63] fs/btrfs: Use the enum req_op and blk_opf_t types [v2,51/63] fs/ext4: Use the new blk_opf_t type [v2,52/63] fs/f2fs: Use the enum req_op and blk_opf_t types [v2,53/63] fs/gfs2: Use the enum req_op and blk_opf_t types [v2,54/63] fs/hfsplus: Use the enum req_op and blk_opf_t types [v2,55/63] fs/iomap: Use the new blk_opf_t type [v2,56/63] fs/jbd2: Fix the documentation of the jbd2_write_superblock() callers [v2,57/63] fs/nfs: Use enum req_op where appropriate [v2,58/63] fs/nilfs2: Use the enum req_op and blk_opf_t types [v2,59/63] fs/ntfs3: Use enum req_op where appropriate [v2,60/63] fs/ocfs2: Use the enum req_op and blk_opf_t types [v2,61/63] PM: Use the enum req_op and blk_opf_t types [v2,62/63] fs/xfs: Use the enum req_op and blk_opf_t types [v2,63/63] fs/zonefs: Use the enum req_op type for request operations

diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c index 1b7acda45c78..dc01ce33265b 100644 --- a/drivers/md/dm-bufio.c +++ b/drivers/md/dm-bufio.c @@ -577,12 +577,12 @@ static void dmio_complete(unsigned long error, void *context) b->end_io(b, unlikely(error != 0) ? BLK_STS_IOERR : 0); } -static void use_dmio(struct dm_buffer *b, int rw, sector_t sector, +static void use_dmio(struct dm_buffer *b, enum req_op op, sector_t sector, unsigned n_sectors, unsigned offset) { int r; struct dm_io_request io_req = { - .bi_opf = rw, + .bi_opf = op, .notify.fn = dmio_complete, .notify.context = b, .client = b->c->dm_io, @@ -615,7 +615,7 @@ static void bio_complete(struct bio *bio) b->end_io(b, status); } -static void use_bio(struct dm_buffer *b, int rw, sector_t sector, +static void use_bio(struct dm_buffer *b, enum req_op op, sector_t sector, unsigned n_sectors, unsigned offset) { struct bio *bio; @@ -629,10 +629,10 @@ static void use_bio(struct dm_buffer *b, int rw, sector_t sector, bio = bio_kmalloc(vec_size, GFP_NOWAIT | __GFP_NORETRY | __GFP_NOWARN); if (!bio) { dmio: - use_dmio(b, rw, sector, n_sectors, offset); + use_dmio(b, op, sector, n_sectors, offset); return; } - bio_init(bio, b->c->bdev, bio->bi_inline_vecs, vec_size, rw); + bio_init(bio, b->c->bdev, bio->bi_inline_vecs, vec_size, op); bio->bi_iter.bi_sector = sector; bio->bi_end_io = bio_complete; bio->bi_private = b; @@ -668,7 +668,8 @@ static inline sector_t block_to_sector(struct dm_bufio_client *c, sector_t block return sector; } -static void submit_io(struct dm_buffer *b, int rw, void (*end_io)(struct dm_buffer *, blk_status_t)) +static void submit_io(struct dm_buffer *b, enum req_op op, + void (*end_io)(struct dm_buffer *, blk_status_t)) { unsigned n_sectors; sector_t sector; @@ -678,7 +679,7 @@ static void submit_io(struct dm_buffer *b, int rw, void (*end_io)(struct dm_buff sector = block_to_sector(b->c, b->block); - if (rw != REQ_OP_WRITE) { + if (op != REQ_OP_WRITE) { n_sectors = b->c->block_size >> SECTOR_SHIFT; offset = 0; } else { @@ -697,9 +698,9 @@ static void submit_io(struct dm_buffer *b, int rw, void (*end_io)(struct dm_buff } if (b->data_mode != DATA_MODE_VMALLOC) - use_bio(b, rw, sector, n_sectors, offset); + use_bio(b, op, sector, n_sectors, offset); else - use_dmio(b, rw, sector, n_sectors, offset); + use_dmio(b, op, sector, n_sectors, offset); } /*---------------------------------------------------------------- diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c index 0606e00d1817..783564533459 100644 --- a/drivers/md/dm-io.c +++ b/drivers/md/dm-io.c @@ -293,7 +293,7 @@ static void km_dp_init(struct dpages *dp, void *data) /*----------------------------------------------------------------- * IO routines that accept a list of pages. *---------------------------------------------------------------*/ -static void do_region(int op, int op_flags, unsigned region, +static void do_region(const blk_opf_t opf, unsigned region, struct dm_io_region *where, struct dpages *dp, struct io *io) { @@ -306,6 +306,7 @@ static void do_region(int op, int op_flags, unsigned region, struct request_queue *q = bdev_get_queue(where->bdev); sector_t num_sectors; unsigned int special_cmd_max_sectors; + const enum req_op op = opf & REQ_OP_MASK; /* * Reject unsupported discard and write same requests. @@ -339,8 +340,8 @@ static void do_region(int op, int op_flags, unsigned region, (PAGE_SIZE >> SECTOR_SHIFT))); } - bio = bio_alloc_bioset(where->bdev, num_bvecs, op | op_flags, - GFP_NOIO, &io->client->bios); + bio = bio_alloc_bioset(where->bdev, num_bvecs, opf, GFP_NOIO, + &io->client->bios); bio->bi_iter.bi_sector = where->sector + (where->count - remaining); bio->bi_end_io = endio; store_io_and_region_in_bio(bio, io, region); @@ -368,7 +369,7 @@ static void do_region(int op, int op_flags, unsigned region, } while (remaining); } -static void dispatch_io(int op, int op_flags, unsigned int num_regions, +static void dispatch_io(blk_opf_t opf, unsigned int num_regions, struct dm_io_region *where, struct dpages *dp, struct io *io, int sync) { @@ -378,7 +379,7 @@ static void dispatch_io(int op, int op_flags, unsigned int num_regions, BUG_ON(num_regions > DM_IO_MAX_REGIONS); if (sync) - op_flags |= REQ_SYNC; + opf |= REQ_SYNC; /* * For multiple regions we need to be careful to rewind @@ -386,8 +387,8 @@ static void dispatch_io(int op, int op_flags, unsigned int num_regions, */ for (i = 0; i < num_regions; i++) { *dp = old_pages; - if (where[i].count || (op_flags & REQ_PREFLUSH)) - do_region(op, op_flags, i, where + i, dp, io); + if (where[i].count || (opf & REQ_PREFLUSH)) + do_region(opf, i, where + i, dp, io); } /* @@ -411,13 +412,13 @@ static void sync_io_complete(unsigned long error, void *context) } static int sync_io(struct dm_io_client *client, unsigned int num_regions, - struct dm_io_region *where, int op, int op_flags, - struct dpages *dp, unsigned long *error_bits) + struct dm_io_region *where, blk_opf_t opf, struct dpages *dp, + unsigned long *error_bits) { struct io *io; struct sync_io sio; - if (num_regions > 1 && !op_is_write(op)) { + if (num_regions > 1 && !op_is_write(opf)) { WARN_ON(1); return -EIO; } @@ -434,7 +435,7 @@ static int sync_io(struct dm_io_client *client, unsigned int num_regions, io->vma_invalidate_address = dp->vma_invalidate_address; io->vma_invalidate_size = dp->vma_invalidate_size; - dispatch_io(op, op_flags, num_regions, where, dp, io, 1); + dispatch_io(opf, num_regions, where, dp, io, 1); wait_for_completion_io(&sio.wait); @@ -445,12 +446,12 @@ static int sync_io(struct dm_io_client *client, unsigned int num_regions, } static int async_io(struct dm_io_client *client, unsigned int num_regions, - struct dm_io_region *where, int op, int op_flags, + struct dm_io_region *where, blk_opf_t opf, struct dpages *dp, io_notify_fn fn, void *context) { struct io *io; - if (num_regions > 1 && !op_is_write(op)) { + if (num_regions > 1 && !op_is_write(opf)) { WARN_ON(1); fn(1, context); return -EIO; @@ -466,7 +467,7 @@ static int async_io(struct dm_io_client *client, unsigned int num_regions, io->vma_invalidate_address = dp->vma_invalidate_address; io->vma_invalidate_size = dp->vma_invalidate_size; - dispatch_io(op, op_flags, num_regions, where, dp, io, 0); + dispatch_io(opf, num_regions, where, dp, io, 0); return 0; } @@ -519,13 +520,10 @@ int dm_io(struct dm_io_request *io_req, unsigned num_regions, if (!io_req->notify.fn) return sync_io(io_req->client, num_regions, where, - io_req->bi_opf & REQ_OP_MASK, - io_req->bi_opf & ~REQ_OP_MASK, &dp, - sync_error_bits); + io_req->bi_opf, &dp, sync_error_bits); return async_io(io_req->client, num_regions, where, - io_req->bi_opf & REQ_OP_MASK, - io_req->bi_opf & ~REQ_OP_MASK, &dp, io_req->notify.fn, + io_req->bi_opf, &dp, io_req->notify.fn, io_req->notify.context); } EXPORT_SYMBOL(dm_io); diff --git a/drivers/md/dm.c b/drivers/md/dm.c index c6e004157da3..438b8791265c 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -716,7 +716,7 @@ static void dm_put_live_table_fast(struct mapped_device *md) __releases(RCU) } static inline struct dm_table *dm_get_live_table_bio(struct mapped_device *md, - int *srcu_idx, unsigned bio_opf) + int *srcu_idx, blk_opf_t bio_opf) { if (bio_opf & REQ_NOWAIT) return dm_get_live_table_fast(md); @@ -725,7 +725,7 @@ static inline struct dm_table *dm_get_live_table_bio(struct mapped_device *md, } static inline void dm_put_live_table_bio(struct mapped_device *md, int srcu_idx, - unsigned bio_opf) + blk_opf_t bio_opf) { if (bio_opf & REQ_NOWAIT) dm_put_live_table_fast(md); @@ -1511,7 +1511,7 @@ static void __send_changing_extent_only(struct clone_info *ci, struct dm_target static bool is_abnormal_io(struct bio *bio) { - unsigned int op = bio_op(bio); + enum req_op op = bio_op(bio); if (op != REQ_OP_READ && op != REQ_OP_WRITE && op != REQ_OP_FLUSH) { switch (op) { @@ -1625,7 +1625,7 @@ static blk_status_t __split_and_process_bio(struct clone_info *ci) * Only support bio polling for normal IO, and the target io is * exactly inside the dm_io instance (verified in dm_poll_dm_io) */ - ci->submit_as_polled = ci->bio->bi_opf & REQ_POLLED; + ci->submit_as_polled = !!(ci->bio->bi_opf & REQ_POLLED); len = min_t(sector_t, max_io_len(ti, ci->sector), ci->sector_count); setup_split_accounting(ci, len); @@ -1722,7 +1722,7 @@ static void dm_submit_bio(struct bio *bio) struct mapped_device *md = bio->bi_bdev->bd_disk->private_data; int srcu_idx; struct dm_table *map; - unsigned bio_opf = bio->bi_opf; + blk_opf_t bio_opf = bio->bi_opf; map = dm_get_live_table_bio(md, &srcu_idx, bio_opf);

[v2,23/63] dm/core: Combine request operation type and flags

Commit Message

Patch