Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48614d52 authored by Arseniy Krasnov's avatar Arseniy Krasnov Committed by Greg Kroah-Hartman
Browse files

virtio/vsock: fix logic which reduces credit update messages 



[ Upstream commit 93b80887668226180ea5f5349cc728ca6dc700ab ]

Add one more condition for sending credit update during dequeue from
stream socket: when number of bytes in the rx queue is smaller than
SO_RCVLOWAT value of the socket. This is actual for non-default value
of SO_RCVLOWAT (e.g. not 1) - idea is to "kick" peer to continue data
transmission, because we need at least SO_RCVLOWAT bytes in our rx
queue to wake up user for reading data (in corner case it is also
possible to stuck both tx and rx sides, this is why 'Fixes' is used).

Fixes: b89d882d ("vsock/virtio: reduce credit update messages")
Signed-off-by: default avatarArseniy Krasnov <avkrasnov@salutedevices.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 332cd73a

net/vmw_vsock/virtio_transport_common.c

+10 −3
Original line number Diff line number Diff line
@@ -276,6 +276,8 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk, 
	struct virtio_vsock_pkt *pkt;

	size_t bytes, total = 0;

	u32 free_space;

	u32 fwd_cnt_delta;

	bool low_rx_bytes;

	int err = -EFAULT;



	spin_lock_bh(&vvs->rx_lock);
@@ -307,7 +309,10 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk, 
		}

	}



	free_space = vvs->buf_alloc - (vvs->fwd_cnt - vvs->last_fwd_cnt);

	fwd_cnt_delta = vvs->fwd_cnt - vvs->last_fwd_cnt;

	free_space = vvs->buf_alloc - fwd_cnt_delta;

	low_rx_bytes = (vvs->rx_bytes <

			sock_rcvlowat(sk_vsock(vsk), 0, INT_MAX));



	spin_unlock_bh(&vvs->rx_lock);
@@ -317,9 +322,11 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk, 
	 * too high causes extra messages. Too low causes transmitter

	 * stalls. As stalls are in theory more expensive than extra

	 * messages, we set the limit to a high value. TODO: experiment

	 * with different values.

	 * with different values. Also send credit update message when

	 * number of bytes in rx queue is not enough to wake up reader.

	 */

	if (free_space < VIRTIO_VSOCK_MAX_PKT_BUF_SIZE) {

	if (fwd_cnt_delta &&

	    (free_space < VIRTIO_VSOCK_MAX_PKT_BUF_SIZE || low_rx_bytes)) {

		virtio_transport_send_credit_update(vsk,

						    VIRTIO_VSOCK_TYPE_STREAM,

						    NULL);