diff options
| author | Stefano Garzarella <sgarzare@redhat.com> | 2019-07-30 17:43:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-30 15:00:00 -0700 |
| commit | 9632e9f61bc4191411c47933abe5f2d93c578f5e (patch) | |
| tree | 39df578365d29e1705e41a48d4a8b228cfb1c405 /net | |
| parent | b89d882dc9fc279c8acbf1df71d51b22394186d5 (diff) | |
| download | linux-stable-9632e9f61bc4191411c47933abe5f2d93c578f5e.tar.gz linux-stable-9632e9f61bc4191411c47933abe5f2d93c578f5e.tar.bz2 linux-stable-9632e9f61bc4191411c47933abe5f2d93c578f5e.zip | |
vsock/virtio: fix locking in virtio_transport_inc_tx_pkt()
fwd_cnt and last_fwd_cnt are protected by rx_lock, so we should use
the same spinlock also if we are in the TX path.
Move also buf_alloc under the same lock.
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/vmw_vsock/virtio_transport_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index a85559d4d974..34a2b42313b7 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -210,11 +210,11 @@ static void virtio_transport_dec_rx_pkt(struct virtio_vsock_sock *vvs, void virtio_transport_inc_tx_pkt(struct virtio_vsock_sock *vvs, struct virtio_vsock_pkt *pkt) { - spin_lock_bh(&vvs->tx_lock); + spin_lock_bh(&vvs->rx_lock); vvs->last_fwd_cnt = vvs->fwd_cnt; pkt->hdr.fwd_cnt = cpu_to_le32(vvs->fwd_cnt); pkt->hdr.buf_alloc = cpu_to_le32(vvs->buf_alloc); - spin_unlock_bh(&vvs->tx_lock); + spin_unlock_bh(&vvs->rx_lock); } EXPORT_SYMBOL_GPL(virtio_transport_inc_tx_pkt); |