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

crypto: add error handling to claim function

Browse Source 
When adding RPC support, did some refactoring and totally missed
error handling in the claim function.  This patch adds it.

Addresses github issue #445≠

Change-Id: Ie2df279af7bfa3660a4a9fe2fd8bcbf7b5fd07fd
Signed-off-by: paul luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/427170
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
paul luse 2018-09-27 17:37:00 -04:00 committed by Jim Harris
parent 6de9698dec
commit b5c5d14506
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/bdev/crypto/vbdev_crypto.c
View File

@ -128,7 +128,7 @@ static void _complete_internal_io(struct spdk_bdev_io *bdev_io, bool success, vo
static void _complete_internal_read(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg); static void _complete_internal_read(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg);
static void _complete_internal_write(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg); static void _complete_internal_write(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg);
static void vbdev_crypto_examine(struct spdk_bdev *bdev); static void vbdev_crypto_examine(struct spdk_bdev *bdev);
static void vbdev_crypto_claim(struct spdk_bdev *bdev); static int vbdev_crypto_claim(struct spdk_bdev *bdev);
/* list of crypto_bdev names and their base bdevs via configuration file. /* list of crypto_bdev names and their base bdevs via configuration file.
* Used so we can parse the conf once at init and use this list in examine(). * Used so we can parse the conf once at init and use this list in examine().
@ -1128,7 +1128,11 @@ create_crypto_disk(const char *bdev_name, const char *vbdev_name,
return 0; return 0;
} }
vbdev_crypto_claim(bdev); rc = vbdev_crypto_claim(bdev);
if (rc) {
SPDK_ERRLOG("Error claiming bdev\n");
return rc;
}
rc = vbdev_crypto_init_crypto_drivers(); rc = vbdev_crypto_init_crypto_drivers();
if (rc) { if (rc) {
@ -1319,12 +1323,12 @@ static struct spdk_bdev_module crypto_if = {
SPDK_BDEV_MODULE_REGISTER(&crypto_if) SPDK_BDEV_MODULE_REGISTER(&crypto_if)
static void static int
vbdev_crypto_claim(struct spdk_bdev *bdev) vbdev_crypto_claim(struct spdk_bdev *bdev)
{ {
struct bdev_names *name; struct bdev_names *name;
struct vbdev_crypto *vbdev; struct vbdev_crypto *vbdev;
int rc; int rc = 0;
/* Check our list of names from config versus this bdev and if /* Check our list of names from config versus this bdev and if
* there's a match, create the crypto_bdev & bdev accordingly. * there's a match, create the crypto_bdev & bdev accordingly.
@ -1338,7 +1342,8 @@ vbdev_crypto_claim(struct spdk_bdev *bdev)
vbdev = calloc(1, sizeof(struct vbdev_crypto)); vbdev = calloc(1, sizeof(struct vbdev_crypto));
if (!vbdev) { if (!vbdev) {
SPDK_ERRLOG("could not allocate crypto_bdev\n"); SPDK_ERRLOG("could not allocate crypto_bdev\n");
break; rc = -ENOMEM;
goto error_vbdev_alloc;
} }
/* The base bdev that we're attaching to. */ /* The base bdev that we're attaching to. */
@ -1346,18 +1351,21 @@ vbdev_crypto_claim(struct spdk_bdev *bdev)
vbdev->crypto_bdev.name = strdup(name->vbdev_name); vbdev->crypto_bdev.name = strdup(name->vbdev_name);
if (!vbdev->crypto_bdev.name) { if (!vbdev->crypto_bdev.name) {
SPDK_ERRLOG("could not allocate crypto_bdev name\n"); SPDK_ERRLOG("could not allocate crypto_bdev name\n");
rc = -ENOMEM;
goto error_bdev_name; goto error_bdev_name;
} }
vbdev->key = strdup(name->key); vbdev->key = strdup(name->key);
if (!vbdev->key) { if (!vbdev->key) {
SPDK_ERRLOG("could not allocate crypto_bdev key\n"); SPDK_ERRLOG("could not allocate crypto_bdev key\n");
rc = -ENOMEM;
goto error_alloc_key; goto error_alloc_key;
} }
vbdev->drv_name = strdup(name->drv_name); vbdev->drv_name = strdup(name->drv_name);
if (!vbdev->drv_name) { if (!vbdev->drv_name) {
SPDK_ERRLOG("could not allocate crypto_bdev drv_name\n"); SPDK_ERRLOG("could not allocate crypto_bdev drv_name\n");
rc = -ENOMEM;
goto error_drv_name; goto error_drv_name;
} }
@ -1404,7 +1412,7 @@ vbdev_crypto_claim(struct spdk_bdev *bdev)
SPDK_NOTICELOG("registered crypto_bdev for: %s\n", name->vbdev_name); SPDK_NOTICELOG("registered crypto_bdev for: %s\n", name->vbdev_name);
} }
return; return rc;
/* Error cleanup paths. */ /* Error cleanup paths. */
error_claim: error_claim:
@ -1419,6 +1427,8 @@ error_alloc_key:
free(vbdev->crypto_bdev.name); free(vbdev->crypto_bdev.name);
error_bdev_name: error_bdev_name:
free(vbdev); free(vbdev);
error_vbdev_alloc:
return rc;
} }
/* RPC entry for deleting a crypto vbdev. */ /* RPC entry for deleting a crypto vbdev. */
@ -1465,7 +1475,12 @@ vbdev_crypto_examine(struct spdk_bdev *bdev)
struct vbdev_crypto *crypto_bdev, *tmp; struct vbdev_crypto *crypto_bdev, *tmp;
int rc; int rc;
vbdev_crypto_claim(bdev); rc = vbdev_crypto_claim(bdev);
if (rc) {
SPDK_ERRLOG("could not claim bdev\n");
spdk_bdev_module_examine_done(&crypto_if);
return;
}
TAILQ_FOREACH_SAFE(crypto_bdev, &g_vbdev_crypto, link, tmp) { TAILQ_FOREACH_SAFE(crypto_bdev, &g_vbdev_crypto, link, tmp) {
if (strcmp(crypto_bdev->base_bdev->name, bdev->name) == 0) { if (strcmp(crypto_bdev->base_bdev->name, bdev->name) == 0) {