loop: use kiocb helpers to fix lockdep warning
PATCH 1/1 loop: use kiocb helpers to fix lockdep warning
The lockdep tool can report a circular lock dependency warning in the loop driver's AIO read/write path:
```
[ 6540.587728] kworker/u96:5/72779 is trying to acquire lock:
[ 6540.593856] ff110001b5968440 (sb_writers#9){.+.+}-{0:0}, at: loop_process_work+0x11a/0xf70 [loop]
[ 6540.603786]
[ 6540.603786] but task is already holding lock:
[ 6540.610291] ff110001b5968440 (sb_writers#9){.+.+}-{0:0}, at: loop_process_work+0x11a/0xf70 [loop]
[ 6540.620210]
[ 6540.620210] other info that might help us debug this:
[ 6540.627499] Possible unsafe locking scenario:
[ 6540.627499]
[ 6540.634110] CPU0
[ 6540.636841] ----
[ 6540.639574] lock(sb_writers#9);
[ 6540.643281] lock(sb_writers#9);
[ 6540.646988]
[ 6540.646988] *** DEADLOCK ***
```This patch fixes the issue by using the AIO-specific helpers kiocb_start_write() and kiocb_end_write(). These functions are designed to be used with a kiocb and manage write sequencing correctly for asynchronous I/O without introducing the problematic lock dependency.
The kiocb is already part of the loop_cmd struct, so this change also simplifies the completion function lo_rw_aio_do_completion() by using the iocb from the cmd struct directly, instead of retrieving the loop device from the request queue.
--- drivers/block/loop.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/block/loop.c +2 -3
@@ -308,14 +308,13 @@ static void lo_complete_rq(struct request *rq)static void lo_rw_aio_do_completion (struct loop_cmd *cmd) {struct request *rq =blk_mq_rq_from_pdu (cmd); -struct loop_device *lo = rq->q->queuedata;if (!atomic_dec_and_test (&cmd->ref))return ;kfree (cmd->bvec); cmd->bvec =NULL ;if (req_op (rq) ==REQ_OP_WRITE ) -file_end_write (lo->lo_backing_file); +kiocb_end_write (&cmd->iocb);if (likely (!blk_should_fake_timeout (rq->q)))blk_mq_complete_request (rq); }
@@ -391,7 +390,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, }if (rw ==ITER_SOURCE ) { -file_start_write (lo->lo_backing_file); +kiocb_start_write (&cmd->iocb); ret = file->f_op->write_iter (&cmd->iocb, &iter); }else ret = file->f_op->read_iter (&cmd->iocb, &iter);
Signature · 1 line
2.50.1
Quoted 5 lines · Ming Lei
This patch fixes the issue by using the AIO-specific helpers
kiocb_start_write()andkiocb_end_write(). These functions are designed to be used with akiocband manage write sequencing correctly for asynchronous I/O without introducing the problematic lock dependency.
Maybe explain what it actually does. That is drop and reacquire the lockdep notion of a held lock, because the process is not holding it but instead handing it of to the one handling the completion of the asynchronous I/O.
The change looks fine to me, but this commit log is rather confusing.
Quoted 8 lines · Christoph Hellwig
Quoted 5 lines · Ming Lei
This patch fixes the issue by using the AIO-specific helpers
kiocb_start_write()andkiocb_end_write(). These functions are designed to be used with akiocband manage write sequencing correctly for asynchronous I/O without introducing the problematic lock dependency.
Quoted 6 lines
Maybe explain what it actually does. That is drop and reacquire the lockdep notion of a held lock, because the process is not holding it but instead handing it of to the one handling the completion of the asynchronous I/O.
The change looks fine to me, but this commit log is rather confusing.
It is actually the typical use case for aio, please see use in fs/aio.c.
Thanks,
Ming
Quoted 9 lines · Ming Lei
Quoted 8 lines · Christoph Hellwig
Quoted 5 lines · Ming Lei
This patch fixes the issue by using the AIO-specific helpers
kiocb_start_write()andkiocb_end_write(). These functions are designed to be used with akiocband manage write sequencing correctly for asynchronous I/O without introducing the problematic lock dependency.
Quoted 8 lines
Quoted 6 lines
Maybe explain what it actually does. That is drop and reacquire the lockdep notion of a held lock, because the process is not holding it but instead handing it of to the one handling the completion of the asynchronous I/O.
The change looks fine to me, but this commit log is rather confusing.
It is actually the typical use case for aio, please see use in
fs/aio.c.
I know, that's not the point.
Quoted 21 lines · Ming Lei
The lockdep tool can report a circular lock dependency warning in the loop driver's AIO read/write path:
``` [ 6540.587728] kworker/u96:5/72779 is trying to acquire lock: [ 6540.593856] ff110001b5968440 (sb_writers#9){.+.+}-{0:0}, at: loop_process_work+0x11a/0xf70 [loop] [ 6540.603786] [ 6540.603786] but task is already holding lock: [ 6540.610291] ff110001b5968440 (sb_writers#9){.+.+}-{0:0}, at: loop_process_work+0x11a/0xf70 [loop] [ 6540.620210] [ 6540.620210] other info that might help us debug this: [ 6540.627499] Possible unsafe locking scenario: [ 6540.627499] [ 6540.634110] CPU0 [ 6540.636841] ---- [ 6540.639574] lock(sb_writers#9); [ 6540.643281] lock(sb_writers#9); [ 6540.646988] [ 6540.646988] *** DEADLOCK *** ```
Quoted 1 line
[...]
Applied, thanks!
[1/1] loop: use kiocb helpers to fix lockdep warning
commit: c4706c5058a7bd7d7c20f3b24a8f523ecad44e83
Best regards,
Signature · 1 line
Jens Axboe
Quoted 70 lines · Ming Lei
The lockdep tool can report a circular lock dependency warning in the loop driver's AIO read/write path:
``` [ 6540.587728] kworker/u96:5/72779 is trying to acquire lock: [ 6540.593856] ff110001b5968440 (sb_writers#9){.+.+}-{0:0}, at: loop_process_work+0x11a/0xf70 [loop] [ 6540.603786] [ 6540.603786] but task is already holding lock: [ 6540.610291] ff110001b5968440 (sb_writers#9){.+.+}-{0:0}, at: loop_process_work+0x11a/0xf70 [loop] [ 6540.620210] [ 6540.620210] other info that might help us debug this: [ 6540.627499] Possible unsafe locking scenario: [ 6540.627499] [ 6540.634110] CPU0 [ 6540.636841] ---- [ 6540.639574] lock(sb_writers#9); [ 6540.643281] lock(sb_writers#9); [ 6540.646988] [ 6540.646988] *** DEADLOCK *** ```This patch fixes the issue by using the AIO-specific helpers
kiocb_start_write()andkiocb_end_write(). These functions are designed to be used with akiocband manage write sequencing correctly for asynchronous I/O without introducing the problematic lock dependency.The
kiocbis already part of theloop_cmdstruct, so this change also simplifies the completion functionlo_rw_aio_do_completion()by using theiocbfrom thecmdstruct directly, instead of retrieving the loop device from the request queue.Fixes 39d86db34e41 ("loop: add file_start_write() and file_end_write()")Cc Changhui Zhong <[email protected]>Signed-off-by Ming Lei <[email protected]>--- drivers/block/loop.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/block/loop.c +2
-4@@ -308,14 +308,13 @@ static void lo_complete_rq(struct request *rq)static void lo_rw_aio_do_completion (struct loop_cmd *cmd) {struct request *rq =blk_mq_rq_from_pdu (cmd); -struct loop_device *lo = rq->q->queuedata;if (!atomic_dec_and_test (&cmd->ref))return ;kfree (cmd->bvec); cmd->bvec =NULL ;if (req_op (rq) ==REQ_OP_WRITE ) -file_end_write (lo->lo_backing_file); +kiocb_end_write (&cmd->iocb);if (likely (!blk_should_fake_timeout (rq->q)))blk_mq_complete_request (rq); }@@ -391,7 +390,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, }if (rw ==ITER_SOURCE ) { -file_start_write (lo->lo_backing_file); +kiocb_start_write (&cmd->iocb); ret = file->f_op->write_iter (&cmd->iocb, &iter); }else ret = file->f_op->read_iter (&cmd->iocb, &iter); --
Quoted 2 lines
2.50.1
Thanks Ming!
Verify that after applying the patch, this warning message is no longer triggered,