2016-01-14 08:41:02 +00:00
|
|
|
/*
|
2017-07-07 20:30:43 +00:00
|
|
|
* Copyright (C) 2016-2017 Red Hat, Inc.
|
2016-01-14 08:41:02 +00:00
|
|
|
* Copyright (C) 2005 Anthony Liguori <anthony@codemonkey.ws>
|
|
|
|
*
|
|
|
|
* Network Block Device Client Side
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; under version 2 of the License.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2016-01-29 17:50:05 +00:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 08:01:28 +00:00
|
|
|
#include "qapi/error.h"
|
2017-07-07 15:29:18 +00:00
|
|
|
#include "trace.h"
|
2016-01-14 08:41:02 +00:00
|
|
|
#include "nbd-internal.h"
|
|
|
|
|
|
|
|
/* Definitions for opaque data types */
|
|
|
|
|
|
|
|
static QTAILQ_HEAD(, NBDExport) exports = QTAILQ_HEAD_INITIALIZER(exports);
|
|
|
|
|
|
|
|
/* That's all folks */
|
|
|
|
|
|
|
|
/* Basic flow for negotiation
|
|
|
|
|
|
|
|
Server Client
|
|
|
|
Negotiate
|
|
|
|
|
|
|
|
or
|
|
|
|
|
|
|
|
Server Client
|
|
|
|
Negotiate #1
|
|
|
|
Option
|
|
|
|
Negotiate #2
|
|
|
|
|
|
|
|
----
|
|
|
|
|
|
|
|
followed by
|
|
|
|
|
|
|
|
Server Client
|
|
|
|
Request
|
|
|
|
Response
|
|
|
|
Request
|
|
|
|
Response
|
|
|
|
...
|
|
|
|
...
|
|
|
|
Request (type == 2)
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
2016-10-14 18:33:10 +00:00
|
|
|
/* Send an option request.
|
|
|
|
*
|
|
|
|
* The request is for option @opt, with @data containing @len bytes of
|
|
|
|
* additional payload for the request (@len may be -1 to treat @data as
|
|
|
|
* a C string; and @data may be NULL if @len is 0).
|
|
|
|
* Return 0 if successful, -1 with errp set if it is impossible to
|
|
|
|
* continue. */
|
|
|
|
static int nbd_send_option_request(QIOChannel *ioc, uint32_t opt,
|
|
|
|
uint32_t len, const char *data,
|
|
|
|
Error **errp)
|
|
|
|
{
|
2017-11-22 10:19:57 +00:00
|
|
|
NBDOption req;
|
2016-10-14 18:33:10 +00:00
|
|
|
QEMU_BUILD_BUG_ON(sizeof(req) != 16);
|
|
|
|
|
|
|
|
if (len == -1) {
|
|
|
|
req.length = len = strlen(data);
|
|
|
|
}
|
2017-07-07 20:30:43 +00:00
|
|
|
trace_nbd_send_option_request(opt, nbd_opt_lookup(opt), len);
|
2016-10-14 18:33:10 +00:00
|
|
|
|
|
|
|
stq_be_p(&req.magic, NBD_OPTS_MAGIC);
|
|
|
|
stl_be_p(&req.option, opt);
|
|
|
|
stl_be_p(&req.length, len);
|
|
|
|
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_write(ioc, &req, sizeof(req), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to send option request header: ");
|
2016-10-14 18:33:10 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2017-06-02 15:01:39 +00:00
|
|
|
if (len && nbd_write(ioc, (char *) data, len, errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to send option request data: ");
|
2016-10-14 18:33:10 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-10-14 18:33:11 +00:00
|
|
|
/* Send NBD_OPT_ABORT as a courtesy to let the server know that we are
|
|
|
|
* not going to attempt further negotiation. */
|
|
|
|
static void nbd_send_opt_abort(QIOChannel *ioc)
|
|
|
|
{
|
|
|
|
/* Technically, a compliant server is supposed to reply to us; but
|
|
|
|
* older servers disconnected instead. At any rate, we're allowed
|
|
|
|
* to disconnect without waiting for the server reply, so we don't
|
|
|
|
* even care if the request makes it to the server, let alone
|
|
|
|
* waiting around for whether the server replies. */
|
|
|
|
nbd_send_option_request(ioc, NBD_OPT_ABORT, 0, NULL, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-10-14 18:33:10 +00:00
|
|
|
/* Receive the header of an option reply, which should match the given
|
|
|
|
* opt. Read through the length field, but NOT the length bytes of
|
|
|
|
* payload. Return 0 if successful, -1 with errp set if it is
|
|
|
|
* impossible to continue. */
|
|
|
|
static int nbd_receive_option_reply(QIOChannel *ioc, uint32_t opt,
|
2017-11-22 10:19:57 +00:00
|
|
|
NBDOptionReply *reply, Error **errp)
|
2016-10-14 18:33:10 +00:00
|
|
|
{
|
|
|
|
QEMU_BUILD_BUG_ON(sizeof(*reply) != 20);
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_read(ioc, reply, sizeof(*reply), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "failed to read option reply: ");
|
2016-10-14 18:33:11 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
2016-10-14 18:33:10 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
be64_to_cpus(&reply->magic);
|
|
|
|
be32_to_cpus(&reply->option);
|
|
|
|
be32_to_cpus(&reply->type);
|
|
|
|
be32_to_cpus(&reply->length);
|
|
|
|
|
2017-07-07 20:30:43 +00:00
|
|
|
trace_nbd_receive_option_reply(reply->option, nbd_opt_lookup(reply->option),
|
|
|
|
reply->type, nbd_rep_lookup(reply->type),
|
|
|
|
reply->length);
|
2016-02-10 18:41:09 +00:00
|
|
|
|
2016-10-14 18:33:10 +00:00
|
|
|
if (reply->magic != NBD_REP_MAGIC) {
|
|
|
|
error_setg(errp, "Unexpected option reply magic");
|
2016-10-14 18:33:11 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
2016-10-14 18:33:10 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (reply->option != opt) {
|
|
|
|
error_setg(errp, "Unexpected option type %x expected %x",
|
|
|
|
reply->option, opt);
|
2016-10-14 18:33:11 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
2016-10-14 18:33:10 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If reply represents success, return 1 without further action.
|
|
|
|
* If reply represents an error, consume the optional payload of
|
|
|
|
* the packet on ioc. Then return 0 for unsupported (so the client
|
|
|
|
* can fall back to other approaches), or -1 with errp set for other
|
|
|
|
* errors.
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
*/
|
2017-11-22 10:19:57 +00:00
|
|
|
static int nbd_handle_reply_err(QIOChannel *ioc, NBDOptionReply *reply,
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
Error **errp)
|
2016-02-10 18:41:09 +00:00
|
|
|
{
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
char *msg = NULL;
|
|
|
|
int result = -1;
|
|
|
|
|
2016-10-14 18:33:10 +00:00
|
|
|
if (!(reply->type & (1 << 31))) {
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-10-14 18:33:10 +00:00
|
|
|
if (reply->length) {
|
|
|
|
if (reply->length > NBD_MAX_BUFFER_SIZE) {
|
2018-02-15 13:51:43 +00:00
|
|
|
error_setg(errp, "server error %" PRIu32
|
2017-07-07 20:30:43 +00:00
|
|
|
" (%s) message is too long",
|
|
|
|
reply->type, nbd_rep_lookup(reply->type));
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2016-10-14 18:33:10 +00:00
|
|
|
msg = g_malloc(reply->length + 1);
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_read(ioc, msg, reply->length, errp) < 0) {
|
2018-02-15 13:51:43 +00:00
|
|
|
error_prepend(errp, "failed to read option error %" PRIu32
|
2017-11-13 15:24:24 +00:00
|
|
|
" (%s) message: ",
|
2017-07-07 20:30:43 +00:00
|
|
|
reply->type, nbd_rep_lookup(reply->type));
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2016-10-14 18:33:10 +00:00
|
|
|
msg[reply->length] = '\0';
|
2016-02-10 18:41:09 +00:00
|
|
|
}
|
|
|
|
|
2016-10-14 18:33:10 +00:00
|
|
|
switch (reply->type) {
|
2016-02-10 18:41:09 +00:00
|
|
|
case NBD_REP_ERR_UNSUP:
|
2017-07-07 20:30:43 +00:00
|
|
|
trace_nbd_reply_err_unsup(reply->option, nbd_opt_lookup(reply->option));
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
result = 0;
|
|
|
|
goto cleanup;
|
2016-02-10 18:41:09 +00:00
|
|
|
|
2016-02-10 18:41:11 +00:00
|
|
|
case NBD_REP_ERR_POLICY:
|
2018-02-15 13:51:43 +00:00
|
|
|
error_setg(errp, "Denied by server for option %" PRIu32 " (%s)",
|
2017-07-07 20:30:43 +00:00
|
|
|
reply->option, nbd_opt_lookup(reply->option));
|
2016-02-10 18:41:11 +00:00
|
|
|
break;
|
|
|
|
|
2016-02-10 18:41:09 +00:00
|
|
|
case NBD_REP_ERR_INVALID:
|
2018-02-15 13:51:43 +00:00
|
|
|
error_setg(errp, "Invalid parameters for option %" PRIu32 " (%s)",
|
2017-07-07 20:30:43 +00:00
|
|
|
reply->option, nbd_opt_lookup(reply->option));
|
2016-02-10 18:41:09 +00:00
|
|
|
break;
|
|
|
|
|
2016-10-14 18:33:16 +00:00
|
|
|
case NBD_REP_ERR_PLATFORM:
|
2018-02-15 13:51:43 +00:00
|
|
|
error_setg(errp, "Server lacks support for option %" PRIu32 " (%s)",
|
2017-07-07 20:30:43 +00:00
|
|
|
reply->option, nbd_opt_lookup(reply->option));
|
2016-10-14 18:33:16 +00:00
|
|
|
break;
|
|
|
|
|
2016-02-10 18:41:11 +00:00
|
|
|
case NBD_REP_ERR_TLS_REQD:
|
2018-02-15 13:51:43 +00:00
|
|
|
error_setg(errp, "TLS negotiation required before option %" PRIu32
|
2017-07-07 20:30:43 +00:00
|
|
|
" (%s)", reply->option, nbd_opt_lookup(reply->option));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case NBD_REP_ERR_UNKNOWN:
|
2017-07-17 14:23:10 +00:00
|
|
|
error_setg(errp, "Requested export not available");
|
2016-02-10 18:41:11 +00:00
|
|
|
break;
|
|
|
|
|
2016-10-14 18:33:16 +00:00
|
|
|
case NBD_REP_ERR_SHUTDOWN:
|
2018-02-15 13:51:43 +00:00
|
|
|
error_setg(errp, "Server shutting down before option %" PRIu32 " (%s)",
|
2017-07-07 20:30:43 +00:00
|
|
|
reply->option, nbd_opt_lookup(reply->option));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case NBD_REP_ERR_BLOCK_SIZE_REQD:
|
2018-02-15 13:51:43 +00:00
|
|
|
error_setg(errp, "Server requires INFO_BLOCK_SIZE for option %" PRIu32
|
2017-07-07 20:30:43 +00:00
|
|
|
" (%s)", reply->option, nbd_opt_lookup(reply->option));
|
2016-10-14 18:33:16 +00:00
|
|
|
break;
|
|
|
|
|
2016-02-10 18:41:09 +00:00
|
|
|
default:
|
2018-02-15 13:51:43 +00:00
|
|
|
error_setg(errp, "Unknown error code when asking for option %" PRIu32
|
2017-07-07 20:30:43 +00:00
|
|
|
" (%s)", reply->option, nbd_opt_lookup(reply->option));
|
2016-02-10 18:41:09 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
if (msg) {
|
2017-07-17 14:23:10 +00:00
|
|
|
error_append_hint(errp, "server reported: %s\n", msg);
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
g_free(msg);
|
2016-10-14 18:33:11 +00:00
|
|
|
if (result < 0) {
|
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
}
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
return result;
|
2016-02-10 18:41:09 +00:00
|
|
|
}
|
|
|
|
|
2016-10-14 18:33:13 +00:00
|
|
|
/* Process another portion of the NBD_OPT_LIST reply. Set *@match if
|
|
|
|
* the current reply matches @want or if the server does not support
|
|
|
|
* NBD_OPT_LIST, otherwise leave @match alone. Return 0 if iteration
|
|
|
|
* is complete, positive if more replies are expected, or negative
|
|
|
|
* with @errp set if an unrecoverable error occurred. */
|
|
|
|
static int nbd_receive_list(QIOChannel *ioc, const char *want, bool *match,
|
|
|
|
Error **errp)
|
2016-02-10 18:41:09 +00:00
|
|
|
{
|
2017-11-22 10:19:57 +00:00
|
|
|
NBDOptionReply reply;
|
2016-02-10 18:41:09 +00:00
|
|
|
uint32_t len;
|
|
|
|
uint32_t namelen;
|
2016-10-14 18:33:13 +00:00
|
|
|
char name[NBD_MAX_NAME_SIZE + 1];
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
int error;
|
2016-02-10 18:41:09 +00:00
|
|
|
|
2016-10-14 18:33:10 +00:00
|
|
|
if (nbd_receive_option_reply(ioc, NBD_OPT_LIST, &reply, errp) < 0) {
|
2016-02-10 18:41:09 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2016-10-14 18:33:10 +00:00
|
|
|
error = nbd_handle_reply_err(ioc, &reply, errp);
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
if (error <= 0) {
|
2016-10-14 18:33:13 +00:00
|
|
|
/* The server did not support NBD_OPT_LIST, so set *match on
|
|
|
|
* the assumption that any name will be accepted. */
|
|
|
|
*match = true;
|
nbd: Fix NBD unsupported options
nbd-client.c currently fails to handle unsupported options properly.
If during option haggling the server finds an option that is
unsupported, it returns an NBD_REP_ERR_UNSUP reply.
According to nbd's proto.md, the format for such a reply
should be:
S: 64 bits, 0x3e889045565a9 (magic number for replies)
S: 32 bits, the option as sent by the client to which this is a reply
S: 32 bits, reply type (e.g., NBD_REP_ACK for successful completion,
or NBD_REP_ERR_UNSUP to mark use of an option not known by this server
S: 32 bits, length of the reply. This may be zero for some replies,
in which case the next field is not sent
S: any data as required by the reply (e.g., an export name in the case
of NBD_REP_SERVER, or optional UTF-8 message for NBD_REP_ERR_*)
However, in nbd-client.c, the reply type was being read, and if it
contained an error, it was bailing out and issuing the next option
request without first reading the length. This meant that the
next option / handshake read had an extra 4 or more bytes of data in it.
In practice, this makes Qemu incompatible with servers that do not
support NBD_OPT_LIST.
To verify this isn't an error in the specification or my reading of
it, replies are sent by the reference implementation here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1232
and as is evident it always sends a 'datasize' (aka length) 32 bit
word. Unsupported elements are replied to here:
https://github.com/yoe/nbd/blob/66dfb35/nbd-server.c#L1371
Signed-off-by: Alex Bligh <alex@alex.org.uk>
Message-Id: <1459882500-24316-1-git-send-email-alex@alex.org.uk>
[rework to ALWAYS consume an optional UTF-8 message from the server]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1459961962-18771-1-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-04-06 16:59:22 +00:00
|
|
|
return error;
|
2016-02-10 18:41:09 +00:00
|
|
|
}
|
2016-10-14 18:33:10 +00:00
|
|
|
len = reply.length;
|
2016-02-10 18:41:09 +00:00
|
|
|
|
2016-10-14 18:33:10 +00:00
|
|
|
if (reply.type == NBD_REP_ACK) {
|
2016-02-10 18:41:09 +00:00
|
|
|
if (len != 0) {
|
|
|
|
error_setg(errp, "length too long for option end");
|
2016-10-14 18:33:11 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
2016-02-10 18:41:09 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2016-10-14 18:33:13 +00:00
|
|
|
return 0;
|
|
|
|
} else if (reply.type != NBD_REP_SERVER) {
|
|
|
|
error_setg(errp, "Unexpected reply type %" PRIx32 " expected %x",
|
|
|
|
reply.type, NBD_REP_SERVER);
|
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
2016-02-10 18:41:09 +00:00
|
|
|
|
2016-10-14 18:33:13 +00:00
|
|
|
if (len < sizeof(namelen) || len > NBD_MAX_BUFFER_SIZE) {
|
|
|
|
error_setg(errp, "incorrect option length %" PRIu32, len);
|
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_read(ioc, &namelen, sizeof(namelen), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "failed to read option name length: ");
|
2016-10-14 18:33:13 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
namelen = be32_to_cpu(namelen);
|
|
|
|
len -= sizeof(namelen);
|
|
|
|
if (len < namelen) {
|
|
|
|
error_setg(errp, "incorrect option name length");
|
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (namelen != strlen(want)) {
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_drop(ioc, len, errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp,
|
|
|
|
"failed to skip export name with wrong length: ");
|
2016-10-14 18:33:12 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
2016-04-08 01:09:37 +00:00
|
|
|
}
|
2016-10-14 18:33:13 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(namelen < sizeof(name));
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_read(ioc, name, namelen, errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "failed to read export name: ");
|
2016-10-14 18:33:13 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
name[namelen] = '\0';
|
|
|
|
len -= namelen;
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_drop(ioc, len, errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "failed to read export description: ");
|
2016-10-14 18:33:11 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
2016-02-10 18:41:09 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2016-10-14 18:33:13 +00:00
|
|
|
if (!strcmp(name, want)) {
|
|
|
|
*match = true;
|
|
|
|
}
|
2016-02-10 18:41:09 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
/* Returns -1 if NBD_OPT_GO proves the export @wantname cannot be
|
|
|
|
* used, 0 if NBD_OPT_GO is unsupported (fall back to NBD_OPT_LIST and
|
|
|
|
* NBD_OPT_EXPORT_NAME in that case), and > 0 if the export is good to
|
|
|
|
* go (with @info populated). */
|
|
|
|
static int nbd_opt_go(QIOChannel *ioc, const char *wantname,
|
|
|
|
NBDExportInfo *info, Error **errp)
|
|
|
|
{
|
2017-11-22 10:19:57 +00:00
|
|
|
NBDOptionReply reply;
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
uint32_t len = strlen(wantname);
|
|
|
|
uint16_t type;
|
|
|
|
int error;
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
/* The protocol requires that the server send NBD_INFO_EXPORT with
|
|
|
|
* a non-zero flags (at least NBD_FLAG_HAS_FLAGS must be set); so
|
|
|
|
* flags still 0 is a witness of a broken server. */
|
|
|
|
info->flags = 0;
|
|
|
|
|
|
|
|
trace_nbd_opt_go_start(wantname);
|
nbd: Implement NBD_INFO_BLOCK_SIZE on client
The upstream NBD Protocol has defined a new extension to allow
the server to advertise block sizes to the client, as well as
a way for the client to inform the server whether it intends to
obey block sizes.
When using the block layer as the client, we will obey block
sizes; but when used as 'qemu-nbd -c' to hand off to the
kernel nbd module as the client, we are still waiting for the
kernel to implement a way for us to learn if it will honor
block sizes (perhaps by an addition to sysfs, rather than an
ioctl), as well as any way to tell the kernel what additional
block sizes to obey (NBD_SET_BLKSIZE appears to be accurate
for the minimum size, but preferred and maximum sizes would
probably be new ioctl()s), so until then, we need to make our
request for block sizes conditional.
When using ioctl(NBD_SET_BLKSIZE) to hand off to the kernel,
use the minimum block size as the sector size if it is larger
than 512, which also has the nice effect of cooperating with
(non-qemu) servers that don't do read-modify-write when
exposing a block device with 4k sectors; it might also allow
us to visit a file larger than 2T on a 32-bit kernel.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-10-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:49 +00:00
|
|
|
buf = g_malloc(4 + len + 2 + 2 * info->request_sizes + 1);
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
stl_be_p(buf, len);
|
|
|
|
memcpy(buf + 4, wantname, len);
|
nbd: Implement NBD_INFO_BLOCK_SIZE on client
The upstream NBD Protocol has defined a new extension to allow
the server to advertise block sizes to the client, as well as
a way for the client to inform the server whether it intends to
obey block sizes.
When using the block layer as the client, we will obey block
sizes; but when used as 'qemu-nbd -c' to hand off to the
kernel nbd module as the client, we are still waiting for the
kernel to implement a way for us to learn if it will honor
block sizes (perhaps by an addition to sysfs, rather than an
ioctl), as well as any way to tell the kernel what additional
block sizes to obey (NBD_SET_BLKSIZE appears to be accurate
for the minimum size, but preferred and maximum sizes would
probably be new ioctl()s), so until then, we need to make our
request for block sizes conditional.
When using ioctl(NBD_SET_BLKSIZE) to hand off to the kernel,
use the minimum block size as the sector size if it is larger
than 512, which also has the nice effect of cooperating with
(non-qemu) servers that don't do read-modify-write when
exposing a block device with 4k sectors; it might also allow
us to visit a file larger than 2T on a 32-bit kernel.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-10-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:49 +00:00
|
|
|
/* At most one request, everything else up to server */
|
|
|
|
stw_be_p(buf + 4 + len, info->request_sizes);
|
|
|
|
if (info->request_sizes) {
|
|
|
|
stw_be_p(buf + 4 + len + 2, NBD_INFO_BLOCK_SIZE);
|
|
|
|
}
|
2017-07-27 02:42:09 +00:00
|
|
|
error = nbd_send_option_request(ioc, NBD_OPT_GO,
|
|
|
|
4 + len + 2 + 2 * info->request_sizes,
|
|
|
|
buf, errp);
|
|
|
|
g_free(buf);
|
|
|
|
if (error < 0) {
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
if (nbd_receive_option_reply(ioc, NBD_OPT_GO, &reply, errp) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
error = nbd_handle_reply_err(ioc, &reply, errp);
|
|
|
|
if (error <= 0) {
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
len = reply.length;
|
|
|
|
|
|
|
|
if (reply.type == NBD_REP_ACK) {
|
|
|
|
/* Server is done sending info and moved into transmission
|
|
|
|
phase, but make sure it sent flags */
|
|
|
|
if (len) {
|
|
|
|
error_setg(errp, "server sent invalid NBD_REP_ACK");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!info->flags) {
|
|
|
|
error_setg(errp, "broken server omitted NBD_INFO_EXPORT");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
trace_nbd_opt_go_success();
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (reply.type != NBD_REP_INFO) {
|
2018-02-15 13:51:43 +00:00
|
|
|
error_setg(errp, "unexpected reply type %" PRIu32
|
|
|
|
" (%s), expected %u",
|
nbd: Implement NBD_INFO_BLOCK_SIZE on client
The upstream NBD Protocol has defined a new extension to allow
the server to advertise block sizes to the client, as well as
a way for the client to inform the server whether it intends to
obey block sizes.
When using the block layer as the client, we will obey block
sizes; but when used as 'qemu-nbd -c' to hand off to the
kernel nbd module as the client, we are still waiting for the
kernel to implement a way for us to learn if it will honor
block sizes (perhaps by an addition to sysfs, rather than an
ioctl), as well as any way to tell the kernel what additional
block sizes to obey (NBD_SET_BLKSIZE appears to be accurate
for the minimum size, but preferred and maximum sizes would
probably be new ioctl()s), so until then, we need to make our
request for block sizes conditional.
When using ioctl(NBD_SET_BLKSIZE) to hand off to the kernel,
use the minimum block size as the sector size if it is larger
than 512, which also has the nice effect of cooperating with
(non-qemu) servers that don't do read-modify-write when
exposing a block device with 4k sectors; it might also allow
us to visit a file larger than 2T on a 32-bit kernel.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-10-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:49 +00:00
|
|
|
reply.type, nbd_rep_lookup(reply.type), NBD_REP_INFO);
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (len < sizeof(type)) {
|
|
|
|
error_setg(errp, "NBD_REP_INFO length %" PRIu32 " is too short",
|
|
|
|
len);
|
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (nbd_read(ioc, &type, sizeof(type), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "failed to read info type: ");
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
len -= sizeof(type);
|
|
|
|
be16_to_cpus(&type);
|
|
|
|
switch (type) {
|
|
|
|
case NBD_INFO_EXPORT:
|
|
|
|
if (len != sizeof(info->size) + sizeof(info->flags)) {
|
|
|
|
error_setg(errp, "remaining export info len %" PRIu32
|
|
|
|
" is unexpected size", len);
|
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (nbd_read(ioc, &info->size, sizeof(info->size), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "failed to read info size: ");
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
be64_to_cpus(&info->size);
|
|
|
|
if (nbd_read(ioc, &info->flags, sizeof(info->flags), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "failed to read info flags: ");
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
be16_to_cpus(&info->flags);
|
|
|
|
trace_nbd_receive_negotiate_size_flags(info->size, info->flags);
|
|
|
|
break;
|
|
|
|
|
nbd: Implement NBD_INFO_BLOCK_SIZE on client
The upstream NBD Protocol has defined a new extension to allow
the server to advertise block sizes to the client, as well as
a way for the client to inform the server whether it intends to
obey block sizes.
When using the block layer as the client, we will obey block
sizes; but when used as 'qemu-nbd -c' to hand off to the
kernel nbd module as the client, we are still waiting for the
kernel to implement a way for us to learn if it will honor
block sizes (perhaps by an addition to sysfs, rather than an
ioctl), as well as any way to tell the kernel what additional
block sizes to obey (NBD_SET_BLKSIZE appears to be accurate
for the minimum size, but preferred and maximum sizes would
probably be new ioctl()s), so until then, we need to make our
request for block sizes conditional.
When using ioctl(NBD_SET_BLKSIZE) to hand off to the kernel,
use the minimum block size as the sector size if it is larger
than 512, which also has the nice effect of cooperating with
(non-qemu) servers that don't do read-modify-write when
exposing a block device with 4k sectors; it might also allow
us to visit a file larger than 2T on a 32-bit kernel.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-10-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:49 +00:00
|
|
|
case NBD_INFO_BLOCK_SIZE:
|
|
|
|
if (len != sizeof(info->min_block) * 3) {
|
|
|
|
error_setg(errp, "remaining export info len %" PRIu32
|
|
|
|
" is unexpected size", len);
|
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (nbd_read(ioc, &info->min_block, sizeof(info->min_block),
|
|
|
|
errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "failed to read info minimum block size: ");
|
nbd: Implement NBD_INFO_BLOCK_SIZE on client
The upstream NBD Protocol has defined a new extension to allow
the server to advertise block sizes to the client, as well as
a way for the client to inform the server whether it intends to
obey block sizes.
When using the block layer as the client, we will obey block
sizes; but when used as 'qemu-nbd -c' to hand off to the
kernel nbd module as the client, we are still waiting for the
kernel to implement a way for us to learn if it will honor
block sizes (perhaps by an addition to sysfs, rather than an
ioctl), as well as any way to tell the kernel what additional
block sizes to obey (NBD_SET_BLKSIZE appears to be accurate
for the minimum size, but preferred and maximum sizes would
probably be new ioctl()s), so until then, we need to make our
request for block sizes conditional.
When using ioctl(NBD_SET_BLKSIZE) to hand off to the kernel,
use the minimum block size as the sector size if it is larger
than 512, which also has the nice effect of cooperating with
(non-qemu) servers that don't do read-modify-write when
exposing a block device with 4k sectors; it might also allow
us to visit a file larger than 2T on a 32-bit kernel.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-10-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:49 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
be32_to_cpus(&info->min_block);
|
|
|
|
if (!is_power_of_2(info->min_block)) {
|
|
|
|
error_setg(errp, "server minimum block size %" PRId32
|
|
|
|
"is not a power of two", info->min_block);
|
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (nbd_read(ioc, &info->opt_block, sizeof(info->opt_block),
|
|
|
|
errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp,
|
|
|
|
"failed to read info preferred block size: ");
|
nbd: Implement NBD_INFO_BLOCK_SIZE on client
The upstream NBD Protocol has defined a new extension to allow
the server to advertise block sizes to the client, as well as
a way for the client to inform the server whether it intends to
obey block sizes.
When using the block layer as the client, we will obey block
sizes; but when used as 'qemu-nbd -c' to hand off to the
kernel nbd module as the client, we are still waiting for the
kernel to implement a way for us to learn if it will honor
block sizes (perhaps by an addition to sysfs, rather than an
ioctl), as well as any way to tell the kernel what additional
block sizes to obey (NBD_SET_BLKSIZE appears to be accurate
for the minimum size, but preferred and maximum sizes would
probably be new ioctl()s), so until then, we need to make our
request for block sizes conditional.
When using ioctl(NBD_SET_BLKSIZE) to hand off to the kernel,
use the minimum block size as the sector size if it is larger
than 512, which also has the nice effect of cooperating with
(non-qemu) servers that don't do read-modify-write when
exposing a block device with 4k sectors; it might also allow
us to visit a file larger than 2T on a 32-bit kernel.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-10-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:49 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
be32_to_cpus(&info->opt_block);
|
|
|
|
if (!is_power_of_2(info->opt_block) ||
|
|
|
|
info->opt_block < info->min_block) {
|
|
|
|
error_setg(errp, "server preferred block size %" PRId32
|
|
|
|
"is not valid", info->opt_block);
|
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (nbd_read(ioc, &info->max_block, sizeof(info->max_block),
|
|
|
|
errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "failed to read info maximum block size: ");
|
nbd: Implement NBD_INFO_BLOCK_SIZE on client
The upstream NBD Protocol has defined a new extension to allow
the server to advertise block sizes to the client, as well as
a way for the client to inform the server whether it intends to
obey block sizes.
When using the block layer as the client, we will obey block
sizes; but when used as 'qemu-nbd -c' to hand off to the
kernel nbd module as the client, we are still waiting for the
kernel to implement a way for us to learn if it will honor
block sizes (perhaps by an addition to sysfs, rather than an
ioctl), as well as any way to tell the kernel what additional
block sizes to obey (NBD_SET_BLKSIZE appears to be accurate
for the minimum size, but preferred and maximum sizes would
probably be new ioctl()s), so until then, we need to make our
request for block sizes conditional.
When using ioctl(NBD_SET_BLKSIZE) to hand off to the kernel,
use the minimum block size as the sector size if it is larger
than 512, which also has the nice effect of cooperating with
(non-qemu) servers that don't do read-modify-write when
exposing a block device with 4k sectors; it might also allow
us to visit a file larger than 2T on a 32-bit kernel.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-10-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:49 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
be32_to_cpus(&info->max_block);
|
|
|
|
trace_nbd_opt_go_info_block_size(info->min_block, info->opt_block,
|
|
|
|
info->max_block);
|
|
|
|
break;
|
|
|
|
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
default:
|
|
|
|
trace_nbd_opt_go_info_unknown(type, nbd_info_lookup(type));
|
|
|
|
if (nbd_drop(ioc, len, errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to read info payload: ");
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-14 18:33:13 +00:00
|
|
|
/* Return -1 on failure, 0 if wantname is an available export. */
|
2016-02-10 18:41:09 +00:00
|
|
|
static int nbd_receive_query_exports(QIOChannel *ioc,
|
|
|
|
const char *wantname,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
bool foundExport = false;
|
|
|
|
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_receive_query_exports_start(wantname);
|
2016-10-14 18:33:10 +00:00
|
|
|
if (nbd_send_option_request(ioc, NBD_OPT_LIST, 0, NULL, errp) < 0) {
|
2016-02-10 18:41:09 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (1) {
|
2016-10-14 18:33:13 +00:00
|
|
|
int ret = nbd_receive_list(ioc, wantname, &foundExport, errp);
|
2016-02-10 18:41:09 +00:00
|
|
|
|
|
|
|
if (ret < 0) {
|
2016-10-14 18:33:13 +00:00
|
|
|
/* Server gave unexpected reply */
|
2016-02-10 18:41:09 +00:00
|
|
|
return -1;
|
2016-10-14 18:33:13 +00:00
|
|
|
} else if (ret == 0) {
|
|
|
|
/* Done iterating. */
|
|
|
|
if (!foundExport) {
|
|
|
|
error_setg(errp, "No export with name '%s' available",
|
|
|
|
wantname);
|
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
return -1;
|
|
|
|
}
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_receive_query_exports_success(wantname);
|
2016-10-14 18:33:13 +00:00
|
|
|
return 0;
|
2016-02-10 18:41:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-27 10:40:34 +00:00
|
|
|
/* nbd_request_simple_option: Send an option request, and parse the reply
|
|
|
|
* return 1 for successful negotiation,
|
|
|
|
* 0 if operation is unsupported,
|
|
|
|
* -1 with errp set for any other error
|
|
|
|
*/
|
|
|
|
static int nbd_request_simple_option(QIOChannel *ioc, int opt, Error **errp)
|
2016-02-10 18:41:11 +00:00
|
|
|
{
|
2017-11-22 10:19:57 +00:00
|
|
|
NBDOptionReply reply;
|
2017-10-27 10:40:34 +00:00
|
|
|
int error;
|
2016-02-10 18:41:11 +00:00
|
|
|
|
2017-10-27 10:40:34 +00:00
|
|
|
if (nbd_send_option_request(ioc, opt, 0, NULL, errp) < 0) {
|
|
|
|
return -1;
|
2016-02-10 18:41:11 +00:00
|
|
|
}
|
|
|
|
|
2017-10-27 10:40:34 +00:00
|
|
|
if (nbd_receive_option_reply(ioc, opt, &reply, errp) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
error = nbd_handle_reply_err(ioc, &reply, errp);
|
|
|
|
if (error <= 0) {
|
|
|
|
return error;
|
2016-02-10 18:41:11 +00:00
|
|
|
}
|
2016-10-14 18:33:10 +00:00
|
|
|
|
|
|
|
if (reply.type != NBD_REP_ACK) {
|
2017-10-27 10:40:34 +00:00
|
|
|
error_setg(errp, "Server answered option %d (%s) with unexpected "
|
2018-02-15 13:51:43 +00:00
|
|
|
"reply %" PRIu32 " (%s)", opt, nbd_opt_lookup(opt),
|
2017-10-27 10:40:34 +00:00
|
|
|
reply.type, nbd_rep_lookup(reply.type));
|
2016-10-14 18:33:11 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
2017-10-27 10:40:34 +00:00
|
|
|
return -1;
|
2016-02-10 18:41:11 +00:00
|
|
|
}
|
|
|
|
|
2016-10-14 18:33:10 +00:00
|
|
|
if (reply.length != 0) {
|
2017-10-27 10:40:34 +00:00
|
|
|
error_setg(errp, "Option %d ('%s') response length is %" PRIu32
|
|
|
|
" (it should be zero)", opt, nbd_opt_lookup(opt),
|
2016-10-14 18:33:10 +00:00
|
|
|
reply.length);
|
2016-10-14 18:33:11 +00:00
|
|
|
nbd_send_opt_abort(ioc);
|
2017-10-27 10:40:34 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static QIOChannel *nbd_receive_starttls(QIOChannel *ioc,
|
|
|
|
QCryptoTLSCreds *tlscreds,
|
|
|
|
const char *hostname, Error **errp)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
QIOChannelTLS *tioc;
|
|
|
|
struct NBDTLSHandshakeData data = { 0 };
|
|
|
|
|
|
|
|
ret = nbd_request_simple_option(ioc, NBD_OPT_STARTTLS, errp);
|
|
|
|
if (ret <= 0) {
|
|
|
|
if (ret == 0) {
|
|
|
|
error_setg(errp, "Server don't support STARTTLS option");
|
|
|
|
nbd_send_opt_abort(ioc);
|
|
|
|
}
|
2016-02-10 18:41:11 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_receive_starttls_new_client();
|
2016-02-10 18:41:11 +00:00
|
|
|
tioc = qio_channel_tls_new_client(ioc, tlscreds, hostname, errp);
|
|
|
|
if (!tioc) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2016-09-30 10:57:14 +00:00
|
|
|
qio_channel_set_name(QIO_CHANNEL(tioc), "nbd-client-tls");
|
2016-02-10 18:41:11 +00:00
|
|
|
data.loop = g_main_loop_new(g_main_context_default(), FALSE);
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_receive_starttls_tls_handshake();
|
2016-02-10 18:41:11 +00:00
|
|
|
qio_channel_tls_handshake(tioc,
|
|
|
|
nbd_tls_handshake,
|
|
|
|
&data,
|
2018-03-05 06:43:24 +00:00
|
|
|
NULL,
|
2016-02-10 18:41:11 +00:00
|
|
|
NULL);
|
|
|
|
|
|
|
|
if (!data.complete) {
|
|
|
|
g_main_loop_run(data.loop);
|
|
|
|
}
|
|
|
|
g_main_loop_unref(data.loop);
|
|
|
|
if (data.error) {
|
|
|
|
error_propagate(errp, data.error);
|
|
|
|
object_unref(OBJECT(tioc));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return QIO_CHANNEL(tioc);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-07-07 20:30:41 +00:00
|
|
|
int nbd_receive_negotiate(QIOChannel *ioc, const char *name,
|
2016-02-10 18:41:11 +00:00
|
|
|
QCryptoTLSCreds *tlscreds, const char *hostname,
|
2017-07-07 20:30:41 +00:00
|
|
|
QIOChannel **outioc, NBDExportInfo *info,
|
|
|
|
Error **errp)
|
2016-01-14 08:41:02 +00:00
|
|
|
{
|
|
|
|
char buf[256];
|
2017-07-07 20:30:41 +00:00
|
|
|
uint64_t magic;
|
2016-01-14 08:41:02 +00:00
|
|
|
int rc;
|
2016-10-14 18:33:14 +00:00
|
|
|
bool zeroes = true;
|
2017-10-27 10:40:37 +00:00
|
|
|
bool structured_reply = info->structured_reply;
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_receive_negotiate(tlscreds, hostname ? hostname : "<null>");
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2017-10-27 10:40:37 +00:00
|
|
|
info->structured_reply = false;
|
2016-01-14 08:41:02 +00:00
|
|
|
rc = -EINVAL;
|
|
|
|
|
2016-02-10 18:41:11 +00:00
|
|
|
if (outioc) {
|
|
|
|
*outioc = NULL;
|
|
|
|
}
|
|
|
|
if (tlscreds && !outioc) {
|
|
|
|
error_setg(errp, "Output I/O channel required for TLS");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_read(ioc, buf, 8, errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to read data: ");
|
2016-01-14 08:41:02 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
buf[8] = '\0';
|
|
|
|
if (strlen(buf) == 0) {
|
|
|
|
error_setg(errp, "Server connection closed unexpectedly");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2017-07-07 15:29:14 +00:00
|
|
|
magic = ldq_be_p(buf);
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_receive_negotiate_magic(magic);
|
2016-01-14 08:41:02 +00:00
|
|
|
|
|
|
|
if (memcmp(buf, "NBDMAGIC", 8) != 0) {
|
|
|
|
error_setg(errp, "Invalid magic received");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_read(ioc, &magic, sizeof(magic), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to read magic: ");
|
2016-01-14 08:41:02 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
magic = be64_to_cpu(magic);
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_receive_negotiate_magic(magic);
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2016-02-10 18:41:05 +00:00
|
|
|
if (magic == NBD_OPTS_MAGIC) {
|
2016-02-10 18:41:07 +00:00
|
|
|
uint32_t clientflags = 0;
|
|
|
|
uint16_t globalflags;
|
2016-02-10 18:41:09 +00:00
|
|
|
bool fixedNewStyle = false;
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_read(ioc, &globalflags, sizeof(globalflags), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to read server flags: ");
|
2016-01-14 08:41:02 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2016-02-10 18:41:09 +00:00
|
|
|
globalflags = be16_to_cpu(globalflags);
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_receive_negotiate_server_flags(globalflags);
|
2016-02-10 18:41:07 +00:00
|
|
|
if (globalflags & NBD_FLAG_FIXED_NEWSTYLE) {
|
2016-02-10 18:41:09 +00:00
|
|
|
fixedNewStyle = true;
|
2016-02-10 18:41:07 +00:00
|
|
|
clientflags |= NBD_FLAG_C_FIXED_NEWSTYLE;
|
|
|
|
}
|
2016-10-14 18:33:14 +00:00
|
|
|
if (globalflags & NBD_FLAG_NO_ZEROES) {
|
|
|
|
zeroes = false;
|
|
|
|
clientflags |= NBD_FLAG_C_NO_ZEROES;
|
|
|
|
}
|
2016-02-10 18:41:07 +00:00
|
|
|
/* client requested flags */
|
2016-02-10 18:41:09 +00:00
|
|
|
clientflags = cpu_to_be32(clientflags);
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_write(ioc, &clientflags, sizeof(clientflags), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to send clientflags field: ");
|
2016-01-14 08:41:02 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2016-02-10 18:41:11 +00:00
|
|
|
if (tlscreds) {
|
|
|
|
if (fixedNewStyle) {
|
|
|
|
*outioc = nbd_receive_starttls(ioc, tlscreds, hostname, errp);
|
|
|
|
if (!*outioc) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
ioc = *outioc;
|
|
|
|
} else {
|
|
|
|
error_setg(errp, "Server does not support STARTTLS");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2016-02-10 18:41:05 +00:00
|
|
|
if (!name) {
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_receive_negotiate_default_name();
|
2016-02-10 18:41:10 +00:00
|
|
|
name = "";
|
2016-02-10 18:41:05 +00:00
|
|
|
}
|
2016-02-10 18:41:09 +00:00
|
|
|
if (fixedNewStyle) {
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
int result;
|
|
|
|
|
2017-10-27 10:40:37 +00:00
|
|
|
if (structured_reply) {
|
|
|
|
result = nbd_request_simple_option(ioc,
|
|
|
|
NBD_OPT_STRUCTURED_REPLY,
|
|
|
|
errp);
|
|
|
|
if (result < 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
info->structured_reply = result == 1;
|
|
|
|
}
|
|
|
|
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
/* Try NBD_OPT_GO first - if it works, we are done (it
|
|
|
|
* also gives us a good message if the server requires
|
|
|
|
* TLS). If it is not available, fall back to
|
|
|
|
* NBD_OPT_LIST for nicer error messages about a missing
|
|
|
|
* export, then use NBD_OPT_EXPORT_NAME. */
|
|
|
|
result = nbd_opt_go(ioc, name, info, errp);
|
|
|
|
if (result < 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
if (result > 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
2016-02-10 18:41:09 +00:00
|
|
|
/* Check our desired export is present in the
|
|
|
|
* server export list. Since NBD_OPT_EXPORT_NAME
|
|
|
|
* cannot return an error message, running this
|
nbd: Implement NBD_OPT_GO on client
NBD_OPT_EXPORT_NAME is lousy: per the NBD protocol, any failure
requires the server to close the connection rather than report an
error to us. Therefore, upstream NBD recently added NBD_OPT_GO as
the improved version of the option that does what we want [1]: it
reports sane errors on failures, and on success provides at least
as much info as NBD_OPT_EXPORT_NAME.
[1] https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md
This is a first cut at use of the information types. Note that we
do not need to use NBD_OPT_INFO, and that use of NBD_OPT_GO means
we no longer have to use NBD_OPT_LIST to learn whether a server
requires TLS (this requires servers that gracefully handle unknown
NBD_OPT, many servers prior to qemu 2.5 were buggy, but I have patched
qemu, upstream nbd, and nbdkit in the meantime, in part because of
interoperability testing with this patch). We still fall back to
NBD_OPT_LIST when NBD_OPT_GO is not supported on the server, as it
is still one last chance for a nicer error message. Later patches
will use further info, like NBD_INFO_BLOCK_SIZE.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-8-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:47 +00:00
|
|
|
* query gives us better error reporting if the
|
|
|
|
* export name is not available.
|
2016-02-10 18:41:09 +00:00
|
|
|
*/
|
|
|
|
if (nbd_receive_query_exports(ioc, name, errp) < 0) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2016-10-14 18:33:10 +00:00
|
|
|
/* write the export name request */
|
|
|
|
if (nbd_send_option_request(ioc, NBD_OPT_EXPORT_NAME, -1, name,
|
|
|
|
errp) < 0) {
|
2016-01-14 08:41:02 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2016-02-10 18:41:05 +00:00
|
|
|
|
2016-10-14 18:33:10 +00:00
|
|
|
/* Read the response */
|
2017-07-07 20:30:41 +00:00
|
|
|
if (nbd_read(ioc, &info->size, sizeof(info->size), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to read export length: ");
|
2016-01-14 08:41:02 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2017-07-07 20:30:41 +00:00
|
|
|
be64_to_cpus(&info->size);
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2017-07-07 20:30:41 +00:00
|
|
|
if (nbd_read(ioc, &info->flags, sizeof(info->flags), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to read export flags: ");
|
2016-02-10 18:41:05 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2017-07-07 20:30:41 +00:00
|
|
|
be16_to_cpus(&info->flags);
|
2016-02-10 18:41:05 +00:00
|
|
|
} else if (magic == NBD_CLIENT_MAGIC) {
|
2016-07-21 19:34:46 +00:00
|
|
|
uint32_t oldflags;
|
|
|
|
|
2016-02-10 18:41:05 +00:00
|
|
|
if (name) {
|
|
|
|
error_setg(errp, "Server does not support export names");
|
|
|
|
goto fail;
|
|
|
|
}
|
2016-02-10 18:41:11 +00:00
|
|
|
if (tlscreds) {
|
|
|
|
error_setg(errp, "Server does not support STARTTLS");
|
|
|
|
goto fail;
|
|
|
|
}
|
2016-02-10 18:41:05 +00:00
|
|
|
|
2017-07-07 20:30:41 +00:00
|
|
|
if (nbd_read(ioc, &info->size, sizeof(info->size), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to read export length: ");
|
2016-02-10 18:41:05 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2017-07-07 20:30:41 +00:00
|
|
|
be64_to_cpus(&info->size);
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2017-06-02 15:01:39 +00:00
|
|
|
if (nbd_read(ioc, &oldflags, sizeof(oldflags), errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to read export flags: ");
|
2016-01-14 08:41:02 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
2016-07-21 19:34:46 +00:00
|
|
|
be32_to_cpus(&oldflags);
|
|
|
|
if (oldflags & ~0xffff) {
|
|
|
|
error_setg(errp, "Unexpected export flags %0x" PRIx32, oldflags);
|
|
|
|
goto fail;
|
|
|
|
}
|
2017-07-07 20:30:41 +00:00
|
|
|
info->flags = oldflags;
|
2016-01-14 08:41:02 +00:00
|
|
|
} else {
|
2016-02-10 18:41:05 +00:00
|
|
|
error_setg(errp, "Bad magic received");
|
|
|
|
goto fail;
|
2016-01-14 08:41:02 +00:00
|
|
|
}
|
2016-02-10 18:41:05 +00:00
|
|
|
|
2017-07-07 20:30:41 +00:00
|
|
|
trace_nbd_receive_negotiate_size_flags(info->size, info->flags);
|
2017-06-02 15:01:39 +00:00
|
|
|
if (zeroes && nbd_drop(ioc, 124, errp) < 0) {
|
2017-11-13 15:24:24 +00:00
|
|
|
error_prepend(errp, "Failed to read reserved block: ");
|
2016-01-14 08:41:02 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
rc = 0;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef __linux__
|
2017-07-07 20:30:41 +00:00
|
|
|
int nbd_init(int fd, QIOChannelSocket *sioc, NBDExportInfo *info,
|
2017-05-26 11:09:13 +00:00
|
|
|
Error **errp)
|
2016-01-14 08:41:02 +00:00
|
|
|
{
|
nbd: Implement NBD_INFO_BLOCK_SIZE on client
The upstream NBD Protocol has defined a new extension to allow
the server to advertise block sizes to the client, as well as
a way for the client to inform the server whether it intends to
obey block sizes.
When using the block layer as the client, we will obey block
sizes; but when used as 'qemu-nbd -c' to hand off to the
kernel nbd module as the client, we are still waiting for the
kernel to implement a way for us to learn if it will honor
block sizes (perhaps by an addition to sysfs, rather than an
ioctl), as well as any way to tell the kernel what additional
block sizes to obey (NBD_SET_BLKSIZE appears to be accurate
for the minimum size, but preferred and maximum sizes would
probably be new ioctl()s), so until then, we need to make our
request for block sizes conditional.
When using ioctl(NBD_SET_BLKSIZE) to hand off to the kernel,
use the minimum block size as the sector size if it is larger
than 512, which also has the nice effect of cooperating with
(non-qemu) servers that don't do read-modify-write when
exposing a block device with 4k sectors; it might also allow
us to visit a file larger than 2T on a 32-bit kernel.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-10-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:49 +00:00
|
|
|
unsigned long sector_size = MAX(BDRV_SECTOR_SIZE, info->min_block);
|
|
|
|
unsigned long sectors = info->size / sector_size;
|
|
|
|
|
|
|
|
/* FIXME: Once the kernel module is patched to honor block sizes,
|
|
|
|
* and to advertise that fact to user space, we should update the
|
|
|
|
* hand-off to the kernel to use any block sizes we learned. */
|
|
|
|
assert(!info->request_sizes);
|
|
|
|
if (info->size / sector_size != sectors) {
|
2017-07-07 20:30:41 +00:00
|
|
|
error_setg(errp, "Export size %" PRIu64 " too large for 32-bit kernel",
|
|
|
|
info->size);
|
2016-05-11 22:39:40 +00:00
|
|
|
return -E2BIG;
|
|
|
|
}
|
|
|
|
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_init_set_socket();
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2016-05-11 22:39:40 +00:00
|
|
|
if (ioctl(fd, NBD_SET_SOCK, (unsigned long) sioc->fd) < 0) {
|
2016-01-14 08:41:02 +00:00
|
|
|
int serrno = errno;
|
2017-05-26 11:09:13 +00:00
|
|
|
error_setg(errp, "Failed to set NBD socket");
|
2016-01-14 08:41:02 +00:00
|
|
|
return -serrno;
|
|
|
|
}
|
|
|
|
|
nbd: Implement NBD_INFO_BLOCK_SIZE on client
The upstream NBD Protocol has defined a new extension to allow
the server to advertise block sizes to the client, as well as
a way for the client to inform the server whether it intends to
obey block sizes.
When using the block layer as the client, we will obey block
sizes; but when used as 'qemu-nbd -c' to hand off to the
kernel nbd module as the client, we are still waiting for the
kernel to implement a way for us to learn if it will honor
block sizes (perhaps by an addition to sysfs, rather than an
ioctl), as well as any way to tell the kernel what additional
block sizes to obey (NBD_SET_BLKSIZE appears to be accurate
for the minimum size, but preferred and maximum sizes would
probably be new ioctl()s), so until then, we need to make our
request for block sizes conditional.
When using ioctl(NBD_SET_BLKSIZE) to hand off to the kernel,
use the minimum block size as the sector size if it is larger
than 512, which also has the nice effect of cooperating with
(non-qemu) servers that don't do read-modify-write when
exposing a block device with 4k sectors; it might also allow
us to visit a file larger than 2T on a 32-bit kernel.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-10-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:49 +00:00
|
|
|
trace_nbd_init_set_block_size(sector_size);
|
2016-01-14 08:41:02 +00:00
|
|
|
|
nbd: Implement NBD_INFO_BLOCK_SIZE on client
The upstream NBD Protocol has defined a new extension to allow
the server to advertise block sizes to the client, as well as
a way for the client to inform the server whether it intends to
obey block sizes.
When using the block layer as the client, we will obey block
sizes; but when used as 'qemu-nbd -c' to hand off to the
kernel nbd module as the client, we are still waiting for the
kernel to implement a way for us to learn if it will honor
block sizes (perhaps by an addition to sysfs, rather than an
ioctl), as well as any way to tell the kernel what additional
block sizes to obey (NBD_SET_BLKSIZE appears to be accurate
for the minimum size, but preferred and maximum sizes would
probably be new ioctl()s), so until then, we need to make our
request for block sizes conditional.
When using ioctl(NBD_SET_BLKSIZE) to hand off to the kernel,
use the minimum block size as the sector size if it is larger
than 512, which also has the nice effect of cooperating with
(non-qemu) servers that don't do read-modify-write when
exposing a block device with 4k sectors; it might also allow
us to visit a file larger than 2T on a 32-bit kernel.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-10-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:49 +00:00
|
|
|
if (ioctl(fd, NBD_SET_BLKSIZE, sector_size) < 0) {
|
2016-01-14 08:41:02 +00:00
|
|
|
int serrno = errno;
|
2017-05-26 11:09:13 +00:00
|
|
|
error_setg(errp, "Failed setting NBD block size");
|
2016-01-14 08:41:02 +00:00
|
|
|
return -serrno;
|
|
|
|
}
|
|
|
|
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_init_set_size(sectors);
|
nbd: Implement NBD_INFO_BLOCK_SIZE on client
The upstream NBD Protocol has defined a new extension to allow
the server to advertise block sizes to the client, as well as
a way for the client to inform the server whether it intends to
obey block sizes.
When using the block layer as the client, we will obey block
sizes; but when used as 'qemu-nbd -c' to hand off to the
kernel nbd module as the client, we are still waiting for the
kernel to implement a way for us to learn if it will honor
block sizes (perhaps by an addition to sysfs, rather than an
ioctl), as well as any way to tell the kernel what additional
block sizes to obey (NBD_SET_BLKSIZE appears to be accurate
for the minimum size, but preferred and maximum sizes would
probably be new ioctl()s), so until then, we need to make our
request for block sizes conditional.
When using ioctl(NBD_SET_BLKSIZE) to hand off to the kernel,
use the minimum block size as the sector size if it is larger
than 512, which also has the nice effect of cooperating with
(non-qemu) servers that don't do read-modify-write when
exposing a block device with 4k sectors; it might also allow
us to visit a file larger than 2T on a 32-bit kernel.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707203049.534-10-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2017-07-07 20:30:49 +00:00
|
|
|
if (info->size % sector_size) {
|
|
|
|
trace_nbd_init_trailing_bytes(info->size % sector_size);
|
2016-05-11 22:39:40 +00:00
|
|
|
}
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2016-05-11 22:39:40 +00:00
|
|
|
if (ioctl(fd, NBD_SET_SIZE_BLOCKS, sectors) < 0) {
|
2016-01-14 08:41:02 +00:00
|
|
|
int serrno = errno;
|
2017-05-26 11:09:13 +00:00
|
|
|
error_setg(errp, "Failed setting size (in blocks)");
|
2016-01-14 08:41:02 +00:00
|
|
|
return -serrno;
|
|
|
|
}
|
|
|
|
|
2017-07-07 20:30:41 +00:00
|
|
|
if (ioctl(fd, NBD_SET_FLAGS, (unsigned long) info->flags) < 0) {
|
2016-01-14 08:41:02 +00:00
|
|
|
if (errno == ENOTTY) {
|
2017-07-07 20:30:41 +00:00
|
|
|
int read_only = (info->flags & NBD_FLAG_READ_ONLY) != 0;
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_init_set_readonly();
|
2016-01-14 08:41:02 +00:00
|
|
|
|
|
|
|
if (ioctl(fd, BLKROSET, (unsigned long) &read_only) < 0) {
|
|
|
|
int serrno = errno;
|
2017-05-26 11:09:13 +00:00
|
|
|
error_setg(errp, "Failed setting read-only attribute");
|
2016-01-14 08:41:02 +00:00
|
|
|
return -serrno;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
int serrno = errno;
|
2017-05-26 11:09:13 +00:00
|
|
|
error_setg(errp, "Failed setting flags");
|
2016-01-14 08:41:02 +00:00
|
|
|
return -serrno;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_init_finish();
|
2016-01-14 08:41:02 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int nbd_client(int fd)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
int serrno;
|
|
|
|
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_client_loop();
|
2016-01-14 08:41:02 +00:00
|
|
|
|
|
|
|
ret = ioctl(fd, NBD_DO_IT);
|
|
|
|
if (ret < 0 && errno == EPIPE) {
|
|
|
|
/* NBD_DO_IT normally returns EPIPE when someone has disconnected
|
|
|
|
* the socket via NBD_DISCONNECT. We do not want to return 1 in
|
|
|
|
* that case.
|
|
|
|
*/
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
serrno = errno;
|
|
|
|
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_client_loop_ret(ret, strerror(serrno));
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_client_clear_queue();
|
2016-01-14 08:41:02 +00:00
|
|
|
ioctl(fd, NBD_CLEAR_QUE);
|
|
|
|
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_client_clear_socket();
|
2016-01-14 08:41:02 +00:00
|
|
|
ioctl(fd, NBD_CLEAR_SOCK);
|
|
|
|
|
|
|
|
errno = serrno;
|
|
|
|
return ret;
|
|
|
|
}
|
2016-05-11 22:39:39 +00:00
|
|
|
|
|
|
|
int nbd_disconnect(int fd)
|
|
|
|
{
|
|
|
|
ioctl(fd, NBD_CLEAR_QUE);
|
|
|
|
ioctl(fd, NBD_DISCONNECT);
|
|
|
|
ioctl(fd, NBD_CLEAR_SOCK);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-01-14 08:41:02 +00:00
|
|
|
#else
|
2017-07-07 20:30:41 +00:00
|
|
|
int nbd_init(int fd, QIOChannelSocket *ioc, NBDExportInfo *info,
|
2017-05-26 11:09:13 +00:00
|
|
|
Error **errp)
|
2016-01-14 08:41:02 +00:00
|
|
|
{
|
2017-05-26 11:09:13 +00:00
|
|
|
error_setg(errp, "nbd_init is only supported on Linux");
|
2016-01-14 08:41:02 +00:00
|
|
|
return -ENOTSUP;
|
|
|
|
}
|
|
|
|
|
|
|
|
int nbd_client(int fd)
|
|
|
|
{
|
|
|
|
return -ENOTSUP;
|
|
|
|
}
|
2016-05-11 22:39:39 +00:00
|
|
|
int nbd_disconnect(int fd)
|
|
|
|
{
|
|
|
|
return -ENOTSUP;
|
|
|
|
}
|
2016-01-14 08:41:02 +00:00
|
|
|
#endif
|
|
|
|
|
2017-08-04 15:14:27 +00:00
|
|
|
int nbd_send_request(QIOChannel *ioc, NBDRequest *request)
|
2016-01-14 08:41:02 +00:00
|
|
|
{
|
|
|
|
uint8_t buf[NBD_REQUEST_SIZE];
|
|
|
|
|
2017-07-07 15:29:18 +00:00
|
|
|
trace_nbd_send_request(request->from, request->len, request->handle,
|
2017-07-17 19:26:34 +00:00
|
|
|
request->flags, request->type,
|
|
|
|
nbd_cmd_lookup(request->type));
|
2016-04-06 03:35:04 +00:00
|
|
|
|
2016-06-10 16:15:42 +00:00
|
|
|
stl_be_p(buf, NBD_REQUEST_MAGIC);
|
2016-10-14 18:33:04 +00:00
|
|
|
stw_be_p(buf + 4, request->flags);
|
|
|
|
stw_be_p(buf + 6, request->type);
|
2016-06-10 16:15:42 +00:00
|
|
|
stq_be_p(buf + 8, request->handle);
|
|
|
|
stq_be_p(buf + 16, request->from);
|
|
|
|
stl_be_p(buf + 24, request->len);
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2017-06-02 15:01:39 +00:00
|
|
|
return nbd_write(ioc, buf, sizeof(buf), NULL);
|
2016-01-14 08:41:02 +00:00
|
|
|
}
|
|
|
|
|
2017-10-27 10:40:35 +00:00
|
|
|
/* nbd_receive_simple_reply
|
|
|
|
* Read simple reply except magic field (which should be already read).
|
|
|
|
* Payload is not read (payload is possible for CMD_READ, but here we even
|
|
|
|
* don't know whether it take place or not).
|
|
|
|
*/
|
|
|
|
static int nbd_receive_simple_reply(QIOChannel *ioc, NBDSimpleReply *reply,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
assert(reply->magic == NBD_SIMPLE_REPLY_MAGIC);
|
|
|
|
|
|
|
|
ret = nbd_read(ioc, (uint8_t *)reply + sizeof(reply->magic),
|
|
|
|
sizeof(*reply) - sizeof(reply->magic), errp);
|
|
|
|
if (ret < 0) {
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
be32_to_cpus(&reply->error);
|
|
|
|
be64_to_cpus(&reply->handle);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* nbd_receive_structured_reply_chunk
|
|
|
|
* Read structured reply chunk except magic field (which should be already
|
|
|
|
* read).
|
|
|
|
* Payload is not read.
|
|
|
|
*/
|
|
|
|
static int nbd_receive_structured_reply_chunk(QIOChannel *ioc,
|
|
|
|
NBDStructuredReplyChunk *chunk,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
assert(chunk->magic == NBD_STRUCTURED_REPLY_MAGIC);
|
|
|
|
|
|
|
|
ret = nbd_read(ioc, (uint8_t *)chunk + sizeof(chunk->magic),
|
|
|
|
sizeof(*chunk) - sizeof(chunk->magic), errp);
|
|
|
|
if (ret < 0) {
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
be16_to_cpus(&chunk->flags);
|
|
|
|
be16_to_cpus(&chunk->type);
|
|
|
|
be64_to_cpus(&chunk->handle);
|
|
|
|
be32_to_cpus(&chunk->length);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-08-04 15:14:26 +00:00
|
|
|
/* nbd_receive_reply
|
|
|
|
* Returns 1 on success
|
|
|
|
* 0 on eof, when no data was read (errp is not set)
|
|
|
|
* negative errno on failure (errp is set)
|
|
|
|
*/
|
|
|
|
int nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)
|
2016-01-14 08:41:02 +00:00
|
|
|
{
|
2017-08-04 15:14:26 +00:00
|
|
|
int ret;
|
2017-11-08 21:56:59 +00:00
|
|
|
const char *type;
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2017-10-27 10:40:35 +00:00
|
|
|
ret = nbd_read_eof(ioc, &reply->magic, sizeof(reply->magic), errp);
|
2017-02-13 13:52:24 +00:00
|
|
|
if (ret <= 0) {
|
2016-01-14 08:41:02 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-10-27 10:40:35 +00:00
|
|
|
be32_to_cpus(&reply->magic);
|
2016-01-14 08:41:02 +00:00
|
|
|
|
2017-10-27 10:40:35 +00:00
|
|
|
switch (reply->magic) {
|
|
|
|
case NBD_SIMPLE_REPLY_MAGIC:
|
|
|
|
ret = nbd_receive_simple_reply(ioc, &reply->simple, errp);
|
|
|
|
if (ret < 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
trace_nbd_receive_simple_reply(reply->simple.error,
|
|
|
|
nbd_err_lookup(reply->simple.error),
|
|
|
|
reply->handle);
|
|
|
|
break;
|
|
|
|
case NBD_STRUCTURED_REPLY_MAGIC:
|
|
|
|
ret = nbd_receive_structured_reply_chunk(ioc, &reply->structured, errp);
|
|
|
|
if (ret < 0) {
|
|
|
|
break;
|
|
|
|
}
|
2017-11-08 21:56:59 +00:00
|
|
|
type = nbd_reply_type_lookup(reply->structured.type);
|
2017-10-27 10:40:35 +00:00
|
|
|
trace_nbd_receive_structured_reply_chunk(reply->structured.flags,
|
2017-11-08 21:56:59 +00:00
|
|
|
reply->structured.type, type,
|
2017-10-27 10:40:35 +00:00
|
|
|
reply->structured.handle,
|
|
|
|
reply->structured.length);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
error_setg(errp, "invalid magic (got 0x%" PRIx32 ")", reply->magic);
|
2016-10-14 18:33:16 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2017-10-27 10:40:35 +00:00
|
|
|
if (ret < 0) {
|
|
|
|
return ret;
|
2016-01-14 08:41:02 +00:00
|
|
|
}
|
2017-08-04 15:14:26 +00:00
|
|
|
|
|
|
|
return 1;
|
2016-01-14 08:41:02 +00:00
|
|
|
}
|
|
|
|
|