From mboxrd@z Thu Jan 1 00:00:00 1970 From: xiangxia.m.yue@gmail.com Subject: [PATCH net-next v8 2/7] net: vhost: replace magic number of lock annotation Date: Sun, 19 Aug 2018 05:11:21 -0700 Message-ID: <1534680686-3108-3-git-send-email-xiangxia.m.yue@gmail.com> References: <1534680686-3108-1-git-send-email-xiangxia.m.yue@gmail.com> Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, Tonghao Zhang To: jasowang@redhat.com, mst@redhat.com, makita.toshiaki@lab.ntt.co.jp Return-path: Received: from mail-pg1-f194.google.com ([209.85.215.194]:37326 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726393AbeHSPW6 (ORCPT ); Sun, 19 Aug 2018 11:22:58 -0400 Received: by mail-pg1-f194.google.com with SMTP id n7-v6so5482112pgq.4 for ; Sun, 19 Aug 2018 05:11:42 -0700 (PDT) In-Reply-To: <1534680686-3108-1-git-send-email-xiangxia.m.yue@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Tonghao Zhang Use the VHOST_NET_VQ_XXX as a subclass for mutex_lock_nested. Signed-off-by: Tonghao Zhang Acked-by: Jason Wang --- 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 367d802..32c1b52 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -712,7 +712,7 @@ static void handle_tx(struct vhost_net *net) struct vhost_virtqueue *vq = &nvq->vq; struct socket *sock; - mutex_lock(&vq->mutex); + mutex_lock_nested(&vq->mutex, VHOST_NET_VQ_TX); sock = vq->private_data; if (!sock) goto out; @@ -777,7 +777,7 @@ static int vhost_net_rx_peek_head_len(struct vhost_net *net, struct sock *sk, /* Flush batched heads first */ vhost_net_signal_used(rnvq); /* Both tx vq and rx socket were polled here */ - mutex_lock_nested(&tvq->mutex, 1); + mutex_lock_nested(&tvq->mutex, VHOST_NET_VQ_TX); vhost_disable_notify(&net->dev, tvq); preempt_disable(); @@ -919,7 +919,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; -- 1.8.3.1