From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsUWc-0006Da-FK for qemu-devel@nongnu.org; Mon, 16 Dec 2013 04:31:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsUWV-0002Bc-IL for qemu-devel@nongnu.org; Mon, 16 Dec 2013 04:31:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16530) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsUWV-0002B0-3s for qemu-devel@nongnu.org; Mon, 16 Dec 2013 04:31:35 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBG9VY82028916 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 16 Dec 2013 04:31:34 -0500 From: Gerd Hoffmann Date: Mon, 16 Dec 2013 10:31:09 +0100 Message-Id: <1387186277-9573-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1387186277-9573-1-git-send-email-kraxel@redhat.com> References: <1387186277-9573-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 08/16] Split nbd block client code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Paolo Bonzini Signed-off-by: Gerd Hoffmann --- block/Makefile.objs | 2 +- block/nbd-client.c | 372 ++++++++++++++++++++++++++++++++++++++++++++++= +++++ block/nbd-client.h | 51 +++++++ block/nbd.c | 373 ++++------------------------------------------= ------ 4 files changed, 452 insertions(+), 346 deletions(-) create mode 100644 block/nbd-client.c create mode 100644 block/nbd-client.h diff --git a/block/Makefile.objs b/block/Makefile.objs index f43ecbc..4e8c91e 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -10,7 +10,7 @@ block-obj-$(CONFIG_POSIX) +=3D raw-posix.o block-obj-$(CONFIG_LINUX_AIO) +=3D linux-aio.o =20 ifeq ($(CONFIG_POSIX),y) -block-obj-y +=3D nbd.o sheepdog.o +block-obj-y +=3D nbd.o nbd-client.o sheepdog.o block-obj-$(CONFIG_LIBISCSI) +=3D iscsi.o block-obj-$(CONFIG_CURL) +=3D curl.o block-obj-$(CONFIG_RBD) +=3D rbd.o diff --git a/block/nbd-client.c b/block/nbd-client.c new file mode 100644 index 0000000..1abfc6a --- /dev/null +++ b/block/nbd-client.c @@ -0,0 +1,372 @@ +/* + * QEMU Block driver for NBD + * + * Copyright (C) 2008 Bull S.A.S. + * Author: Laurent Vivier + * + * Some parts: + * Copyright (C) 2007 Anthony Liguori + * + * Permission is hereby granted, free of charge, to any person obtaining= a copy + * of this software and associated documentation files (the "Software"),= to deal + * in the Software without restriction, including without limitation the= rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or = sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be includ= ed in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRE= SS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILI= TY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHA= LL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR = OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISI= NG FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALING= S IN + * THE SOFTWARE. + */ + +#include "nbd-client.h" +#include "qemu/sockets.h" + +#define HANDLE_TO_INDEX(bs, handle) ((handle) ^ ((uint64_t)(intptr_t)bs)= ) +#define INDEX_TO_HANDLE(bs, index) ((index) ^ ((uint64_t)(intptr_t)bs)= ) + +static void nbd_reply_ready(void *opaque) +{ + NbdClientSession *s =3D opaque; + uint64_t i; + int ret; + + if (s->reply.handle =3D=3D 0) { + /* No reply already in flight. Fetch a header. It is possible + * that another thread has done the same thing in parallel, so + * the socket is not readable anymore. + */ + ret =3D nbd_receive_reply(s->sock, &s->reply); + if (ret =3D=3D -EAGAIN) { + return; + } + if (ret < 0) { + s->reply.handle =3D 0; + goto fail; + } + } + + /* There's no need for a mutex on the receive side, because the + * handler acts as a synchronization point and ensures that only + * one coroutine is called until the reply finishes. */ + i =3D HANDLE_TO_INDEX(s, s->reply.handle); + if (i >=3D MAX_NBD_REQUESTS) { + goto fail; + } + + if (s->recv_coroutine[i]) { + qemu_coroutine_enter(s->recv_coroutine[i], NULL); + return; + } + +fail: + for (i =3D 0; i < MAX_NBD_REQUESTS; i++) { + if (s->recv_coroutine[i]) { + qemu_coroutine_enter(s->recv_coroutine[i], NULL); + } + } +} + +static void nbd_restart_write(void *opaque) +{ + NbdClientSession *s =3D opaque; + + qemu_coroutine_enter(s->send_coroutine, NULL); +} + +static int nbd_co_send_request(NbdClientSession *s, + struct nbd_request *request, + QEMUIOVector *qiov, int offset) +{ + int rc, ret; + + qemu_co_mutex_lock(&s->send_mutex); + s->send_coroutine =3D qemu_coroutine_self(); + qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, nbd_restart_write,= s); + if (qiov) { + if (!s->is_unix) { + socket_set_cork(s->sock, 1); + } + rc =3D nbd_send_request(s->sock, request); + if (rc >=3D 0) { + ret =3D qemu_co_sendv(s->sock, qiov->iov, qiov->niov, + offset, request->len); + if (ret !=3D request->len) { + rc =3D -EIO; + } + } + if (!s->is_unix) { + socket_set_cork(s->sock, 0); + } + } else { + rc =3D nbd_send_request(s->sock, request); + } + qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, NULL, s); + s->send_coroutine =3D NULL; + qemu_co_mutex_unlock(&s->send_mutex); + return rc; +} + +static void nbd_co_receive_reply(NbdClientSession *s, + struct nbd_request *request, struct nbd_reply *reply, + QEMUIOVector *qiov, int offset) +{ + int ret; + + /* Wait until we're woken up by the read handler. TODO: perhaps + * peek at the next reply and avoid yielding if it's ours? */ + qemu_coroutine_yield(); + *reply =3D s->reply; + if (reply->handle !=3D request->handle) { + reply->error =3D EIO; + } else { + if (qiov && reply->error =3D=3D 0) { + ret =3D qemu_co_recvv(s->sock, qiov->iov, qiov->niov, + offset, request->len); + if (ret !=3D request->len) { + reply->error =3D EIO; + } + } + + /* Tell the read handler to read another header. */ + s->reply.handle =3D 0; + } +} + +static void nbd_coroutine_start(NbdClientSession *s, + struct nbd_request *request) +{ + int i; + + /* Poor man semaphore. The free_sema is locked when no other reques= t + * can be accepted, and unlocked after receiving one reply. */ + if (s->in_flight >=3D MAX_NBD_REQUESTS - 1) { + qemu_co_mutex_lock(&s->free_sema); + assert(s->in_flight < MAX_NBD_REQUESTS); + } + s->in_flight++; + + for (i =3D 0; i < MAX_NBD_REQUESTS; i++) { + if (s->recv_coroutine[i] =3D=3D NULL) { + s->recv_coroutine[i] =3D qemu_coroutine_self(); + break; + } + } + + assert(i < MAX_NBD_REQUESTS); + request->handle =3D INDEX_TO_HANDLE(s, i); +} + +static void nbd_coroutine_end(NbdClientSession *s, + struct nbd_request *request) +{ + int i =3D HANDLE_TO_INDEX(s, request->handle); + s->recv_coroutine[i] =3D NULL; + if (s->in_flight-- =3D=3D MAX_NBD_REQUESTS) { + qemu_co_mutex_unlock(&s->free_sema); + } +} + +static int nbd_co_readv_1(NbdClientSession *client, int64_t sector_num, + int nb_sectors, QEMUIOVector *qiov, + int offset) +{ + struct nbd_request request; + struct nbd_reply reply; + ssize_t ret; + + request.type =3D NBD_CMD_READ; + request.from =3D sector_num * 512; + request.len =3D nb_sectors * 512; + + nbd_coroutine_start(client, &request); + ret =3D nbd_co_send_request(client, &request, NULL, 0); + if (ret < 0) { + reply.error =3D -ret; + } else { + nbd_co_receive_reply(client, &request, &reply, qiov, offset); + } + nbd_coroutine_end(client, &request); + return -reply.error; + +} + +static int nbd_co_writev_1(NbdClientSession *client, int64_t sector_num, + int nb_sectors, QEMUIOVector *qiov, + int offset) +{ + struct nbd_request request; + struct nbd_reply reply; + ssize_t ret; + + request.type =3D NBD_CMD_WRITE; + if (!bdrv_enable_write_cache(client->bs) && + (client->nbdflags & NBD_FLAG_SEND_FUA)) { + request.type |=3D NBD_CMD_FLAG_FUA; + } + + request.from =3D sector_num * 512; + request.len =3D nb_sectors * 512; + + nbd_coroutine_start(client, &request); + ret =3D nbd_co_send_request(client, &request, qiov, offset); + if (ret < 0) { + reply.error =3D -ret; + } else { + nbd_co_receive_reply(client, &request, &reply, NULL, 0); + } + nbd_coroutine_end(client, &request); + return -reply.error; +} + +/* qemu-nbd has a limit of slightly less than 1M per request. Try to + * remain aligned to 4K. */ +#define NBD_MAX_SECTORS 2040 + +int nbd_client_session_co_readv(NbdClientSession *client, int64_t sector= _num, + int nb_sectors, QEMUIOVector *qiov) +{ + int offset =3D 0; + int ret; + while (nb_sectors > NBD_MAX_SECTORS) { + ret =3D nbd_co_readv_1(client, sector_num, + NBD_MAX_SECTORS, qiov, offset); + if (ret < 0) { + return ret; + } + offset +=3D NBD_MAX_SECTORS * 512; + sector_num +=3D NBD_MAX_SECTORS; + nb_sectors -=3D NBD_MAX_SECTORS; + } + return nbd_co_readv_1(client, sector_num, nb_sectors, qiov, offset); +} + +int nbd_client_session_co_writev(NbdClientSession *client, int64_t secto= r_num, + int nb_sectors, QEMUIOVector *qiov) +{ + int offset =3D 0; + int ret; + while (nb_sectors > NBD_MAX_SECTORS) { + ret =3D nbd_co_writev_1(client, sector_num, + NBD_MAX_SECTORS, qiov, offset); + if (ret < 0) { + return ret; + } + offset +=3D NBD_MAX_SECTORS * 512; + sector_num +=3D NBD_MAX_SECTORS; + nb_sectors -=3D NBD_MAX_SECTORS; + } + return nbd_co_writev_1(client, sector_num, nb_sectors, qiov, offset)= ; +} + +int nbd_client_session_co_flush(NbdClientSession *client) +{ + struct nbd_request request; + struct nbd_reply reply; + ssize_t ret; + + if (!(client->nbdflags & NBD_FLAG_SEND_FLUSH)) { + return 0; + } + + request.type =3D NBD_CMD_FLUSH; + if (client->nbdflags & NBD_FLAG_SEND_FUA) { + request.type |=3D NBD_CMD_FLAG_FUA; + } + + request.from =3D 0; + request.len =3D 0; + + nbd_coroutine_start(client, &request); + ret =3D nbd_co_send_request(client, &request, NULL, 0); + if (ret < 0) { + reply.error =3D -ret; + } else { + nbd_co_receive_reply(client, &request, &reply, NULL, 0); + } + nbd_coroutine_end(client, &request); + return -reply.error; +} + +int nbd_client_session_co_discard(NbdClientSession *client, int64_t sect= or_num, + int nb_sectors) +{ + struct nbd_request request; + struct nbd_reply reply; + ssize_t ret; + + if (!(client->nbdflags & NBD_FLAG_SEND_TRIM)) { + return 0; + } + request.type =3D NBD_CMD_TRIM; + request.from =3D sector_num * 512; + request.len =3D nb_sectors * 512; + + nbd_coroutine_start(client, &request); + ret =3D nbd_co_send_request(client, &request, NULL, 0); + if (ret < 0) { + reply.error =3D -ret; + } else { + nbd_co_receive_reply(client, &request, &reply, NULL, 0); + } + nbd_coroutine_end(client, &request); + return -reply.error; + +} + +static void nbd_teardown_connection(NbdClientSession *client) +{ + struct nbd_request request; + + request.type =3D NBD_CMD_DISC; + request.from =3D 0; + request.len =3D 0; + nbd_send_request(client->sock, &request); + + qemu_aio_set_fd_handler(client->sock, NULL, NULL, NULL); + closesocket(client->sock); + client->sock =3D -1; +} + +void nbd_client_session_close(NbdClientSession *client) +{ + nbd_teardown_connection(client); + g_free(client->export_name); + client->export_name =3D NULL; +} + +int nbd_client_session_init(NbdClientSession *client, + BlockDriverState *bs, int sock) +{ + int ret; + + /* NBD handshake */ + ret =3D nbd_receive_negotiate(sock, client->export_name, + &client->nbdflags, &client->size, + &client->blocksize); + if (ret < 0) { + logout("Failed to negotiate with the NBD server\n"); + closesocket(sock); + return ret; + } + + qemu_co_mutex_init(&client->send_mutex); + qemu_co_mutex_init(&client->free_sema); + client->bs =3D bs; + client->sock =3D sock; + + /* Now that we're connected, set the socket to be non-blocking and + * kick the reply mechanism. */ + qemu_set_nonblock(sock); + qemu_aio_set_fd_handler(sock, nbd_reply_ready, NULL, client); + + logout("Established connection with NBD server\n"); + return 0; +} diff --git a/block/nbd-client.h b/block/nbd-client.h new file mode 100644 index 0000000..c271236 --- /dev/null +++ b/block/nbd-client.h @@ -0,0 +1,51 @@ +#ifndef NBD_CLIENT_H +#define NBD_CLIENT_H + +#include "qemu-common.h" +#include "block/nbd.h" +#include "block/block_int.h" + +/* #define DEBUG_NBD */ + +#if defined(DEBUG_NBD) +#define logout(fmt, ...) \ + fprintf(stderr, "nbd\t%-24s" fmt, __func__, ##__VA_ARGS__) +#else +#define logout(fmt, ...) ((void)0) +#endif + +#define MAX_NBD_REQUESTS 16 + +typedef struct NbdClientSession { + int sock; + uint32_t nbdflags; + off_t size; + size_t blocksize; + + CoMutex send_mutex; + CoMutex free_sema; + Coroutine *send_coroutine; + int in_flight; + + Coroutine *recv_coroutine[MAX_NBD_REQUESTS]; + struct nbd_reply reply; + + char *export_name; /* An NBD server may export several devices */ + bool is_unix; + + BlockDriverState *bs; +} NbdClientSession; + +int nbd_client_session_init(NbdClientSession *client, + BlockDriverState *bs, int sock); +void nbd_client_session_close(NbdClientSession *client); + +int nbd_client_session_co_discard(NbdClientSession *client, int64_t sect= or_num, + int nb_sectors); +int nbd_client_session_co_flush(NbdClientSession *client); +int nbd_client_session_co_writev(NbdClientSession *client, int64_t secto= r_num, + int nb_sectors, QEMUIOVector *qiov); +int nbd_client_session_co_readv(NbdClientSession *client, int64_t sector= _num, + int nb_sectors, QEMUIOVector *qiov); + +#endif /* NBD_CLIENT_H */ diff --git a/block/nbd.c b/block/nbd.c index c8deeee..be75ba0 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -26,8 +26,7 @@ * THE SOFTWARE. */ =20 -#include "qemu-common.h" -#include "block/nbd.h" +#include "block/nbd-client.h" #include "qemu/uri.h" #include "block/block_int.h" #include "qemu/module.h" @@ -40,37 +39,9 @@ =20 #define EN_OPTSTR ":exportname=3D" =20 -/* #define DEBUG_NBD */ - -#if defined(DEBUG_NBD) -#define logout(fmt, ...) \ - fprintf(stderr, "nbd\t%-24s" fmt, __func__, ##__VA_ARGS_= _) -#else -#define logout(fmt, ...) ((void)0) -#endif - -#define MAX_NBD_REQUESTS 16 -#define HANDLE_TO_INDEX(bs, handle) ((handle) ^ ((uint64_t)(intptr_t)bs)= ) -#define INDEX_TO_HANDLE(bs, index) ((index) ^ ((uint64_t)(intptr_t)bs)= ) - typedef struct BDRVNBDState { - int sock; - uint32_t nbdflags; - off_t size; - size_t blocksize; - - CoMutex send_mutex; - CoMutex free_sema; - Coroutine *send_coroutine; - int in_flight; - - Coroutine *recv_coroutine[MAX_NBD_REQUESTS]; - struct nbd_reply reply; - - bool is_unix; + NbdClientSession client; QemuOpts *socket_opts; - - char *export_name; /* An NBD server may export several devices */ } BDRVNBDState; =20 static int nbd_parse_uri(const char *filename, QDict *options) @@ -227,9 +198,9 @@ static int nbd_config(BDRVNBDState *s, QDict *options= ) "be used at the same time."); return -EINVAL; } - s->is_unix =3D true; + s->client.is_unix =3D true; } else if (qdict_haskey(options, "host")) { - s->is_unix =3D false; + s->client.is_unix =3D false; } else { return -EINVAL; } @@ -247,162 +218,20 @@ static int nbd_config(BDRVNBDState *s, QDict *opti= ons) qemu_opt_set_number(s->socket_opts, "port", NBD_DEFAULT_PORT); } =20 - s->export_name =3D g_strdup(qdict_get_try_str(options, "export")); - if (s->export_name) { + s->client.export_name =3D g_strdup(qdict_get_try_str(options, "expor= t")); + if (s->client.export_name) { qdict_del(options, "export"); } =20 return 0; } =20 - -static void nbd_coroutine_start(BDRVNBDState *s, struct nbd_request *req= uest) -{ - int i; - - /* Poor man semaphore. The free_sema is locked when no other reques= t - * can be accepted, and unlocked after receiving one reply. */ - if (s->in_flight >=3D MAX_NBD_REQUESTS - 1) { - qemu_co_mutex_lock(&s->free_sema); - assert(s->in_flight < MAX_NBD_REQUESTS); - } - s->in_flight++; - - for (i =3D 0; i < MAX_NBD_REQUESTS; i++) { - if (s->recv_coroutine[i] =3D=3D NULL) { - s->recv_coroutine[i] =3D qemu_coroutine_self(); - break; - } - } - - assert(i < MAX_NBD_REQUESTS); - request->handle =3D INDEX_TO_HANDLE(s, i); -} - -static void nbd_reply_ready(void *opaque) -{ - BDRVNBDState *s =3D opaque; - uint64_t i; - int ret; - - if (s->reply.handle =3D=3D 0) { - /* No reply already in flight. Fetch a header. It is possible - * that another thread has done the same thing in parallel, so - * the socket is not readable anymore. - */ - ret =3D nbd_receive_reply(s->sock, &s->reply); - if (ret =3D=3D -EAGAIN) { - return; - } - if (ret < 0) { - s->reply.handle =3D 0; - goto fail; - } - } - - /* There's no need for a mutex on the receive side, because the - * handler acts as a synchronization point and ensures that only - * one coroutine is called until the reply finishes. */ - i =3D HANDLE_TO_INDEX(s, s->reply.handle); - if (i >=3D MAX_NBD_REQUESTS) { - goto fail; - } - - if (s->recv_coroutine[i]) { - qemu_coroutine_enter(s->recv_coroutine[i], NULL); - return; - } - -fail: - for (i =3D 0; i < MAX_NBD_REQUESTS; i++) { - if (s->recv_coroutine[i]) { - qemu_coroutine_enter(s->recv_coroutine[i], NULL); - } - } -} - -static void nbd_restart_write(void *opaque) -{ - BDRVNBDState *s =3D opaque; - qemu_coroutine_enter(s->send_coroutine, NULL); -} - -static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *requ= est, - QEMUIOVector *qiov, int offset) -{ - int rc, ret; - - qemu_co_mutex_lock(&s->send_mutex); - s->send_coroutine =3D qemu_coroutine_self(); - qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, nbd_restart_write,= s); - if (qiov) { - if (!s->is_unix) { - socket_set_cork(s->sock, 1); - } - rc =3D nbd_send_request(s->sock, request); - if (rc >=3D 0) { - ret =3D qemu_co_sendv(s->sock, qiov->iov, qiov->niov, - offset, request->len); - if (ret !=3D request->len) { - rc =3D -EIO; - } - } - if (!s->is_unix) { - socket_set_cork(s->sock, 0); - } - } else { - rc =3D nbd_send_request(s->sock, request); - } - qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, NULL, s); - s->send_coroutine =3D NULL; - qemu_co_mutex_unlock(&s->send_mutex); - return rc; -} - -static void nbd_co_receive_reply(BDRVNBDState *s, struct nbd_request *re= quest, - struct nbd_reply *reply, - QEMUIOVector *qiov, int offset) -{ - int ret; - - /* Wait until we're woken up by the read handler. TODO: perhaps - * peek at the next reply and avoid yielding if it's ours? */ - qemu_coroutine_yield(); - *reply =3D s->reply; - if (reply->handle !=3D request->handle) { - reply->error =3D EIO; - } else { - if (qiov && reply->error =3D=3D 0) { - ret =3D qemu_co_recvv(s->sock, qiov->iov, qiov->niov, - offset, request->len); - if (ret !=3D request->len) { - reply->error =3D EIO; - } - } - - /* Tell the read handler to read another header. */ - s->reply.handle =3D 0; - } -} - -static void nbd_coroutine_end(BDRVNBDState *s, struct nbd_request *reque= st) -{ - int i =3D HANDLE_TO_INDEX(s, request->handle); - s->recv_coroutine[i] =3D NULL; - if (s->in_flight-- =3D=3D MAX_NBD_REQUESTS) { - qemu_co_mutex_unlock(&s->free_sema); - } -} - static int nbd_establish_connection(BlockDriverState *bs) { BDRVNBDState *s =3D bs->opaque; int sock; - int ret; - off_t size; - size_t blocksize; =20 - if (s->is_unix) { + if (s->client.is_unix) { sock =3D unix_socket_outgoing(qemu_opt_get(s->socket_opts, "path= ")); } else { sock =3D tcp_socket_outgoing_opts(s->socket_opts); @@ -417,50 +246,14 @@ static int nbd_establish_connection(BlockDriverStat= e *bs) return -errno; } =20 - /* NBD handshake */ - ret =3D nbd_receive_negotiate(sock, s->export_name, &s->nbdflags, &s= ize, - &blocksize); - if (ret < 0) { - logout("Failed to negotiate with the NBD server\n"); - closesocket(sock); - return ret; - } - - /* Now that we're connected, set the socket to be non-blocking and - * kick the reply mechanism. */ - qemu_set_nonblock(sock); - qemu_aio_set_fd_handler(sock, nbd_reply_ready, NULL, s); - - s->sock =3D sock; - s->size =3D size; - s->blocksize =3D blocksize; - - logout("Established connection with NBD server\n"); - return 0; -} - -static void nbd_teardown_connection(BlockDriverState *bs) -{ - BDRVNBDState *s =3D bs->opaque; - struct nbd_request request; - - request.type =3D NBD_CMD_DISC; - request.from =3D 0; - request.len =3D 0; - nbd_send_request(s->sock, &request); - - qemu_aio_set_fd_handler(s->sock, NULL, NULL, NULL); - closesocket(s->sock); + return sock; } =20 static int nbd_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { BDRVNBDState *s =3D bs->opaque; - int result; - - qemu_co_mutex_init(&s->send_mutex); - qemu_co_mutex_init(&s->free_sema); + int result, sock; =20 /* Pop the config into our state object. Exit if invalid. */ result =3D nbd_config(s, options); @@ -471,172 +264,62 @@ static int nbd_open(BlockDriverState *bs, QDict *o= ptions, int flags, /* establish TCP connection, return error if it fails * TODO: Configurable retry-until-timeout behaviour. */ - result =3D nbd_establish_connection(bs); - - return result; -} - -static int nbd_co_readv_1(BlockDriverState *bs, int64_t sector_num, - int nb_sectors, QEMUIOVector *qiov, - int offset) -{ - BDRVNBDState *s =3D bs->opaque; - struct nbd_request request; - struct nbd_reply reply; - ssize_t ret; - - request.type =3D NBD_CMD_READ; - request.from =3D sector_num * 512; - request.len =3D nb_sectors * 512; - - nbd_coroutine_start(s, &request); - ret =3D nbd_co_send_request(s, &request, NULL, 0); - if (ret < 0) { - reply.error =3D -ret; - } else { - nbd_co_receive_reply(s, &request, &reply, qiov, offset); - } - nbd_coroutine_end(s, &request); - return -reply.error; - -} - -static int nbd_co_writev_1(BlockDriverState *bs, int64_t sector_num, - int nb_sectors, QEMUIOVector *qiov, - int offset) -{ - BDRVNBDState *s =3D bs->opaque; - struct nbd_request request; - struct nbd_reply reply; - ssize_t ret; - - request.type =3D NBD_CMD_WRITE; - if (!bdrv_enable_write_cache(bs) && (s->nbdflags & NBD_FLAG_SEND_FUA= )) { - request.type |=3D NBD_CMD_FLAG_FUA; + sock =3D nbd_establish_connection(bs); + if (sock < 0) { + return sock; } =20 - request.from =3D sector_num * 512; - request.len =3D nb_sectors * 512; - - nbd_coroutine_start(s, &request); - ret =3D nbd_co_send_request(s, &request, qiov, offset); - if (ret < 0) { - reply.error =3D -ret; - } else { - nbd_co_receive_reply(s, &request, &reply, NULL, 0); - } - nbd_coroutine_end(s, &request); - return -reply.error; + /* NBD handshake */ + return nbd_client_session_init(&s->client, bs, sock); } =20 -/* qemu-nbd has a limit of slightly less than 1M per request. Try to - * remain aligned to 4K. */ -#define NBD_MAX_SECTORS 2040 - static int nbd_co_readv(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov) { - int offset =3D 0; - int ret; - while (nb_sectors > NBD_MAX_SECTORS) { - ret =3D nbd_co_readv_1(bs, sector_num, NBD_MAX_SECTORS, qiov, of= fset); - if (ret < 0) { - return ret; - } - offset +=3D NBD_MAX_SECTORS * 512; - sector_num +=3D NBD_MAX_SECTORS; - nb_sectors -=3D NBD_MAX_SECTORS; - } - return nbd_co_readv_1(bs, sector_num, nb_sectors, qiov, offset); + BDRVNBDState *s =3D bs->opaque; + + return nbd_client_session_co_readv(&s->client, sector_num, + nb_sectors, qiov); } =20 static int nbd_co_writev(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov) { - int offset =3D 0; - int ret; - while (nb_sectors > NBD_MAX_SECTORS) { - ret =3D nbd_co_writev_1(bs, sector_num, NBD_MAX_SECTORS, qiov, o= ffset); - if (ret < 0) { - return ret; - } - offset +=3D NBD_MAX_SECTORS * 512; - sector_num +=3D NBD_MAX_SECTORS; - nb_sectors -=3D NBD_MAX_SECTORS; - } - return nbd_co_writev_1(bs, sector_num, nb_sectors, qiov, offset); + BDRVNBDState *s =3D bs->opaque; + + return nbd_client_session_co_writev(&s->client, sector_num, + nb_sectors, qiov); } =20 static int nbd_co_flush(BlockDriverState *bs) { BDRVNBDState *s =3D bs->opaque; - struct nbd_request request; - struct nbd_reply reply; - ssize_t ret; - - if (!(s->nbdflags & NBD_FLAG_SEND_FLUSH)) { - return 0; - } =20 - request.type =3D NBD_CMD_FLUSH; - if (s->nbdflags & NBD_FLAG_SEND_FUA) { - request.type |=3D NBD_CMD_FLAG_FUA; - } - - request.from =3D 0; - request.len =3D 0; - - nbd_coroutine_start(s, &request); - ret =3D nbd_co_send_request(s, &request, NULL, 0); - if (ret < 0) { - reply.error =3D -ret; - } else { - nbd_co_receive_reply(s, &request, &reply, NULL, 0); - } - nbd_coroutine_end(s, &request); - return -reply.error; + return nbd_client_session_co_flush(&s->client); } =20 static int nbd_co_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) { BDRVNBDState *s =3D bs->opaque; - struct nbd_request request; - struct nbd_reply reply; - ssize_t ret; =20 - if (!(s->nbdflags & NBD_FLAG_SEND_TRIM)) { - return 0; - } - request.type =3D NBD_CMD_TRIM; - request.from =3D sector_num * 512; - request.len =3D nb_sectors * 512; - - nbd_coroutine_start(s, &request); - ret =3D nbd_co_send_request(s, &request, NULL, 0); - if (ret < 0) { - reply.error =3D -ret; - } else { - nbd_co_receive_reply(s, &request, &reply, NULL, 0); - } - nbd_coroutine_end(s, &request); - return -reply.error; + return nbd_client_session_co_discard(&s->client, sector_num, + nb_sectors); } =20 static void nbd_close(BlockDriverState *bs) { BDRVNBDState *s =3D bs->opaque; - g_free(s->export_name); - qemu_opts_del(s->socket_opts); =20 - nbd_teardown_connection(bs); + qemu_opts_del(s->socket_opts); + nbd_client_session_close(&s->client); } =20 static int64_t nbd_getlength(BlockDriverState *bs) { BDRVNBDState *s =3D bs->opaque; =20 - return s->size; + return s->client.size; } =20 static BlockDriver bdrv_nbd =3D { --=20 1.8.3.1