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

ib_srpt: Further reduce number of kmalloc() calls per I/O

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3905 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2011-10-30 13:41:46 +00:00
parent 75fa117690
commit d79d58e467
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
srpt/src/ib_srpt.c
View File

@@ -2745,7 +2745,7 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
u32 rsize;
u32 tsize;
u32 dma_len;
int count, nrdma;
int count;
int i, j, k;
int max_sge, nsge;
@@ -2777,17 +2777,21 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
ioctx->mapped_sg_count = count;
nrdma = (count + max_sge - 1) / max_sge + ioctx->n_rbuf;
nsge = count + ioctx->n_rbuf;
ioctx->rdma_ius = kzalloc(nrdma * sizeof(*riu) +
nsge * sizeof(*riu->sge),
scst_cmd_atomic(scmnd) ?
GFP_ATOMIC : GFP_KERNEL);
if (!ioctx->rdma_ius)
goto free_mem;
{
int size, nrdma;
ioctx->n_rdma_ius = nrdma;
sge_array = (void *)(ioctx->rdma_ius + nrdma);
nrdma = (count + max_sge - 1) / max_sge + ioctx->n_rbuf;
nsge = count + ioctx->n_rbuf;
size = nrdma * sizeof(*riu) + nsge * sizeof(*sge);
ioctx->rdma_ius = size <= sizeof(ioctx->rdma_ius_buf) ?
ioctx->rdma_ius_buf : kmalloc(size,
scst_cmd_atomic(scmnd) ? GFP_ATOMIC : GFP_KERNEL);
if (!ioctx->rdma_ius)
goto free_mem;
ioctx->n_rdma_ius = nrdma;
sge_array = (struct ib_sge *)(ioctx->rdma_ius + nrdma);
}
db = ioctx->rbufs;
tsize = (dir == SCST_DATA_READ)
@@ -2924,7 +2928,8 @@ static void srpt_unmap_sg_to_ib_sge(struct srpt_rdma_ch *ch,
EXTRACHECKS_BUG_ON(!ioctx);
EXTRACHECKS_BUG_ON(ioctx->n_rdma && !ioctx->rdma_ius);
kfree(ioctx->rdma_ius);
if (ioctx->rdma_ius != (void *)ioctx->rdma_ius_buf)
kfree(ioctx->rdma_ius);
ioctx->rdma_ius = NULL;
ioctx->n_rdma = 0;

7
srpt/src/ib_srpt.h
View File

@@ -232,8 +232,8 @@ struct srpt_tsk_mgmt {
* @free_list: Node in srpt_rdma_ch.free_list.
* @sg_cnt: SG-list size.
* @mapped_sg_count: ib_dma_map_sg() return value.
* @n_rdma_ius: Number of elements in the rdma_ius array.
* @n_rdma:
* @n_rdma_ius: Size of the rdma_ius array.
* @n_rdma: Number of elements used of the rdma_ius array.
* @n_rbuf: Number of data buffers in the received SRP command.
* @req_lim_delta: Value of the req_lim_delta value field in the latest
* SRP response sent.
@@ -259,6 +259,9 @@ struct srpt_send_ioctx {
u8 n_rbuf;
int req_lim_delta;
struct srpt_tsk_mgmt tsk_mgmt;
u8 rdma_ius_buf[2 * sizeof(struct rdma_iu)
+ 2 * sizeof(struct ib_sge)]
__aligned(sizeof(uint64_t));
};
/**