]> git.baikalelectronics.ru Git - kernel.git/commitdiff
nvmet-tcp: fix lockdep complaint on nvmet_tcp_wq flush during queue teardown
authorSagi Grimberg <sagi@grimberg.me>
Sun, 24 Jul 2022 08:58:43 +0000 (11:58 +0300)
committerJens Axboe <axboe@kernel.dk>
Tue, 2 Aug 2022 23:22:53 +0000 (17:22 -0600)
We probably need nvmet_tcp_wq to have MEM_RECLAIM as we are
sending/receiving for the socket from works on this workqueue.
Also this eliminates lockdep complaints:
--
[ 6174.010200] workqueue: WQ_MEM_RECLAIM
nvmet-wq:nvmet_tcp_release_queue_work [nvmet_tcp] is flushing
!WQ_MEM_RECLAIM nvmet_tcp_wq:nvmet_tcp_io_work [nvmet_tcp]
[ 6174.010216] WARNING: CPU: 20 PID: 14456 at kernel/workqueue.c:2628
check_flush_dependency+0x110/0x14c

Reported-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/nvme/target/tcp.c

index 0a9542599ad1c9d898509140132f634be0587ab6..dc3b4dc8fe08b9d04e44a2aadf77d547a7520cc5 100644 (file)
@@ -1839,7 +1839,8 @@ static int __init nvmet_tcp_init(void)
 {
        int ret;
 
-       nvmet_tcp_wq = alloc_workqueue("nvmet_tcp_wq", WQ_HIGHPRI, 0);
+       nvmet_tcp_wq = alloc_workqueue("nvmet_tcp_wq",
+                               WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
        if (!nvmet_tcp_wq)
                return -ENOMEM;