Commit 581075e4 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

dm/core: Reduce the size of struct dm_io_request 



Combine the bi_op and bi_op_flags into the bi_opf member. Use the new
blk_opf_t type to improve static type checking. This patch does not
change any functionality.

Cc: Alasdair Kergon <agk@redhat.com>
Cc: Mike Snitzer <snitzer@kernel.org>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-22-bvanassche@acm.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7ee1de6e

drivers/md/dm-bufio.c

+3 −6
Original line number Diff line number Diff line
@@ -582,8 +582,7 @@ static void use_dmio(struct dm_buffer *b, int rw, sector_t sector, 
{

	int r;

	struct dm_io_request io_req = {

		.bi_op = rw,

		.bi_op_flags = 0,

		.bi_opf = rw,

		.notify.fn = dmio_complete,

		.notify.context = b,

		.client = b->c->dm_io,
@@ -1341,8 +1340,7 @@ EXPORT_SYMBOL_GPL(dm_bufio_write_dirty_buffers); 
int dm_bufio_issue_flush(struct dm_bufio_client *c)

{

	struct dm_io_request io_req = {

		.bi_op = REQ_OP_WRITE,

		.bi_op_flags = REQ_PREFLUSH | REQ_SYNC,

		.bi_opf = REQ_OP_WRITE | REQ_PREFLUSH | REQ_SYNC,

		.mem.type = DM_IO_KMEM,

		.mem.ptr.addr = NULL,

		.client = c->dm_io,
@@ -1365,8 +1363,7 @@ EXPORT_SYMBOL_GPL(dm_bufio_issue_flush); 
int dm_bufio_issue_discard(struct dm_bufio_client *c, sector_t block, sector_t count)

{

	struct dm_io_request io_req = {

		.bi_op = REQ_OP_DISCARD,

		.bi_op_flags = REQ_SYNC,

		.bi_opf = REQ_OP_DISCARD | REQ_SYNC,

		.mem.type = DM_IO_KMEM,

		.mem.ptr.addr = NULL,

		.client = c->dm_io,

drivers/md/dm-integrity.c

+5 −10
Original line number Diff line number Diff line
@@ -557,8 +557,7 @@ static int sync_rw_sb(struct dm_integrity_c *ic, int op, int op_flags) 
	struct dm_io_region io_loc;

	int r;



	io_req.bi_op = op;

	io_req.bi_op_flags = op_flags;

	io_req.bi_opf = op | op_flags;

	io_req.mem.type = DM_IO_KMEM;

	io_req.mem.ptr.addr = ic->sb;

	io_req.notify.fn = NULL;
@@ -1067,8 +1066,7 @@ static void rw_journal_sectors(struct dm_integrity_c *ic, int op, int op_flags, 
	pl_index = sector >> (PAGE_SHIFT - SECTOR_SHIFT);

	pl_offset = (sector << SECTOR_SHIFT) & (PAGE_SIZE - 1);



	io_req.bi_op = op;

	io_req.bi_op_flags = op_flags;

	io_req.bi_opf = op | op_flags;

	io_req.mem.type = DM_IO_PAGE_LIST;

	if (ic->journal_io)

		io_req.mem.ptr.pl = &ic->journal_io[pl_index];
@@ -1188,8 +1186,7 @@ static void copy_from_journal(struct dm_integrity_c *ic, unsigned section, unsig 
	pl_index = sector >> (PAGE_SHIFT - SECTOR_SHIFT);

	pl_offset = (sector << SECTOR_SHIFT) & (PAGE_SIZE - 1);



	io_req.bi_op = REQ_OP_WRITE;

	io_req.bi_op_flags = 0;

	io_req.bi_opf = REQ_OP_WRITE;

	io_req.mem.type = DM_IO_PAGE_LIST;

	io_req.mem.ptr.pl = &ic->journal[pl_index];

	io_req.mem.offset = pl_offset;
@@ -1516,8 +1513,7 @@ static void dm_integrity_flush_buffers(struct dm_integrity_c *ic, bool flush_dat 
	if (!ic->meta_dev)

		flush_data = false;

	if (flush_data) {

		fr.io_req.bi_op = REQ_OP_WRITE,

		fr.io_req.bi_op_flags = REQ_PREFLUSH | REQ_SYNC,

		fr.io_req.bi_opf = REQ_OP_WRITE | REQ_PREFLUSH | REQ_SYNC,

		fr.io_req.mem.type = DM_IO_KMEM,

		fr.io_req.mem.ptr.addr = NULL,

		fr.io_req.notify.fn = flush_notify,
@@ -2706,8 +2702,7 @@ static void integrity_recalc(struct work_struct *w) 
	if (unlikely(dm_integrity_failed(ic)))

		goto err;



	io_req.bi_op = REQ_OP_READ;

	io_req.bi_op_flags = 0;

	io_req.bi_opf = REQ_OP_READ;

	io_req.mem.type = DM_IO_VMA;

	io_req.mem.ptr.addr = ic->recalc_buffer;

	io_req.notify.fn = NULL;

drivers/md/dm-io.c

+6 −4
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int dp_init(struct dm_io_request *io_req, struct dpages *dp, 


	case DM_IO_VMA:

		flush_kernel_vmap_range(io_req->mem.ptr.vma, size);

		if (io_req->bi_op == REQ_OP_READ) {

		if ((io_req->bi_opf & REQ_OP_MASK) == REQ_OP_READ) {

			dp->vma_invalidate_address = io_req->mem.ptr.vma;

			dp->vma_invalidate_size = size;

		}
@@ -519,11 +519,13 @@ 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_op, io_req->bi_op_flags, &dp,

			       io_req->bi_opf & REQ_OP_MASK,

			       io_req->bi_opf & ~REQ_OP_MASK, &dp,

			       sync_error_bits);



	return async_io(io_req->client, num_regions, where, io_req->bi_op,

			io_req->bi_op_flags, &dp, io_req->notify.fn,

	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->notify.context);

}

EXPORT_SYMBOL(dm_io);

drivers/md/dm-kcopyd.c

+1 −2
Original line number Diff line number Diff line
@@ -549,8 +549,7 @@ static int run_io_job(struct kcopyd_job *job) 
{

	int r;

	struct dm_io_request io_req = {

		.bi_op = job->rw,

		.bi_op_flags = 0,

		.bi_opf = job->rw,

		.mem.type = DM_IO_PAGE_LIST,

		.mem.ptr.pl = job->pages,

		.mem.offset = 0,

drivers/md/dm-log.c

+2 −4
Original line number Diff line number Diff line
@@ -293,8 +293,7 @@ static void header_from_disk(struct log_header_core *core, struct log_header_dis 


static int rw_header(struct log_c *lc, int op)

{

	lc->io_req.bi_op = op;

	lc->io_req.bi_op_flags = 0;

	lc->io_req.bi_opf = op;



	return dm_io(&lc->io_req, 1, &lc->header_location, NULL);

}
@@ -307,8 +306,7 @@ static int flush_header(struct log_c *lc) 
		.count = 0,

	};



	lc->io_req.bi_op = REQ_OP_WRITE;

	lc->io_req.bi_op_flags = REQ_PREFLUSH;

	lc->io_req.bi_opf = REQ_OP_WRITE | REQ_PREFLUSH;



	return dm_io(&lc->io_req, 1, &null_location, NULL);

}