Shin'ichiro Kawasaki 0a5aa8d161 block: fix blk_mq_attempt_bio_merge and rq_qos_throttle protection ... Commit 9d497e2941 ("block: don't protect submit_bio_checks by q_usage_counter") moved blk_mq_attempt_bio_merge and rq_qos_throttle calls out of q_usage_counter protection. However, these functions require q_usage_counter protection. The blk_mq_attempt_bio_merge call without the protection resulted in blktests block/005 failure with KASAN null- ptr-deref or use-after-free at bio merge. The rq_qos_throttle call without the protection caused kernel hang at qos throttle. To fix the failures, move the blk_mq_attempt_bio_merge and rq_qos_throttle calls back to q_usage_counter protection. Fixes: 9d497e2941 ("block: don't protect submit_bio_checks by q_usage_counter") Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> Link: https://lore.kernel.org/r/20220308080915.3473689-1-shinichiro.kawasaki@wdc.com Reviewed-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>		2022-03-08 17:48:39 -07:00
..
partitions	block: remove GENHD_FL_EXT_DEVT	2021-11-29 06:38:35 -07:00
badblocks.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
bdev.c	mm: remove cleancache	2022-01-22 08:33:38 +02:00
bfq-cgroup.c	block, bfq: fix UAF problem in bfqg_stats_init()	2021-10-19 15:18:30 -06:00
bfq-iosched.c	block/wbt: fix negative inflight counter when remove scsi device	2022-02-17 07:54:03 -07:00
bfq-iosched.h	bfq: Provide helper to generate bfqq name	2021-11-29 06:38:52 -07:00
bfq-wf2q.c	block: Introduce IOPRIO_NR_LEVELS	2021-08-18 07:21:12 -06:00
bio-integrity.c	block: bio-integrity: Advance seed correctly for larger interval sizes	2022-02-03 21:09:24 -07:00
bio.c	block: Fix wrong offset in bio_truncate()	2022-01-20 06:30:12 -07:00
blk-cgroup-rwstat.c	blk-cgroup: Fix the recursive blkg rwstat	2021-03-05 11:32:15 -07: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	block: don't include <linux/part_stat.h> in blk.h	2021-11-29 06:38:44 -07:00
blk-core.c	block: fix surprise removal for drivers calling blk_set_queue_dying	2022-02-17 07:54:03 -07:00
blk-crypto-fallback.c	blk-crypto: rename blk_keyslot_manager to blk_crypto_profile	2021-10-21 10:49:32 -06:00
blk-crypto-internal.h	block: move struct request to blk-mq.h	2021-10-18 06:17:02 -06:00
blk-crypto-profile.c	blk-crypto: remove blk_crypto_unregister()	2021-11-29 06:38:51 -07:00
blk-crypto.c	blk-crypto: rename blk_keyslot_manager to blk_crypto_profile	2021-10-21 10:49:32 -06:00
blk-flush.c	block: switch to atomic_t for request references	2021-12-03 14:51:29 -07:00
blk-ia-ranges.c	block: fix memory leak in disk_register_independent_access_ranges	2022-01-23 09:13:09 -07:00
blk-integrity.c	blk-crypto: remove blk_crypto_unregister()	2021-11-29 06:38:51 -07:00
blk-ioc.c	block: drop needless assignment in set_task_ioprio()	2021-12-23 07:10:07 -07:00
blk-iocost.c	iocost: Fix divide-by-zero on donation from low hweight cgroup	2021-12-14 06:58:15 -07:00
blk-iolatency.c	mm: don't include <linux/blk-cgroup.h> in <linux/backing-dev.h>	2021-10-18 06:17:01 -06:00
blk-ioprio.c	blk-ioprio: don't set bio priority if not needed	2021-11-29 06:38:35 -07:00
blk-ioprio.h	block: Introduce the ioprio rq-qos policy	2021-06-21 15:03:40 -06:00
blk-lib.c	block: export blk_next_bio()	2021-06-17 15:51:20 +02:00
blk-map.c	block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern	2022-02-17 07:54:03 -07:00
blk-merge.c	block: don't check ->rq_disk in merges	2021-11-29 06:41:29 -07: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	block: Cleanup license notice	2019-01-17 21:21:40 -07:00
blk-mq-debugfs.c	blk-mq: check q->poll_stat in queue_poll_stat_show	2021-12-02 08:20:49 -07:00
blk-mq-debugfs.h	blk-mq: no need to check return value of debugfs_create functions	2019-06-13 03:00:30 -06:00
blk-mq-pci.c	block: Fix blk_mq_*_map_queues() kernel-doc headers	2019-05-31 15:12:34 -06:00
blk-mq-rdma.c	block: Fix blk_mq_*_map_queues() kernel-doc headers	2019-05-31 15:12:34 -06:00
blk-mq-sched.c	blk-mq: run dispatch lock once in case of issuing from list	2021-12-03 14:51:29 -07:00
blk-mq-sched.h	block: move blk_mq_sched_assign_ioc to blk-ioc.c	2021-11-29 06:41:29 -07:00
blk-mq-sysfs.c	blk-mq: move srcu from blk_mq_hw_ctx to request_queue	2021-12-03 14:51:29 -07:00
blk-mq-tag.c	blk-mq: fix tag_get wait task can't be awakened	2022-01-13 12:52:14 -07:00
blk-mq-tag.h	blk-mq: Delete busy_iter_fn	2021-12-06 13:18:47 -07:00
blk-mq-virtio.c	blk-mq: Fix typo in comment	2020-03-17 20:55:21 +01:00
blk-mq.c	block: fix blk_mq_attempt_bio_merge and rq_qos_throttle protection	2022-03-08 17:48:39 -07:00
blk-mq.h	blk-mq: don't run might_sleep() if the operation needn't blocking	2021-12-06 09:40:42 -07:00
blk-pm.c	scsi: block: pm: Always set request queue runtime active in blk_post_runtime_resume()	2021-12-22 23:38:29 -05:00
blk-pm.h	block: Remove unused blk_pm_*() function definitions	2021-02-22 06:33:48 -07:00
blk-rq-qos.c	rq-qos: fix missed wake-ups in rq_qos_throttle try two	2021-06-08 15:12:57 -06:00
blk-rq-qos.h	block: only mark bio as tracked if it really is tracked	2021-10-18 08:50:47 -06:00
blk-settings.c	block: Fix partition check for host-aware zoned block devices	2021-10-27 06:58:01 -06:00
blk-stat.c	block: make queue stat accounting a reference	2021-12-14 17:23:05 -07:00
blk-stat.h	block: make queue stat accounting a reference	2021-12-14 17:23:05 -07:00
blk-sysfs.c	block: cleanup q->srcu	2022-01-17 07:24:45 -07:00
blk-throttle.c	block: don't include blk-mq.h in blk.h	2021-11-29 06:38:44 -07:00
blk-throttle.h	block: move blk-throtl fast path inline	2021-10-18 06:17:03 -06:00
blk-timeout.c	block: blk-timeout: delete duplicated word	2020-07-31 16:29:47 -06:00
blk-wbt.c	blk-wbt: prevent NULL pointer dereference in wb_timer_fn	2021-10-19 06:13:41 -06:00
blk-wbt.h	blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()	2021-06-21 15:03:41 -06:00
blk-zoned.c	block: Hold invalidate_lock in BLKRESETZONE ioctl	2021-11-11 11:52:46 -07:00
blk.h	block: only build the icq tracking code when needed	2021-12-16 10:59:02 -07:00
bounce.c	mm: don't include <linux/blk-cgroup.h> in <linux/backing-dev.h>	2021-10-18 06:17:01 -06:00
bsg-lib.c	block: remove the gendisk argument to blk_execute_rq	2021-11-29 06:41:29 -07:00
bsg.c	scsi: bsg: Fix device unregistration	2021-09-14 00:22:15 -04:00
disk-events.c	block: return errors from disk_alloc_events	2021-08-23 12:55:45 -06:00
elevator.c	block/wbt: fix negative inflight counter when remove scsi device	2022-02-17 07:54:03 -07:00
elevator.h	block: move elevator.h to block/	2021-10-18 06:17:01 -06:00
fops.c	block: clear iocb->private in blkdev_bio_end_io_async()	2022-02-22 06:59:49 -07:00
genhd.c	block: fix surprise removal for drivers calling blk_set_queue_dying	2022-02-17 07:54:03 -07:00
holder.c	block: drop unused includes in <linux/genhd.h>	2021-10-18 06:17:02 -06:00
ioctl.c	block: merge disk_scan_partitions and blkdev_reread_part	2021-11-29 06:35:21 -07:00
ioprio.c	for-5.17/block-2022-01-11	2022-01-12 10:26:52 -08:00
Kconfig	block: only build the icq tracking code when needed	2021-12-16 10:59:02 -07:00
Kconfig.iosched	block: only build the icq tracking code when needed	2021-12-16 10:59:02 -07:00
kyber-iosched.c	block: make queue stat accounting a reference	2021-12-14 17:23:05 -07:00
Makefile	block: remove blk-exec.c	2021-11-29 06:34:50 -07:00
mq-deadline.c	block: fix async_depth sysfs interface for mq-deadline	2022-01-20 10:54:02 -07:00
opal_proto.h	block: sed-opal: Change the check condition for regular session validity	2020-03-12 08:00:10 -06: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: move integrity handling out of <linux/blkdev.h>	2021-10-18 06:17:02 -06:00