lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 29 Jun 2018 23:33:56 -0700 From: xiangxia.m.yue@...il.com To: jasowang@...hat.com Cc: mst@...hat.com, makita.toshiaki@....ntt.co.jp, virtualization@...ts.linux-foundation.org, netdev@...r.kernel.org, Tonghao Zhang <xiangxia.m.yue@...il.com>, Tonghao Zhang <zhangtonghao@...ichuxing.com> Subject: [PATCH net-next v3 2/4] net: vhost: replace magic number of lock annotation From: Tonghao Zhang <xiangxia.m.yue@...il.com> Use the VHOST_NET_VQ_XXX as a subclass for mutex_lock_nested. Signed-off-by: Tonghao Zhang <zhangtonghao@...ichuxing.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
Powered by blists - more mailing lists