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

lib/nvme: remove extra function calls in tcp transport.

Browse Source 
Signed-off-by: Seth Howell <seth.howell@intel.com>
Change-Id: I031cb5263598d09fb4956873c35d74ec3173fe63
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478875
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Seth Howell 2019-12-26 17:20:07 -07:00 committed by Tomasz Zawadzki
parent b2225ff593
commit 738b9569f0
1 changed files with 14 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
lib/nvme/nvme_tcp.c
View File

@ -230,8 +230,8 @@ fail:
return -ENOMEM; return -ENOMEM;
} }
static void void
nvme_tcp_qpair_disconnect(struct spdk_nvme_qpair *qpair) nvme_tcp_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{ {
struct nvme_tcp_qpair *tqpair = nvme_tcp_qpair(qpair); struct nvme_tcp_qpair *tqpair = nvme_tcp_qpair(qpair);
struct nvme_tcp_pdu *pdu; struct nvme_tcp_pdu *pdu;
@ -249,8 +249,8 @@ nvme_tcp_qpair_disconnect(struct spdk_nvme_qpair *qpair)
} }
} }
static int int
nvme_tcp_qpair_destroy(struct spdk_nvme_qpair *qpair) nvme_tcp_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{ {
struct nvme_tcp_qpair *tqpair; struct nvme_tcp_qpair *tqpair;
@ -258,7 +258,7 @@ nvme_tcp_qpair_destroy(struct spdk_nvme_qpair *qpair)
return -1; return -1;
} }
nvme_tcp_qpair_disconnect(qpair); nvme_tcp_ctrlr_disconnect_qpair(ctrlr, qpair);
nvme_tcp_qpair_abort_reqs(qpair, 1); nvme_tcp_qpair_abort_reqs(qpair, 1);
nvme_qpair_deinit(qpair); nvme_qpair_deinit(qpair);
tqpair = nvme_tcp_qpair(qpair); tqpair = nvme_tcp_qpair(qpair);
@ -274,21 +274,13 @@ nvme_tcp_ctrlr_enable(struct spdk_nvme_ctrlr *ctrlr)
return 0; return 0;
} }
/* This function must only be called while holding g_spdk_nvme_driver->lock */
int
nvme_tcp_ctrlr_scan(struct spdk_nvme_probe_ctx *probe_ctx,
bool direct_connect)
{
return nvme_fabric_ctrlr_scan(probe_ctx, direct_connect);
}
int int
nvme_tcp_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr) nvme_tcp_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr)
{ {
struct nvme_tcp_ctrlr *tctrlr = nvme_tcp_ctrlr(ctrlr); struct nvme_tcp_ctrlr *tctrlr = nvme_tcp_ctrlr(ctrlr);
if (ctrlr->adminq) { if (ctrlr->adminq) {
nvme_tcp_qpair_destroy(ctrlr->adminq); nvme_tcp_ctrlr_delete_io_qpair(ctrlr, ctrlr->adminq);
} }
nvme_ctrlr_destruct_finish(ctrlr); nvme_ctrlr_destruct_finish(ctrlr);
@ -298,30 +290,6 @@ nvme_tcp_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr)
return 0; return 0;
} }
int
nvme_tcp_ctrlr_set_reg_4(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint32_t value)
{
return nvme_fabric_ctrlr_set_reg_4(ctrlr, offset, value);
}
int
nvme_tcp_ctrlr_set_reg_8(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint64_t value)
{
return nvme_fabric_ctrlr_set_reg_8(ctrlr, offset, value);
}
int
nvme_tcp_ctrlr_get_reg_4(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint32_t *value)
{
return nvme_fabric_ctrlr_get_reg_4(ctrlr, offset, value);
}
int
nvme_tcp_ctrlr_get_reg_8(struct spdk_nvme_ctrlr *ctrlr, uint32_t offset, uint64_t *value)
{
return nvme_fabric_ctrlr_get_reg_8(ctrlr, offset, value);
}
static int static int
nvme_tcp_qpair_process_send_queue(struct nvme_tcp_qpair *tqpair) nvme_tcp_qpair_process_send_queue(struct nvme_tcp_qpair *tqpair)
{ {
@ -645,12 +613,6 @@ nvme_tcp_qpair_submit_request(struct spdk_nvme_qpair *qpair,
return nvme_tcp_qpair_capsule_cmd_send(tqpair, tcp_req); return nvme_tcp_qpair_capsule_cmd_send(tqpair, tcp_req);
} }
int
nvme_tcp_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{
return nvme_tcp_qpair_destroy(qpair);
}
int int
nvme_tcp_qpair_reset(struct spdk_nvme_qpair *qpair) nvme_tcp_qpair_reset(struct spdk_nvme_qpair *qpair)
{ {
@ -1509,13 +1471,13 @@ fail:
/* /*
* Since admin queues take the ctrlr_lock before entering this function, * Since admin queues take the ctrlr_lock before entering this function,
* we can call nvme_tcp_qpair_disconnect. For other qpairs we need * we can call nvme_tcp_ctrlr_disconnect_qpair. For other qpairs we need
* to call the generic function which will take the lock for us. * to call the generic function which will take the lock for us.
*/ */
qpair->transport_failure_reason = SPDK_NVME_QPAIR_FAILURE_UNKNOWN; qpair->transport_failure_reason = SPDK_NVME_QPAIR_FAILURE_UNKNOWN;
if (nvme_qpair_is_admin_queue(qpair)) { if (nvme_qpair_is_admin_queue(qpair)) {
nvme_tcp_qpair_disconnect(qpair); nvme_tcp_ctrlr_disconnect_qpair(qpair->ctrlr, qpair);
} else { } else {
nvme_ctrlr_disconnect_qpair(qpair); nvme_ctrlr_disconnect_qpair(qpair);
} }
@ -1562,17 +1524,17 @@ nvme_tcp_qpair_icreq_send(struct nvme_tcp_qpair *tqpair)
return 0; return 0;
} }
static int int
nvme_tcp_qpair_connect(struct nvme_tcp_qpair *tqpair) nvme_tcp_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{ {
struct sockaddr_storage dst_addr; struct sockaddr_storage dst_addr;
struct sockaddr_storage src_addr; struct sockaddr_storage src_addr;
int rc; int rc;
struct spdk_nvme_ctrlr *ctrlr; struct nvme_tcp_qpair *tqpair;
int family; int family;
long int port; long int port;
ctrlr = tqpair->qpair.ctrlr; tqpair = nvme_tcp_qpair(qpair);
switch (ctrlr->trid.adrfam) { switch (ctrlr->trid.adrfam) {
case SPDK_NVMF_ADRFAM_IPV4: case SPDK_NVMF_ADRFAM_IPV4:
@ -1641,18 +1603,6 @@ nvme_tcp_qpair_connect(struct nvme_tcp_qpair *tqpair)
return 0; return 0;
} }
int
nvme_tcp_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{
return nvme_tcp_qpair_connect(nvme_tcp_qpair(qpair));
}
void
nvme_tcp_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{
return nvme_tcp_qpair_disconnect(qpair);
}
static struct spdk_nvme_qpair * static struct spdk_nvme_qpair *
nvme_tcp_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr, nvme_tcp_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr,
uint16_t qid, uint32_t qsize, uint16_t qid, uint32_t qsize,
@ -1680,13 +1630,13 @@ nvme_tcp_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr,
rc = nvme_tcp_alloc_reqs(tqpair); rc = nvme_tcp_alloc_reqs(tqpair);
if (rc) { if (rc) {
nvme_tcp_qpair_destroy(qpair); nvme_tcp_ctrlr_delete_io_qpair(ctrlr, qpair);
return NULL; return NULL;
} }
rc = nvme_transport_ctrlr_connect_qpair(ctrlr, qpair); rc = nvme_transport_ctrlr_connect_qpair(ctrlr, qpair);
if (rc < 0) { if (rc < 0) {
nvme_tcp_qpair_destroy(qpair); nvme_tcp_ctrlr_delete_io_qpair(ctrlr, qpair);
return NULL; return NULL;
} }