vhost: separated scsi layer from vhost.c

Implemented vhost abstraction layer in preparations for vhost-blk.
Generalized vhost interface and separated vhost-scsi code.

Code placement:
vhost.h
 * vhost_startup() & shutdown()
 * public generic controller API

vhost_internal.h
 * includes rte_vhost.h from DPDK
 * struct spdk_vhost_dev (it has to be inherited by vhost_scsi)
 * vhost_dev management
   * register/unregister() to be used in new_device()/destroy_device()
   * construct/destruct() to be used on permanent creation/destruction.
 * reactor core management

vhost_scsi.h
 * spdk_vhost_scsi_dev management
   * reading VhostScsi section of vhost config file
   * creating/removing controllers
   * adding/removing devices to controllers

vhost_scsi.c
 * virtio scsi logic
 * new_device(), destroy_device()

Change-Id: Iaf661b14eba034593bef24853c525935d9b18e46
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/361963
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>

include/spdk/vhost.h

@@ -43,8 +43,6 @@
 
 #include "spdk/event.h"
 
-#define SPDK_VHOST_SCSI_CTRLR_MAX_DEVS 8
-
 /**
  * \param event event object. event arg1 is optional path to vhost socket.
  */
@@ -64,13 +62,6 @@ struct spdk_vhost_dev *spdk_vhost_dev_next(struct spdk_vhost_dev *prev);
 struct spdk_vhost_dev *spdk_vhost_dev_find(const char *ctrlr_name);
 const char *spdk_vhost_dev_get_name(struct spdk_vhost_dev *ctrl);
 uint64_t spdk_vhost_dev_get_cpumask(struct spdk_vhost_dev *ctrl);
-int spdk_vhost_scsi_dev_construct(const char *name, uint64_t cpumask);
-int spdk_vhost_scsi_dev_remove(struct spdk_vhost_scsi_dev *vdev);
 int spdk_vhost_parse_core_mask(const char *mask, uint64_t *cpumask);
 
-struct spdk_scsi_dev *spdk_vhost_scsi_dev_get_dev(struct spdk_vhost_scsi_dev *ctrl,
-		uint8_t num);
-int spdk_vhost_scsi_dev_add_dev(const char *name, unsigned scsi_dev_num, const char *lun_name);
-int spdk_vhost_scsi_dev_remove_dev(struct spdk_vhost_scsi_dev *vdev, unsigned scsi_dev_num);
-
 #endif /* SPDK_VHOST_H */

lib/vhost/Makefile

@@ -38,7 +38,7 @@ CFLAGS += -I.
 CFLAGS += -Irte_vhost
 CFLAGS += $(ENV_CFLAGS)
 
-C_SRCS = task.c vhost.c vhost_rpc.c vhost_iommu.c
+C_SRCS = task.c vhost.c vhost_rpc.c vhost_iommu.c vhost_scsi.c
 
 LIBNAME = vhost
 

lib/vhost/vhost_internal.h

@@ -0,0 +1,79 @@
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright (c) Intel Corporation.
+ *   All rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SPDK_VHOST_INTERNAL_H
+#define SPDK_VHOST_INTERNAL_H
+
+#include "spdk/stdinc.h"
+
+#include <rte_vhost.h>
+
+#include "spdk_internal/log.h"
+#include "spdk/event.h"
+
+#define SPDK_CACHE_LINE_SIZE RTE_CACHE_LINE_SIZE
+
+#define MAX_VHOST_VRINGS	256
+
+struct spdk_vhost_dev {
+	struct rte_vhost_memory *mem;
+	char *name;
+
+	int vid;
+	int task_cnt;
+	int32_t lcore;
+	uint64_t cpumask;
+
+	uint16_t num_queues;
+	uint64_t negotiated_features;
+	struct rte_vhost_vring virtqueue[MAX_VHOST_VRINGS] __attribute((aligned(SPDK_CACHE_LINE_SIZE)));
+};
+
+
+struct spdk_vhost_dev_backend {
+	uint64_t virtio_features;
+	uint64_t disabled_features;
+	const struct vhost_device_ops ops;
+};
+
+uint32_t spdk_vhost_allocate_reactor(uint64_t cpumask);
+void spdk_vhost_free_reactor(uint32_t lcore);
+
+struct spdk_vhost_dev *spdk_vhost_dev_find_by_vid(int vid);
+int spdk_vhost_dev_construct(struct spdk_vhost_dev *dev);
+int spdk_vhost_dev_register(struct spdk_vhost_dev *dev,
+			    const struct spdk_vhost_dev_backend *backend);
+int spdk_vhost_dev_unregister(struct spdk_vhost_dev *vdev);
+void spdk_vhost_dev_destruct(struct spdk_vhost_dev *dev);
+
+#endif /* SPDK_VHOST_INTERNAL_H */

lib/vhost/vhost_rpc.c

@@ -37,6 +37,7 @@
 #include "spdk/rpc.h"
 #include "spdk/util.h"
 
+#include "vhost_scsi.h"
 #include "spdk/vhost.h"
 #include "task.h"
 

lib/vhost/vhost_scsi.h

@@ -0,0 +1,51 @@
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright (c) Intel Corporation.
+ *   All rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SPDK_VHOST_SCSI_H
+#define SPDK_VHOST_SCSI_H
+
+#include "spdk/scsi_spec.h"
+
+#define SPDK_VHOST_SCSI_CTRLR_MAX_DEVS 8
+
+struct spdk_vhost_scsi_dev;
+
+int spdk_vhost_scsi_controller_construct(void);
+int spdk_vhost_scsi_dev_construct(const char *name, uint64_t cpumask);
+int spdk_vhost_scsi_dev_remove(struct spdk_vhost_scsi_dev *vdev);
+struct spdk_scsi_dev *spdk_vhost_scsi_dev_get_dev(struct spdk_vhost_scsi_dev *ctrl,
+		uint8_t num);
+int spdk_vhost_scsi_dev_add_dev(const char *name, unsigned scsi_dev_num, const char *lun_name);
+int spdk_vhost_scsi_dev_remove_dev(struct spdk_vhost_scsi_dev *vdev, unsigned scsi_dev_num);
+
+#endif /* SPDK_VHOST_SCSI_H */