| Message ID | 20211129215300.1468291-1-vsementsov@virtuozzo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [for-6.2,v2] block/nbd: forbid incompatible change of server options on reconnect | expand |
30.11.2021 00:53, Vladimir Sementsov-Ogievskiy wrote: > Reconnect feature was never prepared to handle server options changed > on reconnect. Let's be stricter and check what exactly is changed. If > server capabilities just got richer don't worry. Otherwise fail and > drop the established connection. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > > v2: by Eric's comments: > - drop extra check about old->min_block % new->min_block > - make context_id check conditional itself > - don't handle READ_ONLY flag here (see comment in code) > - wording > > Code seems quite obvious, but honestly I still didn't test that it does > what it should :( And I'm afraid, Qemu actually doesn't provide good > possibility to do so. > > Eric, may be you know some simple way to test it with nbdkit? Ok, a simple test I can do: qemu-img create -f qcow2 a 10M qemu-img create -f qcow2 b 20M qemu-nbd b then in parallel: ./qemu-io --image-opts driver=nbd,host=localhost,reconnect-delay=5 check that it works: qemu-io> write 10M 1M wrote 1048576/1048576 bytes at offset 10485760 Now, kill nbd server try again qemu-io> write 10M 1M - it will wait up to 5 seconds for reconnection Now start nbd server with shorter file qemu-nbd a Prepatch, qemu-io will successfully connect, request will fail with "Invalid argument". Afterpatch, qemu-io will refuse to connect to shorter export, write will fail with "Input/output error". > > include/block/nbd.h | 9 +++++ > nbd/client-connection.c | 88 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 97 insertions(+) > > diff --git a/include/block/nbd.h b/include/block/nbd.h > index 78d101b774..9e1943d24c 100644 > --- a/include/block/nbd.h > +++ b/include/block/nbd.h > @@ -157,6 +157,10 @@ enum { > #define NBD_FLAG_SEND_RESIZE (1 << NBD_FLAG_SEND_RESIZE_BIT) > #define NBD_FLAG_SEND_CACHE (1 << NBD_FLAG_SEND_CACHE_BIT) > #define NBD_FLAG_SEND_FAST_ZERO (1 << NBD_FLAG_SEND_FAST_ZERO_BIT) > +/* > + * WARNING! If you add any new NBD_FLAG_ flag, check that logic in > + * nbd_is_new_info_compatible() is still good about handling flags. > + */ > > /* New-style handshake (global) flags, sent from server to client, and > control what will happen during handshake phase. */ > @@ -305,6 +309,11 @@ struct NBDExportInfo { > > uint32_t context_id; > > + /* > + * WARNING! When adding any new field to the structure, don't forget > + * to check and update the nbd_is_new_info_compatible() function. > + */ > + > /* Set by server results during nbd_receive_export_list() */ > char *description; > int n_contexts; > diff --git a/nbd/client-connection.c b/nbd/client-connection.c > index 695f855754..d50c187482 100644 > --- a/nbd/client-connection.c > +++ b/nbd/client-connection.c > @@ -37,6 +37,10 @@ struct NBDClientConnection { > bool do_negotiation; > bool do_retry; > > + /* Used only by connection thread, does not need mutex protection */ > + bool has_prev_info; > + NBDExportInfo prev_info; > + > QemuMutex mutex; > > /* > @@ -160,6 +164,69 @@ static int nbd_connect(QIOChannelSocket *sioc, SocketAddress *addr, > return 0; > } > > +static bool nbd_is_new_info_compatible(NBDExportInfo *old, NBDExportInfo *new, > + Error **errp) > +{ > + uint32_t dropped_flags; > + > + if (old->structured_reply && !new->structured_reply) { > + error_setg(errp, "Server options degraded after reconnect: " > + "structured_reply is not supported anymore"); > + return false; > + } > + > + if (old->base_allocation) { > + if (!new->base_allocation) { > + error_setg(errp, "Server options degraded after reconnect: " > + "base_allocation is not supported anymore"); > + return false; > + } > + > + if (old->context_id != new->context_id) { > + error_setg(errp, "Meta context id changed after reconnect"); > + return false; > + } > + } > + > + if (old->size != new->size) { > + error_setg(errp, "NBD export size changed after reconnect"); > + return false; > + } > + > + /* > + * No worry if rotational status changed. > + * > + * Also, we can't handle NBD_FLAG_READ_ONLY properly at this level: we don't > + * actually know, does our client need write access or not. So, it's handled > + * in block layer in nbd_handle_updated_info(). > + * > + * All other flags are feature flags, they should not degrade. > + */ > + dropped_flags = (old->flags & ~new->flags) & > + ~(NBD_FLAG_ROTATIONAL | NBD_FLAG_READ_ONLY); > + if (dropped_flags) { > + error_setg(errp, "Server options degraded after reconnect: flags 0x%" > + PRIx32 " are not reported anymore", dropped_flags); > + return false; > + } > + > + if (new->min_block > old->min_block) { > + error_setg(errp, "Server requires more strict min_block after " > + "reconnect: %" PRIu32 " instead of %" PRIu32, > + new->min_block, old->min_block); > + return false; > + } > + > + if (new->max_block < old->max_block) { > + error_setg(errp, "Server requires more strict max_block after " > + "reconnect: %" PRIu32 " instead of %" PRIu32, > + new->max_block, old->max_block); > + return false; > + } > + > + return true; > +} > + > static void *connect_thread_func(void *opaque) > { > NBDClientConnection *conn = opaque; > @@ -183,6 +250,27 @@ static void *connect_thread_func(void *opaque) > conn->do_negotiation ? &conn->updated_info : NULL, > conn->tlscreds, &conn->ioc, &conn->err); > > + if (ret == 0) { > + if (conn->has_prev_info && > + !nbd_is_new_info_compatible(&conn->prev_info, > + &conn->updated_info, &conn->err)) > + { > + NBDRequest request = { .type = NBD_CMD_DISC }; > + QIOChannel *ioc = conn->ioc ?: QIO_CHANNEL(conn->sioc); > + > + nbd_send_request(ioc, &request); > + qio_channel_close(ioc, NULL); > + > + object_unref(OBJECT(conn->ioc)); > + conn->ioc = NULL; > + > + ret = -EINVAL; > + } else { > + conn->prev_info = conn->updated_info; > + conn->has_prev_info = true; > + } > + } > + > /* > * conn->updated_info will finally be returned to the user. Clear the > * pointers to our internally allocated strings, which are IN parameters >
diff --git a/include/block/nbd.h b/include/block/nbd.h index 78d101b774..9e1943d24c 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -157,6 +157,10 @@ enum { #define NBD_FLAG_SEND_RESIZE (1 << NBD_FLAG_SEND_RESIZE_BIT) #define NBD_FLAG_SEND_CACHE (1 << NBD_FLAG_SEND_CACHE_BIT) #define NBD_FLAG_SEND_FAST_ZERO (1 << NBD_FLAG_SEND_FAST_ZERO_BIT) +/* + * WARNING! If you add any new NBD_FLAG_ flag, check that logic in + * nbd_is_new_info_compatible() is still good about handling flags. + */ /* New-style handshake (global) flags, sent from server to client, and control what will happen during handshake phase. */ @@ -305,6 +309,11 @@ struct NBDExportInfo { uint32_t context_id; + /* + * WARNING! When adding any new field to the structure, don't forget + * to check and update the nbd_is_new_info_compatible() function. + */ + /* Set by server results during nbd_receive_export_list() */ char *description; int n_contexts; diff --git a/nbd/client-connection.c b/nbd/client-connection.c index 695f855754..d50c187482 100644 --- a/nbd/client-connection.c +++ b/nbd/client-connection.c @@ -37,6 +37,10 @@ struct NBDClientConnection { bool do_negotiation; bool do_retry; + /* Used only by connection thread, does not need mutex protection */ + bool has_prev_info; + NBDExportInfo prev_info; + QemuMutex mutex; /* @@ -160,6 +164,69 @@ static int nbd_connect(QIOChannelSocket *sioc, SocketAddress *addr, return 0; } +static bool nbd_is_new_info_compatible(NBDExportInfo *old, NBDExportInfo *new, + Error **errp) +{ + uint32_t dropped_flags; + + if (old->structured_reply && !new->structured_reply) { + error_setg(errp, "Server options degraded after reconnect: " + "structured_reply is not supported anymore"); + return false; + } + + if (old->base_allocation) { + if (!new->base_allocation) { + error_setg(errp, "Server options degraded after reconnect: " + "base_allocation is not supported anymore"); + return false; + } + + if (old->context_id != new->context_id) { + error_setg(errp, "Meta context id changed after reconnect"); + return false; + } + } + + if (old->size != new->size) { + error_setg(errp, "NBD export size changed after reconnect"); + return false; + } + + /* + * No worry if rotational status changed. + * + * Also, we can't handle NBD_FLAG_READ_ONLY properly at this level: we don't + * actually know, does our client need write access or not. So, it's handled + * in block layer in nbd_handle_updated_info(). + * + * All other flags are feature flags, they should not degrade. + */ + dropped_flags = (old->flags & ~new->flags) & + ~(NBD_FLAG_ROTATIONAL | NBD_FLAG_READ_ONLY); + if (dropped_flags) { + error_setg(errp, "Server options degraded after reconnect: flags 0x%" + PRIx32 " are not reported anymore", dropped_flags); + return false; + } + + if (new->min_block > old->min_block) { + error_setg(errp, "Server requires more strict min_block after " + "reconnect: %" PRIu32 " instead of %" PRIu32, + new->min_block, old->min_block); + return false; + } + + if (new->max_block < old->max_block) { + error_setg(errp, "Server requires more strict max_block after " + "reconnect: %" PRIu32 " instead of %" PRIu32, + new->max_block, old->max_block); + return false; + } + + return true; +} + static void *connect_thread_func(void *opaque) { NBDClientConnection *conn = opaque; @@ -183,6 +250,27 @@ static void *connect_thread_func(void *opaque) conn->do_negotiation ? &conn->updated_info : NULL, conn->tlscreds, &conn->ioc, &conn->err); + if (ret == 0) { + if (conn->has_prev_info && + !nbd_is_new_info_compatible(&conn->prev_info, + &conn->updated_info, &conn->err)) + { + NBDRequest request = { .type = NBD_CMD_DISC }; + QIOChannel *ioc = conn->ioc ?: QIO_CHANNEL(conn->sioc); + + nbd_send_request(ioc, &request); + qio_channel_close(ioc, NULL); + + object_unref(OBJECT(conn->ioc)); + conn->ioc = NULL; + + ret = -EINVAL; + } else { + conn->prev_info = conn->updated_info; + conn->has_prev_info = true; + } + } + /* * conn->updated_info will finally be returned to the user. Clear the * pointers to our internally allocated strings, which are IN parameters
Reconnect feature was never prepared to handle server options changed on reconnect. Let's be stricter and check what exactly is changed. If server capabilities just got richer don't worry. Otherwise fail and drop the established connection. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- v2: by Eric's comments: - drop extra check about old->min_block % new->min_block - make context_id check conditional itself - don't handle READ_ONLY flag here (see comment in code) - wording Code seems quite obvious, but honestly I still didn't test that it does what it should :( And I'm afraid, Qemu actually doesn't provide good possibility to do so. Eric, may be you know some simple way to test it with nbdkit? include/block/nbd.h | 9 +++++ nbd/client-connection.c | 88 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+)