dm: Respect request queue page gaps flag
Subsystems (2)
PATCH 1/1 dm: Respect request queue page gaps flag
This has request based dm inherit the QUEUE_FLAG_SG_GAPS flags from its underlying block devices' request queues, and does not merge two requests with sg gaps when required. This fixes problems when submitting cloned requests to multipathed devices requiring virtually contiguous buffers.
--- block/blk-merge.c | 12 ++++++++++++ drivers/md/dm-table.c | 13 +++++++++++++ 2 files changed, 25 insertions(+)
block/blk-merge.c +12 -0
@@ -385,6 +385,14 @@ static bool req_no_special_merge(struct request *req)return !q->mq_ops && req->special; } +static int req_gap_to_prev (struct request *req,struct request *next) +{ +struct bio *prev = req->biotail; + +return bvec_gap_to_prev (&prev->bi_io_vec[prev->bi_vcnt -1 ], + next->bio->bi_io_vec[0 ].bv_offset); +} +static int ll_merge_requests_fn (struct request_queue *q,struct request *req,struct request *next) {
@@ -399,6 +407,10 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req,if (req_no_special_merge (req) ||req_no_special_merge (next))return 0 ; +if ((q->queue_flags & (1 <<QUEUE_FLAG_SG_GAPS )) && +req_gap_to_prev (req, next)) +return 0 ; +/* * Will it become too large? */
drivers/md/dm-table.c +13 -0
@@ -1389,6 +1389,14 @@ static int queue_supports_sg_merge(struct dm_target *ti, struct dm_dev *dev,return q && !test_bit (QUEUE_FLAG_NO_SG_MERGE , &q->queue_flags); } +static int queue_contiguous_sg (struct dm_target *ti,struct dm_dev *dev, +sector_t start,sector_t len,void *data) +{ +struct request_queue *q =bdev_get_queue (dev->bdev); + +return q && !test_bit (QUEUE_FLAG_SG_GAPS , &q->queue_flags); +} +static bool dm_table_all_devices_attribute (struct dm_table *t,iterate_devices_callout_fn func) {
@@ -1509,6 +1517,11 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,else queue_flag_set_unlocked (QUEUE_FLAG_NO_SG_MERGE , q); +if (dm_table_all_devices_attribute (t, queue_contiguous_sg)) +queue_flag_clear_unlocked (QUEUE_FLAG_SG_GAPS , q); +else +queue_flag_set_unlocked (QUEUE_FLAG_SG_GAPS , q); +dm_table_set_integrity (t);/*
Signature · 1 line
1.7.10.4
PATCH v2 1/1 block: do not merge two requests with sg gaps if unsupported
Quoted 6 lines · Keith Busch
This has request based dm inherit the
QUEUE_FLAG_SG_GAPSflags from its underlying block devices' request queues, and does not merge two requests with sg gaps when required. This fixes problems when submitting cloned requests to multipathed devices requiring virtually contiguous buffers.Signed-off-by Keith Busch <[email protected]>
Hi Keith,
I reviewed your patch and cleaned it up a little. Just some whitespace nits and used test_bit(). I also renamed dm-table.c's queue_contiguous_sg() to queue_supports_sg_gaps() to follow the pattern established by the existing queue_supports_sg_merge().
Jens, provided you and Keith agree with my changes, and given that the initial request-based DM support for blk-mq will land during the 3.20
merge: can you please pick this fix up for 3.20? If you'd prefer to just take the block change I'm fine with picking up the DM portion.
Let me know, thanks!
Mike
From: Keith Busch <[email protected]>
Date: Sat, 24 Jan 2015 15:10:48 -0700
Subject: [PATCH] block: do not merge two requests with sg gaps if unsupported
Also, a DM device must inherit the QUEUE_FLAG_SG_GAPS flags from its underlying block devices' request queues.
This fixes problems when submitting cloned requests to multipathed devices requiring virtually contiguous buffers.
--- block/blk-merge.c | 12 ++++++++++++ drivers/md/dm-table.c | 13 +++++++++++++ 2 files changed, 25 insertions(+)
block/blk-merge.c +12 -0
@@ -385,6 +385,14 @@ static bool req_no_special_merge(struct request *req)return !q->mq_ops && req->special; } +static int req_gap_to_prev (struct request *req,struct request *next) +{ +struct bio *prev = req->biotail; + +return bvec_gap_to_prev (&prev->bi_io_vec[prev->bi_vcnt -1 ], + next->bio->bi_io_vec[0 ].bv_offset); +} +static int ll_merge_requests_fn (struct request_queue *q,struct request *req,struct request *next) {
@@ -399,6 +407,10 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req,if (req_no_special_merge (req) ||req_no_special_merge (next))return 0 ; +if (test_bit (QUEUE_FLAG_SG_GAPS , q->queue_flags) && +req_gap_to_prev (req, next)) +return 0 ; +/* * Will it become too large? */
drivers/md/dm-table.c +13 -0
@@ -1389,6 +1389,14 @@ static int queue_supports_sg_merge(struct dm_target *ti, struct dm_dev *dev,return q && !test_bit (QUEUE_FLAG_NO_SG_MERGE , &q->queue_flags); } +static int queue_supports_sg_gaps (struct dm_target *ti,struct dm_dev *dev, +sector_t start,sector_t len,void *data) +{ +struct request_queue *q =bdev_get_queue (dev->bdev); + +return q && !test_bit (QUEUE_FLAG_SG_GAPS , &q->queue_flags); +} +static bool dm_table_all_devices_attribute (struct dm_table *t,iterate_devices_callout_fn func) {
@@ -1509,6 +1517,11 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,else queue_flag_set_unlocked (QUEUE_FLAG_NO_SG_MERGE , q); +if (dm_table_all_devices_attribute (t, queue_supports_sg_gaps)) +queue_flag_clear_unlocked (QUEUE_FLAG_SG_GAPS , q); +else +queue_flag_set_unlocked (QUEUE_FLAG_SG_GAPS , q); +dm_table_set_integrity (t);/*
Signature · 1 line
1.9.3 (Apple Git-50)
Re: [PATCH v2] block: do not merge two requests with sg gaps if unsupported
Quoted 8 lines · Mike Snitzer
Quoted 5 lines · Keith Busch
This has request based dm inherit the
QUEUE_FLAG_SG_GAPSflags from its underlying block devices' request queues, and does not merge two requests with sg gaps when required. This fixes problems when submitting cloned requests to multipathed devices requiring virtually contiguous buffers.
Quoted 8 lines
Quoted 1 line
Signed-off-by Keith Busch <[email protected]>Hi Keith,
I reviewed your patch and cleaned it up a little. Just some whitespace nits and used
test_bit(). I also renamed dm-table.c'squeue_contiguous_sg()toqueue_supports_sg_gaps()to follow the pattern established by the existingqueue_supports_sg_merge().
Thanks Mike! Your modifications look good to me. I try to adapt to the local lingo, but rarely get it right. :)
Quoted 7 lines
Jens, provided you and Keith agree with my changes, and given that the initial request-based DM support for blk-mq will land during the 3.20
merge: can you please pick this fix up for 3.20? If you'd prefer to just take the block change I'm fine with picking up the DM portion.Let me know, thanks!
Mike