Paolo Valente cc051f497e Revert "Revert "block, bfq: honor already-setup queue merges"" ... [ Upstream commit 15729ff814 ] A crash [1] happened to be triggered in conjunction with commit 2d52c58b9c ("block, bfq: honor already-setup queue merges"). The latter was then reverted by commit ebc69e897e ("Revert "block, bfq: honor already-setup queue merges""). Yet, the reverted commit was not the one introducing the bug. In fact, it actually triggered a UAF introduced by a different commit, and now fixed by commit d29bd41428 ("block, bfq: reset last_bfqq_created on group change"). So, there is no point in keeping commit 2d52c58b9c ("block, bfq: honor already-setup queue merges") out. This commit restores it. [1] https://bugzilla.kernel.org/show_bug.cgi?id=214503 Reported-by: Holger Hoffstätte <holger@applied-asynchrony.com> Signed-off-by: Paolo Valente <paolo.valente@linaro.org> Link: https://lore.kernel.org/r/20211125181510.15004-1-paolo.valente@linaro.org Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>		2022-04-08 14:40:32 +02:00
..
partitions	partitions: msdos: fix one-byte get_unaligned()	2021-07-20 16:05:39 +02:00
badblocks.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
bfq-cgroup.c	block, bfq: don't move oom_bfqq	2022-04-08 14:40:30 +02:00
bfq-iosched.c	Revert "Revert "block, bfq: honor already-setup queue merges""	2022-04-08 14:40:32 +02:00
bfq-iosched.h	bfq: fix blkio cgroup leakage v4	2020-08-18 07:48:08 -07:00
bfq-wf2q.c	bfq: fix blkio cgroup leakage v4	2020-08-18 07:48:08 -07:00
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: Fix the recursive blkg rwstat	2021-03-30 14:31:48 +02:00
blk-cgroup-rwstat.h	blk-cgroup: separate out blkg_rwstat under CONFIG_BLK_CGROUP_RWSTAT	2019-11-07 12:28:13 -07:00
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	block: rename generic_make_request to submit_bio_noacct	2020-07-01 07:27:24 -06:00
blk-crypto-internal.h	block: make blk_crypto_rq_bio_prep() able to fail	2020-10-05 10:47:43 -06:00
blk-crypto.c	blk-crypto: fix check for too-large dun_bytes	2021-09-15 09:50:30 +02:00
blk-exec.c	block: add a blk_account_io_merge_bio helper	2020-05-27 05:21:23 -06:00
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	block: remove retry loop in ioc_release_fn()	2020-07-16 10:22:15 -06:00
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	block: add a bdev_is_partition helper	2020-09-25 08:18:57 -06:00
blk-map.c	block: fix bmd->is_null_mapped initialization	2020-09-23 09:18:39 -06:00
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: remove the calling of local_memory_node()	2020-10-20 07:08:17 -06:00
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	block-5.10-2020-10-12	2020-10-13 12:12:44 -07:00
blk-mq-sysfs.c	blk-mq: move cancel of hctx->run_work to the front of blk_exit_queue	2020-10-09 12:46:28 -06:00
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: Fix typo in comment	2020-03-17 20:55:21 +01:00
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	scsi: block: Do not accept any requests while suspended	2021-01-12 20:18:17 +01:00
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-settings: align max_sectors on "logical_block_size" boundary	2021-03-04 11:38:22 +01:00
blk-stat.c	blk-stat: make q->stats->lock irqsafe	2020-09-01 16:48:46 -06:00
blk-stat.h
blk-sysfs.c	block: don't delete queue kobject before its children	2022-04-08 14:40:00 +02:00
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	block: blk-timeout: delete duplicated word	2020-07-31 16:29:47 -06:00
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	block: make bio_crypt_clone() able to fail	2020-10-05 10:47:43 -06:00
bsg-lib.c	block: drop double zeroing	2020-09-23 09:18:13 -06:00
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	block: Suppress uevent for hidden device when removed	2021-03-30 14:31:52 +02:00
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	blk-wbt: Remove obsolete multiqueue I/O scheduling comment	2020-09-01 16:49:26 -06:00
Kconfig.iosched	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
keyslot-manager.c	block/keyslot-manager: prevent crash when num_slots=1	2020-11-20 11:52:52 -07:00
kyber-iosched.c	kyber: fix out of bounds access when preempted	2021-05-19 10:13:13 +02:00
Makefile	blk-mq: merge blk-softirq.c into blk-mq.c	2020-06-24 09:15:56 -06:00
mq-deadline.c	block: return ELEVATOR_DISCARD_MERGE if possible	2021-09-15 09:50:28 +02:00
opal_proto.h	block: sed-opal: Change the check condition for regular session validity	2020-03-12 08:00:10 -06:00
scsi_ioctl.c	drivers-5.10-2020-10-12	2020-10-13 13:04:41 -07:00
sed-opal.c	block: sed-opal: Change the check condition for regular session validity	2020-03-12 08:00:10 -06:00
t10-pi.c	block: Allow t10-pi to be modular	2020-01-06 20:59:04 -07:00