All of lore.kernel.org
 help / color / mirror / Atom feed
From: xiangxia.m.yue@gmail.com
To: jasowang@redhat.com
Cc: netdev@vger.kernel.org,
	virtualization@lists.linux-foundation.org, mst@redhat.com
Subject: [PATCH net-next v7 2/4] net: vhost: replace magic number of lock annotation
Date: Tue, 31 Jul 2018 20:00:52 -0700	[thread overview]
Message-ID: <1533092454-37196-3-git-send-email-xiangxia.m.yue__112.69998872212$1533092367$gmane$org@gmail.com> (raw)
In-Reply-To: <1533092454-37196-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 <xiangxia.m.yue@gmail.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 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

  parent reply	other threads:[~2018-08-01  3:00 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-01  3:00 [PATCH net-next v7 0/4] net: vhost: improve performance when enable busyloop xiangxia.m.yue
2018-08-01  3:00 ` [PATCH net-next v7 1/4] net: vhost: lock the vqs one by one xiangxia.m.yue
2018-08-01  3:00 ` xiangxia.m.yue [this message]
2018-08-01  3:00 ` [PATCH net-next v7 2/4] net: vhost: replace magic number of lock annotation xiangxia.m.yue
2018-08-01  3:00 ` [PATCH net-next v7 3/4] net: vhost: factor out busy polling logic to vhost_net_busy_poll() xiangxia.m.yue
2018-08-01  6:01   ` Jason Wang
2018-08-01  9:52     ` Tonghao Zhang
2018-08-02  8:18       ` Jason Wang
2018-08-02  8:41         ` Toshiaki Makita
2018-08-02  9:23           ` Jason Wang
2018-08-02  9:57             ` Toshiaki Makita
2018-08-03  2:38               ` Jason Wang
2018-08-03  2:38               ` Jason Wang
2018-08-03  2:51             ` Tonghao Zhang
2018-08-03  2:51             ` Tonghao Zhang
2018-08-03  3:07               ` Jason Wang
2018-08-03  3:07               ` Jason Wang
2018-08-03  3:24                 ` Tonghao Zhang
2018-08-03  3:40                   ` Toshiaki Makita
2018-08-03  4:14                     ` Tonghao Zhang
2018-08-03  4:25                       ` Toshiaki Makita
2018-08-03  4:14                     ` Tonghao Zhang
2018-08-03  3:43                   ` Jason Wang
2018-08-03  3:43                   ` Jason Wang
2018-08-03  4:04                     ` Tonghao Zhang
2018-08-03  5:07                       ` Jason Wang
2018-08-03  5:25                         ` Toshiaki Makita
2018-08-03  3:24                 ` Tonghao Zhang
2018-08-03  3:07             ` Jason Wang
2018-08-03  3:32               ` Toshiaki Makita
2018-08-03  3:44                 ` Jason Wang
2018-08-03  3:44                 ` Jason Wang
2018-08-03  3:07             ` Jason Wang
2018-08-02  8:18       ` Jason Wang
2018-08-01  3:00 ` xiangxia.m.yue
2018-08-01  3:00 ` [PATCH net-next v7 4/4] net: vhost: add rx busy polling in tx path xiangxia.m.yue
2018-08-01  3:00 ` 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='1533092454-37196-3-git-send-email-xiangxia.m.yue__112.69998872212$1533092367$gmane$org@gmail.com' \
    --to=xiangxia.m.yue@gmail.com \
    --cc=jasowang@redhat.com \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=virtualization@lists.linux-foundation.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.