Commit 0fe17989 authored by Arseniy Krasnov's avatar Arseniy Krasnov Committed by David S. Miller
Browse files

virtio/vsock: send credit update during setting SO_RCVLOWAT 



Send credit update message when SO_RCVLOWAT is updated and it is bigger
than number of bytes in rx queue. It is needed, because 'poll()' will
wait until number of bytes in rx queue will be not smaller than
O_RCVLOWAT, so kick sender to send more data. Otherwise mutual hungup
for tx/rx is possible: sender waits for free space and receiver is
waiting data in 'poll()'.

Rename 'set_rcvlowat' callback to 'notify_set_rcvlowat' and set
'sk->sk_rcvlowat' only in one place (i.e. 'vsock_set_rcvlowat'), so the
transport doesn't need to do it.

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>
parent 93b80887

drivers/vhost/vsock.c

+1 −0
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ static struct virtio_transport vhost_transport = { 
		.notify_send_pre_enqueue  = virtio_transport_notify_send_pre_enqueue,

		.notify_send_post_enqueue = virtio_transport_notify_send_post_enqueue,

		.notify_buffer_size       = virtio_transport_notify_buffer_size,

		.notify_set_rcvlowat      = virtio_transport_notify_set_rcvlowat,



		.read_skb = virtio_transport_read_skb,

	},

include/linux/virtio_vsock.h

+1 −0
Original line number Diff line number Diff line
@@ -256,4 +256,5 @@ void virtio_transport_put_credit(struct virtio_vsock_sock *vvs, u32 credit); 
void virtio_transport_deliver_tap_pkt(struct sk_buff *skb);

int virtio_transport_purge_skbs(void *vsk, struct sk_buff_head *list);

int virtio_transport_read_skb(struct vsock_sock *vsk, skb_read_actor_t read_actor);

int virtio_transport_notify_set_rcvlowat(struct vsock_sock *vsk, int val);

#endif /* _LINUX_VIRTIO_VSOCK_H */

include/net/af_vsock.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ struct vsock_transport { 
	u64 (*stream_rcvhiwat)(struct vsock_sock *);

	bool (*stream_is_active)(struct vsock_sock *);

	bool (*stream_allow)(u32 cid, u32 port);

	int (*set_rcvlowat)(struct vsock_sock *vsk, int val);



	/* SEQ_PACKET. */

	ssize_t (*seqpacket_dequeue)(struct vsock_sock *vsk, struct msghdr *msg,
@@ -168,6 +167,7 @@ struct vsock_transport { 
		struct vsock_transport_send_notify_data *);

	/* sk_lock held by the caller */

	void (*notify_buffer_size)(struct vsock_sock *, u64 *);

	int (*notify_set_rcvlowat)(struct vsock_sock *vsk, int val);



	/* Shutdown. */

	int (*shutdown)(struct vsock_sock *, int);

net/vmw_vsock/af_vsock.c

+7 −2
Original line number Diff line number Diff line
@@ -2264,8 +2264,13 @@ static int vsock_set_rcvlowat(struct sock *sk, int val) 


	transport = vsk->transport;



	if (transport && transport->set_rcvlowat)

		return transport->set_rcvlowat(vsk, val);

	if (transport && transport->notify_set_rcvlowat) {

		int err;



		err = transport->notify_set_rcvlowat(vsk, val);

		if (err)

			return err;

	}



	WRITE_ONCE(sk->sk_rcvlowat, val ? : 1);

	return 0;

net/vmw_vsock/hyperv_transport.c

+2 −2
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ int hvs_notify_send_post_enqueue(struct vsock_sock *vsk, ssize_t written, 
}



static

int hvs_set_rcvlowat(struct vsock_sock *vsk, int val)

int hvs_notify_set_rcvlowat(struct vsock_sock *vsk, int val)

{

	return -EOPNOTSUPP;

}
@@ -856,7 +856,7 @@ static struct vsock_transport hvs_transport = { 
	.notify_send_pre_enqueue  = hvs_notify_send_pre_enqueue,

	.notify_send_post_enqueue = hvs_notify_send_post_enqueue,



	.set_rcvlowat             = hvs_set_rcvlowat

	.notify_set_rcvlowat      = hvs_notify_set_rcvlowat

};



static bool hvs_check_transport(struct vsock_sock *vsk)