From: Stefano Garzarella <sgarzare@redhat.com> To: Arseny Krasnov <arseny.krasnov@kaspersky.com> Cc: Stefan Hajnoczi <stefanha@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>, Colin Ian King <colin.king@canonical.com>, Andra Paraschiv <andraprs@amazon.com>, Jeff Vander Stoep <jeffv@google.com>, 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: Re: [RFC PATCH v4 07/17] af_vsock: rest of SEQPACKET support Date: Thu, 11 Feb 2021 13:27:14 +0100 [thread overview] Message-ID: <20210211122714.rqiwg3qp3kuprktb@steredhat> (raw) In-Reply-To: <20210207151615.805115-1-arseny.krasnov@kaspersky.com> On Sun, Feb 07, 2021 at 06:16:12PM +0300, Arseny Krasnov wrote: >This does rest of SOCK_SEQPACKET support: >1) Adds socket ops for SEQPACKET type. >2) Allows to create socket with SEQPACKET type. > >Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com> >--- > net/vmw_vsock/af_vsock.c | 37 ++++++++++++++++++++++++++++++++++++- > 1 file changed, 36 insertions(+), 1 deletion(-) > >diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >index a033d3340ac4..c77998a14018 100644 >--- a/net/vmw_vsock/af_vsock.c >+++ b/net/vmw_vsock/af_vsock.c >@@ -452,6 +452,7 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk) > new_transport = transport_dgram; > break; > case SOCK_STREAM: >+ case SOCK_SEQPACKET: > if (vsock_use_local_transport(remote_cid)) > new_transport = transport_local; > else if (remote_cid <= VMADDR_CID_HOST || !transport_h2g || >@@ -459,6 +460,15 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk) > new_transport = transport_g2h; > else > new_transport = transport_h2g; >+ >+ if (sk->sk_type == SOCK_SEQPACKET) { >+ if (!new_transport || >+ !new_transport->seqpacket_seq_send_len || >+ !new_transport->seqpacket_seq_send_eor || >+ !new_transport->seqpacket_seq_get_len || >+ !new_transport->seqpacket_dequeue) >+ return -ESOCKTNOSUPPORT; >+ } Maybe we should move this check after the try_module_get() call, since the memory pointed by 'new_transport' pointer can be deallocated in the meantime. Also, if the socket had a transport before, we should deassign it before returning an error. > break; > default: > return -ESOCKTNOSUPPORT; >@@ -684,6 +694,7 @@ static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr) > > switch (sk->sk_socket->type) { > case SOCK_STREAM: >+ case SOCK_SEQPACKET: > spin_lock_bh(&vsock_table_lock); > retval = __vsock_bind_connectible(vsk, addr); > spin_unlock_bh(&vsock_table_lock); >@@ -769,7 +780,7 @@ static struct sock *__vsock_create(struct net *net, > > static bool sock_type_connectible(u16 type) > { >- return type == SOCK_STREAM; >+ return (type == SOCK_STREAM) || (type == SOCK_SEQPACKET); > } > > static void __vsock_release(struct sock *sk, int level) >@@ -2199,6 +2210,27 @@ static const struct proto_ops vsock_stream_ops = { > .sendpage = sock_no_sendpage, > }; > >+static const struct proto_ops vsock_seqpacket_ops = { >+ .family = PF_VSOCK, >+ .owner = THIS_MODULE, >+ .release = vsock_release, >+ .bind = vsock_bind, >+ .connect = vsock_connect, >+ .socketpair = sock_no_socketpair, >+ .accept = vsock_accept, >+ .getname = vsock_getname, >+ .poll = vsock_poll, >+ .ioctl = sock_no_ioctl, >+ .listen = vsock_listen, >+ .shutdown = vsock_shutdown, >+ .setsockopt = vsock_connectible_setsockopt, >+ .getsockopt = vsock_connectible_getsockopt, >+ .sendmsg = vsock_connectible_sendmsg, >+ .recvmsg = vsock_connectible_recvmsg, >+ .mmap = sock_no_mmap, >+ .sendpage = sock_no_sendpage, >+}; >+ > static int vsock_create(struct net *net, struct socket *sock, > int protocol, int kern) > { >@@ -2219,6 +2251,9 @@ static int vsock_create(struct net *net, struct socket *sock, > case SOCK_STREAM: > sock->ops = &vsock_stream_ops; > break; >+ case SOCK_SEQPACKET: >+ sock->ops = &vsock_seqpacket_ops; >+ break; > default: > return -ESOCKTNOSUPPORT; > } >-- >2.25.1 >
WARNING: multiple messages have this Message-ID (diff)
From: Stefano Garzarella <sgarzare@redhat.com> To: Arseny Krasnov <arseny.krasnov@kaspersky.com> Cc: Andra Paraschiv <andraprs@amazon.com>, kvm@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>, Jeff Vander Stoep <jeffv@google.com>, stsp2@yandex.ru, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, oxffffaa@gmail.com, netdev@vger.kernel.org, Stefan Hajnoczi <stefanha@redhat.com>, Colin Ian King <colin.king@canonical.com>, Jakub Kicinski <kuba@kernel.org>, "David S. Miller" <davem@davemloft.net>, Jorgen Hansen <jhansen@vmware.com> Subject: Re: [RFC PATCH v4 07/17] af_vsock: rest of SEQPACKET support Date: Thu, 11 Feb 2021 13:27:14 +0100 [thread overview] Message-ID: <20210211122714.rqiwg3qp3kuprktb@steredhat> (raw) In-Reply-To: <20210207151615.805115-1-arseny.krasnov@kaspersky.com> On Sun, Feb 07, 2021 at 06:16:12PM +0300, Arseny Krasnov wrote: >This does rest of SOCK_SEQPACKET support: >1) Adds socket ops for SEQPACKET type. >2) Allows to create socket with SEQPACKET type. > >Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com> >--- > net/vmw_vsock/af_vsock.c | 37 ++++++++++++++++++++++++++++++++++++- > 1 file changed, 36 insertions(+), 1 deletion(-) > >diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >index a033d3340ac4..c77998a14018 100644 >--- a/net/vmw_vsock/af_vsock.c >+++ b/net/vmw_vsock/af_vsock.c >@@ -452,6 +452,7 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk) > new_transport = transport_dgram; > break; > case SOCK_STREAM: >+ case SOCK_SEQPACKET: > if (vsock_use_local_transport(remote_cid)) > new_transport = transport_local; > else if (remote_cid <= VMADDR_CID_HOST || !transport_h2g || >@@ -459,6 +460,15 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk) > new_transport = transport_g2h; > else > new_transport = transport_h2g; >+ >+ if (sk->sk_type == SOCK_SEQPACKET) { >+ if (!new_transport || >+ !new_transport->seqpacket_seq_send_len || >+ !new_transport->seqpacket_seq_send_eor || >+ !new_transport->seqpacket_seq_get_len || >+ !new_transport->seqpacket_dequeue) >+ return -ESOCKTNOSUPPORT; >+ } Maybe we should move this check after the try_module_get() call, since the memory pointed by 'new_transport' pointer can be deallocated in the meantime. Also, if the socket had a transport before, we should deassign it before returning an error. > break; > default: > return -ESOCKTNOSUPPORT; >@@ -684,6 +694,7 @@ static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr) > > switch (sk->sk_socket->type) { > case SOCK_STREAM: >+ case SOCK_SEQPACKET: > spin_lock_bh(&vsock_table_lock); > retval = __vsock_bind_connectible(vsk, addr); > spin_unlock_bh(&vsock_table_lock); >@@ -769,7 +780,7 @@ static struct sock *__vsock_create(struct net *net, > > static bool sock_type_connectible(u16 type) > { >- return type == SOCK_STREAM; >+ return (type == SOCK_STREAM) || (type == SOCK_SEQPACKET); > } > > static void __vsock_release(struct sock *sk, int level) >@@ -2199,6 +2210,27 @@ static const struct proto_ops vsock_stream_ops = { > .sendpage = sock_no_sendpage, > }; > >+static const struct proto_ops vsock_seqpacket_ops = { >+ .family = PF_VSOCK, >+ .owner = THIS_MODULE, >+ .release = vsock_release, >+ .bind = vsock_bind, >+ .connect = vsock_connect, >+ .socketpair = sock_no_socketpair, >+ .accept = vsock_accept, >+ .getname = vsock_getname, >+ .poll = vsock_poll, >+ .ioctl = sock_no_ioctl, >+ .listen = vsock_listen, >+ .shutdown = vsock_shutdown, >+ .setsockopt = vsock_connectible_setsockopt, >+ .getsockopt = vsock_connectible_getsockopt, >+ .sendmsg = vsock_connectible_sendmsg, >+ .recvmsg = vsock_connectible_recvmsg, >+ .mmap = sock_no_mmap, >+ .sendpage = sock_no_sendpage, >+}; >+ > static int vsock_create(struct net *net, struct socket *sock, > int protocol, int kern) > { >@@ -2219,6 +2251,9 @@ static int vsock_create(struct net *net, struct socket *sock, > case SOCK_STREAM: > sock->ops = &vsock_stream_ops; > break; >+ case SOCK_SEQPACKET: >+ sock->ops = &vsock_seqpacket_ops; >+ break; > default: > return -ESOCKTNOSUPPORT; > } >-- >2.25.1 > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2021-02-11 12:43 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-07 15:12 [RFC PATCH v4 00/17] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov 2021-02-07 15:14 ` [RFC PATCH v4 01/17] af_vsock: update functions for connectible socket Arseny Krasnov 2021-02-11 10:52 ` Stefano Garzarella 2021-02-11 10:52 ` Stefano Garzarella 2021-02-07 15:14 ` [RFC PATCH v4 02/17] af_vsock: separate wait data loop Arseny Krasnov 2021-02-11 11:24 ` Stefano Garzarella 2021-02-11 11:24 ` Stefano Garzarella 2021-02-11 15:11 ` Jorgen Hansen 2021-02-11 15:11 ` Jorgen Hansen 2021-02-16 6:58 ` Arseny Krasnov 2021-02-07 15:15 ` [RFC PATCH v4 03/17] af_vsock: separate receive " Arseny Krasnov 2021-02-11 11:37 ` Stefano Garzarella 2021-02-11 11:37 ` Stefano Garzarella 2021-02-07 15:15 ` [RFC PATCH v4 04/17] af_vsock: implement SEQPACKET receive loop Arseny Krasnov 2021-02-11 11:47 ` Stefano Garzarella 2021-02-11 11:47 ` Stefano Garzarella 2021-02-07 15:15 ` [RFC PATCH v4 05/17] af_vsock: separate wait space loop Arseny Krasnov 2021-02-07 16:58 ` kernel test robot 2021-02-11 12:14 ` Stefano Garzarella 2021-02-11 12:14 ` Stefano Garzarella 2021-02-07 15:15 ` [RFC PATCH v4 06/17] af_vsock: implement send logic for SEQPACKET Arseny Krasnov 2021-02-11 12:17 ` Stefano Garzarella 2021-02-11 12:17 ` Stefano Garzarella 2021-02-07 15:16 ` [RFC PATCH v4 07/17] af_vsock: rest of SEQPACKET support Arseny Krasnov 2021-02-11 12:27 ` Stefano Garzarella [this message] 2021-02-11 12:27 ` Stefano Garzarella 2021-02-15 9:11 ` Arseny Krasnov 2021-02-07 15:16 ` [RFC PATCH v4 08/17] af_vsock: update comments for stream sockets Arseny Krasnov 2021-02-11 13:19 ` Stefano Garzarella 2021-02-11 13:19 ` Stefano Garzarella 2021-02-07 15:16 ` [RFC PATCH v4 09/17] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov 2021-02-11 13:54 ` Stefano Garzarella 2021-02-11 13:54 ` Stefano Garzarella 2021-02-11 14:03 ` Stefano Garzarella 2021-02-11 14:03 ` Stefano Garzarella 2021-02-07 15:17 ` [RFC PATCH v4 10/17] virtio/vsock: fetch length for SEQPACKET record Arseny Krasnov 2021-02-11 13:58 ` Stefano Garzarella 2021-02-11 13:58 ` Stefano Garzarella 2021-02-07 15:17 ` [RFC PATCH v4 11/17] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov 2021-02-07 15:17 ` [RFC PATCH v4 12/17] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov 2021-02-09 4:34 ` kernel test robot 2021-02-11 11:00 ` Arseny Krasnov 2021-02-11 14:29 ` Stefano Garzarella 2021-02-11 14:29 ` Stefano Garzarella 2021-02-07 15:18 ` [RFC PATCH v4 13/17] virtio/vsock: setup SEQPACKET ops for transport Arseny Krasnov 2021-02-07 15:18 ` [RFC PATCH v4 14/17] vhost/vsock: " Arseny Krasnov 2021-02-07 15:18 ` [RFC PATCH v4 15/17] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov 2021-02-07 15:18 ` [RFC PATCH v4 16/17] loopback/vsock: setup SEQPACKET ops for transport Arseny Krasnov 2021-02-11 14:31 ` Stefano Garzarella 2021-02-11 14:31 ` Stefano Garzarella 2021-02-07 15:19 ` [RFC PATCH v4 17/17] virtio/vsock: simplify credit update function API Arseny Krasnov 2021-02-11 14:39 ` Stefano Garzarella 2021-02-11 14:39 ` Stefano Garzarella 2021-02-07 16:20 ` [RFC PATCH v4 00/17] virtio/vsock: introduce SOCK_SEQPACKET support Michael S. Tsirkin 2021-02-07 16:20 ` Michael S. Tsirkin 2021-02-08 6:32 ` Arseny Krasnov 2021-02-11 14:57 ` Stefano Garzarella 2021-02-11 14:57 ` Stefano Garzarella 2021-02-12 6:11 ` Arseny Krasnov 2021-02-12 8:07 ` Stefano Garzarella 2021-02-12 8:07 ` 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=20210211122714.rqiwg3qp3kuprktb@steredhat \ --to=sgarzare@redhat.com \ --cc=andraprs@amazon.com \ --cc=arseny.krasnov@kaspersky.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=oxffffaa@gmail.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: linkBe 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.