Thread (12 messages) 12 messages, 3 authors, 2018-07-02

Re: [PATCH net-next v3 2/4] net: vhost: replace magic number of lock annotation

From: Jason Wang <jasowang@redhat.com>
Date: 2018-07-02 02:21:37
Also in: virtualization


On 2018年06月30日 14:33, xiangxia.m.yue@gmail.com wrote:
quoted hunk ↗ jump to hunk
From: Tonghao Zhang <redacted>

Use the VHOST_NET_VQ_XXX as a subclass for mutex_lock_nested.

Signed-off-by: Tonghao Zhang <redacted>
---
  drivers/vhost/net.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index e7cf7d2..62bb8e8 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -484,7 +484,7 @@ static void handle_tx(struct vhost_net *net)
  	bool zcopy, zcopy_used;
  	int sent_pkts = 0;
  
-	mutex_lock(&vq->mutex);
+	mutex_lock_nested(&vq->mutex, VHOST_NET_VQ_TX);
  	sock = vq->private_data;
  	if (!sock)
  		goto out;
@@ -655,7 +655,7 @@ static int vhost_net_rx_peek_head_len(struct vhost_net *net, struct sock *sk)
  		/* Flush batched heads first */
  		vhost_rx_signal_used(rvq);
  		/* Both tx vq and rx socket were polled here */
-		mutex_lock_nested(&vq->mutex, 1);
+		mutex_lock_nested(&vq->mutex, VHOST_NET_VQ_TX);
  		vhost_disable_notify(&net->dev, vq);
  
  		preempt_disable();
@@ -789,7 +789,7 @@ static void handle_rx(struct vhost_net *net)
  	__virtio16 num_buffers;
  	int recv_pkts = 0;
  
-	mutex_lock_nested(&vq->mutex, 0);
+	mutex_lock_nested(&vq->mutex, VHOST_NET_VQ_RX);
  	sock = vq->private_data;
  	if (!sock)
  		goto out;
Acked-by: Jason Wang <jasowang@redhat.com>

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help