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>,
Jorgen Hansen <jhansen@vmware.com>,
Norbert Slusarek <nslusarek@gmx.net>,
Colin Ian King <colin.king@canonical.com>,
Andra Paraschiv <andraprs@amazon.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 v5 01/19] af_vsock: update functions for connectible socket
Date: Thu, 18 Feb 2021 08:36:03 +0300 [thread overview]
Message-ID: <20210218053607.1066783-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210218053347.1066159-1-arseny.krasnov@kaspersky.com>
This prepares af_vsock.c for SEQPACKET support: some functions such
as setsockopt(), getsockopt(), connect(), recvmsg(), sendmsg() are
shared between both types of sockets, so rename them in general
manner.
Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
---
net/vmw_vsock/af_vsock.c | 64 +++++++++++++++++++++-------------------
1 file changed, 34 insertions(+), 30 deletions(-)
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 5546710d8ac1..656370e11707 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -604,8 +604,8 @@ static void vsock_pending_work(struct work_struct *work)
/**** SOCKET OPERATIONS ****/
-static int __vsock_bind_stream(struct vsock_sock *vsk,
- struct sockaddr_vm *addr)
+static int __vsock_bind_connectible(struct vsock_sock *vsk,
+ struct sockaddr_vm *addr)
{
static u32 port;
struct sockaddr_vm new_addr;
@@ -685,7 +685,7 @@ static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr)
switch (sk->sk_socket->type) {
case SOCK_STREAM:
spin_lock_bh(&vsock_table_lock);
- retval = __vsock_bind_stream(vsk, addr);
+ retval = __vsock_bind_connectible(vsk, addr);
spin_unlock_bh(&vsock_table_lock);
break;
@@ -767,6 +767,11 @@ static struct sock *__vsock_create(struct net *net,
return sk;
}
+static bool sock_type_connectible(u16 type)
+{
+ return type == SOCK_STREAM;
+}
+
static void __vsock_release(struct sock *sk, int level)
{
if (sk) {
@@ -785,7 +790,7 @@ static void __vsock_release(struct sock *sk, int level)
if (vsk->transport)
vsk->transport->release(vsk);
- else if (sk->sk_type == SOCK_STREAM)
+ else if (sock_type_connectible(sk->sk_type))
vsock_remove_sock(vsk);
sock_orphan(sk);
@@ -947,7 +952,7 @@ static int vsock_shutdown(struct socket *sock, int mode)
lock_sock(sk);
if (sock->state == SS_UNCONNECTED) {
err = -ENOTCONN;
- if (sk->sk_type == SOCK_STREAM)
+ if (sock_type_connectible(sk->sk_type))
goto out;
} else {
sock->state = SS_DISCONNECTING;
@@ -960,7 +965,7 @@ static int vsock_shutdown(struct socket *sock, int mode)
sk->sk_shutdown |= mode;
sk->sk_state_change(sk);
- if (sk->sk_type == SOCK_STREAM) {
+ if (sock_type_connectible(sk->sk_type)) {
sock_reset_flag(sk, SOCK_DONE);
vsock_send_shutdown(sk, mode);
}
@@ -1015,7 +1020,7 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
if (!(sk->sk_shutdown & SEND_SHUTDOWN))
mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
- } else if (sock->type == SOCK_STREAM) {
+ } else if (sock_type_connectible(sk->sk_type)) {
const struct vsock_transport *transport;
lock_sock(sk);
@@ -1262,8 +1267,8 @@ static void vsock_connect_timeout(struct work_struct *work)
sock_put(sk);
}
-static int vsock_stream_connect(struct socket *sock, struct sockaddr *addr,
- int addr_len, int flags)
+static int vsock_connect(struct socket *sock, struct sockaddr *addr,
+ int addr_len, int flags)
{
int err;
struct sock *sk;
@@ -1413,7 +1418,7 @@ static int vsock_accept(struct socket *sock, struct socket *newsock, int flags,
lock_sock(listener);
- if (sock->type != SOCK_STREAM) {
+ if (!sock_type_connectible(sock->type)) {
err = -EOPNOTSUPP;
goto out;
}
@@ -1490,7 +1495,7 @@ static int vsock_listen(struct socket *sock, int backlog)
lock_sock(sk);
- if (sock->type != SOCK_STREAM) {
+ if (!sock_type_connectible(sk->sk_type)) {
err = -EOPNOTSUPP;
goto out;
}
@@ -1534,11 +1539,11 @@ static void vsock_update_buffer_size(struct vsock_sock *vsk,
vsk->buffer_size = val;
}
-static int vsock_stream_setsockopt(struct socket *sock,
- int level,
- int optname,
- sockptr_t optval,
- unsigned int optlen)
+static int vsock_connectible_setsockopt(struct socket *sock,
+ int level,
+ int optname,
+ sockptr_t optval,
+ unsigned int optlen)
{
int err;
struct sock *sk;
@@ -1616,10 +1621,10 @@ static int vsock_stream_setsockopt(struct socket *sock,
return err;
}
-static int vsock_stream_getsockopt(struct socket *sock,
- int level, int optname,
- char __user *optval,
- int __user *optlen)
+static int vsock_connectible_getsockopt(struct socket *sock,
+ int level, int optname,
+ char __user *optval,
+ int __user *optlen)
{
int err;
int len;
@@ -1687,8 +1692,8 @@ static int vsock_stream_getsockopt(struct socket *sock,
return 0;
}
-static int vsock_stream_sendmsg(struct socket *sock, struct msghdr *msg,
- size_t len)
+static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg,
+ size_t len)
{
struct sock *sk;
struct vsock_sock *vsk;
@@ -1827,10 +1832,9 @@ static int vsock_stream_sendmsg(struct socket *sock, struct msghdr *msg,
return err;
}
-
static int
-vsock_stream_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
- int flags)
+vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+ int flags)
{
struct sock *sk;
struct vsock_sock *vsk;
@@ -2006,7 +2010,7 @@ static const struct proto_ops vsock_stream_ops = {
.owner = THIS_MODULE,
.release = vsock_release,
.bind = vsock_bind,
- .connect = vsock_stream_connect,
+ .connect = vsock_connect,
.socketpair = sock_no_socketpair,
.accept = vsock_accept,
.getname = vsock_getname,
@@ -2014,10 +2018,10 @@ static const struct proto_ops vsock_stream_ops = {
.ioctl = sock_no_ioctl,
.listen = vsock_listen,
.shutdown = vsock_shutdown,
- .setsockopt = vsock_stream_setsockopt,
- .getsockopt = vsock_stream_getsockopt,
- .sendmsg = vsock_stream_sendmsg,
- .recvmsg = vsock_stream_recvmsg,
+ .setsockopt = vsock_connectible_setsockopt,
+ .getsockopt = vsock_connectible_getsockopt,
+ .sendmsg = vsock_connectible_sendmsg,
+ .recvmsg = vsock_connectible_recvmsg,
.mmap = sock_no_mmap,
.sendpage = sock_no_sendpage,
};
--
2.25.1
next prev parent reply other threads:[~2021-02-18 5:44 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 5:33 [RFC PATCH v5 00/19] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-02-18 5:36 ` Arseny Krasnov [this message]
2021-02-22 10:50 ` [RFC PATCH v5 01/19] af_vsock: update functions for connectible socket Stefano Garzarella
2021-02-22 10:58 ` Arseny Krasnov
2021-02-22 11:09 ` Stefano Garzarella
2021-02-18 5:36 ` [RFC PATCH v5 02/19] af_vsock: separate wait data loop Arseny Krasnov
2021-02-22 11:29 ` Stefano Garzarella
2021-02-25 14:24 ` Jorgen Hansen
2021-02-25 17:01 ` Arseny Krasnov
2021-02-18 5:36 ` [RFC PATCH v5 03/19] af_vsock: separate receive " Arseny Krasnov
2021-02-22 11:43 ` Stefano Garzarella
2021-02-18 5:37 ` [RFC PATCH v5 04/19] af_vsock: implement SEQPACKET receive loop Arseny Krasnov
2021-02-22 11:53 ` Stefano Garzarella
2021-02-25 16:27 ` Jorgen Hansen
2021-02-25 17:00 ` Arseny Krasnov
2021-02-18 5:37 ` [RFC PATCH v5 05/19] af_vsock: separate wait space loop Arseny Krasnov
2021-02-22 12:06 ` Stefano Garzarella
2021-02-18 5:38 ` [RFC PATCH v5 06/19] af_vsock: implement send logic for SEQPACKET Arseny Krasnov
2021-02-18 5:38 ` [RFC PATCH v5 07/19] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-02-22 14:12 ` Stefano Garzarella
2021-02-18 5:38 ` [RFC PATCH v5 08/19] af_vsock: update comments for stream sockets Arseny Krasnov
2021-02-22 14:18 ` Stefano Garzarella
2021-02-18 5:39 ` [RFC PATCH v5 09/19] virtio/vsock: set packet's type in send Arseny Krasnov
2021-02-23 13:42 ` Stefano Garzarella
2021-02-18 5:39 ` [RFC PATCH v5 10/19] virtio/vsock: simplify credit update function API Arseny Krasnov
2021-02-23 13:49 ` Stefano Garzarella
2021-02-18 5:39 ` [RFC PATCH v5 11/19] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov
2021-02-23 14:15 ` Stefano Garzarella
2021-02-23 14:17 ` Michael S. Tsirkin
2021-02-24 5:07 ` Arseny Krasnov
2021-02-24 6:41 ` Michael S. Tsirkin
2021-02-24 8:31 ` Stefano Garzarella
2021-02-27 8:58 ` Arseny Krasnov
2021-02-18 5:39 ` [RFC PATCH v5 12/19] virtio/vsock: fetch length for SEQPACKET record Arseny Krasnov
2021-02-18 5:40 ` [RFC PATCH v5 13/19] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-02-18 5:40 ` [RFC PATCH v5 14/19] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
2021-02-18 5:40 ` [RFC PATCH v5 15/19] virtio/vsock: setup SEQPACKET ops for transport Arseny Krasnov
2021-02-18 5:41 ` [RFC PATCH v5 16/19] vhost/vsock: " Arseny Krasnov
2021-02-18 5:41 ` [RFC PATCH v5 17/19] vsock/loopback: " Arseny Krasnov
2021-02-18 5:42 ` [RFC PATCH v5 18/19] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-02-18 5:42 ` [RFC PATCH v5 19/19] virtio/vsock: update trace event for SEQPACKET Arseny Krasnov
2021-03-02 22:25 ` Steven Rostedt
2021-03-03 10:42 ` Arseny Krasnov
2021-02-22 14:23 ` [RFC PATCH v5 00/19] virtio/vsock: introduce SOCK_SEQPACKET support Stefano Garzarella
2021-02-23 14:50 ` Stefano Garzarella
2021-02-24 4:29 ` Arseny Krasnov
2021-02-24 8:23 ` Stefano Garzarella
2021-02-24 8:28 ` Arseny Krasnov
2021-02-24 8:35 ` Stefano Garzarella
2021-02-24 8:36 ` 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=20210218053607.1066783-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=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).