block: don't merge across cgroup boundaries if blkcg is enabled
authorTejun Heo <tj@kernel.org>
Tue, 15 Mar 2022 00:30:11 +0000 (14:30 -1000)
committerJens Axboe <axboe@kernel.dk>
Tue, 15 Mar 2022 01:14:37 +0000 (19:14 -0600)
commit6b2b04590b51aa4cf395fcd185ce439cab5961dc
treeca7f907498c68799e2f0ddb8e128464012a26b60
parentaa1b46dcdc7baaf5fec0be25782ef24b26aa209e
block: don't merge across cgroup boundaries if blkcg is enabled

blk-iocost and iolatency are cgroup aware rq-qos policies but they didn't
disable merges across different cgroups. This obviously can lead to
accounting and control errors but more importantly to priority inversions -
e.g. an IO which belongs to a higher priority cgroup or IO class may end up
getting throttled incorrectly because it gets merged to an IO issued from a
low priority cgroup.

Fix it by adding blk_cgroup_mergeable() which is called from merge paths and
rejects cross-cgroup and cross-issue_as_root merges.

Signed-off-by: Tejun Heo <tj@kernel.org>
Fixes: d70675121546 ("block: introduce blk-iolatency io controller")
Cc: stable@vger.kernel.org # v4.19+
Cc: Josef Bacik <jbacik@fb.com>
Link: https://lore.kernel.org/r/Yi/eE/6zFNyWJ+qd@slm.duckdns.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-cgroup.h
block/blk-merge.c