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

nvme/tcp: Move sock creation into nvme_tcp_ctrlr_create_qpair function.

Browse Source 
Purpose: To get the optimal group, we need the socket information.

Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Change-Id: I17b048a402fbf002307dd225f64b20a9f876d642
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3324
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Ziye Yang 2020-12-14 23:31:30 +08:00 committed by Tomasz Zawadzki
parent 2f1cd867f3
commit 579a678a51
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/nvme/nvme_tcp.c
View File

@ -300,8 +300,15 @@ nvme_tcp_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_
{
struct nvme_tcp_qpair *tqpair = nvme_tcp_qpair(qpair);
struct nvme_tcp_pdu *pdu;
int rc;
spdk_sock_close(&tqpair->sock);
rc = spdk_sock_close(&tqpair->sock);
if (tqpair->sock != NULL) {
SPDK_ERRLOG("tqpair=%p, errno=%d, rc=%d\n", tqpair, errno, rc);
/* Set it to NULL manually */
tqpair->sock = NULL;
}
/* clear the send_queue */
while (!TAILQ_EMPTY(&tqpair->send_queue)) {
@ -1676,7 +1683,7 @@ nvme_tcp_qpair_icreq_send(struct nvme_tcp_qpair *tqpair)
}
static int
nvme_tcp_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
nvme_tcp_qpair_connect_sock(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{
struct sockaddr_storage dst_addr;
struct sockaddr_storage src_addr;
@ -1740,6 +1747,24 @@ nvme_tcp_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpa
return rc;
}
return 0;
}
static int
nvme_tcp_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{
int rc = 0;
struct nvme_tcp_qpair *tqpair;
tqpair = nvme_tcp_qpair(qpair);
if (!tqpair->sock) {
rc = nvme_tcp_qpair_connect_sock(ctrlr, qpair);
if (rc < 0) {
return rc;
}
}
if (qpair->poll_group) {
rc = nvme_poll_group_connect_qpair(qpair);
if (rc) {
@ -1799,6 +1824,14 @@ nvme_tcp_ctrlr_create_qpair(struct spdk_nvme_ctrlr *ctrlr,
return NULL;
}
/* spdk_nvme_qpair_get_optimal_poll_group needs socket information.
* So create the socket first when creating a qpair. */
rc = nvme_tcp_qpair_connect_sock(ctrlr, qpair);
if (rc) {
nvme_tcp_ctrlr_delete_io_qpair(ctrlr, qpair);
return NULL;
}
return qpair;
}