virtio: add new library virtio
Exported lib/bdev/rte_virtio as a separate library not dependent on bdev. Virtio is now accessible via spdk_internal/virtio.h. The header is marked `internal`, as it's not meant to be used by end users. It's not handy to handle all backend-specific (e.g. Virtio-SCSI) logic in a user code. For now the Virtio interface is publicly exposed only via bdev_virtio module. We might want to consider adding a separate, public Virtio-SCSI library in the future. Note: this patch doesn't do any changes to the virtio code. Everything is moved 1:1. Change-Id: I805e5d12d265d82b0bc5784c89fbadb81abdb278 Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com> Reviewed-on: https://review.gerrithub.io/388166 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
parent
998feedb17
commit
9dde5e5c27
@ -40,6 +40,7 @@ DIRS-y += bdev blob blobfs conf copy cunit event json jsonrpc \
|
||||
ifeq ($(OS),Linux)
|
||||
DIRS-y += nbd
|
||||
DIRS-$(CONFIG_VHOST) += vhost
|
||||
DIRS-$(CONFIG_VIRTIO) += virtio
|
||||
endif
|
||||
|
||||
|
||||
|
@ -34,14 +34,8 @@
|
||||
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
|
||||
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
|
||||
|
||||
CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/ -Irte_virtio
|
||||
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost/linux
|
||||
|
||||
CFLAGS += $(ENV_CFLAGS)
|
||||
C_SRCS = bdev_virtio.c bdev_virtio_rpc.c
|
||||
C_SRCS += rte_virtio/virtio.c rte_virtio/virtio_pci.c
|
||||
C_SRCS += rte_virtio/virtio_user.c
|
||||
C_SRCS += rte_virtio/virtio_user/vhost_user.c
|
||||
|
||||
LIBNAME = bdev_virtio
|
||||
|
||||
include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
|
||||
|
@ -45,10 +45,10 @@
|
||||
|
||||
#include "spdk_internal/bdev.h"
|
||||
#include "spdk_internal/log.h"
|
||||
#include "spdk_internal/virtio.h"
|
||||
|
||||
#include <linux/virtio_scsi.h>
|
||||
|
||||
#include "rte_virtio/virtio.h"
|
||||
#include "bdev_virtio.h"
|
||||
|
||||
#define BDEV_VIRTIO_MAX_TARGET 64
|
||||
|
42
lib/virtio/Makefile
Normal file
42
lib/virtio/Makefile
Normal file
@ -0,0 +1,42 @@
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
|
||||
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
|
||||
|
||||
CFLAGS += $(ENV_CFLAGS)
|
||||
C_SRCS = virtio.c virtio_user.c virtio_pci.c
|
||||
C_SRCS += virtio_user/vhost_user.c
|
||||
LIBNAME = virtio
|
||||
|
||||
include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
|
@ -55,6 +55,8 @@
|
||||
#include "spdk/env.h"
|
||||
#include "spdk/barrier.h"
|
||||
|
||||
#include "spdk_internal/virtio.h"
|
||||
|
||||
/* We use SMP memory barrier variants as all virtio_pci devices
|
||||
* are purely virtual. All MMIO is executed on a CPU core, so
|
||||
* there's no need to do full MMIO synchronization.
|
||||
@ -63,8 +65,6 @@
|
||||
#define virtio_rmb() spdk_smp_rmb()
|
||||
#define virtio_wmb() spdk_smp_wmb()
|
||||
|
||||
#include "virtio.h"
|
||||
|
||||
struct virtio_driver g_virtio_driver = {
|
||||
.scsi_devs = TAILQ_HEAD_INITIALIZER(g_virtio_driver.scsi_devs),
|
||||
};
|
@ -38,7 +38,7 @@
|
||||
#include "spdk/env.h"
|
||||
#include "spdk/pci_ids.h"
|
||||
|
||||
#include "virtio.h"
|
||||
#include "spdk_internal/virtio.h"
|
||||
|
||||
struct virtio_hw {
|
||||
uint8_t use_msix;
|
@ -42,10 +42,10 @@
|
||||
#include <rte_alarm.h>
|
||||
|
||||
#include "virtio_user/vhost.h"
|
||||
#include "virtio.h"
|
||||
|
||||
#include "spdk/string.h"
|
||||
|
||||
#include "spdk_internal/virtio.h"
|
||||
|
||||
static int
|
||||
virtio_user_create_queue(struct virtio_dev *vdev, uint32_t queue_sel)
|
||||
{
|
@ -39,8 +39,7 @@
|
||||
#include <linux/vhost.h>
|
||||
|
||||
#include "spdk_internal/log.h"
|
||||
|
||||
#include "../virtio.h"
|
||||
#include "spdk_internal/virtio.h"
|
||||
|
||||
enum vhost_user_request {
|
||||
VHOST_USER_NONE = 0,
|
@ -41,7 +41,7 @@ BLOCKDEV_MODULES_DEPS += -libverbs -lrdmacm
|
||||
endif
|
||||
|
||||
ifeq ($(OS),Linux)
|
||||
BLOCKDEV_MODULES_LIST += bdev_aio bdev_virtio
|
||||
BLOCKDEV_MODULES_LIST += bdev_aio bdev_virtio virtio
|
||||
BLOCKDEV_MODULES_DEPS += -laio
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user