diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile index 96b5587a5..aaf20050b 100644 --- a/app/iscsi_tgt/Makefile +++ b/app/iscsi_tgt/Makefile @@ -46,7 +46,7 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib C_SRCS := iscsi_tgt.c -SPDK_LIB_LIST = event_bdev +SPDK_LIB_LIST = event_bdev event_copy 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 diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile index e07b2da6c..4dc715d07 100644 --- a/app/nvmf_tgt/Makefile +++ b/app/nvmf_tgt/Makefile @@ -42,7 +42,7 @@ CFLAGS += $(ENV_CFLAGS) C_SRCS := conf.c nvmf_main.c nvmf_tgt.c nvmf_rpc.c -SPDK_LIB_LIST = event_bdev +SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += nvmf event log trace conf util bdev copy rpc jsonrpc json SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc diff --git a/app/vhost/Makefile b/app/vhost/Makefile index 8f3b79724..3b9833751 100644 --- a/app/vhost/Makefile +++ b/app/vhost/Makefile @@ -42,7 +42,7 @@ CFLAGS += $(ENV_CFLAGS) C_SRCS := vhost.c -SPDK_LIB_LIST = event_bdev +SPDK_LIB_LIST = event_bdev event_copy 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 diff --git a/include/spdk/copy_engine.h b/include/spdk/copy_engine.h index c241ef070..0bff2b1e9 100644 --- a/include/spdk/copy_engine.h +++ b/include/spdk/copy_engine.h @@ -46,6 +46,9 @@ struct spdk_io_channel; struct spdk_copy_task; +void spdk_copy_engine_initialize(void); +int spdk_copy_engine_finish(void); + struct spdk_io_channel *spdk_copy_engine_get_io_channel(void); int64_t spdk_copy_submit(struct spdk_copy_task *copy_req, struct spdk_io_channel *ch, void *dst, void *src, uint64_t nbytes, spdk_copy_completion_cb cb); diff --git a/lib/copy/copy_engine.c b/lib/copy/copy_engine.c index 77a133938..febc0667b 100644 --- a/lib/copy/copy_engine.c +++ b/lib/copy/copy_engine.c @@ -237,7 +237,7 @@ spdk_copy_engine_module_finish(void) } } -static void +void spdk_copy_engine_initialize(void) { spdk_copy_engine_module_initialize(); @@ -251,7 +251,7 @@ spdk_copy_engine_initialize(void) spdk_subsystem_init_next(0); } -static int +int spdk_copy_engine_finish(void) { spdk_copy_engine_module_finish(); @@ -259,4 +259,3 @@ spdk_copy_engine_finish(void) } SPDK_COPY_MODULE_REGISTER(copy_engine_mem_init, NULL, NULL, copy_engine_mem_get_ctx_size) -SPDK_SUBSYSTEM_REGISTER(copy, spdk_copy_engine_initialize, spdk_copy_engine_finish, NULL) diff --git a/lib/event/subsystems/Makefile b/lib/event/subsystems/Makefile index 54be7c8c4..ff33f78ea 100644 --- a/lib/event/subsystems/Makefile +++ b/lib/event/subsystems/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y += bdev +DIRS-y += bdev copy .PHONY: all clean $(DIRS-y) diff --git a/lib/event/subsystems/copy/Makefile b/lib/event/subsystems/copy/Makefile new file mode 100644 index 000000000..f243bd070 --- /dev/null +++ b/lib/event/subsystems/copy/Makefile @@ -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 = copy.c +LIBNAME = event_copy + +include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/event/subsystems/copy/copy.c b/lib/event/subsystems/copy/copy.c new file mode 100644 index 000000000..7c8e172c7 --- /dev/null +++ b/lib/event/subsystems/copy/copy.c @@ -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/copy_engine.h" + +#include "spdk_internal/event.h" + +SPDK_SUBSYSTEM_REGISTER(copy, spdk_copy_engine_initialize, spdk_copy_engine_finish, NULL) +SPDK_SUBSYSTEM_DEPEND(bdev, copy) diff --git a/lib/rocksdb/spdk.rocksdb.mk b/lib/rocksdb/spdk.rocksdb.mk index 6b1e55bc2..53ff79e8f 100644 --- a/lib/rocksdb/spdk.rocksdb.mk +++ b/lib/rocksdb/spdk.rocksdb.mk @@ -49,7 +49,7 @@ CXXFLAGS += -fno-profile-arcs -fno-test-coverage CXXFLAGS += -fno-sanitize=undefined CXXFLAGS += -fno-sanitize=address -SPDK_LIB_LIST = event_bdev +SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event util conf trace \ log jsonrpc json rpc diff --git a/test/lib/bdev/bdevio/Makefile b/test/lib/bdev/bdevio/Makefile index 8bc103d61..8d68bd9c2 100644 --- a/test/lib/bdev/bdevio/Makefile +++ b/test/lib/bdev/bdevio/Makefile @@ -42,7 +42,7 @@ C_SRCS := bdevio.c CFLAGS += -I. $(ENV_CFLAGS) -SPDK_LIB_LIST = event_bdev +SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += bdev copy event trace log conf util rpc jsonrpc json LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ diff --git a/test/lib/bdev/bdevperf/Makefile b/test/lib/bdev/bdevperf/Makefile index 0f8ac88a7..3c4bb3af6 100644 --- a/test/lib/bdev/bdevperf/Makefile +++ b/test/lib/bdev/bdevperf/Makefile @@ -42,7 +42,7 @@ C_SRCS := bdevperf.c CFLAGS += -I. $(ENV_CFLAGS) -SPDK_LIB_LIST = event_bdev +SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += bdev copy event trace log conf util rpc jsonrpc json LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ diff --git a/test/lib/blobfs/fuse/Makefile b/test/lib/blobfs/fuse/Makefile index b1bc8c68f..55a490752 100644 --- a/test/lib/blobfs/fuse/Makefile +++ b/test/lib/blobfs/fuse/Makefile @@ -41,7 +41,7 @@ APP = fuse C_SRCS := fuse.c CFLAGS += $(DPDK_INC) -SPDK_LIB_LIST = event_bdev +SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event util conf trace \ log jsonrpc json rpc diff --git a/test/lib/blobfs/mkfs/Makefile b/test/lib/blobfs/mkfs/Makefile index c06522d76..1a0e6a4dd 100644 --- a/test/lib/blobfs/mkfs/Makefile +++ b/test/lib/blobfs/mkfs/Makefile @@ -41,7 +41,7 @@ APP = mkfs C_SRCS := mkfs.c CFLAGS += $(DPDK_INC) -SPDK_LIB_LIST = event_bdev +SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event util conf trace \ log jsonrpc json rpc