ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev/compress: prepare to add some unit tests

Browse Source 
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 <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/436227
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
paul luse 2018-12-05 18:35:02 -05:00 committed by Jim Harris
parent aa3fdd01bd
commit cd4de753af
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autotest.sh
View File

@ -122,7 +122,7 @@ timing_enter nvmf_setup
rdma_device_init rdma_device_init
timing_exit nvmf_setup 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 if grep -q '#define SPDK_CONFIG_IGB_UIO_DRIVER 1' $rootdir/include/spdk/config.h; then
./scripts/qat_setup.sh igb_uio ./scripts/qat_setup.sh igb_uio
else else

6
lib/bdev/compress/vbdev_compress.c
View File

@ -299,6 +299,8 @@ vbdev_init_compress_drivers(void)
rc = rte_vdev_init(ISAL_PMD, NULL); rc = rte_vdev_init(ISAL_PMD, NULL);
if (rc == 0) { if (rc == 0) {
SPDK_NOTICELOG("created virtual PMD %s\n", ISAL_PMD); SPDK_NOTICELOG("created virtual PMD %s\n", ISAL_PMD);
} else if (rc == -EEXIST) {
SPDK_NOTICELOG("virtual PMD %s already exists.\n", ISAL_PMD);
} else { } else {
SPDK_ERRLOG("error creating virtual PMD %s\n", ISAL_PMD); SPDK_ERRLOG("error creating virtual PMD %s\n", ISAL_PMD);
return -EINVAL; return -EINVAL;
@ -953,7 +955,7 @@ comp_bdev_ch_destroy_cb(void *io_device, void *ctx_buf)
/* RPC entry point for compression vbdev creation. */ /* RPC entry point for compression vbdev creation. */
int 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; struct spdk_bdev *bdev;
@ -1115,7 +1117,7 @@ error_bdev_name:
} }
void 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; struct vbdev_compress *comp_bdev = NULL;

8
lib/bdev/compress/vbdev_compress.h
View File

@ -43,12 +43,12 @@ typedef void (*spdk_delete_compress_complete)(void *cb_arg, int bdeverrno);
/** /**
* Create new compression bdev. * Create new compression bdev.
* *
* \param bdev_name Bdev on which compression vbdev will be created. * \param bdev_name Bdev on which compression bdev will be created.
* \param vbdev_name Vbdev name. * \param vbdev_name Compression bdev name.
* \param comp_pmd Compression PMD name. * \param comp_pmd Compression PMD name.
* \return 0 on success, other on failure. * \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. * 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_fn Function to call after deletion.
* \param cb_arg Argument to pass to cb_fn. * \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); void *cb_arg);
#endif /* SPDK_VBDEV_COMPRESS_H */ #endif /* SPDK_VBDEV_COMPRESS_H */

4
lib/bdev/compress/vbdev_compress_rpc.c
View File

@ -78,7 +78,7 @@ spdk_rpc_construct_compress_bdev(struct spdk_jsonrpc_request *request,
goto invalid; 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) { if (rc != 0) {
goto invalid; goto invalid;
} }
@ -150,7 +150,7 @@ spdk_rpc_delete_compress_bdev(struct spdk_jsonrpc_request *request,
goto invalid; 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); free_rpc_delete_compress(&req);

1
test/json_config/clear_config.py
View File

@ -56,6 +56,7 @@ def get_bdev_destroy_method(bdev):
'construct_virtio_dev': "remove_virtio_bdev", 'construct_virtio_dev': "remove_virtio_bdev",
'construct_crypto_bdev': "delete_crypto_bdev", 'construct_crypto_bdev': "delete_crypto_bdev",
'construct_passthru_bdev': "delete_passthru_bdev", 'construct_passthru_bdev': "delete_passthru_bdev",
'construct_compress_bdev': 'delete_compress_bdev',
} }
destroy_method = None destroy_method = None
if 'method' in bdev: if 'method' in bdev: