path: root/block
diff options
authorTejun Heo <tj@kernel.org>2012-03-05 13:15:29 -0800
committerJens Axboe <axboe@kernel.dk>2012-03-06 21:27:24 +0100
commit671058fb2a2aac4e70f01b316b06bc59b98bd138 (patch)
tree6c49961409ad0e3c16b5e2027f515cafecedf39a /block
parentblock: make block cgroup policies follow bio task association (diff)
block: make blk-throttle preserve the issuing task on delayed bios
Make blk-throttle call bio_associate_current() on bios being delayed such that they get issued to block layer with the original io_context. This allows stacking blk-throttle and cfq-iosched propio policies. bios will always be issued with the correct ioc and blkcg whether it gets delayed by blk-throttle or not. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
1 files changed, 4 insertions, 0 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 08b7ab292a80..4ba141820a2e 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -894,6 +894,9 @@ bool blk_throtl_bio(struct request_queue *q, struct bio *bio)
goto out;
+ /* bio_associate_current() needs ioc, try creating */
+ create_io_context(GFP_ATOMIC, q->node);
* A throtl_grp pointer retrieved under rcu can be used to access
* basic fields like stats and io rates. If a group has no rules,
@@ -958,6 +961,7 @@ queue_bio:
tg->io_disp[rw], tg->iops[rw],
tg->nr_queued[READ], tg->nr_queued[WRITE]);
+ bio_associate_current(bio);
throtl_add_bio_tg(q->td, tg, bio);
throttled = true;