Commit d1bf88e5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-06-13' into staging 



nbd patches for 2019-06-13

- add 'qemu-nbd --pid-file'
- NBD-related iotest improvements
- NBD code refactoring in preparation for reconnect

# gpg: Signature made Thu 13 Jun 2019 16:37:58 BST
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2019-06-13:
  block/nbd: merge NBDClientSession struct back to BDRVNBDState
  block/nbd: merge nbd-client.* to nbd.c
  block/nbd-client: drop stale logout
  nbd/server: Nicer spelling of max BLOCK_STATUS reply length
  iotests: Let 233 run concurrently
  iotests: Use qemu-nbd's --pid-file
  qemu-nbd: Do not close stderr
  iotests.py: Add qemu_nbd_early_pipe()
  qemu-nbd: Add --pid-file option

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 650a379d 611ae1d7

block/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ block-obj-y += null.o mirror.o commit.o io.o create.o 
block-obj-y += throttle-groups.o

block-obj-$(CONFIG_LINUX) += nvme.o



block-obj-y += nbd.o nbd-client.o

block-obj-y += nbd.o

block-obj-$(CONFIG_SHEEPDOG) += sheepdog.o

block-obj-$(CONFIG_LIBISCSI) += iscsi.o

block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o

block/nbd-client.c

deleted100644 → 0
+0 −1226

File deleted.

Preview size limit exceeded, changes collapsed.

block/nbd-client.h

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
#ifndef NBD_CLIENT_H

#define NBD_CLIENT_H



#include "block/nbd.h"

#include "block/block_int.h"

#include "io/channel-socket.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 {

    Coroutine *coroutine;

    uint64_t offset;        /* original offset of the request */

    bool receiving;         /* waiting for connection_co? */

} NBDClientRequest;



typedef struct NBDClientSession {

    QIOChannelSocket *sioc; /* The master data channel */

    QIOChannel *ioc; /* The current I/O channel which may differ (eg TLS) */

    NBDExportInfo info;



    CoMutex send_mutex;

    CoQueue free_sema;

    Coroutine *connection_co;

    int in_flight;



    NBDClientRequest requests[MAX_NBD_REQUESTS];

    NBDReply reply;

    BlockDriverState *bs;

    bool quit;

} NBDClientSession;



NBDClientSession *nbd_get_client_session(BlockDriverState *bs);



int nbd_client_init(BlockDriverState *bs,

                    SocketAddress *saddr,

                    const char *export_name,

                    QCryptoTLSCreds *tlscreds,

                    const char *hostname,

                    const char *x_dirty_bitmap,

                    Error **errp);

void nbd_client_close(BlockDriverState *bs);



int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes);

int nbd_client_co_flush(BlockDriverState *bs);

int nbd_client_co_pwritev(BlockDriverState *bs, uint64_t offset,

                          uint64_t bytes, QEMUIOVector *qiov, int flags);

int nbd_client_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset,

                                int bytes, BdrvRequestFlags flags);

int nbd_client_co_preadv(BlockDriverState *bs, uint64_t offset,

                         uint64_t bytes, QEMUIOVector *qiov, int flags);



void nbd_client_detach_aio_context(BlockDriverState *bs);

void nbd_client_attach_aio_context(BlockDriverState *bs,

                                   AioContext *new_context);



int coroutine_fn nbd_client_co_block_status(BlockDriverState *bs,

                                            bool want_zero,

                                            int64_t offset, int64_t bytes,

                                            int64_t *pnum, int64_t *map,

                                            BlockDriverState **file);



#endif /* NBD_CLIENT_H */

block/nbd.c

+1247 −35

File changed.

Preview size limit exceeded, changes collapsed.

block/trace-events

+3 −1
Original line number Diff line number Diff line
@@ -160,11 +160,13 @@ nvme_cmd_map_qiov_iov(void *s, int i, void *page, int pages) "s %p iov[%d] %p pa 
# iscsi.c

iscsi_xcopy(void *src_lun, uint64_t src_off, void *dst_lun, uint64_t dst_off, uint64_t bytes, int ret) "src_lun %p offset %"PRIu64" dst_lun %p offset %"PRIu64" bytes %"PRIu64" ret %d"



# nbd-client.c

# nbd.c

nbd_parse_blockstatus_compliance(const char *err) "ignoring extra data from non-compliant server: %s"

nbd_structured_read_compliance(const char *type) "server sent non-compliant unaligned read %s chunk"

nbd_read_reply_entry_fail(int ret, const char *err) "ret = %d, err: %s"

nbd_co_request_fail(uint64_t from, uint32_t len, uint64_t handle, uint16_t flags, uint16_t type, const char *name, int ret, const char *err) "Request failed { .from = %" PRIu64", .len = %" PRIu32 ", .handle = %" PRIu64 ", .flags = 0x%" PRIx16 ", .type = %" PRIu16 " (%s) } ret = %d, err: %s"

nbd_client_connect(const char *export_name) "export '%s'"

nbd_client_connect_success(const char *export_name) "export '%s'"



# ssh.c

ssh_restart_coroutine(void *co) "co=%p"