diff mbox series

[2/3] vhost/vsock: support for SOCK_SEQPACKET socket.

Message ID 20201229110634.275024-1-arseny.krasnov@kaspersky.com (mailing list archive)
State Changes Requested
Headers show
Series [1/3] vsock/virtio: support for SOCK_SEQPACKET socket. | expand

Checks

Context Check Description
netdev/cover_letter warning Series does not have a cover letter
netdev/fixes_present success Link
netdev/patch_count success Link
netdev/tree_selection success Guessed tree name to be net-next
netdev/subject_prefix success Link
netdev/cc_maintainers success CCed 7 of 7 maintainers
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Link
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/verify_fixes success Link
netdev/checkpatch warning WARNING: line length of 83 exceeds 80 columns WARNING: line length of 84 exceeds 80 columns
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/header_inline success Link
netdev/stable success Stable not CCed

Commit Message

Arseny Krasnov Dec. 29, 2020, 11:06 a.m. UTC
This patch simply adds transport ops and removes
ignore of non-stream type of packets.

Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
---
 drivers/vhost/vsock.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Michael S. Tsirkin Dec. 30, 2020, 8:55 p.m. UTC | #1
On Tue, Dec 29, 2020 at 02:06:33PM +0300, Arseny Krasnov wrote:
> 	This patch simply adds transport ops and removes
> ignore of non-stream type of packets.
> 
> Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>

How is this supposed to work? virtio vsock at the moment
has byte level end to end credit accounting at the
protocol level. I suspect some protocol changes involving
more than this tweak would
be needed to properly support anything that isn't a stream.

