This adds some logic to current stream enqueue function for SEQPACKET
support:
1) Send record begin marker with length of record.
2) Return value from enqueue function is wholevrecord length or error
for SOCK_SEQPACKET.

Signed-off-by: Arseny Krasnov <arseny.kras...@kaspersky.com>
---
 include/net/af_vsock.h   |  1 +
 net/vmw_vsock/af_vsock.c | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
index 46073842d489..ec6bf4600ef8 100644
--- a/include/net/af_vsock.h
+++ b/include/net/af_vsock.h
@@ -136,6 +136,7 @@ struct vsock_transport {
        bool (*stream_allow)(u32 cid, u32 port);
 
        /* SEQ_PACKET. */
+       bool (*seqpacket_seq_send_len)(struct vsock_sock *, size_t len);
        size_t (*seqpacket_seq_get_len)(struct vsock_sock *);
        ssize_t (*seqpacket_dequeue)(struct vsock_sock *, struct msghdr *,
                                     size_t len, int flags);
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 3b266880b7c8..4600c1ec3bb3 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1767,6 +1767,12 @@ static int vsock_connectible_sendmsg(struct socket 
*sock, struct msghdr *msg,
        if (err < 0)
                goto out;
 
+       if (sk->sk_type == SOCK_SEQPACKET) {
+               err = transport->seqpacket_seq_send_len(vsk, len);
+               if (err < 0)
+                       goto out;
+       }
+
        while (total_written < len) {
                ssize_t written;
 
@@ -1845,8 +1851,14 @@ static int vsock_connectible_sendmsg(struct socket 
*sock, struct msghdr *msg,
        }
 
 out_err:
-       if (total_written > 0)
-               err = total_written;
+       if (total_written > 0) {
+               /* Return number of written bytes only if:
+                * 1) SOCK_STREAM socket.
+                * 2) SOCK_SEQPACKET socket when whole buffer is sent.
+                */
+               if (sk->sk_type == SOCK_STREAM || total_written == len)
+                       err = total_written;
+       }
 out:
        release_sock(sk);
        return err;
-- 
2.25.1

Reply via email to