d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvmf/fc: Replace FC specific get/free_buffers by common APIs

Browse Source 
Use spdk_nvmf_request_get_buffers() and spdk_nvmf_request_free_buffers(),
and then remove nvmf_fc_request_free_buffers() and nvmf_fc_request_get_buffers().

Set fc_req->data_from_pool to false after spdk_nvmf_request_free_buffers().

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I046a642156411da3935bc2fa2c2816fc2e025147
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465877
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Anil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
This commit is contained in:
Shuhei Matsumoto 2019-08-23 13:27:05 +09:00 committed by Ben Walker
parent 9968035884
commit 0f73c253b5
1 changed files with 2 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lib/nvmf/fc.c
View File

@ -415,29 +415,6 @@ 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,
struct spdk_nvmf_transport_poll_group *group,
struct spdk_nvmf_transport *transport,
uint32_t num_buffers)
{
uint32_t i;
for (i = 0; i < num_buffers; i++) {
if (group->buf_cache_count < group->buf_cache_size) {
STAILQ_INSERT_HEAD(&group->buf_cache,
(struct spdk_nvmf_transport_pg_cache_buf *)fc_req->req.buffers[i],
link);
group->buf_cache_count++;
} else {
spdk_mempool_put(transport->data_buf_pool, fc_req->req.buffers[i]);
}
fc_req->req.iov[i].iov_base = NULL;
fc_req->req.buffers[i] = NULL;
}
fc_req->req.data_from_pool = false;
}
void
spdk_nvmf_fc_init_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp)
{
@ -1296,36 +1273,6 @@ complete:
(void *)fc_req);
}
static int
nvmf_fc_request_get_buffers(struct spdk_nvmf_fc_request *fc_req,
struct spdk_nvmf_transport_poll_group *group,
struct spdk_nvmf_transport *transport,
uint32_t num_buffers)
{
uint32_t i = 0;
while (i < num_buffers) {
if (!(STAILQ_EMPTY(&group->buf_cache))) {
group->buf_cache_count--;
fc_req->req.buffers[i] = STAILQ_FIRST(&group->buf_cache);
STAILQ_REMOVE_HEAD(&group->buf_cache, link);
assert(fc_req->req.buffers[i] != NULL);
i++;
} else {
if (spdk_mempool_get_bulk(transport->data_buf_pool, &fc_req->req.buffers[i],
num_buffers - i)) {
goto err_exit;
}
i += num_buffers - i;
}
}
return 0;
err_exit:
nvmf_fc_request_free_buffers(fc_req, group, transport, i);
return -ENOMEM;
}
static void
nvmf_fc_request_fill_buffers(struct spdk_nvmf_fc_request *fc_req,
struct spdk_nvmf_transport *transport, uint32_t length)
@ -1357,7 +1304,7 @@ nvmf_fc_request_alloc_buffers(struct spdk_nvmf_fc_request *fc_req)
num_buffers = SPDK_CEIL_DIV(length, transport->opts.io_unit_size);
if (nvmf_fc_request_get_buffers(fc_req, group, transport, num_buffers)) {
if (spdk_nvmf_request_get_buffers(&fc_req->req, group, transport, num_buffers)) {
return -ENOMEM;
}
@ -1535,7 +1482,7 @@ spdk_nvmf_fc_request_free(struct spdk_nvmf_fc_request *fc_req)
/* Release IO buffers */
if (fc_req->req.data_from_pool) {
nvmf_fc_request_free_buffers(fc_req, group, transport, fc_req->req.iovcnt);
spdk_nvmf_request_free_buffers(&fc_req->req, group, transport, fc_req->req.iovcnt);
}
fc_req->req.data = NULL;
fc_req->req.iovcnt = 0;