This is a note to let you know that I've just added the patch titled
io-wq: ensure that hash wait lock is IRQ disabling
to the 5.14-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:
io-wq-ensure-that-hash-wait-lock-is-irq-disabling.patch
and it can be found in the queue-5.14 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 Mon Nov 15 03:27:04 PM CET 2021
From: Jens Axboe <axboe@xxxxxxxxx>
Date: Tue, 31 Aug 2021 06:57:25 -0600
Subject: io-wq: ensure that hash wait lock is IRQ disabling
From: Jens Axboe <axboe@xxxxxxxxx>
commit 08bdbd39b58474d762242e1fadb7f2eb9ffcca71 upstream.
A previous commit removed the IRQ safety of the worker and wqe locks,
but that left one spot of the hash wait lock now being done without
already having IRQs disabled.
Ensure that we use the right locking variant for the hashed waitqueue
lock.
Fixes: a9a4aa9fbfc5 ("io-wq: wqe and worker locks no longer need to be IRQ safe")
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/io-wq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/fs/io-wq.c
+++ b/fs/io-wq.c
@@ -405,7 +405,7 @@ static void io_wait_on_hash(struct io_wq
{
struct io_wq *wq = wqe->wq;
- spin_lock(&wq->hash->wait.lock);
+ spin_lock_irq(&wq->hash->wait.lock);
if (list_empty(&wqe->wait.entry)) {
__add_wait_queue(&wq->hash->wait, &wqe->wait);
if (!test_bit(hash, &wq->hash->map)) {
@@ -413,7 +413,7 @@ static void io_wait_on_hash(struct io_wq
list_del_init(&wqe->wait.entry);
}
}
- spin_unlock(&wq->hash->wait.lock);
+ spin_unlock_irq(&wq->hash->wait.lock);
}
/*
Patches currently in stable-queue which might be from axboe@xxxxxxxxx are
queue-5.14/floppy-fix-add_disk-assumption-on-exit-due-to-new-de.patch
queue-5.14/block-ataflop-more-blk-mq-refactoring-fixes.patch
queue-5.14/nbd-fix-use-after-free-in-pid_show.patch
queue-5.14/floppy-use-blk_cleanup_disk.patch
queue-5.14/block-ataflop-use-the-blk_cleanup_disk-helper.patch
queue-5.14/md-update-superblock-after-changing-rdev-flags-in-st.patch
queue-5.14/alsa-hda-reduce-udelay-at-skl-position-reporting.patch
queue-5.14/block-ataflop-add-registration-bool-before-calling-d.patch
queue-5.14/md-raid1-only-allocate-write-behind-bio-for-writemostly-device.patch
queue-5.14/ataflop-remove-ataflop_probe_lock-mutex.patch
queue-5.14/block-remove-inaccurate-requeue-check.patch
queue-5.14/block-ataflop-provide-a-helper-for-cleanup-up-an-ata.patch
queue-5.14/floppy-fix-calling-platform_device_unregister-on-inv.patch
queue-5.14/io-wq-ensure-that-hash-wait-lock-is-irq-disabling.patch
queue-5.14/block-schedule-queue-restart-after-blk_sts_zone_reso.patch
queue-5.14/io-wq-fix-queue-stalling-race.patch
queue-5.14/block-ataflop-fix-breakage-introduced-at-blk-mq-refa.patch
queue-5.14/io-wq-serialize-hash-clear-with-wakeup.patch
queue-5.14/nvdimm-btt-do-not-call-del_gendisk-if-not-needed.patch
queue-5.14/blk-cgroup-synchronize-blkg-creation-against-policy-.patch
queue-5.14/nbd-fix-possible-overflow-for-first_minor-in-nbd_dev.patch
queue-5.14/nbd-fix-max-value-for-first_minor.patch
queue-5.14/block-bump-max-plugged-deferred-size-from-16-to-32.patch
