linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Jorgen Hansen <jhansen@vmware.com>,
	Andra Paraschiv <andraprs@amazon.com>,
	Colin Ian King <colin.king@canonical.com>,
	Norbert Slusarek <nslusarek@gmx.net>,
	Jeff Vander Stoep <jeffv@google.com>,
	Alexander Popov <alex.popov@linux.com>
Cc: <kvm@vger.kernel.org>,
	<virtualization@lists.linux-foundation.org>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<stsp2@yandex.ru>, <arseny.krasnov@kaspersky.com>,
	<oxffffaa@gmail.com>
Subject: [RFC PATCH v7 06/22] af_vsock: implement send logic for SEQPACKET
Date: Tue, 23 Mar 2021 16:10:42 +0300	[thread overview]
Message-ID: <20210323131045.2460319-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210323130716.2459195-1-arseny.krasnov@kaspersky.com>

This adds some logic to current stream enqueue function for SEQPACKET
support:
1) Use transport's seqpacket enqueue callback.
2) Return value from enqueue function is whole record length or error
   for SOCK_SEQPACKET.

Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
---
 v6 -> v7:
 'seqpacket_enqueue' callback interface changed, 'flags' argument was
 removed, because it was 'msg_flags' field of 'msg' argument which is
 already exists.

 include/net/af_vsock.h   |  2 ++
 net/vmw_vsock/af_vsock.c | 21 +++++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
index 7232f6c42a36..b7063820d0bc 100644
--- a/include/net/af_vsock.h
+++ b/include/net/af_vsock.h
@@ -138,6 +138,8 @@ struct vsock_transport {
 	/* SEQ_PACKET. */
 	int (*seqpacket_dequeue)(struct vsock_sock *vsk, struct msghdr *msg,
 				 int flags, bool *msg_ready, size_t *record_len);
+	int (*seqpacket_enqueue)(struct vsock_sock *vsk, struct msghdr *msg,
+				 size_t len);
 
 	/* Notification. */
 	int (*notify_poll_in)(struct vsock_sock *, size_t, bool *);
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 617ffe42693d..a98e5daa06b7 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1830,9 +1830,13 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg,
 		 * responsibility to check how many bytes we were able to send.
 		 */
 
-		written = transport->stream_enqueue(
-				vsk, msg,
-				len - total_written);
+		if (sk->sk_type == SOCK_SEQPACKET) {
+			written = transport->seqpacket_enqueue(vsk,
+						msg, len - total_written);
+		} else {
+			written = transport->stream_enqueue(vsk,
+					msg, len - total_written);
+		}
 		if (written < 0) {
 			err = -ENOMEM;
 			goto out_err;
@@ -1844,12 +1848,17 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg,
 				vsk, written, &send_data);
 		if (err < 0)
 			goto out_err;
-
 	}
 
 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


  parent reply	other threads:[~2021-03-23 13:11 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-23 13:07 [RFC PATCH v7 00/22] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-03-23 13:08 ` [RFC PATCH v7 01/22] af_vsock: update functions for connectible socket Arseny Krasnov
2021-03-23 13:09 ` [RFC PATCH v7 02/22] af_vsock: separate wait data loop Arseny Krasnov
2021-03-23 13:09 ` [RFC PATCH v7 03/22] af_vsock: separate receive " Arseny Krasnov
2021-03-25  9:06   ` Stefano Garzarella
2021-03-23 13:10 ` [RFC PATCH v7 04/22] af_vsock: implement SEQPACKET receive loop Arseny Krasnov
2021-03-25  9:34   ` Stefano Garzarella
2021-03-25 16:01     ` Arseny Krasnov
2021-03-23 13:10 ` [RFC PATCH v7 05/22] af_vsock: separate wait space loop Arseny Krasnov
2021-03-25  9:37   ` Stefano Garzarella
2021-03-23 13:10 ` Arseny Krasnov [this message]
2021-03-25  9:42   ` [RFC PATCH v7 06/22] af_vsock: implement send logic for SEQPACKET Stefano Garzarella
2021-03-23 13:11 ` [RFC PATCH v7 07/22] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-03-23 13:11 ` [RFC PATCH v7 08/22] af_vsock: update comments for stream sockets Arseny Krasnov
2021-03-23 13:11 ` [RFC PATCH v7 09/22] virtio/vsock: set packet's type in virtio_transport_send_pkt_info() Arseny Krasnov
2021-03-23 13:12 ` [RFC PATCH v7 10/22] virtio/vsock: simplify credit update function API Arseny Krasnov
2021-03-23 13:12 ` [RFC PATCH v7 11/22] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov
2021-03-25  9:56   ` Stefano Garzarella
2021-03-25 16:02     ` Arseny Krasnov
2021-03-23 13:12 ` [RFC PATCH v7 12/22] virtio/vsock: fetch length for SEQPACKET record Arseny Krasnov
2021-03-25 10:08   ` Stefano Garzarella
2021-03-25 16:02     ` Arseny Krasnov
2021-03-23 13:13 ` [RFC PATCH v7 13/22] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-03-25 10:09   ` Stefano Garzarella
2021-03-23 13:13 ` [RFC PATCH v7 14/22] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
2021-03-25 10:18   ` Stefano Garzarella
2021-03-25 16:03     ` Arseny Krasnov
2021-03-23 13:13 ` [RFC PATCH v7 15/22] virtio/vsock: SEQPACKET support feature bit Arseny Krasnov
2021-03-25 10:26   ` Stefano Garzarella
2021-03-25 16:04     ` Arseny Krasnov
2021-03-23 13:14 ` [RFC PATCH v7 16/22] virtio/vsock: setup SEQPACKET ops for transport Arseny Krasnov
2021-03-25 10:39   ` Stefano Garzarella
2021-03-25 16:04     ` Arseny Krasnov
2021-03-23 13:14 ` [RFC PATCH v7 17/22] vhost/vsock: " Arseny Krasnov
2021-03-25 10:42   ` Stefano Garzarella
2021-03-25 16:04     ` Arseny Krasnov
2021-03-23 13:14 ` [RFC PATCH v7 18/22] vsock/loopback: " Arseny Krasnov
2021-03-25 10:48   ` Stefano Garzarella
2021-03-23 13:14 ` [RFC PATCH v7 19/22] vhost/vsock: SEQPACKET feature bit support Arseny Krasnov
2021-03-23 13:15 ` [RFC PATCH v7 20/22] virtio/vsock: " Arseny Krasnov
2021-03-23 13:15 ` [RFC PATCH v7 21/22] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-03-23 13:15 ` [RFC PATCH v7 22/22] virtio/vsock: update trace event for SEQPACKET Arseny Krasnov
2021-03-25 10:52 ` [RFC PATCH v7 00/22] virtio/vsock: introduce SOCK_SEQPACKET support Stefano Garzarella
2021-03-25 16:05   ` Arseny Krasnov

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=20210323131045.2460319-1-arseny.krasnov@kaspersky.com \
    --to=arseny.krasnov@kaspersky.com \
    --cc=alex.popov@linux.com \
    --cc=andraprs@amazon.com \
    --cc=colin.king@canonical.com \
    --cc=davem@davemloft.net \
    --cc=jasowang@redhat.com \
    --cc=jeffv@google.com \
    --cc=jhansen@vmware.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=nslusarek@gmx.net \
    --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).