Commit cd4de753 authored by paul luse's avatar paul luse Committed by Jim Harris
Browse files

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: default avatarpaul luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/436227


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent aa3fdd01

autotest.sh

+1 −1
Original line number Diff line number Diff line
@@ -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

lib/bdev/compress/vbdev_compress.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

lib/bdev/compress/vbdev_compress.h

+4 −4
Original line number Diff line number Diff line
@@ -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 */

lib/bdev/compress/vbdev_compress_rpc.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

test/json_config/clear_config.py

+1 −0
Original line number Diff line number Diff line
@@ -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: