From d8618de0df28627be6427c488bf512207cd7e5f2 Mon Sep 17 00:00:00 2001 From: Liu Xiaodong Date: Wed, 16 Sep 2020 16:16:10 -0400 Subject: [PATCH] interrupt: add interrupt_tgt app interrupt_tgt is similar with vhost_tgt, but it is constructed by libaries supporting event interrupt mode with interrupt functions. Some basic bdev libraries are linked in it. "interrupt_tgt -E" will run the app in interrupt mode. At start, it can work with SPDK RPC methods. Change-Id: I3a9b253a4657758fc670af835e5bed5e53f412dc Signed-off-by: Liu Xiaodong Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4271 Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins --- examples/Makefile | 4 ++ examples/interrupt_tgt/.gitignore | 1 + examples/interrupt_tgt/Makefile | 53 ++++++++++++++++ examples/interrupt_tgt/interrupt_tgt.c | 83 ++++++++++++++++++++++++++ 4 files changed, 141 insertions(+) create mode 100644 examples/interrupt_tgt/.gitignore create mode 100644 examples/interrupt_tgt/Makefile create mode 100644 examples/interrupt_tgt/interrupt_tgt.c diff --git a/examples/Makefile b/examples/Makefile index 516cf83fc..164043a63 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -36,6 +36,10 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y += accel bdev blob ioat nvme sock vmd nvmf +ifeq ($(OS),Linux) +DIRS-y += interrupt_tgt +endif + .PHONY: all clean $(DIRS-y) all: $(DIRS-y) diff --git a/examples/interrupt_tgt/.gitignore b/examples/interrupt_tgt/.gitignore new file mode 100644 index 000000000..feaad4976 --- /dev/null +++ b/examples/interrupt_tgt/.gitignore @@ -0,0 +1 @@ +interrupt_tgt diff --git a/examples/interrupt_tgt/Makefile b/examples/interrupt_tgt/Makefile new file mode 100644 index 000000000..b4d58d43d --- /dev/null +++ b/examples/interrupt_tgt/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.modules.mk + +APP = interrupt_tgt + +C_SRCS := interrupt_tgt.c + +# Basic libaries to support spdk application +SPDK_LIB_LIST += event thread +SPDK_LIB_LIST += jsonrpc json rpc trace conf util log +# Basic bdev libraries +SPDK_LIB_LIST += bdev notify accel vmd sock +SPDK_LIB_LIST += $(EVENT_BDEV_SUBSYSTEM) # event_bdev depends on some other event modules, but they dont support edriven yet + +ifeq ($(SPDK_ROOT_DIR)/lib/env_dpdk,$(CONFIG_ENV)) +SPDK_LIB_LIST += env_dpdk_rpc +endif + +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/examples/interrupt_tgt/interrupt_tgt.c b/examples/interrupt_tgt/interrupt_tgt.c new file mode 100644 index 000000000..3c4676ad5 --- /dev/null +++ b/examples/interrupt_tgt/interrupt_tgt.c @@ -0,0 +1,83 @@ +/*- + * 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/conf.h" +#include "spdk/event.h" + +static void +interrupt_tgt_usage(void) +{ + printf(" -E Set interrupt mode\n"); +} + +static int +interrupt_tgt_parse_arg(int ch, char *arg) +{ + switch (ch) { + case 'E': + spdk_interrupt_mode_enable(); + break; + default: + return -EINVAL; + } + return 0; +} + +static void +interrupt_tgt_started(void *arg1) +{ +} + +int +main(int argc, char *argv[]) +{ + struct spdk_app_opts opts = {}; + int rc; + + spdk_app_opts_init(&opts); + opts.name = "interrupt_tgt"; + + if ((rc = spdk_app_parse_args(argc, argv, &opts, "E", NULL, + interrupt_tgt_parse_arg, interrupt_tgt_usage)) != + SPDK_APP_PARSE_ARGS_SUCCESS) { + exit(rc); + } + + /* Blocks until the application is exiting */ + rc = spdk_app_start(&opts, interrupt_tgt_started, NULL); + + spdk_app_fini(); + + return rc; +}