rbd: avoid a deadlock on header_rwsem when flushing notifies
authorIlya Dryomov <idryomov@gmail.com>
Fri, 13 Mar 2020 10:20:51 +0000 (11:20 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Apr 2020 08:36:26 +0000 (10:36 +0200)
commit88a57e387cf0b967fc84a6632086e76b9d6c3431
tree10f85b3d4d6908fb37de0f99d9574056b0af5c79
parenta362482b2325fc5fb522b1786225fb8d868590c5
rbd: avoid a deadlock on header_rwsem when flushing notifies

[ Upstream commit 0e4e1de5b63fa423b13593337a27fd2d2b0bcf77 ]

rbd_unregister_watch() flushes notifies and therefore cannot be called
under header_rwsem because a header update notify takes header_rwsem to
synchronize with "rbd map".  If mapping an image fails after the watch
is established and a header update notify sneaks in, we deadlock when
erroring out from rbd_dev_image_probe().

Move watch registration and unregistration out of the critical section.
The only reason they were put there was to make header_rwsem management
slightly more obvious.

Fixes: 811c66887746 ("rbd: fix rbd map vs notify races")
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/block/rbd.c