From 96e93bd8d52fcf221650db67f2104fdeeb774ed2 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Thu, 14 Jun 2018 10:15:36 -0400 Subject: [PATCH] bdev: add delete_aio_bdev call Since delete_bdev should be used only for debug purpose, this patch adds delete call specific for AIO. Changes in tests and spdkcli done accordingly. Change-Id: Ib732953a2c138dc25915ba97ce3a8acf771ad74f Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/415462 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/bdev/aio/bdev_aio.c | 11 ++++++ lib/bdev/aio/bdev_aio.h | 4 ++ lib/bdev/aio/bdev_aio_rpc.c | 64 +++++++++++++++++++++++++++++++- scripts/rpc.py | 9 +++++ scripts/rpc/bdev.py | 10 +++++ scripts/spdkcli/ui_root.py | 3 ++ test/json_config/clear_config.py | 2 +- 7 files changed, 101 insertions(+), 2 deletions(-) diff --git a/lib/bdev/aio/bdev_aio.c b/lib/bdev/aio/bdev_aio.c index d339ff831..25bdf6d6b 100644 --- a/lib/bdev/aio/bdev_aio.c +++ b/lib/bdev/aio/bdev_aio.c @@ -547,6 +547,17 @@ error_return: return NULL; } +void +delete_aio_disk(struct spdk_bdev *bdev, spdk_delete_aio_complete cb_fn, void *cb_arg) +{ + if (!bdev || bdev->module != &aio_if) { + cb_fn(cb_arg, -ENODEV); + return; + } + + spdk_bdev_unregister(bdev, cb_fn, cb_arg); +} + static int bdev_aio_initialize(void) { diff --git a/lib/bdev/aio/bdev_aio.h b/lib/bdev/aio/bdev_aio.h index c2a3d14c1..e8c1fc6dc 100644 --- a/lib/bdev/aio/bdev_aio.h +++ b/lib/bdev/aio/bdev_aio.h @@ -65,6 +65,10 @@ struct file_disk { bool block_size_override; }; +typedef void (*spdk_delete_aio_complete)(void *cb_arg, int bdeverrno); + struct spdk_bdev *create_aio_disk(const char *name, const char *filename, uint32_t block_size); +void delete_aio_disk(struct spdk_bdev *bdev, spdk_delete_aio_complete cb_fn, void *cb_arg); + #endif // SPDK_BDEV_AIO_H diff --git a/lib/bdev/aio/bdev_aio_rpc.c b/lib/bdev/aio/bdev_aio_rpc.c index 1d13b8136..52b9ba7d1 100644 --- a/lib/bdev/aio/bdev_aio_rpc.c +++ b/lib/bdev/aio/bdev_aio_rpc.c @@ -34,7 +34,7 @@ #include "bdev_aio.h" #include "spdk/rpc.h" #include "spdk/util.h" - +#include "spdk/string.h" #include "spdk_internal/log.h" struct rpc_construct_aio { @@ -98,3 +98,65 @@ invalid: free_rpc_construct_aio(&req); } SPDK_RPC_REGISTER("construct_aio_bdev", spdk_rpc_construct_aio_bdev, SPDK_RPC_RUNTIME) + +struct rpc_delete_aio { + char *name; +}; + +static void +free_rpc_delete_aio(struct rpc_delete_aio *r) +{ + free(r->name); +} + +static const struct spdk_json_object_decoder rpc_delete_aio_decoders[] = { + {"name", offsetof(struct rpc_delete_aio, name), spdk_json_decode_string}, +}; + +static void +_spdk_rpc_delete_aio_bdev_cb(void *cb_arg, int bdeverrno) +{ + struct spdk_jsonrpc_request *request = cb_arg; + struct spdk_json_write_ctx *w; + + w = spdk_jsonrpc_begin_result(request); + if (w == NULL) { + return; + } + + spdk_json_write_bool(w, bdeverrno == 0); + spdk_jsonrpc_end_result(request, w); +} + +static void +spdk_rpc_delete_aio_bdev(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) +{ + struct rpc_delete_aio req = {NULL}; + struct spdk_bdev *bdev; + int rc; + + if (spdk_json_decode_object(params, rpc_delete_aio_decoders, + SPDK_COUNTOF(rpc_delete_aio_decoders), + &req)) { + rc = -EINVAL; + goto invalid; + } + + bdev = spdk_bdev_get_by_name(req.name); + if (bdev == NULL) { + rc = -ENODEV; + goto invalid; + } + + delete_aio_disk(bdev, _spdk_rpc_delete_aio_bdev_cb, request); + + free_rpc_delete_aio(&req); + + return; + +invalid: + free_rpc_delete_aio(&req); + spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc)); +} +SPDK_RPC_REGISTER("delete_aio_bdev", spdk_rpc_delete_aio_bdev, SPDK_RPC_RUNTIME) diff --git a/scripts/rpc.py b/scripts/rpc.py index 77be4b9bc..b13f44941 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -171,6 +171,15 @@ if __name__ == "__main__": p.add_argument('block_size', help='Block size for this bdev', type=int, nargs='?', default=0) p.set_defaults(func=construct_aio_bdev) + @call_cmd + def delete_aio_bdev(args): + rpc.bdev.delete_aio_bdev(args.client, + name=args.name) + + p = subparsers.add_parser('delete_aio_bdev', help='Delete an aio disk') + p.add_argument('name', help='aio bdev name') + p.set_defaults(func=delete_aio_bdev) + @call_cmd def construct_nvme_bdev(args): print_array(rpc.bdev.construct_nvme_bdev(args.client, diff --git a/scripts/rpc/bdev.py b/scripts/rpc/bdev.py index 087f4887c..797fcb984 100755 --- a/scripts/rpc/bdev.py +++ b/scripts/rpc/bdev.py @@ -74,6 +74,16 @@ def construct_aio_bdev(client, filename, name, block_size=None): return client.call('construct_aio_bdev', params) +def delete_aio_bdev(client, name): + """Remove aio bdev from the system. + + Args: + bdev_name: name of aio bdev to delete + """ + params = {'name': name} + return client.call('delete_aio_bdev', params) + + def construct_nvme_bdev(client, name, trtype, traddr, adrfam=None, trsvcid=None, subnqn=None): """Construct NVMe namespace block devices. diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py index 4c8dab672..d05055cbd 100644 --- a/scripts/spdkcli/ui_root.py +++ b/scripts/spdkcli/ui_root.py @@ -57,6 +57,9 @@ class UIRoot(UINode): response = rpc.bdev.construct_aio_bdev(self.client, **kwargs) return self.print_array(response) + def delete_aio_bdev(self, **kwargs): + rpc.bdev.delete_aio_bdev(self.client, **kwargs) + def create_lvol_bdev(self, **kwargs): response = rpc.lvol.construct_lvol_bdev(self.client, **kwargs) return self.print_array(response) diff --git a/test/json_config/clear_config.py b/test/json_config/clear_config.py index 3c82ee02b..e903ee938 100755 --- a/test/json_config/clear_config.py +++ b/test/json_config/clear_config.py @@ -51,7 +51,7 @@ def get_bdev_destroy_method(bdev): 'construct_rbd_bdev': "delete_bdev", 'construct_malloc_bdev': "delete_bdev", 'construct_null_bdev': "delete_bdev", - 'construct_aio_bdev': "delete_bdev", + 'construct_aio_bdev': "delete_aio_bdev", 'construct_error_bdev': "delete_bdev", 'construct_split_vbdev': "destruct_split_vbdev", 'construct_virtio_dev': {