From: "Michael S. Tsirkin" <mst@redhat.com>
To: Jiyong Park <jiyong@google.com>
Cc: adelva@google.com, kvm@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org, stefanha@redhat.com,
kuba@kernel.org, davem@davemloft.net
Subject: Re: [PATCH 2/2] vsock: refactor vsock_for_each_connected_socket
Date: Thu, 10 Mar 2022 08:09:56 -0500 [thread overview]
Message-ID: <20220310080748-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20220310125425.4193879-3-jiyong@google.com>
On Thu, Mar 10, 2022 at 09:54:25PM +0900, Jiyong Park wrote:
> vsock_for_each_connected_socket now cycles over sockets of a specific
> transport only, rather than asking callers to do the filtering manually,
> which is error-prone.
>
> Signed-off-by: Jiyong Park <jiyong@google.com>
Pls just squash these two patches. Downstream will do its own thing,
probably distict from your patch 1 and depending on what its
requirements are.
> ---
> drivers/vhost/vsock.c | 7 ++-----
> include/net/af_vsock.h | 3 ++-
> net/vmw_vsock/af_vsock.c | 9 +++++++--
> net/vmw_vsock/virtio_transport.c | 12 ++++--------
> net/vmw_vsock/vmci_transport.c | 8 ++------
> 5 files changed, 17 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
> index 853ddac00d5b..e6c9d41db1de 100644
> --- a/drivers/vhost/vsock.c
> +++ b/drivers/vhost/vsock.c
> @@ -722,10 +722,6 @@ static void vhost_vsock_reset_orphans(struct sock *sk)
> * executing.
> */
>
> - /* Only handle our own sockets */
> - if (vsk->transport != &vhost_transport.transport)
> - return;
> -
> /* If the peer is still valid, no need to reset connection */
> if (vhost_vsock_get(vsk->remote_addr.svm_cid))
> return;
> @@ -757,7 +753,8 @@ static int vhost_vsock_dev_release(struct inode *inode, struct file *file)
>
> /* Iterating over all connections for all CIDs to find orphans is
> * inefficient. Room for improvement here. */
> - vsock_for_each_connected_socket(vhost_vsock_reset_orphans);
> + vsock_for_each_connected_socket(&vhost_transport.transport,
> + vhost_vsock_reset_orphans);
>
> /* Don't check the owner, because we are in the release path, so we
> * need to stop the vsock device in any case.
> diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
> index ab207677e0a8..f742e50207fb 100644
> --- a/include/net/af_vsock.h
> +++ b/include/net/af_vsock.h
> @@ -205,7 +205,8 @@ struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr);
> struct sock *vsock_find_connected_socket(struct sockaddr_vm *src,
> struct sockaddr_vm *dst);
> void vsock_remove_sock(struct vsock_sock *vsk);
> -void vsock_for_each_connected_socket(void (*fn)(struct sock *sk));
> +void vsock_for_each_connected_socket(struct vsock_transport *transport,
> + void (*fn)(struct sock *sk));
> int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk);
> bool vsock_find_cid(unsigned int cid);
>
> diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
> index 38baeb189d4e..f04abf662ec6 100644
> --- a/net/vmw_vsock/af_vsock.c
> +++ b/net/vmw_vsock/af_vsock.c
> @@ -334,7 +334,8 @@ void vsock_remove_sock(struct vsock_sock *vsk)
> }
> EXPORT_SYMBOL_GPL(vsock_remove_sock);
>
> -void vsock_for_each_connected_socket(void (*fn)(struct sock *sk))
> +void vsock_for_each_connected_socket(struct vsock_transport *transport,
> + void (*fn)(struct sock *sk))
> {
> int i;
>
> @@ -343,8 +344,12 @@ void vsock_for_each_connected_socket(void (*fn)(struct sock *sk))
> for (i = 0; i < ARRAY_SIZE(vsock_connected_table); i++) {
> struct vsock_sock *vsk;
> list_for_each_entry(vsk, &vsock_connected_table[i],
> - connected_table)
> + connected_table) {
> + if (vsk->transport != transport)
> + continue;
> +
> fn(sk_vsock(vsk));
> + }
> }
>
> spin_unlock_bh(&vsock_table_lock);
> diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
> index 61b24eb31d4b..5afc194a58bb 100644
> --- a/net/vmw_vsock/virtio_transport.c
> +++ b/net/vmw_vsock/virtio_transport.c
> @@ -358,17 +358,11 @@ static void virtio_vsock_event_fill(struct virtio_vsock *vsock)
>
> static void virtio_vsock_reset_sock(struct sock *sk)
> {
> - struct vsock_sock *vsk = vsock_sk(sk);
> -
> /* vmci_transport.c doesn't take sk_lock here either. At least we're
> * under vsock_table_lock so the sock cannot disappear while we're
> * executing.
> */
>
> - /* Only handle our own sockets */
> - if (vsk->transport != &virtio_transport.transport)
> - return;
> -
> sk->sk_state = TCP_CLOSE;
> sk->sk_err = ECONNRESET;
> sk_error_report(sk);
> @@ -391,7 +385,8 @@ static void virtio_vsock_event_handle(struct virtio_vsock *vsock,
> switch (le32_to_cpu(event->id)) {
> case VIRTIO_VSOCK_EVENT_TRANSPORT_RESET:
> virtio_vsock_update_guest_cid(vsock);
> - vsock_for_each_connected_socket(virtio_vsock_reset_sock);
> + vsock_for_each_connected_socket(&virtio_transport.transport,
> + virtio_vsock_reset_sock);
> break;
> }
> }
> @@ -669,7 +664,8 @@ static void virtio_vsock_remove(struct virtio_device *vdev)
> synchronize_rcu();
>
> /* Reset all connected sockets when the device disappear */
> - vsock_for_each_connected_socket(virtio_vsock_reset_sock);
> + vsock_for_each_connected_socket(&virtio_transport.transport,
> + virtio_vsock_reset_sock);
>
> /* Stop all work handlers to make sure no one is accessing the device,
> * so we can safely call virtio_reset_device().
> diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
> index cd2f01513fae..735d5e14608a 100644
> --- a/net/vmw_vsock/vmci_transport.c
> +++ b/net/vmw_vsock/vmci_transport.c
> @@ -803,11 +803,6 @@ static void vmci_transport_handle_detach(struct sock *sk)
> struct vsock_sock *vsk;
>
> vsk = vsock_sk(sk);
> -
> - /* Only handle our own sockets */
> - if (vsk->transport != &vmci_transport)
> - return;
> -
> if (!vmci_handle_is_invalid(vmci_trans(vsk)->qp_handle)) {
> sock_set_flag(sk, SOCK_DONE);
>
> @@ -887,7 +882,8 @@ static void vmci_transport_qp_resumed_cb(u32 sub_id,
> const struct vmci_event_data *e_data,
> void *client_data)
> {
> - vsock_for_each_connected_socket(vmci_transport_handle_detach);
> + vsock_for_each_connected_socket(&vmci_transport,
> + vmci_transport_handle_detach);
> }
>
> static void vmci_transport_recv_pkt_work(struct work_struct *work)
> --
> 2.35.1.723.g4982287a31-goog
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
prev parent reply other threads:[~2022-03-10 13:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220310125425.4193879-1-jiyong@google.com>
2022-03-10 12:57 ` [PATCH 0/2] vsock: cycle only on its own socket Michael S. Tsirkin
2022-03-10 12:59 ` Michael S. Tsirkin
[not found] ` <20220310125425.4193879-2-jiyong@google.com>
2022-03-10 13:01 ` [PATCH 1/2] vsock: each transport cycles only on its own sockets Michael S. Tsirkin
[not found] ` <CALeUXe4V=6WhavV5d0XN_EjtZ9=0_5rD9ZfvQ77M1W4HpYh_2Q@mail.gmail.com>
2022-03-10 13:16 ` Michael S. Tsirkin
2022-03-10 13:18 ` Stefano Garzarella
2022-03-11 2:55 ` kernel test robot
[not found] ` <20220310125425.4193879-3-jiyong@google.com>
2022-03-10 13:09 ` Michael S. Tsirkin [this message]
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=20220310080748-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=adelva@google.com \
--cc=davem@davemloft.net \
--cc=jiyong@google.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--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 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).