All of lore.kernel.org
 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>,
	Arseny Krasnov <arseny.krasnov@kaspersky.com>,
	Colin Ian King <colin.king@canonical.com>,
	Norbert Slusarek <nslusarek@gmx.net>,
	Andra Paraschiv <andraprs@amazon.com>
Cc: <kvm@vger.kernel.org>,
	<virtualization@lists.linux-foundation.org>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<oxffffaa@gmail.com>
Subject: [PATCH v11 07/18] af_vsock: update comments for stream sockets
Date: Fri, 11 Jun 2021 14:11:18 +0300	[thread overview]
Message-ID: <20210611111121.3651747-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210611110744.3650456-1-arseny.krasnov@kaspersky.com>

Replace 'stream' to 'connection oriented' in comments as
SEQPACKET is also connection oriented.

Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
---
 net/vmw_vsock/af_vsock.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 21a56f52d683..67954afef4e1 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -415,8 +415,8 @@ static void vsock_deassign_transport(struct vsock_sock *vsk)
 
 /* Assign a transport to a socket and call the .init transport callback.
  *
- * Note: for stream socket this must be called when vsk->remote_addr is set
- * (e.g. during the connect() or when a connection request on a listener
+ * Note: for connection oriented socket this must be called when vsk->remote_addr
+ * is set (e.g. during the connect() or when a connection request on a listener
  * socket is received).
  * The vsk->remote_addr is used to decide which transport to use:
  *  - remote CID == VMADDR_CID_LOCAL or g2h->local_cid or VMADDR_CID_HOST if
@@ -470,10 +470,10 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk)
 			return 0;
 
 		/* transport->release() must be called with sock lock acquired.
-		 * This path can only be taken during vsock_stream_connect(),
-		 * where we have already held the sock lock.
-		 * In the other cases, this function is called on a new socket
-		 * which is not assigned to any transport.
+		 * This path can only be taken during vsock_connect(), where we
+		 * have already held the sock lock. In the other cases, this
+		 * function is called on a new socket which is not assigned to
+		 * any transport.
 		 */
 		vsk->transport->release(vsk);
 		vsock_deassign_transport(vsk);
