This is a note to let you know that I've just added the patch titled bfq: Drop pointless unlock-lock pair to the 5.4-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: bfq-drop-pointless-unlock-lock-pair.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Tue Jun 7 11:57:10 AM CEST 2022 From: Jan Kara <jack@xxxxxxx> Date: Tue, 7 Jun 2022 11:15:10 +0200 Subject: bfq: Drop pointless unlock-lock pair To: stable@xxxxxxxxxxxxxxx Cc: Jens Axboe <axboe@xxxxxxxxx>, Paolo Valente <paolo.valente@xxxxxxxxxx>, <linux-block@xxxxxxxxxxxxxxx>, Jan Kara <jack@xxxxxxx>, "yukuai (C)" <yukuai3@xxxxxxxxxx>, Christoph Hellwig <hch@xxxxxx> Message-ID: <20220607091528.11906-2-jack@xxxxxxx> From: Jan Kara <jack@xxxxxxx> commit fc84e1f941b91221092da5b3102ec82da24c5673 upstream. In bfq_insert_request() we unlock bfqd->lock only to call trace_block_rq_insert() and then lock bfqd->lock again. This is really pointless since tracing is disabled if we really care about performance and even if the tracepoint is enabled, it is a quick call. CC: stable@xxxxxxxxxxxxxxx Tested-by: "yukuai (C)" <yukuai3@xxxxxxxxxx> Signed-off-by: Jan Kara <jack@xxxxxxx> Reviewed-by: Christoph Hellwig <hch@xxxxxx> Link: https://lore.kernel.org/r/20220401102752.8599-5-jack@xxxxxxx Signed-off-by: Jens Axboe <axboe@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- block/bfq-iosched.c | 3 --- 1 file changed, 3 deletions(-) --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5529,11 +5529,8 @@ static void bfq_insert_request(struct bl return; } - spin_unlock_irq(&bfqd->lock); - blk_mq_sched_request_inserted(rq); - spin_lock_irq(&bfqd->lock); bfqq = bfq_init_rq(rq); if (!bfqq || at_head || blk_rq_is_passthrough(rq)) { if (at_head) Patches currently in stable-queue which might be from jack@xxxxxxx are queue-5.4/bfq-avoid-merging-queues-with-different-parents.patch queue-5.4/ext4-avoid-cycles-in-directory-h-tree.patch queue-5.4/bfq-drop-pointless-unlock-lock-pair.patch queue-5.4/bfq-split-shared-queues-on-move-between-cgroups.patch queue-5.4/bfq-remove-pointless-bfq_init_rq-calls.patch queue-5.4/dax-fix-cache-flush-on-pmd-mapped-pages.patch queue-5.4/fsnotify-fix-wrong-lockdep-annotations.patch queue-5.4/bfq-track-whether-bfq_group-is-still-online.patch queue-5.4/inotify-show-inotify-mask-flags-in-proc-fdinfo.patch queue-5.4/bfq-make-sure-bfqg-for-which-we-are-queueing-requests-is-online.patch queue-5.4/ext4-fix-bug_on-in-ext4_writepages.patch queue-5.4/fs-writeback-writeback_sb_inodes-recalculate-wrote-according-skipped-pages.patch queue-5.4/ext4-verify-dir-block-before-splitting-it.patch queue-5.4/ext4-fix-use-after-free-in-ext4_rename_dir_prepare.patch queue-5.4/bfq-get-rid-of-__bio_blkcg-usage.patch queue-5.4/bfq-update-cgroup-information-before-merging-bio.patch queue-5.4/block-fix-bio_clone_blkg_association-to-associate-with-proper-blkcg_gq.patch