Commit bd3ccdc6 authored by Jason Wang's avatar Jason Wang Committed by Greg Kroah-Hartman

vhost: use mutex_lock_nested() in vhost_dev_lock_vqs()

commit e9cb4239 upstream.

We used to call mutex_lock() in vhost_dev_lock_vqs() which tries to
hold mutexes of all virtqueues. This may confuse lockdep to report a
possible deadlock because of trying to hold locks belong to same
class. Switch to use mutex_lock_nested() to avoid false positive.

Fixes: 6b1e6cc7 ("vhost: new device IOTLB API")
Reported-by: syzbot+dbb7c1161485e61b0241@syzkaller.appspotmail.com
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 80c1c832
...@@ -849,7 +849,7 @@ static void vhost_dev_lock_vqs(struct vhost_dev *d) ...@@ -849,7 +849,7 @@ static void vhost_dev_lock_vqs(struct vhost_dev *d)
{ {
int i = 0; int i = 0;
for (i = 0; i < d->nvqs; ++i) for (i = 0; i < d->nvqs; ++i)
mutex_lock(&d->vqs[i]->mutex); mutex_lock_nested(&d->vqs[i]->mutex, i);
} }
static void vhost_dev_unlock_vqs(struct vhost_dev *d) static void vhost_dev_unlock_vqs(struct vhost_dev *d)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment