Commit 9632e9f6 authored by Stefano Garzarella's avatar Stefano Garzarella Committed by David S. Miller
Browse files

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: default avatarStefano Garzarella <sgarzare@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b89d882d

include/linux/virtio_vsock.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct virtio_vsock_sock { 


	/* Protected by tx_lock */

	u32 tx_cnt;

	u32 buf_alloc;

	u32 peer_fwd_cnt;

	u32 peer_buf_alloc;
@@ -43,6 +42,7 @@ struct virtio_vsock_sock { 
	u32 fwd_cnt;

	u32 last_fwd_cnt;

	u32 rx_bytes;

	u32 buf_alloc;

	struct list_head rx_queue;

};

net/vmw_vsock/virtio_transport_common.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE