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

nvmf/fc: Pass transport and num_buffers as params to nvmf_fc_request_free_buffers

Browse Source 
This is a preparation to the next patch to use buffer cache in
FC transport.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I116b064ea0b0a437f9a3293a6f3d46a0e5fc8ecf
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465867
Reviewed-by: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Anil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-08-23 07:50:11 +09:00 committed by Jim Harris
parent e3b8c31d03
commit fbb0f0faf9
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/nvmf/fc.c
View File

@ -416,13 +416,13 @@ nvmf_fc_req_in_get_buff(struct spdk_nvmf_fc_request *fc_req)
}
static void
nvmf_fc_request_free_buffers(struct spdk_nvmf_fc_request *fc_req)
nvmf_fc_request_free_buffers(struct spdk_nvmf_fc_request *fc_req,
struct spdk_nvmf_transport *transport,
uint32_t num_buffers)
{
struct spdk_nvmf_fc_transport *fc_transport = fc_req->hwqp->fc_poll_group->fc_transport;
struct spdk_nvmf_transport *transport = &fc_transport->transport;
uint32_t i;
for (i = 0; i < fc_req->req.iovcnt; i++) {
for (i = 0; i < num_buffers; i++) {
spdk_mempool_put(transport->data_buf_pool, fc_req->buffers[i]);
fc_req->req.iov[i].iov_base = NULL;
fc_req->buffers[i] = NULL;
@ -1472,27 +1472,31 @@ nvmf_fc_hwqp_handle_request(struct spdk_nvmf_fc_hwqp *hwqp, struct spdk_nvmf_fc_
void
spdk_nvmf_fc_request_free(struct spdk_nvmf_fc_request *fc_req)
{
struct spdk_nvmf_fc_hwqp *hwqp = fc_req->hwqp;
struct spdk_nvmf_fc_transport *fc_transport = hwqp->fc_poll_group->fc_transport;
struct spdk_nvmf_transport *transport = &fc_transport->transport;
if (!fc_req) {
return;
}
if (fc_req->xchg) {
nvmf_fc_put_xchg(fc_req->hwqp, fc_req->xchg);
nvmf_fc_put_xchg(hwqp, fc_req->xchg);
fc_req->xchg = NULL;
}
/* Release IO buffers */
if (fc_req->data_from_pool) {
nvmf_fc_request_free_buffers(fc_req);
nvmf_fc_request_free_buffers(fc_req, transport, fc_req->req.iovcnt);
}
fc_req->req.data = NULL;
fc_req->req.iovcnt = 0;
/* Release Q buffer */
nvmf_fc_rqpair_buffer_release(fc_req->hwqp, fc_req->buf_index);
nvmf_fc_rqpair_buffer_release(hwqp, fc_req->buf_index);
/* Free Fc request */
nvmf_fc_hwqp_free_fc_request(fc_req->hwqp, fc_req);
nvmf_fc_hwqp_free_fc_request(hwqp, fc_req);
}
void