search for: vhost_transport_do_send_pkt

.../* Do not send zero length OP_RW pkt */ if (pkt_len == 0 && info->op == VIRTIO_VSOCK_OP_RW) return pkt_len; ... } then it queues the packet for the TX worker calling .send_pkt() [vhost_transport_send_pkt() in the vhost_transport case] The main function executed by the TX worker is vhost_transport_do_send_pkt() that picks up a buffer from the virtqueue and it tries to copy the packet (up to 4K) on it. If the buffer allocated from the guest will be smaller then 4K, I think here it will be discarded with an error: static void vhost_transport_do_send_pkt(struct vhost_vsock *vsock, struct vhost_virtqu...

.../* Do not send zero length OP_RW pkt */ if (pkt_len == 0 && info->op == VIRTIO_VSOCK_OP_RW) return pkt_len; ... } then it queues the packet for the TX worker calling .send_pkt() [vhost_transport_send_pkt() in the vhost_transport case] The main function executed by the TX worker is vhost_transport_do_send_pkt() that picks up a buffer from the virtqueue and it tries to copy the packet (up to 4K) on it. If the buffer allocated from the guest will be smaller then 4K, I think here it will be discarded with an error: static void vhost_transport_do_send_pkt(struct vhost_vsock *vsock, struct vhost_virtqu...

...so for vsock: Tested-by: Stefano Garzarella <sgarzare at redhat.com> Thanks, Stefano > > diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c > index a483cec31d5c..61c6d3dd2ae3 100644 > --- a/drivers/vhost/vsock.c > +++ b/drivers/vhost/vsock.c > @@ -103,7 +103,8 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, > unsigned out, in; > size_t nbytes; > size_t iov_len, payload_len; > - int head; > + struct vhost_buf buf; > + int ret; > > spin_lock_bh(&vsock->send_pkt_list_lock); > if (list_empty(&vsock->send_pkt_list)) { &...

...so for vsock: Tested-by: Stefano Garzarella <sgarzare at redhat.com> Thanks, Stefano > > diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c > index a483cec31d5c..61c6d3dd2ae3 100644 > --- a/drivers/vhost/vsock.c > +++ b/drivers/vhost/vsock.c > @@ -103,7 +103,8 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, > unsigned out, in; > size_t nbytes; > size_t iov_len, payload_len; > - int head; > + struct vhost_buf buf; > + int ret; > > spin_lock_bh(&vsock->send_pkt_list_lock); > if (list_empty(&vsock->send_pkt_list)) { &...

...O_VSOCK_OP_RW) > > return pkt_len; > > ... > > } > > > > then it queues the packet for the TX worker calling .send_pkt() > > [vhost_transport_send_pkt() in the vhost_transport case] > > > > The main function executed by the TX worker is > > vhost_transport_do_send_pkt() that picks up a buffer from the virtqueue > > and it tries to copy the packet (up to 4K) on it. If the buffer > > allocated from the guest will be smaller then 4K, I think here it will > > be discarded with an error: > > I'm adding more lines to explain better. &gt...

...O_VSOCK_OP_RW) > > return pkt_len; > > ... > > } > > > > then it queues the packet for the TX worker calling .send_pkt() > > [vhost_transport_send_pkt() in the vhost_transport case] > > > > The main function executed by the TX worker is > > vhost_transport_do_send_pkt() that picks up a buffer from the virtqueue > > and it tries to copy the packet (up to 4K) on it. If the buffer > > allocated from the guest will be smaller then 4K, I think here it will > > be discarded with an error: > > I'm adding more lines to explain better. &gt...

...t; > } > > > > > > > > then it queues the packet for the TX worker calling .send_pkt() > > > > [vhost_transport_send_pkt() in the vhost_transport case] > > > > > > > > The main function executed by the TX worker is > > > > vhost_transport_do_send_pkt() that picks up a buffer from the virtqueue > > > > and it tries to copy the packet (up to 4K) on it. If the buffer > > > > allocated from the guest will be smaller then 4K, I think here it will > > > > be discarded with an error: > > > > > >...

...t; > } > > > > > > > > then it queues the packet for the TX worker calling .send_pkt() > > > > [vhost_transport_send_pkt() in the vhost_transport case] > > > > > > > > The main function executed by the TX worker is > > > > vhost_transport_do_send_pkt() that picks up a buffer from the virtqueue > > > > and it tries to copy the packet (up to 4K) on it. If the buffer > > > > allocated from the guest will be smaller then 4K, I think here it will > > > > be discarded with an error: > > > > > >...

...com> --- drivers/vhost/vsock.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index bb5fc0e9fbc2..9951b7e661f6 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -94,7 +94,7 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, struct iov_iter iov_iter; unsigned out, in; size_t nbytes; - size_t len; + size_t iov_len, payload_len; int head; spin_lock_bh(&vsock->send_pkt_list_lock); @@ -139,8 +139,18 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, break;...

