block, cfq: move ioc ioprio/cgroup changed handling to cic
authorTejun Heo <tj@kernel.org>
Tue, 13 Dec 2011 23:33:38 +0000 (00:33 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 13 Dec 2011 23:33:38 +0000 (00:33 +0100)
commitdc86900e0a8f665122de6faadd27fb4c6d2b3e4d
treeec24aa4b076f54fcfb0558d5113f5c5e0f4bc173
parent283287a52e3c3f7f8f9da747f4b8c5202740d776
block, cfq: move ioc ioprio/cgroup changed handling to cic

ioprio/cgroup change was handled by marking the changed state in ioc
and, on the following access to the ioc, performing RCU-protected
iteration through all cic's grabbing the matching queue_lock.

This patch moves the changed state to each cic.  When ioprio or cgroup
changes, the respective bit is set on all cic's of the ioc and when
each of those cic (not ioc) is accessed, change is applied for that
specific ioc-queue pair.

This also fixes the following two race conditions between setting and
clearing of changed states.

* Missing barrier between assign/load of ioprio and ioprio_changed
  allowed applying old ioprio.

* Change requests could happen between application of change and
  clearing of changed variables.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-cgroup.c
block/blk-ioc.c
block/cfq-iosched.c
fs/ioprio.c
include/linux/iocontext.h