diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile index 0736c769a..a5757097f 100644 --- a/app/iscsi_tgt/Makefile +++ b/app/iscsi_tgt/Makefile @@ -49,6 +49,7 @@ SPDK_LIBS = \ $(SPDK_ROOT_DIR)/lib/json/libspdk_json.a \ $(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \ $(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \ + $(SPDK_ROOT_DIR)/lib/bdev/rpc/libspdk_bdev_rpc.a \ $(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \ $(SPDK_ROOT_DIR)/lib/iscsi/libspdk_iscsi.a \ $(SPDK_ROOT_DIR)/lib/scsi/libspdk_scsi.a \ diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile index 2335b2de0..0dd4a09d2 100644 --- a/app/nvmf_tgt/Makefile +++ b/app/nvmf_tgt/Makefile @@ -60,6 +60,7 @@ SPDK_LIBS = \ SPDK_WHOLE_LIBS = \ $(SPDK_ROOT_DIR)/lib/event/rpc/libspdk_app_rpc.a \ $(SPDK_ROOT_DIR)/lib/log/rpc/libspdk_log_rpc.a \ + $(SPDK_ROOT_DIR)/lib/bdev/rpc/libspdk_bdev_rpc.a \ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile index 99d155721..07afabd33 100644 --- a/lib/bdev/Makefile +++ b/lib/bdev/Makefile @@ -38,7 +38,7 @@ CFLAGS += $(ENV_CFLAGS) -I. C_SRCS = bdev.c LIBNAME = bdev -DIRS-y += malloc nvme +DIRS-y += malloc nvme rpc ifeq ($(OS),Linux) DIRS-y += aio diff --git a/lib/bdev/rpc/Makefile b/lib/bdev/rpc/Makefile new file mode 100644 index 000000000..351bc3013 --- /dev/null +++ b/lib/bdev/rpc/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 += -I$(SPDK_ROOT_DIR)/lib/bdev/ +C_SRCS = bdev_rpc.c +LIBNAME = bdev_rpc + +include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/bdev/rpc/bdev_rpc.c b/lib/bdev/rpc/bdev_rpc.c new file mode 100644 index 000000000..8d9ccb390 --- /dev/null +++ b/lib/bdev/rpc/bdev_rpc.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/bdev.h" +#include "spdk/log.h" +#include "spdk/rpc.h" + +static void +spdk_rpc_get_bdevs(struct spdk_jsonrpc_server_conn *conn, + const struct spdk_json_val *params, + const struct spdk_json_val *id) +{ + struct spdk_json_write_ctx *w; + struct spdk_bdev *bdev; + + if (params != NULL) { + spdk_jsonrpc_send_error_response(conn, id, SPDK_JSONRPC_ERROR_INVALID_PARAMS, + "get_bdevs requires no parameters"); + return; + } + + if (id == NULL) { + return; + } + + w = spdk_jsonrpc_begin_result(conn, id); + spdk_json_write_array_begin(w); + + for (bdev = spdk_bdev_first(); bdev != NULL; bdev = spdk_bdev_next(bdev)) { + spdk_json_write_object_begin(w); + + spdk_json_write_name(w, "name"); + spdk_json_write_string(w, bdev->name); + + spdk_json_write_name(w, "product_name"); + spdk_json_write_string(w, bdev->product_name); + + spdk_json_write_name(w, "block_size"); + spdk_json_write_uint32(w, bdev->blocklen); + + spdk_json_write_name(w, "num_blocks"); + spdk_json_write_uint64(w, bdev->blockcnt); + + spdk_json_write_name(w, "claimed"); + spdk_json_write_bool(w, bdev->claimed); + + spdk_json_write_object_end(w); + } + spdk_json_write_array_end(w); + + spdk_jsonrpc_end_result(conn, w); +} +SPDK_RPC_REGISTER("get_bdevs", spdk_rpc_get_bdevs) diff --git a/scripts/rpc.py b/scripts/rpc.py index 7e3812e51..e30bdd23b 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -330,6 +330,12 @@ def get_interfaces(args): p = subparsers.add_parser('get_interfaces', help='Display current interface list') p.set_defaults(func=get_interfaces) +def get_bdevs(args): + print_dict(jsonrpc_call('get_bdevs')) + +p = subparsers.add_parser('get_bdevs', help='Display current blockdev list') +p.set_defaults(func=get_bdevs) + def get_nvmf_subsystems(args): print_dict(jsonrpc_call('get_nvmf_subsystems'))