Skip to content

vsock: consolidate acceptq accounting into core helpers

Raf Dickson netdev virtualization 3 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (main)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest4 patches 13 repliesApplied 4/4
  2. v22 patches 8 repliesSuperseded
  3. v12 patches 2 repliesSuperseded

Changes in v3 from the cover letter

- Add vsock_pending_to_accept() helper for the vmci pending->accept transition, avoiding a double sk_acceptq_added() (Stefano Garzarella)
- Split into 4 patches for bisectability (Stefano Garzarella)
- Fold sk_acceptq_added() into vsock_add_pending() as a separate patch

Patches in v3 All 4 applied

#Subject and filesSizeRepliesApplied
1/4vsock: introduce vsock_pending_to_accept() helperinclude/net/af_vsock.h net/vmw_vsock/af_vsock.c net/vmw_vsock/vmci_transport.c+12 -23 repliesApplied
2/4vsock: fold sk_acceptq_added() into vsock_add_pending()net/vmw_vsock/af_vsock.c net/vmw_vsock/vmci_transport.c+1 -13 repliesApplied
3/4vsock: fold sk_acceptq_added() into vsock_enqueue_accept()net/vmw_vsock/af_vsock.c net/vmw_vsock/hyperv_transport.c net/vmw_vsock/virtio_transport_common.c+1 -23 repliesApplied
4/4vsock: fold sk_acceptq_removed() into vsock_remove_pending()net/vmw_vsock/af_vsock.c net/vmw_vsock/vmci_transport.c+2 -44 repliesApplied

Reviews trailers per patch

All 4 patches have a Reviewed-by or Acked-by.

PatchStefano GarzarellaLuigi LeonardiBobby Eshleman
1/4R-b R-b R-b
2/4R-b R-b R-b
3/4R-b R-b R-b
4/4R-b R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH net-next v3 0/4] vsock: consolidate acceptq accounting into core helpers

These patches follow up on commit c05fa14db43e ("vsock/vmci: fix sk_ack_backlog leak on failed handshake") by consolidating sk_acceptq_added() and sk_acceptq_removed() into the core vsock helpers so transports cannot forget them.

Changes since v2:
- Add vsock_pending_to_accept() helper for the vmci pending->accept transition, avoiding a double sk_acceptq_added() (Stefano Garzarella)
- Split into 4 patches for bisectability (Stefano Garzarella)
- Fold sk_acceptq_added() into vsock_add_pending() as a separate patch

Raf Dickson (4):
vsock: introduce vsock_pending_to_accept() helper
vsock: fold sk_acceptq_added() into vsock_add_pending()
vsock: fold sk_acceptq_added() into vsock_enqueue_accept()
vsock: fold sk_acceptq_removed() into vsock_remove_pending()

 include/net/af_vsock.h                  |  1 +
 net/vmw_vsock/af_vsock.c                | 14 +++++++++++++-
 net/vmw_vsock/hyperv_transport.c        |  1 -
 net/vmw_vsock/virtio_transport_common.c |  1 -
 net/vmw_vsock/vmci_transport.c          |  8 ++------
 5 files changed, 16 insertions(+), 9 deletions(-)
Signature · 1 line
2.54.0