@@ -658,9 +658,10 @@ static int __vsock_bind_connectible(struct vsock_sock *vsk,
 
 	vsock_addr_init(&vsk->local_addr, new_addr.svm_cid, new_addr.svm_port);
 
-	/* Remove stream sockets from the unbound list and add them to the hash
-	 * table for easy lookup by its address.  The unbound list is simply an
-	 * extra entry at the end of the hash table, a trick used by AF_UNIX.
+	/* Remove connection oriented sockets from the unbound list and add them
+	 * to the hash table for easy lookup by its address.  The unbound list
+	 * is simply an extra entry at the end of the hash table, a trick used
+	 * by AF_UNIX.
 	 */
 	__vsock_remove_bound(vsk);
 	__vsock_insert_bound(vsock_bound_sockets(&vsk->local_addr), vsk);
@@ -962,10 +963,10 @@ static int vsock_shutdown(struct socket *sock, int mode)
 	if ((mode & ~SHUTDOWN_MASK) || !mode)
 		return -EINVAL;
 
-	/* If this is a STREAM socket and it is not connected then bail out
-	 * immediately.  If it is a DGRAM socket then we must first kick the
-	 * socket so that it wakes up from any sleeping calls, for example
-	 * recv(), and then afterwards return the error.
+	/* If this is a connection oriented socket and it is not connected then
+	 * bail out immediately.  If it is a DGRAM socket then we must first
+	 * kick the socket so that it wakes up from any sleeping calls, for
+	 * example recv(), and then afterwards return the error.
 	 */
 
 	sk = sock->sk;
@@ -1737,7 +1738,9 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg,
 
 	transport = vsk->transport;
 
-	/* Callers should not provide a destination with stream sockets. */
+	/* Callers should not provide a destination with connection oriented
+	 * sockets.
+	 */
 	if (msg->msg_namelen) {
 		err = sk->sk_state == TCP_ESTABLISHED ? -EISCONN : -EOPNOTSUPP;
 		goto out;
-- 
2.25.1


  parent reply	other threads:[~2021-06-11 11:11 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-11 11:07 [PATCH v11 00/18] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-06-11 11:09 ` [PATCH v11 01/18] af_vsock: update functions for connectible socket Arseny Krasnov
2021-06-11 11:10 ` [PATCH v11 02/18] af_vsock: separate wait data loop Arseny Krasnov
2021-06-11 11:10 ` [PATCH v11 03/18] af_vsock: separate receive " Arseny Krasnov
2021-06-11 11:10 ` [PATCH v11 04/18] af_vsock: implement SEQPACKET receive loop Arseny Krasnov
2021-06-11 11:10 ` [PATCH v11 05/18] af_vsock: implement send logic for SEQPACKET Arseny Krasnov
2021-06-11 11:11 ` [PATCH v11 06/18] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-06-11 11:11 ` Arseny Krasnov [this message]
2021-06-11 11:11 ` [PATCH v11 08/18] virtio/vsock: set packet's type in virtio_transport_send_pkt_info() Arseny Krasnov
2021-06-11 11:12 ` [PATCH v11 09/18] virtio/vsock: simplify credit update function API Arseny Krasnov
2021-06-11 11:12 ` [PATCH v11 10/18] virtio/vsock: defines and constants for SEQPACKET Arseny Krasnov
2021-06-11 11:12 ` [PATCH v11 11/18] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov
2021-06-18 13:44   ` Stefano Garzarella
2021-06-18 13:44     ` Stefano Garzarella
2021-06-18 13:51     ` Michael S. Tsirkin
2021-06-18 13:51       ` Michael S. Tsirkin
2021-06-18 14:44       ` Stefano Garzarella
2021-06-18 14:44         ` Stefano Garzarella
2021-06-18 15:04     ` Arseny Krasnov
2021-06-18 15:55       ` Stefano Garzarella
2021-06-18 15:55         ` Stefano Garzarella
2021-06-18 16:08         ` [MASSMAIL KLMS] " Arseny Krasnov
2021-06-18 16:25           ` Stefano Garzarella
2021-06-18 16:25             ` Stefano Garzarella
2021-06-18 16:26             ` Arseny Krasnov
2021-06-21  6:55               ` Arseny Krasnov
2021-06-21 10:23                 ` Stefano Garzarella
2021-06-21 10:23                   ` Stefano Garzarella
2021-06-21 12:27                   ` Arseny Krasnov
2021-06-11 11:12 ` [PATCH v11 12/18] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-06-11 11:13 ` [PATCH v11 13/18] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
2021-06-11 11:13 ` [PATCH v11 14/18] virtio/vsock: enable SEQPACKET for transport Arseny Krasnov
2021-06-11 11:13 ` [PATCH v11 15/18] vhost/vsock: support " Arseny Krasnov
2021-06-11 11:13 ` [PATCH v11 16/18] vsock/loopback: enable " Arseny Krasnov
2021-06-11 11:14 ` [PATCH v11 17/18] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-06-11 11:14 ` [PATCH v11 18/18] virtio/vsock: update trace event for SEQPACKET Arseny Krasnov
2021-06-11 11:17 ` [PATCH v11 00/18] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-06-11 12:25   ` Stefano Garzarella
2021-06-11 12:25     ` Stefano Garzarella
2021-06-11 14:39     ` Arseny Krasnov
2021-06-11 14:57       ` Stefano Garzarella
2021-06-11 14:57         ` Stefano Garzarella
2021-06-11 15:00         ` Arseny Krasnov
2021-06-11 21:00 ` patchwork-bot+netdevbpf
2021-06-18 13:49   ` Michael S. Tsirkin
2021-06-18 13:49     ` Michael S. Tsirkin

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=20210611111121.3651747-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=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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.