...t.com> --- drivers/vhost/vsock.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index fb4e944c4d0d..07d1fb340fb4 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -103,7 +103,8 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, unsigned out, in; size_t nbytes; size_t iov_len, payload_len; - int head; + struct vhost_buf buf; + int ret; spin_lock_bh(&vsock->send_pkt_list_lock); if (list_empty(&vsock->send_pkt_list)) { @@ -117,16 +118,17 @@ vhost_transport_do_send_...

...t.com> --- drivers/vhost/vsock.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index a483cec31d5c..61c6d3dd2ae3 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -103,7 +103,8 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, unsigned out, in; size_t nbytes; size_t iov_len, payload_len; - int head; + struct vhost_buf buf; + int ret; spin_lock_bh(&vsock->send_pkt_list_lock); if (list_empty(&vsock->send_pkt_list)) { @@ -117,16 +118,17 @@ vhost_transport_do_send_...

...t.com> --- drivers/vhost/vsock.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index a483cec31d5c..61c6d3dd2ae3 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -103,7 +103,8 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, unsigned out, in; size_t nbytes; size_t iov_len, payload_len; - int head; + struct vhost_buf buf; + int ret; spin_lock_bh(&vsock->send_pkt_list_lock); if (list_empty(&vsock->send_pkt_list)) { @@ -117,16 +118,17 @@ vhost_transport_do_send_...

...(pkt_len == 0 && info->op == VIRTIO_VSOCK_OP_RW) > return pkt_len; > ... > } > > then it queues the packet for the TX worker calling .send_pkt() > [vhost_transport_send_pkt() in the vhost_transport case] > > The main function executed by the TX worker is > vhost_transport_do_send_pkt() that picks up a buffer from the virtqueue > and it tries to copy the packet (up to 4K) on it. If the buffer > allocated from the guest will be smaller then 4K, I think here it will > be discarded with an error: > > static void > vhost_transport_do_send_pkt(struct vhost_vsock *...

...s, > Stefano Re-testing v6 would be very much appreciated. > > > > diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c > > index a483cec31d5c..61c6d3dd2ae3 100644 > > --- a/drivers/vhost/vsock.c > > +++ b/drivers/vhost/vsock.c > > @@ -103,7 +103,8 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, > > unsigned out, in; > > size_t nbytes; > > size_t iov_len, payload_len; > > - int head; > > + struct vhost_buf buf; > > + int ret; > > > > spin_lock_bh(&vsock->send_pkt_list_lock); > > if (...

...n; > > > ... > > > } > > > > > > then it queues the packet for the TX worker calling .send_pkt() > > > [vhost_transport_send_pkt() in the vhost_transport case] > > > > > > The main function executed by the TX worker is > > > vhost_transport_do_send_pkt() that picks up a buffer from the virtqueue > > > and it tries to copy the packet (up to 4K) on it. If the buffer > > > allocated from the guest will be smaller then 4K, I think here it will > > > be discarded with an error: > > > > > I'm adding more...

...+++++++++++------- net/vmw_vsock/virtio_transport_common.c | 15 ++++-- 2 files changed, 60 insertions(+), 21 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 6c8390a2af52..9f57736fe15e 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -102,7 +102,7 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, struct iov_iter iov_iter; unsigned out, in; size_t nbytes; - size_t len; + size_t iov_len, payload_len; int head; spin_lock_bh(&vsock->send_pkt_list_lock); @@ -147,8 +147,24 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, break;...

...> > > > > > then it queues the packet for the TX worker calling .send_pkt() > > > > > [vhost_transport_send_pkt() in the vhost_transport case] > > > > > > > > > > The main function executed by the TX worker is > > > > > vhost_transport_do_send_pkt() that picks up a buffer from the virtqueue > > > > > and it tries to copy the packet (up to 4K) on it. If the buffer > > > > > allocated from the guest will be smaller then 4K, I think here it will > > > > > be discarded with an error: > > > &...

...if (!vhost_vq_get_backend(&vsock->vqs[VSOCK_VQ_RX])) { > > ... > > > > This function should be called with 'vq->mutex' acquired as explained in > > the comment, but here we can avoid that, because we are not using the vq, > > so it is safe, because in vhost_transport_do_send_pkt() we check it again. > > > > Please add a comment explaining that. > > > > Thanks, vhost_vq_get_backend is better. I chose a 5.3 kernel to develop > and missed this helper. :-) > > > > As an alternative to this patch, should we kick the send worker when the...

...if (!vhost_vq_get_backend(&vsock->vqs[VSOCK_VQ_RX])) { > > ... > > > > This function should be called with 'vq->mutex' acquired as explained in > > the comment, but here we can avoid that, because we are not using the vq, > > so it is safe, because in vhost_transport_do_send_pkt() we check it again. > > > > Please add a comment explaining that. > > > > Thanks, vhost_vq_get_backend is better. I chose a 5.3 kernel to develop > and missed this helper. :-) > > > > As an alternative to this patch, should we kick the send worker when the...

...or_each_entry(vsock, &vhost_vsock_list, list) { > + if (vsock->guest_cid == guest_cid) { > + mutex_unlock(&vhost_vsock_mutex); > + return vsock; > + } > + } > + mutex_unlock(&vhost_vsock_mutex); > + > + return NULL; > +} > + > +static void > +vhost_transport_do_send_pkt(struct vhost_vsock *vsock, > + struct vhost_virtqueue *vq) > +{ > + struct virtio_vsock_pkt *pkt; > + unsigned out, in; > + struct sock *sk; > + int head, ret; > + > + mutex_lock(&vq->mutex); > + vhost_disable_notify(&vsock->dev, vq); > + for (;;) {...