ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev: Create a separate bdev subsystem library

Browse Source 
Much like bdev modules inside the bdev directory,
add a subsystems directory inside of event. The subsystem
specific code for the bdev library is placed in to
a separate library in that directory, breaking the
strict dependency of the bdev library on the event subsystem
code.

Change-Id: I255941b823a9ec3e2d62f22a586414949d8ff5ad
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/365055
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ben Walker 2017-06-06 13:26:04 -07:00
parent a0a41eefb1
commit 4c0eaac47a
15 changed files with 165 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/iscsi_tgt/Makefile
View File

@ -46,7 +46,8 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib
C_SRCS := iscsi_tgt.c
SPDK_LIB_LIST = jsonrpc json rpc bdev_rpc bdev iscsi scsi net copy trace conf
SPDK_LIB_LIST = event_bdev
SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi net copy trace conf
SPDK_LIB_LIST += util log log_rpc event app_rpc
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \

3
app/nvmf_tgt/Makefile
View File

@ -42,7 +42,8 @@ CFLAGS += $(ENV_CFLAGS)
C_SRCS := conf.c nvmf_main.c nvmf_tgt.c nvmf_rpc.c
SPDK_LIB_LIST = nvmf event log trace conf util bdev copy rpc jsonrpc json
SPDK_LIB_LIST = event_bdev
SPDK_LIB_LIST += nvmf event log trace conf util bdev copy rpc jsonrpc json
SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \

3
app/vhost/Makefile
View File

@ -42,7 +42,8 @@ CFLAGS += $(ENV_CFLAGS)
C_SRCS := vhost.c
SPDK_LIB_LIST = jsonrpc json rpc bdev_rpc bdev scsi net copy trace conf
SPDK_LIB_LIST = event_bdev
SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi net copy trace conf
SPDK_LIB_LIST += util log log_rpc event app_rpc
SPDK_LIB_LIST += vhost rte_vhost

4
include/spdk/bdev.h
View File

@ -107,6 +107,10 @@ struct spdk_bdev_io_stat {
uint64_t num_write_ops;
};
void spdk_bdev_initialize(void);
int spdk_bdev_finish(void);
void spdk_bdev_config_text(FILE *fp);
struct spdk_bdev *spdk_bdev_get_by_name(const char *bdev_name);
struct spdk_bdev *spdk_bdev_first(void);

8
lib/bdev/bdev.c
View File

@ -260,7 +260,7 @@ spdk_bdev_module_get_max_ctx_size(void)
return max_bdev_module_size;
}
static void
void
spdk_bdev_config_text(FILE *fp)
{
struct spdk_bdev_module_if *bdev_module;
@ -344,7 +344,7 @@ spdk_vbdev_module_init_next(int rc)
}
}
static void
void
spdk_bdev_initialize(void)
{
int cache_size;
@ -404,7 +404,7 @@ end:
spdk_bdev_module_init_next(rc);
}
static int
int
spdk_bdev_finish(void)
{
struct spdk_bdev_module_if *bdev_module;
@ -1414,5 +1414,3 @@ spdk_vbdev_module_list_add(struct spdk_bdev_module_if *vbdev_module)
{
TAILQ_INSERT_TAIL(&g_bdev_mgr.vbdev_modules, vbdev_module, tailq);
}
SPDK_SUBSYSTEM_REGISTER(bdev, spdk_bdev_initialize, spdk_bdev_finish, spdk_bdev_config_text)
SPDK_SUBSYSTEM_DEPEND(bdev, copy)

2
lib/event/Makefile
View File

@ -38,6 +38,6 @@ CFLAGS += $(ENV_CFLAGS)
LIBNAME = event
C_SRCS = app.c reactor.c subsystem.c
DIRS-y = rpc
DIRS-y = rpc subsystems
include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

44
lib/event/subsystems/Makefile Normal file
View File

@ -0,0 +1,44 @@
#
# 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
DIRS-y += bdev
.PHONY: all clean $(DIRS-y)
all: $(DIRS-y)
clean: $(DIRS-y)
include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk

41
lib/event/subsystems/bdev/Makefile Normal file
View File

@ -0,0 +1,41 @@
#
# 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) -I.
C_SRCS = bdev.c
LIBNAME = event_bdev
include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

41
lib/event/subsystems/bdev/bdev.c Normal file
View File

@ -0,0 +1,41 @@
/*-
* 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.
*/
#include "spdk/stdinc.h"
#include "spdk/bdev.h"
#include "spdk_internal/event.h"
SPDK_SUBSYSTEM_REGISTER(bdev, spdk_bdev_initialize, spdk_bdev_finish, spdk_bdev_config_text)
SPDK_SUBSYSTEM_DEPEND(bdev, copy)

10
lib/rocksdb/spdk.rocksdb.mk
View File

@ -49,12 +49,12 @@ CXXFLAGS += -fno-profile-arcs -fno-test-coverage
CXXFLAGS += -fno-sanitize=undefined
CXXFLAGS += -fno-sanitize=address
SPDK_LIB_LIST = bdev copy event conf trace log blobfs blob blob_bdev \
util jsonrpc json rpc
SPDK_LIB_LIST = event_bdev
SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event util conf trace \
log jsonrpc json rpc
AM_LINK += $(BLOCKDEV_MODULES_LINKER_ARGS)
AM_LINK += $(SPDK_LIB_LINKER_ARGS)
AM_LINK += $(ENV_LINKER_ARGS)
AM_LINK += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS)
AM_LINK += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
ifeq ($(CONFIG_UBSAN),y)
AM_LINK += -fsanitize=undefined

