*/
#include "qemu/osdep.h"
-#include "contrib/libvhost-user/libvhost-user.h"
+#include <iscsi/iscsi.h>
+#include <iscsi/scsi-lowlevel.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>
-
-/* #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 **/
+
#define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi"
+enum {
+ VHOST_USER_SCSI_MAX_QUEUES = 8,
+};
+
typedef struct VusIscsiLun {
struct iscsi_context *iscsi_ctx;
int iscsi_lun;
} VusIscsiLun;
typedef struct VusDev {
- VuDev vu_dev;
- int server_sock;
- GMainLoop *loop;
- GTree *fdmap; /* fd -> gsource context id */
+ VugDev parent;
+
VusIscsiLun lun;
+ GMainLoop *loop;
} VusDev;
-/** 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;
- VusDev *vdev_scsi;
- GPollFD gfd;
-} 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)
-{
- VusDev *vdev_scsi;
- vus_gsrc_t *vus_src = (vus_gsrc_t *)src;
-
- assert(vus_src);
-
- vdev_scsi = vus_src->vdev_scsi;
-
- assert(vdev_scsi);
-
- ((vu_watch_cb)cb)(&vdev_scsi->vu_dev, vus_src->gfd.revents, data);
-
- return G_SOURCE_CONTINUE;
-}
-
-static GSourceFuncs vus_gsrc_funcs = {
- vus_gsrc_prepare,
- vus_gsrc_check,
- vus_gsrc_dispatch,
- NULL
-};
-
-static void vus_gsrc_new(VusDev *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));
- g_source_set_callback(vus_gsrc, (GSourceFunc) vu_cb, data, NULL);
- vus_src = (vus_gsrc_t *)vus_gsrc;
-
- vus_src->vdev_scsi = vdev_scsi;
- vus_src->gfd.fd = fd;
- vus_src->gfd.events = cond;
-
- 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);
-}
-
/** libiscsi integration **/
typedef struct virtio_scsi_cmd_req VirtIOSCSICmdReq;
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) {
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;
}
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));
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");
+ g_warning("Error serving SCSI command");
g_free(task);
return -1;
}
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;
static void vus_panic_cb(VuDev *vu_dev, const char *buf)
{
+ VugDev *gdev;
VusDev *vdev_scsi;
assert(vu_dev);
- vdev_scsi = container_of(vu_dev, VusDev, 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);
}
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)
-{
- VusDev *vdev_scsi;
- guint id;
-
- assert(vu_dev);
- assert(fd >= 0);
- assert(cb);
-
- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
- 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);
- }
-
- vus_gsrc_new(vdev_scsi, fd, vu_evt, cb, NULL, pvt);
-}
-
-static void vus_del_watch_cb(VuDev *vu_dev, int fd)
-{
- VusDev *vdev_scsi;
- guint id;
-
- assert(vu_dev);
- assert(fd >= 0);
-
- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
- 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_req(VuDev *vu_dev, int idx)
{
+ VugDev *gdev;
VusDev *vdev_scsi;
VuVirtq *vq;
assert(vu_dev);
- vdev_scsi = container_of(vu_dev, VusDev, vu_dev);
- if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
- PERR("VQ Index out of range: %d", idx);
- vus_panic_cb(vu_dev, NULL);
- return;
- }
+ gdev = container_of(vu_dev, VugDev, parent);
+ vdev_scsi = container_of(gdev, VusDev, parent);
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;
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);
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;
}
assert(vu_dev);
- if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {
- PERR("VQ Index out of range: %d", idx);
- vus_panic_cb(vu_dev, NULL);
- return;
- }
-
vq = vu_get_queue(vu_dev, idx);
if (idx == 0 || idx == 1) {
- PDBG("queue %d unimplemented", idx);
+ g_debug("queue %d unimplemented", idx);
} else {
vu_set_queue_handler(vu_dev, vq, started ? vus_proc_req : NULL);
}
.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)
/** vhost-user-scsi **/
-static void vdev_scsi_free(VusDev *vdev_scsi)
-{
- if (vdev_scsi->server_sock >= 0) {
- close(vdev_scsi->server_sock);
- }
- g_main_loop_unref(vdev_scsi->loop);
- g_tree_destroy(vdev_scsi->fdmap);
- g_free(vdev_scsi);
-}
-
-static VusDev *vdev_scsi_new(int server_sock)
-{
- VusDev *vdev_scsi;
-
- vdev_scsi = g_new0(VusDev, 1);
- vdev_scsi->server_sock = server_sock;
- vdev_scsi->loop = g_main_loop_new(NULL, FALSE);
- vdev_scsi->fdmap = g_tree_new(vus_fdmap_compare);
-
- return vdev_scsi;
-}
-
-static int vdev_scsi_run(VusDev *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, NULL, NULL);
- 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);
-
- vus_gsrc_new(vdev_scsi, cli_sock, G_IO_IN, NULL, vus_vhost_cb,
- &vdev_scsi->vu_dev);
-
- g_main_loop_run(vdev_scsi->loop);
-
- vu_deinit(&vdev_scsi->vu_dev);
-
- return ret;
-}
-
int main(int argc, char **argv)
{
VusDev *vdev_scsi = NULL;
char *unix_fn = NULL;
char *iscsi_uri = NULL;
- int sock, opt, err = EXIT_SUCCESS;
+ int lsock = -1, csock = -1, opt, err = EXIT_SUCCESS;
while ((opt = getopt(argc, argv, "u:i:")) != -1) {
switch (opt) {
goto help;
}
- sock = unix_sock_new(unix_fn);
- if (sock < 0) {
+ lsock = unix_sock_new(unix_fn);
+ if (lsock < 0) {
goto err;
}
- vdev_scsi = vdev_scsi_new(sock);
+
+ csock = accept(lsock, NULL, NULL);
+ if (csock < 0) {
+ perror("accept");
+ goto err;
+ }
+
+ 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;
}
- if (vdev_scsi_run(vdev_scsi) != 0) {
+ if (!vug_init(&vdev_scsi->parent, VHOST_USER_SCSI_MAX_QUEUES, csock,
+ vus_panic_cb, &vus_iface)) {
+ g_printerr("Failed to initialize libvhost-user-glib\n");
goto err;
}
+ g_main_loop_run(vdev_scsi->loop);
+
+ vug_deinit(&vdev_scsi->parent);
+
out:
if (vdev_scsi) {
- vdev_scsi_free(vdev_scsi);
+ g_main_loop_unref(vdev_scsi->loop);
+ g_free(vdev_scsi);
unlink(unix_fn);
}
+ if (csock >= 0) {
+ close(csock);
+ }
+ if (lsock >= 0) {
+ close(lsock);
+ }
g_free(unix_fn);
g_free(iscsi_uri);