Branch extension-ext-header now exists to capture the specs reviewed on list and tentatively implemented in both qemu (server and client) and libnbd (client) code. I'm still working on implementing the extension in nbdkit (server) before promoting the extension branch to mainline. Meanwhile, structured replies and block status have been incorporated into mainline for some time now (see commit 6e896bca in 2018, v3.17); and while block status is still not implemented in the kernel module or in nbd-server, we did just recently implement structured replies in nbd-server. Signed-off-by: Eric Blake <eblake@redhat.com> --- Given the review on my v3 spec proposal for extended headers, I've pushed patch 1 and 2 of that series to mainline along with this patch, while patches 3-5 of that series are tweaked per review comments and pushed on the new extension-ext-header branch. My next step will be posting v3 patches to qemu and libnbd which rebases my earlier proof-of-concept patches to those projects to match the spec as now live (and/or tweak the extension spec if something insurmountable comes up). doc/proto.md | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/doc/proto.md b/doc/proto.md index 460823b..8589e22 100644 --- a/doc/proto.md +++ b/doc/proto.md @@ -1137,6 +1137,9 @@ The field has the following format: will be faster than a regular write). Clients MUST NOT set the `NBD_CMD_FLAG_FAST_ZERO` request flag unless this transmission flag is set. +- bit 12, `NBD_FLAG_BLOCK_STATUS_PAYLOAD`; defined by the experimental + `EXTENDED_HEADERS` + [extension](https://github.com/NetworkBlockDevice/nbd/blob/extension-ext-header/doc/prot...). Clients SHOULD ignore unknown flags. @@ -1500,6 +1503,11 @@ of the newstyle negotiation. option does not select any metadata context, provided the client then does not attempt to issue `NBD_CMD_BLOCK_STATUS` commands. +* `NBD_OPT_EXTENDED_HEADERS` (11) + + Defined by the experimental `EXTENDED_HEADERS` + [extension](https://github.com/NetworkBlockDevice/nbd/blob/extension-ext-header/doc/prot...). + #### Option reply types These values are used in the "reply type" field, sent by the server @@ -1680,6 +1688,11 @@ case that data is an error message string suitable for display to the user. The request or the reply is too large to process. +* `NBD_REP_ERR_EXT_HEADER_REQD` (2^31 + 10) + + Defined by the experimental `EXTENDED_HEADERS` + [extension](https://github.com/NetworkBlockDevice/nbd/blob/extension-ext-header/doc/prot...). + ### Transmission phase #### Flag fields @@ -1733,6 +1746,9 @@ valid may depend on negotiation during the handshake phase. `NBD_CMD_WRITE`, then the server MUST fail quickly with an error of `NBD_ENOTSUP`. The client MUST NOT set this unless the server advertised `NBD_FLAG_SEND_FAST_ZERO`. +- bit 5, `NBD_CMD_FLAG_PAYLOAD_LEN`; defined by the experimental + `EXTENDED_HEADERS` + [extension](https://github.com/NetworkBlockDevice/nbd/blob/extension-ext-header/doc/prot...). ##### Structured reply flags @@ -1853,6 +1869,11 @@ small amount of fixed-length overhead inherent in the chunk type). extent information at the first offset not covered by a reduced-length reply. +* `NBD_REPLY_TYPE_BLOCK_STATUS_EXT` (6) + + Defined by the experimental `EXTENDED_HEADERS` + [extension](https://github.com/NetworkBlockDevice/nbd/blob/extension-ext-header/doc/prot...). + All error chunk types have bit 15 set, and begin with the same *error*, *message length*, and optional *message* fields as `NBD_REPLY_TYPE_ERROR`. If nonzero, *message length* indicates @@ -2336,9 +2357,7 @@ with names starting with the word 'extension'. Currently known are: -* The `STRUCTURED_REPLY` [extension](https://github.com/NetworkBlockDevice/nbd/blob/extension-structured-reply/do...). - -* The `BLOCK_STATUS` [extension](https://github.com/NetworkBlockDevice/nbd/blob/extension-blockstatus/doc/pro...) (based on the `STRUCTURED_REPLY` extension). +* The `EXTENDED_HEADER` [extension](https://github.com/NetworkBlockDevice/nbd/blob/extension-ext-header/doc/prot...). * The `RESIZE` [extension](https://github.com/NetworkBlockDevice/nbd/blob/extension-resize/doc/proto.md). base-commit: daf3fce989b23cc8c9023f28e0eec2f074c9f1bd -- 2.40.0