Netdev List
 help / color / mirror / Atom feed
From: xiangxia.m.yue@gmail.com
To: jasowang@redhat.com
Cc: mst@redhat.com, makita.toshiaki@lab.ntt.co.jp,
	virtualization@lists.linux-foundation.org,
	netdev@vger.kernel.org, Tonghao Zhang <xiangxia.m.yue@gmail.com>,
	Tonghao Zhang <zhangtonghao@didichuxing.com>
Subject: [PATCH net-next v4 2/4] net: vhost: replace magic number of lock annotation
Date: Mon,  2 Jul 2018 05:57:06 -0700	[thread overview]
Message-ID: <1530536228-17462-3-git-send-email-xiangxia.m.yue@gmail.com> (raw)
In-Reply-To: <1530536228-17462-1-git-send-email-xiangxia.m.yue@gmail.com>

From: Tonghao Zhang <xiangxia.m.yue@gmail.com>

Use the VHOST_NET_VQ_XXX as a subclass for mutex_lock_nested.

Signed-off-by: Tonghao Zhang <zhangtonghao@didichuxing.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
 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;
-- 
1.8.3.1

  parent reply	other threads:[~2018-07-02 12:56 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-02 12:57 [PATCH net-next v4 0/4] net: vhost: improve performance when enable busyloop xiangxia.m.yue
2018-07-02 12:57 ` [PATCH net-next v4 1/4] vhost: lock the vqs one by one xiangxia.m.yue
2018-07-02 12:57 ` xiangxia.m.yue [this message]
2018-07-02 12:57 ` [PATCH net-next v4 3/4] net: vhost: factor out busy polling logic to vhost_net_busy_poll() xiangxia.m.yue
2018-07-03  2:12   ` Jason Wang
2018-07-03  5:48     ` Tonghao Zhang
2018-07-03  5:55       ` Jason Wang
2018-07-04  1:40         ` Tonghao Zhang
2018-07-02 12:57 ` [PATCH net-next v4 4/4] net: vhost: add rx busy polling in tx path xiangxia.m.yue

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1530536228-17462-3-git-send-email-xiangxia.m.yue@gmail.com \
    --to=xiangxia.m.yue@gmail.com \
    --cc=jasowang@redhat.com \
    --cc=makita.toshiaki@lab.ntt.co.jp \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=virtualization@lists.linux-foundation.org \
    --cc=zhangtonghao@didichuxing.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox