From: Arseny Krasnov <arseny.krasnov@kaspersky.com>
To: Stefan Hajnoczi <stefanha@redhat.com>,
Stefano Garzarella <sgarzare@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Arseny Krasnov <arseny.krasnov@kaspersky.com>,
Colin Ian King <colin.king@canonical.com>,
Andra Paraschiv <andraprs@amazon.com>,
Jeff Vander Stoep <jeffv@google.com>
Cc: <kvm@vger.kernel.org>,
<virtualization@lists.linux-foundation.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<stsp2@yandex.ru>, <oxffffaa@gmail.com>
Subject: [RFC PATCH v3 04/13] af_vsock: implement send logic for SOCK_SEQPACKET
Date: Mon, 25 Jan 2021 14:12:54 +0300 [thread overview]
Message-ID: <20210125111257.598507-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210125110903.597155-1-arseny.krasnov@kaspersky.com>
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.krasnov@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
next prev parent reply other threads:[~2021-01-25 11:55 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 11:09 [RFC PATCH v3 00/13] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-01-25 11:11 ` [RFC PATCH v3 01/13] af_vsock: prepare for " Arseny Krasnov
2021-01-28 16:10 ` Stefano Garzarella
2021-01-25 11:11 ` [RFC PATCH v3 02/13] af_vsock: prepare 'vsock_connectible_recvmsg()' Arseny Krasnov
2021-01-28 16:32 ` Stefano Garzarella
2021-01-25 11:12 ` [RFC PATCH v3 03/13] af_vsock: implement SEQPACKET rx loop Arseny Krasnov
2021-01-25 13:32 ` stsp
2021-01-28 16:55 ` Stefano Garzarella
2021-01-29 6:28 ` Arseny Krasnov
2021-01-25 11:12 ` Arseny Krasnov [this message]
2021-01-25 11:13 ` [RFC PATCH v3 05/13] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-01-28 17:04 ` Stefano Garzarella
2021-01-25 11:13 ` [RFC PATCH v3 06/13] af_vsock: update comments for stream sockets Arseny Krasnov
2021-01-25 11:13 ` [RFC PATCH v3 07/13] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov
2021-01-25 11:14 ` [RFC PATCH v3 08/13] virtio/vsock: fetch length for SEQPACKET record Arseny Krasnov
2021-01-25 11:14 ` [RFC PATCH v3 09/13] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-01-25 11:15 ` [RFC PATCH v3 10/13] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
[not found] ` <20210129110350.p5h2wtb2xj42rbm4@steredhat>
[not found] ` <83775d60-29c0-2da0-a87f-11c1f0a3102b@kaspersky.com>
2021-02-01 11:04 ` Stefano Garzarella
2021-01-25 11:15 ` [RFC PATCH v3 11/13] virtio/vsock: setup SEQPACKET ops for transport Arseny Krasnov
2021-01-25 11:16 ` [RFC PATCH v3 12/13] vhost/vsock: " Arseny Krasnov
2021-01-25 11:16 ` [RFC PATCH v3 13/13] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-01-26 11:23 ` [RFC PATCH v3 00/13] virtio/vsock: introduce SOCK_SEQPACKET support Stefano Garzarella
2021-01-28 17:19 ` Stefano Garzarella
2021-01-29 6:41 ` Arseny Krasnov
2021-01-29 9:26 ` Stefano Garzarella
[not found] ` <cb6d5a9c-fd49-a9dd-33b3-52027ae2f71c@kaspersky.com>
2021-02-01 11:02 ` Stefano Garzarella
2021-02-01 13:57 ` Arseny Krasnov
2021-02-01 14:23 ` Stefano Garzarella
2021-02-01 14:32 ` Arseny Krasnov
2021-02-01 14:34 ` Stefano Garzarella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210125111257.598507-1-arseny.krasnov@kaspersky.com \
--to=arseny.krasnov@kaspersky.com \
--cc=andraprs@amazon.com \
--cc=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--cc=jeffv@google.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=oxffffaa@gmail.com \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=stsp2@yandex.ru \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).