From cd4de753afbc8184b423e44006e30120dc8e1e60 Mon Sep 17 00:00:00 2001 From: paul luse Date: Wed, 5 Dec 2018 18:35:02 -0500 Subject: [PATCH] bdev/compress: prepare to add some unit tests Misc cleanup from earlier patches, some naming issues and other minor things that are needed before adding UT. Change-Id: Ic76f0e2fd12e48782b048fb8785902b1098cf352 Signed-off-by: paul luse Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/436227 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- autotest.sh | 2 +- lib/bdev/compress/vbdev_compress.c | 6 ++++-- lib/bdev/compress/vbdev_compress.h | 8 ++++---- lib/bdev/compress/vbdev_compress_rpc.c | 4 ++-- test/json_config/clear_config.py | 1 + 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/autotest.sh b/autotest.sh index bffacf6a88..64ab8d8530 100755 --- a/autotest.sh +++ b/autotest.sh @@ -122,7 +122,7 @@ timing_enter nvmf_setup rdma_device_init timing_exit nvmf_setup -if [ $SPDK_TEST_CRYPTO -eq 1 ]; then +if [[ $SPDK_TEST_CRYPTO -eq 1 || $SPDK_TEST_REDUCE -eq 1 ]]; then if grep -q '#define SPDK_CONFIG_IGB_UIO_DRIVER 1' $rootdir/include/spdk/config.h; then ./scripts/qat_setup.sh igb_uio else diff --git a/lib/bdev/compress/vbdev_compress.c b/lib/bdev/compress/vbdev_compress.c index 07b6bc55e4..a2f8e980cd 100644 --- a/lib/bdev/compress/vbdev_compress.c +++ b/lib/bdev/compress/vbdev_compress.c @@ -299,6 +299,8 @@ vbdev_init_compress_drivers(void) rc = rte_vdev_init(ISAL_PMD, NULL); if (rc == 0) { SPDK_NOTICELOG("created virtual PMD %s\n", ISAL_PMD); + } else if (rc == -EEXIST) { + SPDK_NOTICELOG("virtual PMD %s already exists.\n", ISAL_PMD); } else { SPDK_ERRLOG("error creating virtual PMD %s\n", ISAL_PMD); return -EINVAL; @@ -953,7 +955,7 @@ comp_bdev_ch_destroy_cb(void *io_device, void *ctx_buf) /* RPC entry point for compression vbdev creation. */ int -create_compress_disk(const char *bdev_name, const char *vbdev_name, const char *comp_pmd) +create_compress_bdev(const char *bdev_name, const char *vbdev_name, const char *comp_pmd) { struct spdk_bdev *bdev; @@ -1115,7 +1117,7 @@ error_bdev_name: } void -delete_compress_disk(struct spdk_bdev *bdev, spdk_delete_compress_complete cb_fn, void *cb_arg) +delete_compress_bdev(struct spdk_bdev *bdev, spdk_delete_compress_complete cb_fn, void *cb_arg) { struct vbdev_compress *comp_bdev = NULL; diff --git a/lib/bdev/compress/vbdev_compress.h b/lib/bdev/compress/vbdev_compress.h index 28df6dd76f..94b27cfb0d 100644 --- a/lib/bdev/compress/vbdev_compress.h +++ b/lib/bdev/compress/vbdev_compress.h @@ -43,12 +43,12 @@ typedef void (*spdk_delete_compress_complete)(void *cb_arg, int bdeverrno); /** * Create new compression bdev. * - * \param bdev_name Bdev on which compression vbdev will be created. - * \param vbdev_name Vbdev name. + * \param bdev_name Bdev on which compression bdev will be created. + * \param vbdev_name Compression bdev name. * \param comp_pmd Compression PMD name. * \return 0 on success, other on failure. */ -int create_compress_disk(const char *bdev_name, const char *vbdev_name, const char *comp_pmd); +int create_compress_bdev(const char *bdev_name, const char *vbdev_name, const char *comp_pmd); /** * Delete compress bdev. @@ -57,7 +57,7 @@ int create_compress_disk(const char *bdev_name, const char *vbdev_name, const ch * \param cb_fn Function to call after deletion. * \param cb_arg Argument to pass to cb_fn. */ -void delete_compress_disk(struct spdk_bdev *bdev, spdk_delete_compress_complete cb_fn, +void delete_compress_bdev(struct spdk_bdev *bdev, spdk_delete_compress_complete cb_fn, void *cb_arg); #endif /* SPDK_VBDEV_COMPRESS_H */ diff --git a/lib/bdev/compress/vbdev_compress_rpc.c b/lib/bdev/compress/vbdev_compress_rpc.c index bbbff4fc89..140b39d02e 100644 --- a/lib/bdev/compress/vbdev_compress_rpc.c +++ b/lib/bdev/compress/vbdev_compress_rpc.c @@ -78,7 +78,7 @@ spdk_rpc_construct_compress_bdev(struct spdk_jsonrpc_request *request, goto invalid; } - rc = create_compress_disk(req.base_bdev_name, req.name, req.comp_pmd); + rc = create_compress_bdev(req.base_bdev_name, req.name, req.comp_pmd); if (rc != 0) { goto invalid; } @@ -150,7 +150,7 @@ spdk_rpc_delete_compress_bdev(struct spdk_jsonrpc_request *request, goto invalid; } - delete_compress_disk(bdev, _spdk_rpc_delete_compress_bdev_cb, request); + delete_compress_bdev(bdev, _spdk_rpc_delete_compress_bdev_cb, request); free_rpc_delete_compress(&req); diff --git a/test/json_config/clear_config.py b/test/json_config/clear_config.py index e86f41b903..56071446f8 100755 --- a/test/json_config/clear_config.py +++ b/test/json_config/clear_config.py @@ -56,6 +56,7 @@ def get_bdev_destroy_method(bdev): 'construct_virtio_dev': "remove_virtio_bdev", 'construct_crypto_bdev': "delete_crypto_bdev", 'construct_passthru_bdev': "delete_passthru_bdev", + 'construct_compress_bdev': 'delete_compress_bdev', } destroy_method = None if 'method' in bdev: