io-wq: ensure that hash wait lock is IRQ disabling
Jens Axboe
maintainerPATCH 1/1 io-wq: ensure that hash wait lock is IRQ disabling
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 <[email protected]>
---
fs/io-wq.c +2 -2
@@ -405,7 +405,7 @@ static void io_wait_on_hash(struct io_wqe *wqe, unsigned int hash) {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_wqe *wqe, unsigned int hash)list_del_init (&wqe->wait.entry); } } -spin_unlock (&wq->hash->wait.lock); +spin_unlock_irq (&wq->hash->wait.lock); }/*
Signature · 1 line
Jens Axboe