This is a note to let you know that I've just added the patch titled block: fix async_depth sysfs interface for mq-deadline to the 5.16-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: block-fix-async_depth-sysfs-interface-for-mq-deadline.patch and it can be found in the queue-5.16 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 46cdc45acb089c811d9a54fd50af33b96e5fae9d Mon Sep 17 00:00:00 2001 From: Jens Axboe <axboe@xxxxxxxxx> Date: Thu, 20 Jan 2022 10:28:13 -0700 Subject: block: fix async_depth sysfs interface for mq-deadline From: Jens Axboe <axboe@xxxxxxxxx> commit 46cdc45acb089c811d9a54fd50af33b96e5fae9d upstream. A previous commit added this feature, but it inadvertently used the wrong variable to show/store the setting from/to, victimized by copy/paste. Fix it up so that the async_depth sysfs interface reads and writes from the right setting. Fixes: 07757588e507 ("block/mq-deadline: Reserve 25% of scheduler tags for synchronous requests") Link: https://bugzilla.kernel.org/show_bug.cgi?id=215485 Reviewed-by: Bart Van Assche <bvanassche@xxxxxxx> Signed-off-by: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- block/mq-deadline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/block/mq-deadline.c +++ b/block/mq-deadline.c @@ -865,7 +865,7 @@ SHOW_JIFFIES(deadline_write_expire_show, SHOW_JIFFIES(deadline_prio_aging_expire_show, dd->prio_aging_expire); SHOW_INT(deadline_writes_starved_show, dd->writes_starved); SHOW_INT(deadline_front_merges_show, dd->front_merges); -SHOW_INT(deadline_async_depth_show, dd->front_merges); +SHOW_INT(deadline_async_depth_show, dd->async_depth); SHOW_INT(deadline_fifo_batch_show, dd->fifo_batch); #undef SHOW_INT #undef SHOW_JIFFIES @@ -895,7 +895,7 @@ STORE_JIFFIES(deadline_write_expire_stor STORE_JIFFIES(deadline_prio_aging_expire_store, &dd->prio_aging_expire, 0, INT_MAX); STORE_INT(deadline_writes_starved_store, &dd->writes_starved, INT_MIN, INT_MAX); STORE_INT(deadline_front_merges_store, &dd->front_merges, 0, 1); -STORE_INT(deadline_async_depth_store, &dd->front_merges, 1, INT_MAX); +STORE_INT(deadline_async_depth_store, &dd->async_depth, 1, INT_MAX); STORE_INT(deadline_fifo_batch_store, &dd->fifo_batch, 0, INT_MAX); #undef STORE_FUNCTION #undef STORE_INT Patches currently in stable-queue which might be from axboe@xxxxxxxxx are queue-5.16/block-null_blk-only-set-set-nr_maps-as-3-if-active-p.patch queue-5.16/block-fix-error-unwinding-in-device_add_disk.patch queue-5.16/block-check-minor-range-in-device_add_disk.patch queue-5.16/io_uring-fix-no-lock-protection-for-ctx-cq_extra.patch queue-5.16/block-fix-async_depth-sysfs-interface-for-mq-deadline.patch queue-5.16/floppy-fix-hang-in-watchdog-when-disk-is-ejected.patch queue-5.16/io_uring-remove-double-poll-on-poll-update.patch queue-5.16/floppy-add-max-size-check-for-user-space-request.patch queue-5.16/null_blk-allow-zero-poll-queues.patch queue-5.16/block-fix-fsync-always-failed-if-once-failed.patch queue-5.16/bfq-do-not-let-waker-requests-skip-proper-accounting.patch