diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.objs | 1 | ||||
| -rw-r--r-- | contrib/libvhost-user/Makefile.objs | 2 | ||||
| -rw-r--r-- | contrib/libvhost-user/libvhost-user-glib.c | 154 | ||||
| -rw-r--r-- | contrib/libvhost-user/libvhost-user-glib.h | 32 | ||||
| -rw-r--r-- | contrib/libvhost-user/libvhost-user.c | 29 | ||||
| -rw-r--r-- | contrib/libvhost-user/libvhost-user.h | 3 | ||||
| -rw-r--r-- | contrib/vhost-user-scsi/vhost-user-scsi.c | 629 | ||||
| -rw-r--r-- | include/glib-compat.h | 7 | ||||
| -rw-r--r-- | tests/Makefile.include | 2 |
10 files changed, 315 insertions, 547 deletions
@@ -357,6 +357,7 @@ Makefile: $(version-obj-y) # Build libraries libqemuutil.a: $(util-obj-y) $(trace-obj-y) $(stub-obj-y) +libvhost-user.a: $(libvhost-user-obj-y) ###################################################################### @@ -479,7 +480,7 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS) ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) $(call LINK, $^) endif -vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) +vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a $(call LINK, $^) module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak diff --git a/Makefile.objs b/Makefile.objs index bdfa3b6..d4f973a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -115,7 +115,6 @@ libvhost-user-obj-y = contrib/libvhost-user/ vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS) vhost-user-scsi.o-libs := $(LIBISCSI_LIBS) vhost-user-scsi-obj-y = contrib/vhost-user-scsi/ -vhost-user-scsi-obj-y += contrib/libvhost-user/libvhost-user.o ###################################################################### trace-events-subdirs = diff --git a/contrib/libvhost-user/Makefile.objs b/contrib/libvhost-user/Makefile.objs index cef1ad6..ef3778e 100644 --- a/contrib/libvhost-user/Makefile.objs +++ b/contrib/libvhost-user/Makefile.objs @@ -1 +1 @@ -libvhost-user-obj-y = libvhost-user.o +libvhost-user-obj-y += libvhost-user.o libvhost-user-glib.o diff --git a/contrib/libvhost-user/libvhost-user-glib.c b/contrib/libvhost-user/libvhost-user-glib.c new file mode 100644 index 0000000..545f089 --- /dev/null +++ b/contrib/libvhost-user/libvhost-user-glib.c @@ -0,0 +1,154 @@ +/* + * Vhost User library + * + * Copyright (c) 2016 Nutanix Inc. All rights reserved. + * Copyright (c) 2017 Red Hat, Inc. + * + * Authors: + * Marc-André Lureau <mlureau@redhat.com> + * Felipe Franciosi <felipe@nutanix.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" + +#include "libvhost-user-glib.h" + +/* glib event loop integration for libvhost-user and misc callbacks */ + +G_STATIC_ASSERT((int)G_IO_IN == (int)VU_WATCH_IN); +G_STATIC_ASSERT((int)G_IO_OUT == (int)VU_WATCH_OUT); +G_STATIC_ASSERT((int)G_IO_PRI == (int)VU_WATCH_PRI); +G_STATIC_ASSERT((int)G_IO_ERR == (int)VU_WATCH_ERR); +G_STATIC_ASSERT((int)G_IO_HUP == (int)VU_WATCH_HUP); + +typedef struct VugSrc { + GSource parent; + VuDev *dev; + GPollFD gfd; +} VugSrc; + +static gboolean +vug_src_prepare(GSource *gsrc, gint *timeout) +{ + g_assert(timeout); + + *timeout = -1; + return FALSE; +} + +static gboolean +vug_src_check(GSource *gsrc) +{ + VugSrc *src = (VugSrc *)gsrc; + + g_assert(src); + + return src->gfd.revents & src->gfd.events; +} + +static gboolean +vug_src_dispatch(GSource *gsrc, GSourceFunc cb, gpointer data) +{ + VugSrc *src = (VugSrc *)gsrc; + + g_assert(src); + + ((vu_watch_cb)cb)(src->dev, src->gfd.revents, data); + + return G_SOURCE_CONTINUE; +} + +static GSourceFuncs vug_src_funcs = { + vug_src_prepare, + vug_src_check, + vug_src_dispatch, + NULL +}; + +static GSource * +vug_source_new(VuDev *dev, int fd, GIOCondition cond, + vu_watch_cb vu_cb, gpointer data) +{ + GSource *gsrc; + VugSrc *src; + guint id; + + g_assert(dev); + g_assert(fd >= 0); + g_assert(vu_cb); + + gsrc = g_source_new(&vug_src_funcs, sizeof(VugSrc)); + g_source_set_callback(gsrc, (GSourceFunc)vu_cb, data, NULL); + src = (VugSrc *)gsrc; + src->dev = dev; + src->gfd.fd = fd; + src->gfd.events = cond; + + g_source_add_poll(gsrc, &src->gfd); + id = g_source_attach(gsrc, NULL); + g_assert(id); + g_source_unref(gsrc); + + return gsrc; +} + +static void +set_watch(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb, void *pvt) +{ + GSource *src; + VugDev *dev; + + g_assert(vu_dev); + g_assert(fd >= 0); + g_assert(cb); + + dev = container_of(vu_dev, VugDev, parent); + src = vug_source_new(vu_dev, fd, vu_evt, cb, pvt); + g_hash_table_replace(dev->fdmap, GINT_TO_POINTER(fd), src); +} + +static void +remove_watch(VuDev *vu_dev, int fd) +{ + VugDev *dev; + + g_assert(vu_dev); + g_assert(fd >= 0); + + dev = container_of(vu_dev, VugDev, parent); + g_hash_table_remove(dev->fdmap, GINT_TO_POINTER(fd)); +} + + +static void vug_watch(VuDev *dev, int condition, void *data) +{ + if (!vu_dispatch(dev) != 0) { + dev->panic(dev, "Error processing vhost message"); + } +} + +void +vug_init(VugDev *dev, int socket, + vu_panic_cb panic, const VuDevIface *iface) +{ + g_assert(dev); + g_assert(iface); + + vu_init(&dev->parent, socket, panic, set_watch, remove_watch, iface); + dev->fdmap = g_hash_table_new_full(NULL, NULL, NULL, + (GDestroyNotify) g_source_destroy); + + dev->src = vug_source_new(&dev->parent, socket, G_IO_IN, vug_watch, NULL); +} + +void +vug_deinit(VugDev *dev) +{ + g_assert(dev); + + g_hash_table_unref(dev->fdmap); + g_source_unref(dev->src); +} diff --git a/contrib/libvhost-user/libvhost-user-glib.h b/contrib/libvhost-user/libvhost-user-glib.h new file mode 100644 index 0000000..6b2110b --- /dev/null +++ b/contrib/libvhost-user/libvhost-user-glib.h @@ -0,0 +1,32 @@ +/* + * Vhost User library + * + * Copyright (c) 2016 Nutanix Inc. All rights reserved. + * Copyright (c) 2017 Red Hat, Inc. + * + * Authors: + * Marc-André Lureau <mlureau@redhat.com> + * Felipe Franciosi <felipe@nutanix.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. + */ + +#ifndef LIBVHOST_USER_GLIB_H +#define LIBVHOST_USER_GLIB_H + +#include <glib.h> +#include "libvhost-user.h" + +typedef struct VugDev { + VuDev parent; + + GHashTable *fdmap; /* fd -> gsource */ + GSource *src; +} VugDev; + +void vug_init(VugDev *dev, int socket, + vu_panic_cb panic, const VuDevIface *iface); +void vug_deinit(VugDev *dev); + +#endif /* LIBVHOST_USER_GLIB_H */ diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c index d27d630..a0e0da4 100644 --- a/contrib/libvhost-user/libvhost-user.c +++ b/contrib/libvhost-user/libvhost-user.c @@ -13,14 +13,35 @@ * later. See the COPYING file in the top-level directory. */ -#include <qemu/osdep.h> +/* this code avoids GLib dependency */ +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <stdarg.h> +#include <errno.h> +#include <string.h> +#include <assert.h> +#include <inttypes.h> +#include <sys/types.h> +#include <sys/socket.h> #include <sys/eventfd.h> +#include <sys/mman.h> #include <linux/vhost.h> +#include "qemu/compiler.h" #include "qemu/atomic.h" #include "libvhost-user.h" +/* usually provided by GLib */ +#ifndef MIN +#define MIN(x, y) ({ \ + typeof(x) _min1 = (x); \ + typeof(y) _min2 = (y); \ + (void) (&_min1 == &_min2); \ + _min1 < _min2 ? _min1 : _min2; }) +#endif + #define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64) /* The version of the protocol we support */ @@ -81,7 +102,9 @@ vu_panic(VuDev *dev, const char *msg, ...) va_list ap; va_start(ap, msg); - buf = g_strdup_vprintf(msg, ap); + if (vasprintf(&buf, msg, ap) < 0) { + buf = NULL; + } va_end(ap); dev->broken = true; @@ -853,7 +876,7 @@ vu_dispatch(VuDev *dev) success = true; end: - g_free(vmsg.data); + free(vmsg.data); return success; } diff --git a/contrib/libvhost-user/libvhost-user.h b/contrib/libvhost-user/libvhost-user.h index 4021f11..5825b66 100644 --- a/contrib/libvhost-user/libvhost-user.h +++ b/contrib/libvhost-user/libvhost-user.h @@ -358,7 +358,8 @@ void vu_queue_notify(VuDev *dev, VuVirtq *vq); * @vq: a VuVirtq queue * @sz: the size of struct to return (must be >= VuVirtqElement) * - * Returns: a VuVirtqElement filled from the queue or NULL. + * Returns: a VuVirtqElement filled from the queue or NULL. The + * returned element must be free()-d by the caller. */ void *vu_queue_pop(VuDev *dev, VuVirtq *vq, size_t sz); diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c index b5ae02c..54c1191 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -11,263 +11,33 @@ */ #include "qemu/osdep.h" -#include "contrib/libvhost-user/libvhost-user.h" -#include "hw/virtio/virtio-scsi.h" +#include "contrib/libvhost-user/libvhost-user-glib.h" +#include "standard-headers/linux/virtio_scsi.h" #include "iscsi/iscsi.h" +#include "iscsi/scsi-lowlevel.h" #include <glib.h> -/* Small compat shim from glib 2.32 */ -#ifndef G_SOURCE_CONTINUE -#define G_SOURCE_CONTINUE TRUE -#endif -#ifndef G_SOURCE_REMOVE -#define G_SOURCE_REMOVE FALSE -#endif - -/* #define VUS_DEBUG 1 */ - -/** Log helpers **/ - -#define PPRE \ - struct timespec ts; \ - char timebuf[64]; \ - struct tm tm; \ - (void)clock_gettime(CLOCK_REALTIME, &ts); \ - (void)strftime(timebuf, 64, "%Y%m%d %T", gmtime_r(&ts.tv_sec, &tm)) - -#define PEXT(lvl, msg, ...) do { \ - PPRE; \ - fprintf(stderr, "%s.%06ld " lvl ": %s:%s():%d: " msg "\n", \ - timebuf, ts.tv_nsec / 1000, \ - __FILE__, __func__, __LINE__, ## __VA_ARGS__); \ -} while (0) - -#define PNOR(lvl, msg, ...) do { \ - PPRE; \ - fprintf(stderr, "%s.%06ld " lvl ": " msg "\n", \ - timebuf, ts.tv_nsec / 1000, ## __VA_ARGS__); \ -} while (0) - -#ifdef VUS_DEBUG -#define PDBG(msg, ...) PEXT("DBG", msg, ## __VA_ARGS__) -#define PERR(msg, ...) PEXT("ERR", msg, ## __VA_ARGS__) -#define PLOG(msg, ...) PEXT("LOG", msg, ## __VA_ARGS__) -#else -#define PDBG(msg, ...) { } -#define PERR(msg, ...) PNOR("ERR", msg, ## __VA_ARGS__) -#define PLOG(msg, ...) PNOR("LOG", msg, ## __VA_ARGS__) -#endif - -/** vhost-user-scsi specific definitions **/ - - /* Only 1 LUN and device supported today */ -#define VUS_MAX_LUNS 1 -#define VUS_MAX_DEVS 1 - #define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi" -typedef struct iscsi_lun { +typedef struct VusIscsiLun { struct iscsi_context *iscsi_ctx; int iscsi_lun; -} iscsi_lun_t; - -typedef struct vhost_scsi_dev { - VuDev vu_dev; - int server_sock; - GMainLoop *loop; - GTree *fdmap; /* fd -> gsource context id */ - iscsi_lun_t luns[VUS_MAX_LUNS]; -} vhost_scsi_dev_t; - -static vhost_scsi_dev_t *vhost_scsi_devs[VUS_MAX_DEVS]; - -/** glib event loop integration for libvhost-user and misc callbacks **/ - -QEMU_BUILD_BUG_ON((int)G_IO_IN != (int)VU_WATCH_IN); -QEMU_BUILD_BUG_ON((int)G_IO_OUT != (int)VU_WATCH_OUT); -QEMU_BUILD_BUG_ON((int)G_IO_PRI != (int)VU_WATCH_PRI); -QEMU_BUILD_BUG_ON((int)G_IO_ERR != (int)VU_WATCH_ERR); -QEMU_BUILD_BUG_ON((int)G_IO_HUP != (int)VU_WATCH_HUP); - -typedef struct vus_gsrc { - GSource parent; - vhost_scsi_dev_t *vdev_scsi; - GPollFD gfd; - vu_watch_cb vu_cb; -} vus_gsrc_t; - -static gint vus_fdmap_compare(gconstpointer a, gconstpointer b) -{ - return (b > a) - (b < a); -} - -static gboolean vus_gsrc_prepare(GSource *src, gint *timeout) -{ - assert(timeout); - - *timeout = -1; - return FALSE; -} - -static gboolean vus_gsrc_check(GSource *src) -{ - vus_gsrc_t *vus_src = (vus_gsrc_t *)src; - - assert(vus_src); - - return vus_src->gfd.revents & vus_src->gfd.events; -} - -static gboolean vus_gsrc_dispatch(GSource *src, GSourceFunc cb, gpointer data) -{ - vhost_scsi_dev_t *vdev_scsi; - vus_gsrc_t *vus_src = (vus_gsrc_t *)src; - - assert(vus_src); - assert(!(vus_src->vu_cb && cb)); - - vdev_scsi = vus_src->vdev_scsi; - - assert(vdev_scsi); - - if (cb) { - return cb(data); - } - if (vus_src->vu_cb) { - vus_src->vu_cb(&vdev_scsi->vu_dev, vus_src->gfd.revents, data); - } - return G_SOURCE_CONTINUE; -} +} VusIscsiLun; -static GSourceFuncs vus_gsrc_funcs = { - vus_gsrc_prepare, - vus_gsrc_check, - vus_gsrc_dispatch, - NULL -}; +typedef struct VusDev { + VugDev parent; -static int vus_gsrc_new(vhost_scsi_dev_t *vdev_scsi, int fd, GIOCondition cond, - vu_watch_cb vu_cb, GSourceFunc gsrc_cb, gpointer data) -{ - GSource *vus_gsrc; - vus_gsrc_t *vus_src; - guint id; - - assert(vdev_scsi); - assert(fd >= 0); - assert(vu_cb || gsrc_cb); - assert(!(vu_cb && gsrc_cb)); - - vus_gsrc = g_source_new(&vus_gsrc_funcs, sizeof(vus_gsrc_t)); - if (!vus_gsrc) { - PERR("Error creating GSource for new watch"); - return -1; - } - vus_src = (vus_gsrc_t *)vus_gsrc; - - vus_src->vdev_scsi = vdev_scsi; - vus_src->gfd.fd = fd; - vus_src->gfd.events = cond; - vus_src->vu_cb = vu_cb; - - g_source_add_poll(vus_gsrc, &vus_src->gfd); - g_source_set_callback(vus_gsrc, gsrc_cb, data, NULL); - id = g_source_attach(vus_gsrc, NULL); - assert(id); - g_source_unref(vus_gsrc); - - g_tree_insert(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd, - (gpointer)(uintptr_t)id); - - return 0; -} - -/* from libiscsi's scsi-lowlevel.h ** - * - * nb. We can't directly include scsi-lowlevel.h due to a namespace conflict: - * QEMU's scsi.h also defines "SCSI_XFER_NONE". - */ - -#define SCSI_CDB_MAX_SIZE 16 - -struct scsi_iovector { - struct scsi_iovec *iov; - int niov; - int nalloc; - size_t offset; - int consumed; -}; - -struct scsi_allocated_memory { - struct scsi_allocated_memory *next; - char buf[0]; -}; - -struct scsi_data { - int size; - unsigned char *data; -}; - -enum scsi_sense_key { - SCSI_SENSE_NO_SENSE = 0x00, - SCSI_SENSE_RECOVERED_ERROR = 0x01, - SCSI_SENSE_NOT_READY = 0x02, - SCSI_SENSE_MEDIUM_ERROR = 0x03, - SCSI_SENSE_HARDWARE_ERROR = 0x04, - SCSI_SENSE_ILLEGAL_REQUEST = 0x05, - SCSI_SENSE_UNIT_ATTENTION = 0x06, - SCSI_SENSE_DATA_PROTECTION = 0x07, - SCSI_SENSE_BLANK_CHECK = 0x08, - SCSI_SENSE_VENDOR_SPECIFIC = 0x09, - SCSI_SENSE_COPY_ABORTED = 0x0a, - SCSI_SENSE_COMMAND_ABORTED = 0x0b, - SCSI_SENSE_OBSOLETE_ERROR_CODE = 0x0c, - SCSI_SENSE_OVERFLOW_COMMAND = 0x0d, - SCSI_SENSE_MISCOMPARE = 0x0e -}; - -struct scsi_sense { - unsigned char error_type; - enum scsi_sense_key key; - int ascq; - unsigned sense_specific:1; - unsigned ill_param_in_cdb:1; - unsigned bit_pointer_valid:1; - unsigned char bit_pointer; - uint16_t field_pointer; -}; - -enum scsi_residual { - SCSI_RESIDUAL_NO_RESIDUAL = 0, - SCSI_RESIDUAL_UNDERFLOW, - SCSI_RESIDUAL_OVERFLOW -}; - -struct scsi_task { - int status; - int cdb_size; - int xfer_dir; - int expxferlen; - unsigned char cdb[SCSI_CDB_MAX_SIZE]; - enum scsi_residual residual_status; - size_t residual; - struct scsi_sense sense; - struct scsi_data datain; - struct scsi_allocated_memory *mem; - void *ptr; - - uint32_t itt; - uint32_t cmdsn; - uint32_t lun; - - struct scsi_iovector iovector_in; - struct scsi_iovector iovector_out; -}; + VusIscsiLun lun; + GMainLoop *loop; +} VusDev; /** libiscsi integration **/ -static int iscsi_add_lun(iscsi_lun_t *lun, char *iscsi_uri) +typedef struct virtio_scsi_cmd_req VirtIOSCSICmdReq; +typedef struct virtio_scsi_cmd_resp VirtIOSCSICmdResp; + +static int vus_iscsi_add_lun(VusIscsiLun *lun, char *iscsi_uri) { struct iscsi_url *iscsi_url; struct iscsi_context *iscsi_ctx; @@ -275,30 +45,32 @@ static int iscsi_add_lun(iscsi_lun_t *lun, char *iscsi_uri) assert(lun); assert(iscsi_uri); + assert(!lun->iscsi_ctx); iscsi_ctx = iscsi_create_context(VUS_ISCSI_INITIATOR); if (!iscsi_ctx) { - PERR("Unable to create iSCSI context"); + g_warning("Unable to create iSCSI context"); return -1; } iscsi_url = iscsi_parse_full_url(iscsi_ctx, iscsi_uri); if (!iscsi_url) { - PERR("Unable to parse iSCSI URL: %s", iscsi_get_error(iscsi_ctx)); + g_warning("Unable to parse iSCSI URL: %s", iscsi_get_error(iscsi_ctx)); goto fail; } iscsi_set_session_type(iscsi_ctx, ISCSI_SESSION_NORMAL); iscsi_set_header_digest(iscsi_ctx, ISCSI_HEADER_DIGEST_NONE_CRC32C); if (iscsi_full_connect_sync(iscsi_ctx, iscsi_url->portal, iscsi_url->lun)) { - PERR("Unable to login to iSCSI portal: %s", iscsi_get_error(iscsi_ctx)); + g_warning("Unable to login to iSCSI portal: %s", + iscsi_get_error(iscsi_ctx)); goto fail; } lun->iscsi_ctx = iscsi_ctx; lun->iscsi_lun = iscsi_url->lun; - PDBG("Context %p created for lun 0: %s", iscsi_ctx, iscsi_uri); + g_debug("Context %p created for lun 0: %s", iscsi_ctx, iscsi_uri); out: if (iscsi_url) { @@ -313,18 +85,14 @@ fail: } static struct scsi_task *scsi_task_new(int cdb_len, uint8_t *cdb, int dir, - int xfer_len) { + int xfer_len) +{ struct scsi_task *task; assert(cdb_len > 0); assert(cdb); - task = calloc(1, sizeof(struct scsi_task)); - if (!task) { - PERR("Error allocating task: %s", strerror(errno)); - return NULL; - } - + task = g_new0(struct scsi_task, 1); memcpy(task->cdb, cdb, cdb_len); task->cdb_size = cdb_len; task->xfer_dir = dir; @@ -344,7 +112,7 @@ static int get_cdb_len(uint8_t *cdb) case 4: return 16; case 5: return 12; } - PERR("Unable to determine cdb len (0x%02hhX)", cdb[0] >> 5); + g_warning("Unable to determine cdb len (0x%02hhX)", cdb[0] >> 5); return -1; } @@ -352,7 +120,8 @@ static int handle_cmd_sync(struct iscsi_context *ctx, VirtIOSCSICmdReq *req, struct iovec *out, unsigned int out_len, VirtIOSCSICmdResp *rsp, - struct iovec *in, unsigned int in_len) { + struct iovec *in, unsigned int in_len) +{ struct scsi_task *task; uint32_t dir; uint32_t len; @@ -365,7 +134,7 @@ static int handle_cmd_sync(struct iscsi_context *ctx, if (!(!req->lun[1] && req->lun[2] == 0x40 && !req->lun[3])) { /* Ignore anything different than target=0, lun=0 */ - PDBG("Ignoring unconnected lun (0x%hhX, 0x%hhX)", + g_debug("Ignoring unconnected lun (0x%hhX, 0x%hhX)", req->lun[1], req->lun[3]); rsp->status = SCSI_STATUS_CHECK_CONDITION; memset(rsp->sense, 0, sizeof(rsp->sense)); @@ -387,36 +156,32 @@ static int handle_cmd_sync(struct iscsi_context *ctx, if (!out_len && !in_len) { dir = SCSI_XFER_NONE; } else if (out_len) { - dir = SCSI_XFER_TO_DEV; + dir = SCSI_XFER_WRITE; for (i = 0; i < out_len; i++) { len += out[i].iov_len; } } else { - dir = SCSI_XFER_FROM_DEV; + dir = SCSI_XFER_READ; for (i = 0; i < in_len; i++) { len += in[i].iov_len; } } task = scsi_task_new(cdb_len, req->cdb, dir, len); - if (!task) { - PERR("Unable to create iscsi task"); - return -1; - } - if (dir == SCSI_XFER_TO_DEV) { + if (dir == SCSI_XFER_WRITE) { task->iovector_out.iov = (struct scsi_iovec *)out; task->iovector_out.niov = out_len; - } else if (dir == SCSI_XFER_FROM_DEV) { + } else if (dir == SCSI_XFER_READ) { task->iovector_in.iov = (struct scsi_iovec *)in; task->iovector_in.niov = in_len; } - PDBG("Sending iscsi cmd (cdb_len=%d, dir=%d, task=%p)", + g_debug("Sending iscsi cmd (cdb_len=%d, dir=%d, task=%p)", cdb_len, dir, task); if (!iscsi_scsi_command_sync(ctx, 0, task, NULL)) { - PERR("Error serving SCSI command"); - free(task); + g_warning("Error serving SCSI command"); + g_free(task); return -1; } @@ -431,9 +196,9 @@ static int handle_cmd_sync(struct iscsi_context *ctx, memcpy(rsp->sense, &task->datain.data[2], rsp->sense_len); } - free(task); + g_free(task); - PDBG("Filled in rsp: status=%hhX, resid=%u, response=%hhX, sense_len=%u", + g_debug("Filled in rsp: status=%hhX, resid=%u, response=%hhX, sense_len=%u", rsp->status, rsp->resid, rsp->response, rsp->sense_len); return 0; @@ -441,116 +206,46 @@ static int handle_cmd_sync(struct iscsi_context *ctx, /** libvhost-user callbacks **/ -static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev); - static void vus_panic_cb(VuDev *vu_dev, const char *buf) { - vhost_scsi_dev_t *vdev_scsi; + VugDev *gdev; + VusDev *vdev_scsi; assert(vu_dev); - vdev_scsi = vdev_scsi_find_by_vu(vu_dev); - + gdev = container_of(vu_dev, VugDev, parent); + vdev_scsi = container_of(gdev, VusDev, parent); if (buf) { - PERR("vu_panic: %s", buf); + g_warning("vu_panic: %s", buf); } - if (vdev_scsi) { - assert(vdev_scsi->loop); - g_main_loop_quit(vdev_scsi->loop); - } -} - -static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb, - void *pvt) { - vhost_scsi_dev_t *vdev_scsi; - guint id; - - assert(vu_dev); - assert(fd >= 0); - assert(cb); - - vdev_scsi = vdev_scsi_find_by_vu(vu_dev); - if (!vdev_scsi) { - vus_panic_cb(vu_dev, NULL); - return; - } - - id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap, - (gpointer)(uintptr_t)fd); - if (id) { - GSource *vus_src = g_main_context_find_source_by_id(NULL, id); - assert(vus_src); - g_source_destroy(vus_src); - (void)g_tree_remove(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd); - } - - if (vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt)) { - vus_panic_cb(vu_dev, NULL); - } -} - -static void vus_del_watch_cb(VuDev *vu_dev, int fd) -{ - vhost_scsi_dev_t *vdev_scsi; - guint id; - - assert(vu_dev); - assert(fd >= 0); - - vdev_scsi = vdev_scsi_find_by_vu(vu_dev); - if (!vdev_scsi) { - vus_panic_cb(vu_dev, NULL); - return; - } - - id = (guint)(uintptr_t)g_tree_lookup(vdev_scsi->fdmap, - (gpointer)(uintptr_t)fd); - if (id) { - GSource *vus_src = g_main_context_find_source_by_id(NULL, id); - assert(vus_src); - g_source_destroy(vus_src); - (void)g_tree_remove(vdev_scsi->fdmap, (gpointer)(uintptr_t)fd); - } -} - -static void vus_proc_ctl(VuDev *vu_dev, int idx) -{ - /* Control VQ not implemented */ -} - -static void vus_proc_evt(VuDev *vu_dev, int idx) -{ - /* Event VQ not implemented */ + g_main_loop_quit(vdev_scsi->loop); } static void vus_proc_req(VuDev *vu_dev, int idx) { - vhost_scsi_dev_t *vdev_scsi; + VugDev *gdev; + VusDev *vdev_scsi; VuVirtq *vq; assert(vu_dev); - vdev_scsi = vdev_scsi_find_by_vu(vu_dev); - if (!vdev_scsi) { - vus_panic_cb(vu_dev, NULL); - return; - } - - if ((idx < 0) || (idx >= VHOST_MAX_NR_VIRTQUEUE)) { - PERR("VQ Index out of range: %d", idx); + gdev = container_of(vu_dev, VugDev, parent); + vdev_scsi = container_of(gdev, VusDev, parent); + if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) { + g_warning("VQ Index out of range: %d", idx); vus_panic_cb(vu_dev, NULL); return; } vq = vu_get_queue(vu_dev, idx); if (!vq) { - PERR("Error fetching VQ (dev=%p, idx=%d)", vu_dev, idx); + g_warning("Error fetching VQ (dev=%p, idx=%d)", vu_dev, idx); vus_panic_cb(vu_dev, NULL); return; } - PDBG("Got kicked on vq[%d]@%p", idx, vq); + g_debug("Got kicked on vq[%d]@%p", idx, vq); while (1) { VuVirtqElement *elem; @@ -559,29 +254,29 @@ static void vus_proc_req(VuDev *vu_dev, int idx) elem = vu_queue_pop(vu_dev, vq, sizeof(VuVirtqElement)); if (!elem) { - PDBG("No more elements pending on vq[%d]@%p", idx, vq); + g_debug("No more elements pending on vq[%d]@%p", idx, vq); break; } - PDBG("Popped elem@%p", elem); + g_debug("Popped elem@%p", elem); - assert(!((elem->out_num > 1) && (elem->in_num > 1))); - assert((elem->out_num > 0) && (elem->in_num > 0)); + assert(!(elem->out_num > 1 && elem->in_num > 1)); + assert(elem->out_num > 0 && elem->in_num > 0); if (elem->out_sg[0].iov_len < sizeof(VirtIOSCSICmdReq)) { - PERR("Invalid virtio-scsi req header"); + g_warning("Invalid virtio-scsi req header"); vus_panic_cb(vu_dev, NULL); break; } req = (VirtIOSCSICmdReq *)elem->out_sg[0].iov_base; if (elem->in_sg[0].iov_len < sizeof(VirtIOSCSICmdResp)) { - PERR("Invalid virtio-scsi rsp header"); + g_warning("Invalid virtio-scsi rsp header"); vus_panic_cb(vu_dev, NULL); break; } rsp = (VirtIOSCSICmdResp *)elem->in_sg[0].iov_base; - if (handle_cmd_sync(vdev_scsi->luns[0].iscsi_ctx, + if (handle_cmd_sync(vdev_scsi->lun.iscsi_ctx, req, &elem->out_sg[1], elem->out_num - 1, rsp, &elem->in_sg[1], elem->in_num - 1) != 0) { vus_panic_cb(vu_dev, NULL); @@ -601,22 +296,17 @@ static void vus_queue_set_started(VuDev *vu_dev, int idx, bool started) assert(vu_dev); - if ((idx < 0) || (idx >= VHOST_MAX_NR_VIRTQUEUE)) { - PERR("VQ Index out of range: %d", idx); + if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) { + g_warning("VQ Index out of range: %d", idx); vus_panic_cb(vu_dev, NULL); return; } vq = vu_get_queue(vu_dev, idx); - switch (idx) { - case 0: - vu_set_queue_handler(vu_dev, vq, started ? vus_proc_ctl : NULL); - break; - case 1: - vu_set_queue_handler(vu_dev, vq, started ? vus_proc_evt : NULL); - break; - default: + if (idx == 0 || idx == 1) { + g_debug("queue %d unimplemented", idx); + } else { vu_set_queue_handler(vu_dev, vq, started ? vus_proc_req : NULL); } } @@ -625,21 +315,6 @@ static const VuDevIface vus_iface = { .queue_set_started = vus_queue_set_started, }; -static gboolean vus_vhost_cb(gpointer data) -{ - VuDev *vu_dev = (VuDev *)data; - - assert(vu_dev); - - if (!vu_dispatch(vu_dev) != 0) { - PERR("Error processing vhost message"); - vus_panic_cb(vu_dev, NULL); - return G_SOURCE_REMOVE; - } - - return G_SOURCE_CONTINUE; -} - /** misc helpers **/ static int unix_sock_new(char *unix_fn) @@ -681,159 +356,22 @@ fail: /** vhost-user-scsi **/ -static vhost_scsi_dev_t *vdev_scsi_find_by_vu(VuDev *vu_dev) -{ - int i; - - assert(vu_dev); - - for (i = 0; i < VUS_MAX_DEVS; i++) { - if (&vhost_scsi_devs[i]->vu_dev == vu_dev) { - return vhost_scsi_devs[i]; - } - } - - PERR("Unknown VuDev %p", vu_dev); - return NULL; -} - -static void vdev_scsi_deinit(vhost_scsi_dev_t *vdev_scsi) -{ - if (!vdev_scsi) { - return; - } - - if (vdev_scsi->server_sock >= 0) { - struct sockaddr_storage ss; - socklen_t sslen = sizeof(ss); - - if (getsockname(vdev_scsi->server_sock, (struct sockaddr *)&ss, - &sslen) == 0) { - struct sockaddr_un *su = (struct sockaddr_un *)&ss; - (void)unlink(su->sun_path); - } - - (void)close(vdev_scsi->server_sock); - vdev_scsi->server_sock = -1; - } - - if (vdev_scsi->loop) { - g_main_loop_unref(vdev_scsi->loop); - vdev_scsi->loop = NULL; - } -} - -static vhost_scsi_dev_t *vdev_scsi_new(char *unix_fn) -{ - vhost_scsi_dev_t *vdev_scsi = NULL; - - assert(unix_fn); - - vdev_scsi = calloc(1, sizeof(vhost_scsi_dev_t)); - if (!vdev_scsi) { - PERR("calloc: %s", strerror(errno)); - return NULL; - } - - vdev_scsi->server_sock = unix_sock_new(unix_fn); - if (vdev_scsi->server_sock < 0) { - goto err; - } - - vdev_scsi->loop = g_main_loop_new(NULL, FALSE); - if (!vdev_scsi->loop) { - PERR("Error creating glib event loop"); - goto err; - } - - vdev_scsi->fdmap = g_tree_new(vus_fdmap_compare); - if (!vdev_scsi->fdmap) { - PERR("Error creating glib tree for fdmap"); - goto err; - } - - return vdev_scsi; - -err: - vdev_scsi_deinit(vdev_scsi); - free(vdev_scsi); - - return NULL; -} - -static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi, - char *iscsi_uri, uint32_t lun) { - assert(vdev_scsi); - assert(iscsi_uri); - assert(lun < VUS_MAX_LUNS); - - if (vdev_scsi->luns[lun].iscsi_ctx) { - PERR("Lun %d already configured", lun); - return -1; - } - - if (iscsi_add_lun(&vdev_scsi->luns[lun], iscsi_uri) != 0) { - return -1; - } - - return 0; -} - -static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi) -{ - int cli_sock; - int ret = 0; - - assert(vdev_scsi); - assert(vdev_scsi->server_sock >= 0); - assert(vdev_scsi->loop); - - cli_sock = accept(vdev_scsi->server_sock, (void *)0, (void *)0); - if (cli_sock < 0) { - perror("accept"); - return -1; - } - - vu_init(&vdev_scsi->vu_dev, - cli_sock, - vus_panic_cb, - vus_add_watch_cb, - vus_del_watch_cb, - &vus_iface); - - if (vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb, - &vdev_scsi->vu_dev)) { - goto fail; - } - - g_main_loop_run(vdev_scsi->loop); - -out: - vu_deinit(&vdev_scsi->vu_dev); - - return ret; - -fail: - ret = -1; - goto out; -} - int main(int argc, char **argv) { - vhost_scsi_dev_t *vdev_scsi = NULL; + VusDev *vdev_scsi = NULL; char *unix_fn = NULL; char *iscsi_uri = NULL; - int opt, err = EXIT_SUCCESS; + int lsock = -1, csock = -1, opt, err = EXIT_SUCCESS; while ((opt = getopt(argc, argv, "u:i:")) != -1) { switch (opt) { case 'h': goto help; case 'u': - unix_fn = strdup(optarg); + unix_fn = g_strdup(optarg); break; case 'i': - iscsi_uri = strdup(optarg); + iscsi_uri = g_strdup(optarg); break; default: goto help; @@ -843,31 +381,44 @@ int main(int argc, char **argv) goto help; } - vdev_scsi = vdev_scsi_new(unix_fn); - if (!vdev_scsi) { + lsock = unix_sock_new(unix_fn); + if (lsock < 0) { goto err; } - vhost_scsi_devs[0] = vdev_scsi; - if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) != 0) { + csock = accept(lsock, NULL, NULL); + if (csock < 0) { + perror("accept"); goto err; } - if (vdev_scsi_run(vdev_scsi) != 0) { + vdev_scsi = g_new0(VusDev, 1); + vdev_scsi->loop = g_main_loop_new(NULL, FALSE); + + if (vus_iscsi_add_lun(&vdev_scsi->lun, iscsi_uri) != 0) { goto err; } + vug_init(&vdev_scsi->parent, csock, vus_panic_cb, &vus_iface); + + g_main_loop_run(vdev_scsi->loop); + + vug_deinit(&vdev_scsi->parent); + out: if (vdev_scsi) { - vdev_scsi_deinit(vdev_scsi); - free(vdev_scsi); + g_main_loop_unref(vdev_scsi->loop); + g_free(vdev_scsi); + unlink(unix_fn); } - if (unix_fn) { - free(unix_fn); + if (csock >= 0) { + close(csock); } - if (iscsi_uri) { - free(iscsi_uri); + if (lsock >= 0) { + close(lsock); } + g_free(unix_fn); + g_free(iscsi_uri); return err; diff --git a/include/glib-compat.h b/include/glib-compat.h index e15aca2..c49cf87 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -356,5 +356,12 @@ g_test_add_data_func_full(const char *path, } #endif +/* Small compat shim from glib 2.32 */ +#ifndef G_SOURCE_CONTINUE +#define G_SOURCE_CONTINUE TRUE +#endif +#ifndef G_SOURCE_REMOVE +#define G_SOURCE_REMOVE FALSE +#endif #endif diff --git a/tests/Makefile.include b/tests/Makefile.include index abc6707..4ca15e6 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -795,7 +795,7 @@ tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-ob tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtest-obj-y) tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y) tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y) $(libqos-pc-obj-y) -tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o contrib/libvhost-user/libvhost-user.o $(test-util-obj-y) +tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y) tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y) |