From 1a0ce4ded0585d4aacc19284451f68e8b0830b0f Mon Sep 17 00:00:00 2001 From: Maciej Szwed Date: Fri, 22 Jun 2018 11:48:31 +0200 Subject: [PATCH] bdev: add delete_pmem_bdev call Since delete_bdev should be used only for debug purpose, this patch adds delete call specific for pmem bdev. Signed-off-by: Maciej Szwed Change-Id: Ic526e9ae462f595c4668c2b2612ad074208a7c4e Reviewed-on: https://review.gerrithub.io/416520 Tested-by: SPDK Automated Test System Reviewed-by: Tomasz Zawadzki Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- lib/bdev/pmem/bdev_pmem.c | 11 ++++++ lib/bdev/pmem/bdev_pmem.h | 23 ++++++++++++ lib/bdev/pmem/bdev_pmem_rpc.c | 60 +++++++++++++++++++++++++++++++ scripts/rpc.py | 9 +++++ scripts/rpc/bdev.py | 10 ++++++ test/iscsi_tgt/pmem/iscsi_pmem.sh | 2 +- test/json_config/clear_config.py | 2 +- test/pmem/pmem.sh | 12 +++---- 8 files changed, 121 insertions(+), 8 deletions(-) diff --git a/lib/bdev/pmem/bdev_pmem.c b/lib/bdev/pmem/bdev_pmem.c index 55b202e6e..2b6b4e5cd 100644 --- a/lib/bdev/pmem/bdev_pmem.c +++ b/lib/bdev/pmem/bdev_pmem.c @@ -385,6 +385,17 @@ spdk_create_pmem_disk(const char *pmem_file, const char *name, struct spdk_bdev return 0; } +void +spdk_delete_pmem_disk(struct spdk_bdev *bdev, spdk_delete_pmem_complete cb_fn, void *cb_arg) +{ + if (!bdev || bdev->module != &pmem_if) { + cb_fn(cb_arg, -ENODEV); + return; + } + + spdk_bdev_unregister(bdev, cb_fn, cb_arg); +} + static void bdev_pmem_read_conf(void) { diff --git a/lib/bdev/pmem/bdev_pmem.h b/lib/bdev/pmem/bdev_pmem.h index 9011dacaf..abdfd5aa3 100644 --- a/lib/bdev/pmem/bdev_pmem.h +++ b/lib/bdev/pmem/bdev_pmem.h @@ -36,6 +36,29 @@ #include "spdk/bdev.h" +typedef void (*spdk_delete_pmem_complete)(void *cb_arg, int bdeverrno); + +/** + * Create new pmem bdev. + * + * \param pmem_file Pointer to pmem pool file. + * \param name Bdev name. + * \param bdev output parameter for bdev when operation is successful. + * \return 0 on success. + * -EIO if pool check failed + * -EINVAL if input paramteres check failed + * -ENOMEM if buffer cannot be allocated + */ int spdk_create_pmem_disk(const char *pmem_file, const char *name, struct spdk_bdev **bdev); +/** + * Delete pmem bdev. + * + * \param bdev Pointer to pmem bdev. + * \param cb_fn Function to call after deletion. + * \param cb_arg Argument to pass to cb_fn. + */ +void spdk_delete_pmem_disk(struct spdk_bdev *bdev, spdk_delete_pmem_complete cb_fn, + void *cb_arg); + #endif /* SPDK_BDEV_PMEM_H */ diff --git a/lib/bdev/pmem/bdev_pmem_rpc.c b/lib/bdev/pmem/bdev_pmem_rpc.c index 5a44002e0..3156cffbe 100644 --- a/lib/bdev/pmem/bdev_pmem_rpc.c +++ b/lib/bdev/pmem/bdev_pmem_rpc.c @@ -99,6 +99,66 @@ invalid: } SPDK_RPC_REGISTER("construct_pmem_bdev", spdk_rpc_construct_pmem_bdev, SPDK_RPC_RUNTIME) +struct rpc_delete_pmem { + char *name; +}; + +static void +free_rpc_delete_pmem(struct rpc_delete_pmem *req) +{ + free(req->name); +} + +static const struct spdk_json_object_decoder rpc_delete_pmem_decoders[] = { + {"name", offsetof(struct rpc_delete_pmem, name), spdk_json_decode_string}, +}; + +static void +_spdk_rpc_delete_pmem_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_pmem_bdev(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) +{ + struct rpc_delete_pmem req = {NULL}; + struct spdk_bdev *bdev; + int rc; + + if (spdk_json_decode_object(params, rpc_delete_pmem_decoders, + SPDK_COUNTOF(rpc_delete_pmem_decoders), + &req)) { + rc = -EINVAL; + goto invalid; + } + + bdev = spdk_bdev_get_by_name(req.name); + if (bdev == NULL) { + rc = -ENODEV; + goto invalid; + } + + spdk_delete_pmem_disk(bdev, _spdk_rpc_delete_pmem_bdev_cb, request); + free_rpc_delete_pmem(&req); + return; + +invalid: + free_rpc_delete_pmem(&req); + spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc)); +} +SPDK_RPC_REGISTER("delete_pmem_bdev", spdk_rpc_delete_pmem_bdev, SPDK_RPC_RUNTIME) + struct rpc_create_pmem_pool { char *pmem_file; uint64_t num_blocks; diff --git a/scripts/rpc.py b/scripts/rpc.py index 33064a2d7..181269b4b 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -312,6 +312,15 @@ if __name__ == "__main__": p.add_argument('-n', '--name', help='Block device name', required=True) p.set_defaults(func=construct_pmem_bdev) + @call_cmd + def delete_pmem_bdev(args): + rpc.bdev.delete_pmem_bdev(args.client, + name=args.name) + + p = subparsers.add_parser('delete_pmem_bdev', help='Delete a pmem bdev') + p.add_argument('name', help='pmem bdev name') + p.set_defaults(func=delete_pmem_bdev) + @call_cmd def construct_passthru_bdev(args): print(rpc.bdev.construct_passthru_bdev(args.client, diff --git a/scripts/rpc/bdev.py b/scripts/rpc/bdev.py index 26306b0b6..f0a2c5bdc 100755 --- a/scripts/rpc/bdev.py +++ b/scripts/rpc/bdev.py @@ -234,6 +234,16 @@ def construct_pmem_bdev(client, pmem_file, name): return client.call('construct_pmem_bdev', params) +def delete_pmem_bdev(client, name): + """Remove pmem bdev from the system. + + Args: + name: name of pmem bdev to delete + """ + params = {'name': name} + return client.call('delete_pmem_bdev', params) + + def construct_passthru_bdev(client, base_bdev_name, passthru_bdev_name): """Construct a pass-through block device. diff --git a/test/iscsi_tgt/pmem/iscsi_pmem.sh b/test/iscsi_tgt/pmem/iscsi_pmem.sh index 930bd558d..5d2bb2781 100755 --- a/test/iscsi_tgt/pmem/iscsi_pmem.sh +++ b/test/iscsi_tgt/pmem/iscsi_pmem.sh @@ -58,7 +58,7 @@ timing_exit fio_test iscsicleanup for pmem in $PMEM_BDEVS; do - $rpc_py delete_bdev $pmem + $rpc_py delete_pmem_bdev $pmem done for i in `seq 1 $TGT_NR`; do diff --git a/test/json_config/clear_config.py b/test/json_config/clear_config.py index 1ae8b89cc..a56a5bd29 100755 --- a/test/json_config/clear_config.py +++ b/test/json_config/clear_config.py @@ -47,10 +47,10 @@ def delete_subbdevs(args, bdev, rpc_bdevs): def get_bdev_destroy_method(bdev): destroy_method_map = {'construct_nvme_bdev': "delete_bdev", - 'construct_pmem_bdev': "delete_bdev", 'construct_malloc_bdev': "delete_malloc_bdev", 'construct_null_bdev': "delete_null_bdev", 'construct_rbd_bdev': "delete_rbd_bdev", + 'construct_pmem_bdev': "delete_pmem_bdev", 'construct_aio_bdev': "delete_aio_bdev", 'construct_error_bdev': "delete_error_bdev", 'construct_split_vbdev': "destruct_split_vbdev", diff --git a/test/pmem/pmem.sh b/test/pmem/pmem.sh index 622dc257e..15188635d 100755 --- a/test/pmem/pmem.sh +++ b/test/pmem/pmem.sh @@ -532,7 +532,7 @@ function construct_pmem_bdev_tc5() error "Pmem bdev not found!" fi - if ! $rpc_py delete_bdev $pmem_bdev_name; then + if ! $rpc_py delete_pmem_bdev $pmem_bdev_name; then error "Failed to delete pmem bdev!" fi @@ -568,7 +568,7 @@ function construct_pmem_bdev_tc6() error "Constructed pmem bdev with occupied path!" fi - if ! $rpc_py delete_bdev $pmem_bdev_name; then + if ! $rpc_py delete_pmem_bdev $pmem_bdev_name; then error "Failed to delete pmem bdev!" fi @@ -604,7 +604,7 @@ function delete_bdev_tc1() error "$pmem_bdev_name bdev not found!" fi - if ! $rpc_py delete_bdev $pmem_bdev_name; then + if ! $rpc_py delete_pmem_bdev $pmem_bdev_name; then error "Failed to delete $pmem_bdev_name bdev!" fi @@ -637,12 +637,12 @@ function delete_bdev_tc2() error "Pmem bdev not found!" fi - if ! $rpc_py delete_bdev $pmem_bdev_name; then + if ! $rpc_py delete_pmem_bdev $pmem_bdev_name; then error "Failed to delete pmem bdev!" fi - if $rpc_py delete_bdev $pmem_bdev_name; then - error "delete_bdev deleted pmem bdev for second time!" + if $rpc_py delete_pmem_bdev $pmem_bdev_name; then + error "delete_pmem_bdev deleted pmem bdev for second time!" fi pmem_clean_pool_file