> ---
>  drivers/vhost/vsock.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
> index a483cec31d5c..4a36ef1c52d0 100644
> --- a/drivers/vhost/vsock.c
> +++ b/drivers/vhost/vsock.c
> @@ -346,8 +346,7 @@ vhost_vsock_alloc_pkt(struct vhost_virtqueue *vq,
>  		return NULL;
>  	}
>  
> -	if (le16_to_cpu(pkt->hdr.type) == VIRTIO_VSOCK_TYPE_STREAM)
> -		pkt->len = le32_to_cpu(pkt->hdr.len);
> +	pkt->len = le32_to_cpu(pkt->hdr.len);
>  
>  	/* No payload */
>  	if (!pkt->len)
> @@ -416,6 +415,9 @@ static struct virtio_transport vhost_transport = {
>  		.stream_is_active         = virtio_transport_stream_is_active,
>  		.stream_allow             = virtio_transport_stream_allow,
>  
> +		.seqpacket_seq_send_len	  = virtio_transport_seqpacket_seq_send_len,
> +		.seqpacket_seq_get_len	  = virtio_transport_seqpacket_seq_get_len,
> +
>  		.notify_poll_in           = virtio_transport_notify_poll_in,
>  		.notify_poll_out          = virtio_transport_notify_poll_out,
>  		.notify_recv_init         = virtio_transport_notify_recv_init,
> -- 
> 2.25.1
Michael S. Tsirkin Dec. 30, 2020, 8:58 p.m. UTC | #2
On Wed, Dec 30, 2020 at 03:56:03PM -0500, Michael S. Tsirkin wrote:
> On Tue, Dec 29, 2020 at 02:06:33PM +0300, Arseny Krasnov wrote:
> > 	This patch simply adds transport ops and removes
> > ignore of non-stream type of packets.
> > 
> > Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
> 
> How is this supposed to work? virtio vsock at the moment
> has byte level end to end credit accounting at the
> protocol level. I suspect some protocol changes involving
> more than this tweak would
> be needed to properly support anything that isn't a stream.


oh this was not threaded correctly so I did not see rest of
patches. ignore this pls will respond there.

> > ---
> >  drivers/vhost/vsock.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
> > index a483cec31d5c..4a36ef1c52d0 100644
> > --- a/drivers/vhost/vsock.c
> > +++ b/drivers/vhost/vsock.c
> > @@ -346,8 +346,7 @@ vhost_vsock_alloc_pkt(struct vhost_virtqueue *vq,
> >  		return NULL;
> >  	}
> >  
> > -	if (le16_to_cpu(pkt->hdr.type) == VIRTIO_VSOCK_TYPE_STREAM)
> > -		pkt->len = le32_to_cpu(pkt->hdr.len);
> > +	pkt->len = le32_to_cpu(pkt->hdr.len);
> >  
> >  	/* No payload */
> >  	if (!pkt->len)
> > @@ -416,6 +415,9 @@ static struct virtio_transport vhost_transport = {
> >  		.stream_is_active         = virtio_transport_stream_is_active,
> >  		.stream_allow             = virtio_transport_stream_allow,
> >  
> > +		.seqpacket_seq_send_len	  = virtio_transport_seqpacket_seq_send_len,
> > +		.seqpacket_seq_get_len	  = virtio_transport_seqpacket_seq_get_len,
> > +
> >  		.notify_poll_in           = virtio_transport_notify_poll_in,
> >  		.notify_poll_out          = virtio_transport_notify_poll_out,
> >  		.notify_recv_init         = virtio_transport_notify_recv_init,
> > -- 
> > 2.25.1
Arseny Krasnov Jan. 2, 2021, 10:12 a.m. UTC | #3
> oh this was not threaded correctly so I did not see rest of
> patches. ignore this pls will respond there.

Sorry, i'll resend whole patchset ASAP in one thread.

On 30.12.2020 23:58, Michael S. Tsirkin wrote:
> On Wed, Dec 30, 2020 at 03:56:03PM -0500, Michael S. Tsirkin wrote:
>> On Tue, Dec 29, 2020 at 02:06:33PM +0300, Arseny Krasnov wrote:
>>> 	This patch simply adds transport ops and removes
>>> ignore of non-stream type of packets.
>>>
>>> Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
>> How is this supposed to work? virtio vsock at the moment
>> has byte level end to end credit accounting at the
>> protocol level. I suspect some protocol changes involving
>> more than this tweak would
>> be needed to properly support anything that isn't a stream.
>
> oh this was not threaded correctly so I did not see rest of
> patches. ignore this pls will respond there.
>
>>> ---
>>>  drivers/vhost/vsock.c | 6 ++++--
>>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
>>> index a483cec31d5c..4a36ef1c52d0 100644
>>> --- a/drivers/vhost/vsock.c
>>> +++ b/drivers/vhost/vsock.c
>>> @@ -346,8 +346,7 @@ vhost_vsock_alloc_pkt(struct vhost_virtqueue *vq,
>>>  		return NULL;
>>>  	}
>>>  
>>> -	if (le16_to_cpu(pkt->hdr.type) == VIRTIO_VSOCK_TYPE_STREAM)
>>> -		pkt->len = le32_to_cpu(pkt->hdr.len);
>>> +	pkt->len = le32_to_cpu(pkt->hdr.len);
>>>  
>>>  	/* No payload */
>>>  	if (!pkt->len)
>>> @@ -416,6 +415,9 @@ static struct virtio_transport vhost_transport = {
>>>  		.stream_is_active         = virtio_transport_stream_is_active,
>>>  		.stream_allow             = virtio_transport_stream_allow,
>>>  
>>> +		.seqpacket_seq_send_len	  = virtio_transport_seqpacket_seq_send_len,
>>> +		.seqpacket_seq_get_len	  = virtio_transport_seqpacket_seq_get_len,
>>> +
>>>  		.notify_poll_in           = virtio_transport_notify_poll_in,
>>>  		.notify_poll_out          = virtio_transport_notify_poll_out,
>>>  		.notify_recv_init         = virtio_transport_notify_recv_init,
>>> -- 
>>> 2.25.1
>
diff mbox series

Patch

diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index a483cec31d5c..4a36ef1c52d0 100644
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -346,8 +346,7 @@  vhost_vsock_alloc_pkt(struct vhost_virtqueue *vq,
 		return NULL;
 	}
 
-	if (le16_to_cpu(pkt->hdr.type) == VIRTIO_VSOCK_TYPE_STREAM)
-		pkt->len = le32_to_cpu(pkt->hdr.len);
+	pkt->len = le32_to_cpu(pkt->hdr.len);
 
 	/* No payload */
 	if (!pkt->len)
@@ -416,6 +415,9 @@  static struct virtio_transport vhost_transport = {
 		.stream_is_active         = virtio_transport_stream_is_active,
 		.stream_allow             = virtio_transport_stream_allow,
 
+		.seqpacket_seq_send_len	  = virtio_transport_seqpacket_seq_send_len,
+		.seqpacket_seq_get_len	  = virtio_transport_seqpacket_seq_get_len,
+
 		.notify_poll_in           = virtio_transport_notify_poll_in,
 		.notify_poll_out          = virtio_transport_notify_poll_out,
 		.notify_recv_init         = virtio_transport_notify_recv_init,