Skip to content

block/nbd: rework client connection

Vladimir Sementsov-Ogievskiy qemu-devel 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest32 patches 19 repliesIn review
  2. v333 patches 87 repliesSuperseded

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/32co-queue: drop extra coroutine_fn marksinclude/qemu/coroutine.h+4 -22 replies
2/32block/nbd: fix channel object leakblock/nbd.c+1 -00 replies
3/32block/nbd: fix how state is cleared on nbd_open() failure pathsblock/nbd.c+18 -180 replies
4/32block/nbd: connect_thread_func(): do qio_channel_set_delay(false)block/nbd.c+2 -01 reply
5/32qemu-sockets: introduce socket_address_parse_named_fd()include/qemu/sockets.h util/qemu-sockets.c+33 -02 replies
6/32block/nbd: call socket_address_parse_named_fd() in advanceblock/nbd.c+6 -01 reply
7/32block/nbd: ensure ->connection_thread is always validblock/nbd.c+21 -350 replies
8/32block/nbd: nbd_client_handshake(): fix leak of s->iocblock/nbd.c+2 -00 replies
9/32block/nbd: BDRVNBDState: drop unused connect_err and connect_statusblock/nbd.c+2 -100 replies
10/32block/nbd: simplify waking of nbd_co_establish_connection()block/nbd.c+15 -401 reply
11/32block/nbd: drop thr->stateblock/nbd.c+44 -951 reply
12/32block/nbd: bs-independent interface for nbd_co_establish_connection()block/nbd.c+32 -180 replies
13/32block/nbd: make nbd_co_establish_connection_cancel() bs-independentblock/nbd.c+9 -80 replies
14/32block/nbd: rename NBDConnectThread to NBDClientConnectionblock/nbd.c+67 -670 replies
15/32block/nbd: introduce nbd_client_connection_new()block/nbd.c+9 -60 replies
16/32block/nbd: introduce nbd_client_connection_release()block/nbd.c+27 -181 reply
17/32nbd: move connection code from block/nbd to nbd/client-connectionblock/nbd.c include/block/nbd.h nbd/client-connection.c +1 more+243 -2060 replies
18/32nbd/client-connection: use QEMU_LOCK_GUARDnbd/client-connection.c+45 -541 reply
19/32nbd/client-connection: add possibility of negotiationblock/nbd.c include/block/nbd.h nbd/client-connection.c+109 -91 reply
20/32nbd/client-connection: implement connection retryinclude/block/nbd.h nbd/client-connection.c+45 -134 replies
21/32nbd/client-connection: shutdown connection on releasenbd/client-connection.c+17 -31 reply
22/32block/nbd: split nbd_handle_updated_info out of nbd_client_handshake()block/nbd.c+58 -420 replies
23/32block/nbd: use negotiation of NBDClientConnectionblock/nbd.c+30 -140 replies
24/32block/nbd: don't touch s->sioc in nbd_teardown_connection()block/nbd.c+0 -40 replies
25/32block/nbd: drop BDRVNBDState::siocblock/nbd.c+48 -500 replies
26/32nbd/client-connection: return only one io channelblock/nbd.c include/block/nbd.h nbd/client-connection.c+29 -210 replies
27/32block-coroutine-wrapper: allow non bdrv_ prefixscripts/block-coroutine-wrapper.py+4 -30 replies
28/32block/nbd: split nbd_co_do_establish_connection out of nbd_reconnect_attemptblock/nbd.c+42 -381 reply
29/32nbd/client-connection: add option for non-blocking connection attemptblock/nbd.c include/block/nbd.h nbd/client-connection.c+9 -30 replies
30/32block/nbd: reuse nbd_co_do_establish_connection() in nbd_open()block/coroutines.h block/nbd.c+11 -980 replies
31/32block/nbd: add nbd_client_connected() helperblock/nbd.c+14 -110 replies
32/32block/nbd: safer transition to receiving requestblock/nbd.c+3 -10 replies

Reviews trailers per patch

31 of 32 patches have a Reviewed-by or Acked-by.

PatchEric BlakeRoman Kagan
1/32R-b
2/32R-b
3/32R-b R-b
4/32R-b
5/32R-b
6/32R-b
7/32R-b
8/32R-b
9/32R-b R-b
10/32Reviewied-by
11/32R-b
12/32R-b R-b
13/32R-b R-b
14/32R-b R-b
15/32R-b R-b
16/32R-b
17/32R-b
18/32R-b
19/32R-b
20/32R-b
21/32R-b
22/32R-b R-b
23/32R-b
24/32R-b
25/32R-b
26/32R-b
27/32R-b
28/32R-b
29/32R-b
30/32R-b
31/32R-b
32/32R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 00/32] block/nbd: rework client connection