19
mk/spdk.app.mk
View File

@ -31,24 +31,29 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Event subsystems only export constructor functions, so wrap these
# in whole-archive linker args
SPDK_FILTER_LIB_LIST = $(filter event_%,$(SPDK_LIB_LIST))
# RPC libraries only export constructor functions, so these need to be treated
# separately and wrapped in whole-archive linker args
SPDK_RPC_LIB_LIST = $(filter %_rpc,$(SPDK_LIB_LIST))
SPDK_FILTER_LIB_LIST += $(filter %_rpc,$(SPDK_LIB_LIST))
# Currently some libraries contain their respective RPC methods
# rather than breaking them out into separate libraries. So we must also include
# these directories in the RPC library list.
SPDK_RPC_LIB_LIST += $(filter iscsi,$(SPDK_LIB_LIST))
SPDK_RPC_LIB_LIST += $(filter net,$(SPDK_LIB_LIST))
SPDK_RPC_LIB_LIST += $(filter scsi,$(SPDK_LIB_LIST))
SPDK_RPC_LIB_LIST += $(filter vhost,$(SPDK_LIB_LIST))
SPDK_FILTER_LIB_LIST += $(filter iscsi,$(SPDK_LIB_LIST))
SPDK_FILTER_LIB_LIST += $(filter net,$(SPDK_LIB_LIST))
SPDK_FILTER_LIB_LIST += $(filter scsi,$(SPDK_LIB_LIST))
SPDK_FILTER_LIB_LIST += $(filter vhost,$(SPDK_LIB_LIST))
SPDK_REMAINING_LIB_LIST = $(filter-out $(SPDK_RPC_LIB_LIST),$(SPDK_LIB_LIST))
SPDK_WHOLE_ARCHIVE_LIB_LIST = $(sort $(SPDK_FILTER_LIB_LIST))
SPDK_REMAINING_LIB_LIST = $(filter-out $(SPDK_WHOLE_ARCHIVE_LIB_LIST),$(SPDK_LIB_LIST))
SPDK_LIB_FILES = $(call spdk_lib_list_to_files,$(SPDK_LIB_LIST))
SPDK_LIB_LINKER_ARGS = \
-L$(SPDK_ROOT_DIR)/build/lib \
-Wl,--whole-archive \
$(SPDK_RPC_LIB_LIST:%=-lspdk_%) \
$(SPDK_WHOLE_ARCHIVE_LIB_LIST:%=-lspdk_%) \
-Wl,--no-whole-archive \
$(SPDK_REMAINING_LIB_LIST:%=-lspdk_%)

3
test/lib/bdev/bdevio/Makefile
View File

@ -42,7 +42,8 @@ C_SRCS := bdevio.c
CFLAGS += -I. $(ENV_CFLAGS)
SPDK_LIB_LIST = bdev copy event trace log conf util rpc jsonrpc json
SPDK_LIB_LIST = event_bdev
SPDK_LIB_LIST += bdev copy event trace log conf util rpc jsonrpc json
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS)

3
test/lib/bdev/bdevperf/Makefile
View File

@ -42,7 +42,8 @@ C_SRCS := bdevperf.c
CFLAGS += -I. $(ENV_CFLAGS)
SPDK_LIB_LIST = bdev copy event trace log conf util rpc jsonrpc json
SPDK_LIB_LIST = event_bdev
SPDK_LIB_LIST += bdev copy event trace log conf util rpc jsonrpc json
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS)

3
test/lib/blobfs/fuse/Makefile
View File

@ -41,7 +41,8 @@ APP = fuse
C_SRCS := fuse.c
CFLAGS += $(DPDK_INC)
SPDK_LIB_LIST = blobfs blob bdev blob_bdev copy event util conf trace \
SPDK_LIB_LIST = event_bdev
SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event util conf trace \
log jsonrpc json rpc
LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS)

3
test/lib/blobfs/mkfs/Makefile
View File

@ -41,7 +41,8 @@ APP = mkfs
C_SRCS := mkfs.c
CFLAGS += $(DPDK_INC)
SPDK_LIB_LIST = blobfs blob bdev blob_bdev copy event util conf trace \
SPDK_LIB_LIST = event_bdev
SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event util conf trace \
log jsonrpc json rpc
LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS)