Skip to contentSkip to conversation

md: add new interface 'mk_rq' in target_type

PATCH New Robin Dong 1 participant 2 messages Sep 3, 2012 Device mapper

lore
Share & tools
lore

Robin Dong

author
#0 lore raw

PATCH 1/2 md: add new interface 'mk_rq' in target_type

From: Robin Dong <[email protected]>

We are now trying to modify flashcache(https://github.com/facebook/flashcache) to make it request based so that
we can let cfq io-controller control the bandwidth between different io cgroups.

A search in the dm directory tells me that only multipath is a request based dm target and its functionality
is very simple and map_rq() is used to map the request to different underlying devices. We can't work in this way because:

1. the request which processed by map_rq() need to be issued to
different lower devices (disk device and cache device, in flashcache), therefore the request
can't be totally remapped by simply changing its queue and returning DM_MAPIO_REMAPPED in map_rq() like multipath_map()
2. to submit bios drectly in map_rq() (by return DM_MAPIO_SUBMITTED) will cause BUG_ON(!irqs_disabled())

	in dm_request_fn() because the submit_bio()->generic_make_request()->blk_queue_bio() will definitly call spin_unlock_irq to enable the irqs

As above,the interface map_rq() provided by devcie-mapper framework is not enough for an autonomous target, like flashcache.

We propose to add a new
mk_rq interface so that we can make the requests
by ourselves.

---
 drivers/md/dm.c               |   10 ++++++++++
 include/linux/device-mapper.h |    3 +++
 2 files changed, 13 insertions(+), 0 deletions(-)
drivers/md/dm.c +10 -0
index 4e09b6f..3ae67de 100644
@@ -1459,11 +1459,21 @@ static int dm_request_based(struct mapped_device *md)
 static void dm_request(struct request_queue *q, struct bio *bio)
 {
 	struct mapped_device *md = q->queuedata;
+	struct dm_table *map = dm_get_live_table(md);
+	struct dm_target *ti = dm_table_find_target(map, bio->bi_sector);
+
+	if (ti->type->mk_rq) {
+		ti->type->mk_rq(ti, q, bio);
+		goto out;
+	}
 
 	if (dm_request_based(md))
 		blk_queue_bio(q, bio);
 	else
 		_dm_request(q, bio);
+
+out:
+	dm_table_put(map);
 }
 
 void dm_dispatch_request(struct request *rq)
include/linux/device-mapper.h +3 -0
index 38d27a1..2386389 100644
@@ -50,6 +50,8 @@ typedef int (*dm_map_fn) (struct dm_target *ti, struct bio *bio,
 			  union map_info *map_context);
 typedef int (*dm_map_request_fn) (struct dm_target *ti, struct request *clone,
 				  union map_info *map_context);
+typedef int (*dm_make_request_fn) (struct dm_target *ti,
+				struct request_queue *q, struct bio *bio);
 
 /*
  * Returns:
@@ -136,6 +138,7 @@ struct target_type {
 	dm_dtr_fn dtr;
 	dm_map_fn map;
 	dm_map_request_fn map_rq;
+	dm_make_request_fn mk_rq;
 	dm_endio_fn end_io;
 	dm_request_endio_fn rq_end_io;
 	dm_presuspend_fn presuspend;
Signature · 1 line
1.7.1
author
#1 lore raw

PATCH 2/2 md: modify dm_io() so it could return bios instead of submitting it

From: Robin Dong <[email protected]>

When trying to modify flashcache to request based (current it's bio based), we need to make request from bios by ourselves, but dm_io() will submit these bios directly, so we propose to modify the dm_io() to return bios instead of submiting it.

This could also improve the flexibility of dm_io().

---
 drivers/md/dm-bufio.c           |    2 +
 drivers/md/dm-io.c              |   58 +++++++++++++++++++++++----------------
 drivers/md/dm-kcopyd.c          |    1 +
 drivers/md/dm-log.c             |    1 +
 drivers/md/dm-raid1.c           |    3 ++
 drivers/md/dm-snap-persistent.c |    1 +
 include/linux/dm-io.h           |    3 ++
 7 files changed, 45 insertions(+), 24 deletions(-)
drivers/md/dm-bufio.c +2 -0
index cc06a1e..f5867b9 100644
@@ -487,6 +487,7 @@ static void use_dmio(struct dm_buffer *b, int rw, sector_t block,
 		.notify.fn = dmio_complete,
 		.notify.context = b,
 		.client = b->c->dm_io,
+		.submit_bio = 1,
 	};
 	struct dm_io_region region = {
 		.bdev = b->c->bdev,
@@ -1200,6 +1201,7 @@ int dm_bufio_issue_flush(struct dm_bufio_client *c)
 		.mem.type = DM_IO_KMEM,
 		.mem.ptr.addr = NULL,
 		.client = c->dm_io,
+		.submit_bio = 1,
 	};
 	struct dm_io_region io_reg = {
 		.bdev = c->bdev,
drivers/md/dm-io.c +34 -24

138 lines not on this page · raw message

drivers/md/dm-kcopyd.c +1 -0
index bed444c..6a8ecc9 100644
@@ -387,6 +387,7 @@ static int run_io_job(struct kcopyd_job *job)
 		.notify.fn = complete_io,
 		.notify.context = job,
 		.client = job->kc->io_client,
+		.submit_bio = 1,
 	};
 
 	if (job->rw == READ)
drivers/md/dm-log.c +1 -0
index 627d191..8425e84 100644
@@ -463,6 +463,7 @@ static int create_log_context(struct dm_dirty_log *log, struct dm_target *ti,
 			kfree(lc);
 			return r;
 		}
+		lc->io_req.submit_bio = 1;
 
 		lc->disk_header = vmalloc(buf_size);
 		if (!lc->disk_header) {
drivers/md/dm-raid1.c +3 -0
index bc5ddba..338d726 100644
@@ -261,6 +261,7 @@ static int mirror_flush(struct dm_target *ti)
 		.mem.type = DM_IO_KMEM,
 		.mem.ptr.addr = NULL,
 		.client = ms->io_client,
+		.submit_bio = 1,
 	};
 
 	for (i = 0, m = ms->mirror; i < ms->nr_mirrors; i++, m++) {
@@ -530,6 +531,7 @@ static void read_async_bio(struct mirror *m, struct bio *bio)
 		.notify.fn = read_callback,
 		.notify.context = bio,
 		.client = m->ms->io_client,
+		.submit_bio = 1,
 	};
 
 	map_region(&io, m, bio);
@@ -633,6 +635,7 @@ static void do_write(struct mirror_set *ms, struct bio *bio)
 		.notify.fn = write_callback,
 		.notify.context = bio,
 		.client = ms->io_client,
+		.submit_bio = 1,
 	};
 
 	if (bio->bi_rw & REQ_DISCARD) {
drivers/md/dm-snap-persistent.c +1 -0
index 3ac4156..0600e1d 100644
@@ -241,6 +241,7 @@ static int chunk_io(struct pstore *ps, void *area, chunk_t chunk, int rw,
 		.mem.ptr.vma = area,
 		.client = ps->io_client,
 		.notify.fn = NULL,
+		.submit_bio = 1,
 	};
 	struct mdata_req req;
 
include/linux/dm-io.h +3 -0
index f4b0aa3..45f576b 100644
@@ -61,6 +61,9 @@ struct dm_io_request {
 	struct dm_io_memory mem;	/* Memory to use for io */
 	struct dm_io_notify notify;	/* Synchronous if notify.fn is NULL */
 	struct dm_io_client *client;	/* Client memory handler */
+	int submit_bio;
+	struct bio *start;
+	struct bio *end;
 };
 
 /*
Signature · 1 line
1.7.1