Tejun Heo ce1927b8cf block: don't merge across cgroup boundaries if blkcg is enabled ... commit 6b2b04590b upstream. 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: d706751215 ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2022-04-08 14:39:55 +02:00
..
partitions	partitions: msdos: fix one-byte get_unaligned()	2021-07-20 16:05:39 +02:00
badblocks.c
bfq-cgroup.c
bfq-iosched.c	block/wbt: fix negative inflight counter when remove scsi device	2022-02-23 12:01:04 +01:00
bfq-iosched.h
bfq-wf2q.c
bio-integrity.c	block: bio-integrity: Advance seed correctly for larger interval sizes	2022-02-08 18:30:35 +01:00
bio.c	block: Fix wrong offset in bio_truncate()	2022-02-01 17:25:48 +01:00
blk-cgroup-rwstat.c
blk-cgroup-rwstat.h
blk-cgroup.c	blk-cgroup: fix UAF by grabbing blkcg lock before destroying blkg pd	2021-09-30 10:11:07 +02:00
blk-core.c	blkcg: Remove extra blkcg_bio_issue_init	2021-11-26 10:39:13 +01:00
blk-crypto-fallback.c
blk-crypto-internal.h
blk-crypto.c	blk-crypto: fix check for too-large dun_bytes	2021-09-15 09:50:30 +02:00
blk-exec.c
blk-flush.c	block: Fix fsync always failed if once failed	2022-01-27 10:54:30 +01:00
blk-integrity.c	block: flush the integrity workqueue in blk_integrity_unregister	2021-09-30 10:11:06 +02:00
blk-ioc.c
blk-iocost.c	iocost: Fix divide-by-zero on donation from low hweight cgroup	2021-12-22 09:30:57 +01:00
blk-iolatency.c	blk-iolatency: error out if blk_get_queue() failed in iolatency_set_limit()	2021-08-12 13:22:08 +02:00
blk-lib.c
blk-map.c
blk-merge.c	block: don't merge across cgroup boundaries if blkcg is enabled	2022-04-08 14:39:55 +02:00
blk-mq-cpumap.c
blk-mq-debugfs-zoned.c
blk-mq-debugfs.c	block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output	2021-10-27 09:56:46 +02:00
blk-mq-debugfs.h
blk-mq-pci.c
blk-mq-rdma.c
blk-mq-sched.c	block: limit request dispatch loop duration	2022-04-08 14:39:55 +02:00
blk-mq-sched.h
blk-mq-sysfs.c
blk-mq-tag.c	blk-mq: avoid to iterate over stale request	2021-09-30 10:11:05 +02:00
blk-mq-tag.h	blk-mq: clear stale request in tags->rq[] before freeing one request pool	2021-07-14 16:55:58 +02:00
blk-mq-virtio.c
blk-mq.c	block: remove inaccurate requeue check	2021-11-18 14:03:58 +01:00
blk-mq.h	blk-mq: grab rq->refcount before calling ->fn in blk_mq_tagset_busy_iter	2021-07-14 16:55:58 +02:00
blk-pm.c	scsi: block: pm: Always set request queue runtime active in blk_post_runtime_resume()	2022-01-27 10:54:08 +01:00
blk-pm.h
blk-rq-qos.c	rq-qos: fix missed wake-ups in rq_qos_throttle try two	2021-07-19 09:45:00 +02:00
blk-rq-qos.h	block: fix race between adding/removing rq qos and normal IO	2021-07-14 16:56:00 +02:00
blk-settings.c
blk-stat.c
blk-stat.h
blk-sysfs.c
blk-throttle.c	blk-throttle: fix UAF by deleteing timer in blk_throtl_exit()	2021-09-26 14:09:01 +02:00
blk-timeout.c
blk-wbt.c	blk-wbt: make sure throttle is enabled properly	2021-07-14 16:56:12 +02:00
blk-wbt.h	blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()	2021-07-14 16:56:12 +02:00
blk-zoned.c	blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN	2021-09-18 13:40:06 +02:00
blk.h	block: bump max plugged deferred size from 16 to 32	2021-11-18 14:03:57 +01:00
bounce.c
bsg-lib.c
bsg.c	scsi: bsg: Remove support for SCSI_IOCTL_SEND_COMMAND	2021-09-18 13:40:11 +02:00
cmdline-parser.c
elevator.c	block/wbt: fix negative inflight counter when remove scsi device	2022-02-23 12:01:04 +01:00
genhd.c
ioctl.c	block: return -EBUSY when there are open partitions in blkdev_reread_part	2021-04-28 13:39:59 +02:00
ioprio.c	block: fix ioprio_get(IOPRIO_WHO_PGRP) vs setuid(2)	2021-12-14 11:32:40 +01:00
Kconfig
Kconfig.iosched
keyslot-manager.c
kyber-iosched.c	kyber: fix out of bounds access when preempted	2021-05-19 10:13:13 +02:00
Makefile
mq-deadline.c	block: return ELEVATOR_DISCARD_MERGE if possible	2021-09-15 09:50:28 +02:00
opal_proto.h
scsi_ioctl.c
sed-opal.c
t10-pi.c