From 483eb2f56657e8e7f419ab1a4fab8dce9ade8609 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 20:24:20 +0200 Subject: Adding upstream version 14.2.21. Signed-off-by: Daniel Baumann --- src/spdk/app/Makefile | 51 +++++ src/spdk/app/iscsi_tgt/.gitignore | 1 + src/spdk/app/iscsi_tgt/Makefile | 70 ++++++ src/spdk/app/iscsi_tgt/iscsi_tgt.c | 120 ++++++++++ src/spdk/app/iscsi_top/.gitignore | 1 + src/spdk/app/iscsi_top/Makefile | 53 +++++ src/spdk/app/iscsi_top/iscsi_top.cpp | 251 +++++++++++++++++++++ src/spdk/app/nvmf_tgt/.gitignore | 1 + src/spdk/app/nvmf_tgt/Makefile | 65 ++++++ src/spdk/app/nvmf_tgt/nvmf_main.c | 78 +++++++ src/spdk/app/spdk_tgt/.gitignore | 1 + src/spdk/app/spdk_tgt/Makefile | 73 ++++++ src/spdk/app/spdk_tgt/spdk_tgt.c | 126 +++++++++++ src/spdk/app/trace/.gitignore | 1 + src/spdk/app/trace/Makefile | 51 +++++ src/spdk/app/trace/trace.cpp | 418 +++++++++++++++++++++++++++++++++++ src/spdk/app/vhost/.gitignore | 1 + src/spdk/app/vhost/Makefile | 63 ++++++ src/spdk/app/vhost/vhost.c | 118 ++++++++++ 19 files changed, 1543 insertions(+) create mode 100644 src/spdk/app/Makefile create mode 100644 src/spdk/app/iscsi_tgt/.gitignore create mode 100644 src/spdk/app/iscsi_tgt/Makefile create mode 100644 src/spdk/app/iscsi_tgt/iscsi_tgt.c create mode 100644 src/spdk/app/iscsi_top/.gitignore create mode 100644 src/spdk/app/iscsi_top/Makefile create mode 100644 src/spdk/app/iscsi_top/iscsi_top.cpp create mode 100644 src/spdk/app/nvmf_tgt/.gitignore create mode 100644 src/spdk/app/nvmf_tgt/Makefile create mode 100644 src/spdk/app/nvmf_tgt/nvmf_main.c create mode 100644 src/spdk/app/spdk_tgt/.gitignore create mode 100644 src/spdk/app/spdk_tgt/Makefile create mode 100644 src/spdk/app/spdk_tgt/spdk_tgt.c create mode 100644 src/spdk/app/trace/.gitignore create mode 100644 src/spdk/app/trace/Makefile create mode 100644 src/spdk/app/trace/trace.cpp create mode 100644 src/spdk/app/vhost/.gitignore create mode 100644 src/spdk/app/vhost/Makefile create mode 100644 src/spdk/app/vhost/vhost.c (limited to 'src/spdk/app') diff --git a/src/spdk/app/Makefile b/src/spdk/app/Makefile new file mode 100644 index 00000000..e6103a81 --- /dev/null +++ b/src/spdk/app/Makefile @@ -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. +# + +SPDK_ROOT_DIR := $(abspath $(CURDIR)/..) +include $(SPDK_ROOT_DIR)/mk/spdk.common.mk + +DIRS-y += trace +DIRS-y += nvmf_tgt +DIRS-y += iscsi_top +DIRS-y += iscsi_tgt +DIRS-y += spdk_tgt +ifeq ($(OS),Linux) +DIRS-$(CONFIG_VHOST) += vhost +endif + +.PHONY: all clean $(DIRS-y) + +all: $(DIRS-y) +clean: $(DIRS-y) + +include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk diff --git a/src/spdk/app/iscsi_tgt/.gitignore b/src/spdk/app/iscsi_tgt/.gitignore new file mode 100644 index 00000000..14d948c5 --- /dev/null +++ b/src/spdk/app/iscsi_tgt/.gitignore @@ -0,0 +1 @@ +iscsi_tgt diff --git a/src/spdk/app/iscsi_tgt/Makefile b/src/spdk/app/iscsi_tgt/Makefile new file mode 100644 index 00000000..5fc7dd42 --- /dev/null +++ b/src/spdk/app/iscsi_tgt/Makefile @@ -0,0 +1,70 @@ +# +# 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 +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk +include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk + +APP = iscsi_tgt + +# Add iSCSI library directory to include path +# TODO: remove this once iSCSI has a public API header +CFLAGS += -I$(SPDK_ROOT_DIR)/lib + +C_SRCS := iscsi_tgt.c + +SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi event +SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi copy trace conf +SPDK_LIB_LIST += thread util log log_rpc app_rpc net + +ifeq ($(OS),Linux) +SPDK_LIB_LIST += event_nbd nbd +endif + +LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ + $(COPY_MODULES_LINKER_ARGS) \ + $(SOCK_MODULES_LINKER_ARGS) +LIBS += $(SPDK_LIB_LINKER_ARGS) +LIBS += $(ENV_LINKER_ARGS) + +all : $(APP) + @: + +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES) + $(LINK_C) + +clean : + $(CLEAN_C) $(APP) + +include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk diff --git a/src/spdk/app/iscsi_tgt/iscsi_tgt.c b/src/spdk/app/iscsi_tgt/iscsi_tgt.c new file mode 100644 index 00000000..9f23437e --- /dev/null +++ b/src/spdk/app/iscsi_tgt/iscsi_tgt.c @@ -0,0 +1,120 @@ +/*- + * 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/env.h" +#include "spdk/event.h" +#include "iscsi/iscsi.h" +#include "spdk/log.h" +#include "spdk/net.h" + +static int g_daemon_mode = 0; + +static void +spdk_sigusr1(int signo __attribute__((__unused__))) +{ + char *config_str = NULL; + if (spdk_app_get_running_config(&config_str, "iscsi.conf") < 0) { + fprintf(stderr, "Error getting config\n"); + } else { + fprintf(stdout, "============================\n"); + fprintf(stdout, " iSCSI target running config\n"); + fprintf(stdout, "=============================\n"); + fprintf(stdout, "%s", config_str); + } + free(config_str); +} + +static void +iscsi_usage(void) +{ + printf(" -b run iscsi target background, the default is foreground\n"); +} + +static void +spdk_startup(void *arg1, void *arg2) +{ + if (getenv("MEMZONE_DUMP") != NULL) { + spdk_memzone_dump(stdout); + fflush(stdout); + } +} + +static void +iscsi_parse_arg(int ch, char *arg) +{ + switch (ch) { + case 'b': + g_daemon_mode = 1; + break; + default: + assert(false); + break; + } +} + +int +main(int argc, char **argv) +{ + int rc; + struct spdk_app_opts opts = {}; + + spdk_app_opts_init(&opts); + opts.name = "iscsi"; + if ((rc = spdk_app_parse_args(argc, argv, &opts, "b", NULL, + iscsi_parse_arg, iscsi_usage)) != + SPDK_APP_PARSE_ARGS_SUCCESS) { + exit(rc); + } + + if (g_daemon_mode) { + if (daemon(1, 0) < 0) { + SPDK_ERRLOG("Start iscsi target daemon faild.\n"); + exit(EXIT_FAILURE); + } + } + + opts.shutdown_cb = NULL; + opts.usr1_handler = spdk_sigusr1; + + /* Blocks until the application is exiting */ + rc = spdk_app_start(&opts, spdk_startup, NULL, NULL); + if (rc) { + SPDK_ERRLOG("Start iscsi target daemon: spdk_app_start() retn non-zero\n"); + } + + spdk_app_fini(); + + return rc; +} diff --git a/src/spdk/app/iscsi_top/.gitignore b/src/spdk/app/iscsi_top/.gitignore new file mode 100644 index 00000000..7d90ff34 --- /dev/null +++ b/src/spdk/app/iscsi_top/.gitignore @@ -0,0 +1 @@ +iscsi_top diff --git a/src/spdk/app/iscsi_top/Makefile b/src/spdk/app/iscsi_top/Makefile new file mode 100644 index 00000000..e4f9f573 --- /dev/null +++ b/src/spdk/app/iscsi_top/Makefile @@ -0,0 +1,53 @@ +# +# 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 +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk + +CXXFLAGS += $(ENV_CXXFLAGS) +CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib +CXX_SRCS = iscsi_top.cpp + +APP = iscsi_top + +all: $(APP) + @: + +$(APP) : $(OBJS) + $(LINK_CXX) + +clean: + $(CLEAN_C) $(APP) + +include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk diff --git a/src/spdk/app/iscsi_top/iscsi_top.cpp b/src/spdk/app/iscsi_top/iscsi_top.cpp new file mode 100644 index 00000000..50449b59 --- /dev/null +++ b/src/spdk/app/iscsi_top/iscsi_top.cpp @@ -0,0 +1,251 @@ +/*- + * 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 +#include +#include + +extern "C" { +#include "spdk/trace.h" +#include "iscsi/conn.h" +} + +static char *exe_name; +static int g_shm_id = 0; + +static void usage(void) +{ + fprintf(stderr, "usage:\n"); + fprintf(stderr, " %s