admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

iser: free tx_desc of queued/inflight pdus

Browse Source 
tx_desc and memory region buffer assigned to iser pdus should be given back to
tx_desc list and allocator before free all memory regions.
This may happend during reconnecting/disconnecting.

Signed-off-by: wanghonghao <wanghonghao@bytedance.com>
This commit is contained in:
wanghonghao
2020-04-06 21:08:24 +08:00
parent 2212021747
commit bd9524b4ce
1 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/iser.c
View File

@@ -333,6 +333,29 @@ release:
return NULL; return NULL;
} }
static void
iser_free_queued_pdu_tx_desc(struct iscsi_context *iscsi)
{
struct iscsi_pdu *pdu;
struct iser_pdu *iser_pdu;
for (pdu = iscsi->waitpdu; pdu; pdu = pdu->next) {
iser_pdu = container_of(pdu, struct iser_pdu, iscsi_pdu);
if (iser_pdu->desc) {
iser_tx_desc_free(iscsi, iser_pdu->desc);
iser_pdu->desc = NULL;
}
}
for (pdu = iscsi->outqueue; pdu; pdu = pdu->next) {
iser_pdu = container_of(pdu, struct iser_pdu, iscsi_pdu);
if (iser_pdu->desc) {
iser_tx_desc_free(iscsi, iser_pdu->desc);
iser_pdu->desc = NULL;
}
}
}
/* /*
* iser_free_rx_descriptors() - freeing descriptors memory * iser_free_rx_descriptors() - freeing descriptors memory
* @iser_conn: ib connection context * @iser_conn: ib connection context
@@ -445,14 +468,15 @@ iser_free_iser_conn_res(struct iser_conn *iser_conn, bool destroy)
/* /*
* iser_conn_release() - releasing ib resources * iser_conn_release() - releasing ib resources
* and destroying cm id * and destroying cm id
* @iser_conn: ib connection context * @iscsi_context: iscsi context
*/ */
static void static void
iser_conn_release(struct iser_conn *iser_conn) iser_conn_release(struct iscsi_context *iscsi)
{ {
int ret; int ret;
struct iscsi_context *iscsi = iser_conn->cma_id->context; struct iser_conn *iser_conn = iscsi->opaque;
iser_free_queued_pdu_tx_desc(iscsi);
iser_free_iser_conn_res(iser_conn, true); iser_free_iser_conn_res(iser_conn, true);
if (iser_conn->cma_id) { if (iser_conn->cma_id) {
@@ -504,7 +528,7 @@ iscsi_iser_disconnect(struct iscsi_context *iscsi) {
if (iser_conn->cma_id) { if (iser_conn->cma_id) {
iser_conn_terminate(iser_conn); iser_conn_terminate(iser_conn);
iser_conn_release(iser_conn); iser_conn_release(iscsi);
} }
if (iscsi->fd != -1) { if (iscsi->fd != -1) {
@@ -1587,7 +1611,7 @@ iscsi_iser_cm_event(struct iscsi_context *iscsi) {
/* connect failed, cleanup itself */ /* connect failed, cleanup itself */
if (iser_conn->cma_id) { if (iser_conn->cma_id) {
iser_conn_terminate(iser_conn); iser_conn_terminate(iser_conn);
iser_conn_release(iser_conn); iser_conn_release(iscsi);
iser_conn->cma_id = NULL; iser_conn->cma_id = NULL;
} }
@@ -1637,7 +1661,7 @@ iscsi_iser_connect(struct iscsi_context *iscsi, union socket_address *sa,__attri
if (old_iser_conn) { if (old_iser_conn) {
if (old_iser_conn->cma_id) { if (old_iser_conn->cma_id) {
iser_conn_terminate(old_iser_conn); iser_conn_terminate(old_iser_conn);
iser_conn_release(old_iser_conn); iser_conn_release(old_iscsi);
} }
iscsi_free(old_iscsi, old_iser_conn); iscsi_free(old_iscsi, old_iser_conn);