mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 03:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

isert: Make sure we don't call dma_unmap on memory we already unmapped

Browse Source 
Signed-off-by: Yan Burman <yanb@mellanox.com>

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5897 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Yan Burman
2014-11-30 08:17:09 +00:00
parent bd70a2eb27
commit a105745c4c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
iscsi-scst/kernel/isert-scst/iser_buf.c
View File

@@ -294,9 +294,11 @@ void isert_wr_release(struct isert_wr *wr)
struct isert_device *isert_dev = wr->isert_dev;
struct ib_device *ib_dev;
ib_dev = isert_dev->ib_dev;
ib_dma_unmap_sg(ib_dev, isert_buf->sg, isert_buf->sg_cnt,
isert_buf->dma_dir);
if (isert_buf->sg_cnt) {
ib_dev = isert_dev->ib_dev;
ib_dma_unmap_sg(ib_dev, isert_buf->sg, isert_buf->sg_cnt,
isert_buf->dma_dir);
}
isert_buf_release(isert_buf);
}
memset(wr, 0, sizeof(*wr));

6
iscsi-scst/kernel/isert-scst/iser_rdma.c
View File

@@ -359,6 +359,7 @@ static void isert_rdma_rd_completion_handler(struct isert_wr *wr)
ib_dma_unmap_sg(ib_dev, isert_buf->sg, isert_buf->sg_cnt,
isert_buf->dma_dir);
isert_buf->sg_cnt = 0;
isert_data_out_ready(&wr->pdu->iscsi);
}
@@ -371,6 +372,7 @@ static void isert_rdma_wr_completion_handler(struct isert_wr *wr)
ib_dma_unmap_sg(ib_dev, isert_buf->sg, isert_buf->sg_cnt,
isert_buf->dma_dir);
isert_buf->sg_cnt = 0;
isert_data_in_sent(&wr->pdu->iscsi);
}
@@ -543,9 +545,9 @@ static void isert_handle_wc_error(struct ib_wc *wc)
break;
case ISER_WR_RDMA_READ:
if (isert_buf->sg_cnt != 0) {
isert_buf->sg_cnt = 0;
ib_dma_unmap_sg(ib_dev, isert_buf->sg, isert_buf->sg_cnt,
isert_buf->dma_dir);
isert_buf->sg_cnt = 0;
}
isert_pdu_err(&isert_pdu->iscsi);
break;
@@ -554,9 +556,9 @@ static void isert_handle_wc_error(struct ib_wc *wc)
break;
case ISER_WR_RDMA_WRITE:
if (isert_buf->sg_cnt != 0) {
isert_buf->sg_cnt = 0;
ib_dma_unmap_sg(ib_dev, isert_buf->sg, isert_buf->sg_cnt,
isert_buf->dma_dir);
isert_buf->sg_cnt = 0;
}
/* RDMA-WR and SEND response of a READ task
are sent together, so when receiving RDMA-WR error,