v4:

Now based on new Paolo's patch:
Based-on: <[email protected]>

Also, I've dropped patch 33 for now, it's too much for this series. I'll resend it later on top of this.

The series is also available at tag up-nbd-client-connection-v4 in git https://src.openvz.org/scm/~vsementsov/qemu.git

01: new
02: add Eric's r-b
03: add Roman's and Eric's r-bs
04: rebased to start of the series
05-06: new
07: tweak comment, add Eric's r-b
08: add Roman's r-b
09: add Eric's r-b
10: tweak comment, use aio_co_wake (after Paolo's fix), keep calling aio_co_wake after mutex in nbd_co_establish_connection_cancel 11: improve comments, change logic a bit
12: add Eric's r-b, fix grammar
13: add Eric's r-b, improve wording
14: add Roman's and Eric's r-bs
15: add Eric's r-b, fix commit message
16: rebased
17: add Eric's r-b, rebased on some changes, but still a clear movement.
18: rebased, changed
19: rebased, tweak comment
20: tweak wording, add comment
21: rebased, tweak wording
22: add Roman's and Eric's r-bs, tweak comment
23: add Eric's r-b, tweak commit message
24: add Eric's r-b, tweak commit message and subject
25-26: add Eric's r-b
27: add Eric's r-b, tweak commit message
28: tweak commit message, keep coroutine_fn
29: add Eric's r-b, tweak commit message
30: add Eric's r-b, add whitespace in comment
31: add Eric's r-b, fix s/clinen?t/client/
32: add Eric's r-b, rebased

Roman Kagan (2):
block/nbd: fix channel object leak block/nbd: ensure ->connection_thread is always valid

Vladimir Sementsov-Ogievskiy (30):
co-queue: drop extra coroutine_fn marks
block/nbd: fix how state is cleared on nbd_open() failure paths block/nbd: connect_thread_func(): do qio_channel_set_delay(false)
qemu-sockets: introduce socket_address_parse_named_fd() block/nbd: call socket_address_parse_named_fd() in advance block/nbd: nbd_client_handshake(): fix leak of s->ioc block/nbd: BDRVNBDState: drop unused connect_err and connect_status block/nbd: simplify waking of nbd_co_establish_connection() block/nbd: drop thr->state
block/nbd: bs-independent interface for nbd_co_establish_connection() block/nbd: make nbd_co_establish_connection_cancel() bs-independent block/nbd: rename NBDConnectThread to NBDClientConnection block/nbd: introduce nbd_client_connection_new() block/nbd: introduce nbd_client_connection_release()
nbd: move connection code from block/nbd to nbd/client-connection nbd/client-connection: use QEMU_LOCK_GUARD nbd/client-connection: add possibility of negotiation nbd/client-connection: implement connection retry nbd/client-connection: shutdown connection on release block/nbd: split nbd_handle_updated_info out of nbd_client_handshake() block/nbd: use negotiation of NBDClientConnection block/nbd: don't touch s->sioc in nbd_teardown_connection() block/nbd: drop BDRVNBDState::sioc
nbd/client-connection: return only one io channel
block-coroutine-wrapper: allow non bdrv_ prefix
block/nbd: split nbd_co_do_establish_connection out of
nbd_reconnect_attempt
nbd/client-connection: add option for non-blocking connection attempt block/nbd: reuse nbd_co_do_establish_connection() in nbd_open() block/nbd: add nbd_client_connected() helper
block/nbd: safer transition to receiving request

 block/coroutines.h                 |   6 +
 include/block/nbd.h                |  18 +
 include/qemu/coroutine.h           |   6 +-
 include/qemu/sockets.h             |  14 +
 block/nbd.c                        | 553 ++++++-----------------------
 nbd/client-connection.c            | 384 ++++++++++++++++++++
 util/qemu-sockets.c                |  19 +
 nbd/meson.build                    |   1 +
 scripts/block-coroutine-wrapper.py |   7 +-
 9 files changed, 560 insertions(+), 448 deletions(-)
 create mode 100644 nbd/client-connection.c
Signature · 1 line
2.29.2