Re: [PATCH v10 13/18] virtio/vsock: rest of SOCK_SEQPACKET support

[Stefano Garzarella]

On Thu, May 20, 2021 at 10:18:37PM +0300, Arseny Krasnov wrote:
> Small updates to make SOCK_SEQPACKET work:
> 1) Send SHUTDOWN on socket close for SEQPACKET type.
> 2) Set SEQPACKET packet type during send.
> 3) Set 'VIRTIO_VSOCK_SEQ_EOR' bit in flags for last
>   packet of message.
>
> Signed-off-by: Arseny Krasnov <arseny.krasnov@xxxxxxxxxxxxx>
> ---
> v9 -> v10:
> 1) Use 'msg_data_left()' instead of direct access to 'msg_hdr'.
> 2) Commit message updated.
> 3) Add check for socket type when setting SEQ_EOR bit.
>
> include/linux/virtio_vsock.h            |  4 ++++
> net/vmw_vsock/virtio_transport_common.c | 18 ++++++++++++++++--
> 2 files changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
> index 02acf6e9ae04..7360ab7ea0af 100644
> --- a/include/linux/virtio_vsock.h
> +++ b/include/linux/virtio_vsock.h
> @@ -80,6 +80,10 @@ virtio_transport_dgram_dequeue(struct vsock_sock *vsk,
> 			       struct msghdr *msg,
> 			       size_t len, int flags);
>
> +int
> +virtio_transport_seqpacket_enqueue(struct vsock_sock *vsk,
> +				   struct msghdr *msg,
> +				   size_t len);
> ssize_t
> virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk,
> 				   struct msghdr *msg,
> diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
> index a6f8b0f39775..f7a3281b3eab 100644
> --- a/net/vmw_vsock/virtio_transport_common.c
> +++ b/net/vmw_vsock/virtio_transport_common.c
> @@ -74,6 +74,11 @@ virtio_transport_alloc_pkt(struct virtio_vsock_pkt_info *info,
> 		err = memcpy_from_msg(pkt->buf, info->msg, len);
> 		if (err)
> 			goto out;
> +
> +		if (msg_data_left(info->msg) == 0 &&
> +		    info->type == VIRTIO_VSOCK_TYPE_SEQPACKET)
> +			pkt->hdr.flags = cpu_to_le32(info->flags |
> +						VIRTIO_VSOCK_SEQ_EOR);

`pkt->hdr.flags |= cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR)` should be enough, 
no?

Stefano

> 	}
>
> 	trace_virtio_transport_alloc_pkt(src_cid, src_port,
> @@ -187,7 +192,7 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk,
> 	struct virtio_vsock_pkt *pkt;
> 	u32 pkt_len = info->pkt_len;
>
> -	info->type = VIRTIO_VSOCK_TYPE_STREAM;
> +	info->type = virtio_transport_get_type(sk_vsock(vsk));
>
> 	t_ops = virtio_transport_get_ops(vsk);
> 	if (unlikely(!t_ops))
> @@ -478,6 +483,15 @@ virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk,
> }
> EXPORT_SYMBOL_GPL(virtio_transport_seqpacket_dequeue);
>
> +int
> +virtio_transport_seqpacket_enqueue(struct vsock_sock *vsk,
> +				   struct msghdr *msg,
> +				   size_t len)
> +{
> +	return virtio_transport_stream_enqueue(vsk, msg, len);
> +}
> +EXPORT_SYMBOL_GPL(virtio_transport_seqpacket_enqueue);
> +
> int
> virtio_transport_dgram_dequeue(struct vsock_sock *vsk,
> 			       struct msghdr *msg,
> @@ -912,7 +926,7 @@ void virtio_transport_release(struct vsock_sock *vsk)
> 	struct sock *sk = &vsk->sk;
> 	bool remove_sock = true;
>
> -	if (sk->sk_type == SOCK_STREAM)
> +	if (sk->sk_type == SOCK_STREAM || sk->sk_type == SOCK_SEQPACKET)
> 		remove_sock = virtio_transport_close(vsk);
>
> 	if (remove_sock) {
> --
> 2.25.1