浏览代码

vhost: use mutex_lock_nested() in vhost_dev_lock_vqs()

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: 6b1e6cc7855b0 ("vhost: new device IOTLB API")
Reported-by: syzbot+dbb7c1161485e61b0241@syzkaller.appspotmail.com
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jason Wang 7 年之前
父节点
当前提交
e9cb423913
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/vhost/vhost.c

+ 1 - 1
drivers/vhost/vhost.c

@@ -904,7 +904,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)