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

nvmf/rdma: pd null check

Browse Source 
In case of pd allocation by nvmf hooks there is a lack of null
check as oposed to pd allocation by ibv_alloc_pd.

Signed-off-by: Jacek Kalwas <jacek.kalwas@intel.com>
Change-Id: Iead6e0332bdee3da4adb6e657af298215c4e2196
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461576
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Jacek Kalwas 2019-07-12 11:25:54 +02:00 committed by Changpeng Liu
parent e2c0d9a294
commit 114a067738
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/nvmf/rdma.c
View File

@ -2128,7 +2128,6 @@ spdk_nvmf_rdma_create(struct spdk_nvmf_transport_opts *opts)
int rc; int rc;
struct spdk_nvmf_rdma_transport *rtransport; struct spdk_nvmf_rdma_transport *rtransport;
struct spdk_nvmf_rdma_device *device, *tmp; struct spdk_nvmf_rdma_device *device, *tmp;
struct ibv_pd *pd;
struct ibv_context **contexts; struct ibv_context **contexts;
uint32_t i; uint32_t i;
int flag; int flag;
@ -2282,20 +2281,16 @@ spdk_nvmf_rdma_create(struct spdk_nvmf_transport_opts *opts)
TAILQ_INSERT_TAIL(&rtransport->devices, device, link); TAILQ_INSERT_TAIL(&rtransport->devices, device, link);
i++; i++;
pd = NULL;
if (g_nvmf_hooks.get_ibv_pd) { if (g_nvmf_hooks.get_ibv_pd) {
pd = g_nvmf_hooks.get_ibv_pd(NULL, device->context); device->pd = g_nvmf_hooks.get_ibv_pd(NULL, device->context);
} else {
device->pd = ibv_alloc_pd(device->context);
} }
if (!g_nvmf_hooks.get_ibv_pd) { if (!device->pd) {
device->pd = ibv_alloc_pd(device->context); SPDK_ERRLOG("Unable to allocate protection domain.\n");
if (!device->pd) { spdk_nvmf_rdma_destroy(&rtransport->transport);
SPDK_ERRLOG("Unable to allocate protection domain.\n"); return NULL;
spdk_nvmf_rdma_destroy(&rtransport->transport);
return NULL;
}
} else {
device->pd = pd;
} }
assert(device->map == NULL); assert(device->map == NULL);