Re: [PATCH net-next v2 2/2] vsock: fold sk_acceptq_removed() into vsock_remove_pending()

[Stefano Garzarella]

On Thu, Jun 11, 2026 at 02:13:17AM +0000, Raf Dickson wrote:
Callers of vsock_remove_pending() must also call sk_acceptq_removed()
to keep sk_ack_backlog consistent. Move the call into
vsock_remove_pending() itself to make it automatic and prevent future
callers from forgetting it.
Suggested-by: Stefano Garzarella <sgarz...@redhat.com>
Signed-off-by: Raf Dickson <rafdo...@gmail.com>
---
net/vmw_vsock/af_vsock.c       | 3 +--
net/vmw_vsock/vmci_transport.c | 5 +----
2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 73e6416ee9..b9772a0205 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -493,6 +493,7 @@ void vsock_remove_pending(struct sock *listener, struct 
sock *pending)
        list_del_init(&vpending->pending_links);
        sock_put(listener);
        sock_put(pending);
+       sk_acceptq_removed(listener);
}

I'm unsure about the ordering of patches. Now that I'm looking at this, 
it's clear that 2 patches are really related and can't be split without 
breaking the bisectability.

Maybe we can keep these patches separated (which I like) if we introduce 
the vsock_pending_to_accept() I suggested with an initial patch of the 
series (feel free to chose another name, I'm not great at naming xD).

Thanks,
Stefano

EXPORT_SYMBOL_GPL(vsock_remove_pending);

@@ -761,8 +762,6 @@ static void vsock_pending_work(struct work_struct *work)

        if (vsock_is_pending(sk)) {
                vsock_remove_pending(listener, sk);
-
-               sk_acceptq_removed(listener);
        } else if (!vsk->rejected) {
                /* We are not on the pending list and accept() did not reject
                 * us, so we must have been accepted by our user process.  We
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 91516488a7..a417403c8d 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -980,11 +980,8 @@ static int vmci_transport_recv_listen(struct sock *sk,
                        err = -EINVAL;
                }

-               if (err < 0) {
+               if (err < 0)
                        vsock_remove_pending(sk, pending);
-                       sk_acceptq_removed(sk);
-               }
-
                release_sock(pending);
                vmci_transport_release_pending(pending);

--
2.54.0