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

iscsi: free mempools on exit

Browse Source 
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ia3b3afc1a5331fe2b89d75eeddfd6e4430567cff

Reviewed-on: https://review.gerrithub.io/362450
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Jim Harris 2017-05-24 16:10:00 -07:00 committed by Ben Walker
parent f21448cfbc
commit 41d477cfa3
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/iscsi/iscsi_subsystem.c
View File

@ -468,7 +468,8 @@ spdk_iscsi_check_pool(struct rte_mempool *pool, uint32_t count)
} }
} }
static int spdk_iscsi_check_pools(void) static int
spdk_iscsi_check_pools(void)
{ {
int rc = 0; int rc = 0;
struct spdk_iscsi_globals *iscsi = &g_spdk_iscsi; struct spdk_iscsi_globals *iscsi = &g_spdk_iscsi;
@ -477,6 +478,7 @@ static int spdk_iscsi_check_pools(void)
rc += spdk_iscsi_check_pool(iscsi->session_pool, SESSION_POOL_SIZE(iscsi)); rc += spdk_iscsi_check_pool(iscsi->session_pool, SESSION_POOL_SIZE(iscsi));
rc += spdk_iscsi_check_pool(iscsi->pdu_immediate_data_pool, IMMEDIATE_DATA_POOL_SIZE(iscsi)); rc += spdk_iscsi_check_pool(iscsi->pdu_immediate_data_pool, IMMEDIATE_DATA_POOL_SIZE(iscsi));
rc += spdk_iscsi_check_pool(iscsi->pdu_data_out_pool, DATA_OUT_POOL_SIZE(iscsi)); rc += spdk_iscsi_check_pool(iscsi->pdu_data_out_pool, DATA_OUT_POOL_SIZE(iscsi));
/* TODO: check the task_pool on exit */
if (rc == 0) { if (rc == 0) {
return 0; return 0;
@ -485,6 +487,18 @@ static int spdk_iscsi_check_pools(void)
} }
} }
static void
spdk_iscsi_free_pools(void)
{
struct spdk_iscsi_globals *iscsi = &g_spdk_iscsi;
rte_mempool_free(iscsi->pdu_pool);
rte_mempool_free(iscsi->session_pool);
rte_mempool_free(iscsi->pdu_immediate_data_pool);
rte_mempool_free(iscsi->pdu_data_out_pool);
rte_mempool_free(iscsi->task_pool);
}
void spdk_put_pdu(struct spdk_iscsi_pdu *pdu) void spdk_put_pdu(struct spdk_iscsi_pdu *pdu)
{ {
if (!pdu) if (!pdu)
@ -992,6 +1006,7 @@ spdk_iscsi_subsystem_fini(void)
int rc; int rc;
rc = spdk_iscsi_check_pools(); rc = spdk_iscsi_check_pools();
spdk_iscsi_free_pools();
spdk_iscsi_shutdown_tgt_nodes(); spdk_iscsi_shutdown_tgt_nodes();
spdk_iscsi_init_grp_array_destroy(); spdk_iscsi_init_grp_array_destroy();