diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c index 74bef76e7..050998748 100644 --- a/lib/nvmf/ctrlr.c +++ b/lib/nvmf/ctrlr.c @@ -2862,7 +2862,7 @@ spdk_nvmf_request_free(struct spdk_nvmf_request *req) struct spdk_nvmf_qpair *qpair = req->qpair; TAILQ_REMOVE(&qpair->outstanding, req, link); - if (spdk_nvmf_transport_req_free(req)) { + if (nvmf_transport_req_free(req)) { SPDK_ERRLOG("Unable to free transport level request resources.\n"); } @@ -2896,7 +2896,7 @@ spdk_nvmf_request_complete(struct spdk_nvmf_request *req) rsp->cdw0, rsp->status.sct, rsp->status.sc, rsp->cid); TAILQ_REMOVE(&qpair->outstanding, req, link); - if (spdk_nvmf_transport_req_complete(req)) { + if (nvmf_transport_req_complete(req)) { SPDK_ERRLOG("Transport request completion error!\n"); } diff --git a/lib/nvmf/ctrlr_discovery.c b/lib/nvmf/ctrlr_discovery.c index 5f6f9b191..ab1c46ba1 100644 --- a/lib/nvmf/ctrlr_discovery.c +++ b/lib/nvmf/ctrlr_discovery.c @@ -105,7 +105,7 @@ nvmf_generate_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn, size entry->subtype = subsystem->subtype; snprintf(entry->subnqn, sizeof(entry->subnqn), "%s", subsystem->subnqn); - spdk_nvmf_transport_listener_discover(listener->transport, listener->trid, entry); + nvmf_transport_listener_discover(listener->transport, listener->trid, entry); numrec++; } diff --git a/lib/nvmf/fc.c b/lib/nvmf/fc.c index 5c1922189..585e70b4f 100644 --- a/lib/nvmf/fc.c +++ b/lib/nvmf/fc.c @@ -57,7 +57,7 @@ #ifndef ASSERT_SPDK_FC_MASTER_THREAD #define ASSERT_SPDK_FC_MASTER_THREAD() \ - DEV_VERIFY(spdk_get_thread() == spdk_nvmf_fc_get_master_thread()); + DEV_VERIFY(spdk_get_thread() == nvmf_fc_get_master_thread()); #endif /* @@ -249,7 +249,7 @@ static TAILQ_HEAD(, spdk_nvmf_fc_poll_group) g_nvmf_fgroups = TAILQ_HEAD_INITIALIZER(g_nvmf_fgroups); struct spdk_thread * -spdk_nvmf_fc_get_master_thread(void) +nvmf_fc_get_master_thread(void) { return g_nvmf_fc_master_thread; } @@ -337,8 +337,8 @@ nvmf_fc_handle_assoc_deletion(void *arg) { struct spdk_nvmf_fc_conn *fc_conn = arg; - spdk_nvmf_fc_delete_association(fc_conn->fc_assoc->tgtport, - fc_conn->fc_assoc->assoc_id, false, true, NULL, NULL); + nvmf_fc_delete_association(fc_conn->fc_assoc->tgtport, + fc_conn->fc_assoc->assoc_id, false, true, NULL, NULL); } static int @@ -359,7 +359,7 @@ nvmf_fc_create_req_mempool(struct spdk_nvmf_fc_hwqp *hwqp) for (i = 0; i < hwqp->rq_size; i++) { fc_req = hwqp->fc_reqs_buf + i; - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_INIT); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_INIT); TAILQ_INSERT_TAIL(&hwqp->free_reqs, fc_req, link); } @@ -390,7 +390,7 @@ nvmf_fc_hwqp_free_fc_request(struct spdk_nvmf_fc_hwqp *hwqp, struct spdk_nvmf_fc { if (fc_req->state != SPDK_NVMF_FC_REQ_SUCCESS) { /* Log an error for debug purpose. */ - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_FAILED); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_FAILED); } /* set the magic to mark req as no longer valid. */ @@ -412,13 +412,13 @@ nvmf_fc_req_in_get_buff(struct spdk_nvmf_fc_request *fc_req) } void -spdk_nvmf_fc_init_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp) +nvmf_fc_init_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp) { nvmf_fc_init_rqpair_buffers(hwqp); } struct spdk_nvmf_fc_conn * -spdk_nvmf_fc_hwqp_find_fc_conn(struct spdk_nvmf_fc_hwqp *hwqp, uint64_t conn_id) +nvmf_fc_hwqp_find_fc_conn(struct spdk_nvmf_fc_hwqp *hwqp, uint64_t conn_id) { struct spdk_nvmf_fc_conn *fc_conn; @@ -432,7 +432,7 @@ spdk_nvmf_fc_hwqp_find_fc_conn(struct spdk_nvmf_fc_hwqp *hwqp, uint64_t conn_id) } void -spdk_nvmf_fc_hwqp_reinit_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp, void *queues_curr) +nvmf_fc_hwqp_reinit_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp, void *queues_curr) { struct spdk_nvmf_fc_abts_ctx *ctx; struct spdk_nvmf_fc_poller_api_queue_sync_args *args = NULL, *tmp = NULL; @@ -454,14 +454,14 @@ spdk_nvmf_fc_hwqp_reinit_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp, void *que } void -spdk_nvmf_fc_init_hwqp(struct spdk_nvmf_fc_port *fc_port, struct spdk_nvmf_fc_hwqp *hwqp) +nvmf_fc_init_hwqp(struct spdk_nvmf_fc_port *fc_port, struct spdk_nvmf_fc_hwqp *hwqp) { hwqp->fc_port = fc_port; /* clear counters */ memset(&hwqp->counters, 0, sizeof(struct spdk_nvmf_fc_errors)); - spdk_nvmf_fc_init_poller_queues(hwqp); + nvmf_fc_init_poller_queues(hwqp); if (&fc_port->ls_queue != hwqp) { nvmf_fc_create_req_mempool(hwqp); } @@ -491,7 +491,7 @@ nvmf_fc_get_idlest_poll_group(void) } void -spdk_nvmf_fc_poll_group_add_hwqp(struct spdk_nvmf_fc_hwqp *hwqp) +nvmf_fc_poll_group_add_hwqp(struct spdk_nvmf_fc_hwqp *hwqp) { struct spdk_nvmf_fc_poll_group *fgroup = NULL; @@ -512,11 +512,11 @@ spdk_nvmf_fc_poll_group_add_hwqp(struct spdk_nvmf_fc_hwqp *hwqp) hwqp->thread = fgroup->group.group->thread; hwqp->fgroup = fgroup; fgroup->hwqp_count++; - spdk_nvmf_fc_poller_api_func(hwqp, SPDK_NVMF_FC_POLLER_API_ADD_HWQP, NULL); + nvmf_fc_poller_api_func(hwqp, SPDK_NVMF_FC_POLLER_API_ADD_HWQP, NULL); } void -spdk_nvmf_fc_poll_group_remove_hwqp(struct spdk_nvmf_fc_hwqp *hwqp) +nvmf_fc_poll_group_remove_hwqp(struct spdk_nvmf_fc_hwqp *hwqp) { assert(hwqp); @@ -528,7 +528,7 @@ spdk_nvmf_fc_poll_group_remove_hwqp(struct spdk_nvmf_fc_hwqp *hwqp) SPDK_ERRLOG("HWQP (%d) not assigned to poll group\n", hwqp->hwqp_id); } else { hwqp->fgroup->hwqp_count--; - spdk_nvmf_fc_poller_api_func(hwqp, SPDK_NVMF_FC_POLLER_API_REMOVE_HWQP, NULL); + nvmf_fc_poller_api_func(hwqp, SPDK_NVMF_FC_POLLER_API_REMOVE_HWQP, NULL); } } @@ -574,9 +574,9 @@ nvmf_fc_queue_synced_cb(void *cb_data, enum spdk_nvmf_fc_poller_api_ret ret) args = ctx->abts_poller_args; for (int i = 0; i < ctx->num_hwqps; i++) { poller_arg = args + i; - spdk_nvmf_fc_poller_api_func(poller_arg->hwqp, - SPDK_NVMF_FC_POLLER_API_ABTS_RECEIVED, - poller_arg); + nvmf_fc_poller_api_func(poller_arg->hwqp, + SPDK_NVMF_FC_POLLER_API_ABTS_RECEIVED, + poller_arg); } } @@ -620,9 +620,9 @@ nvmf_fc_handle_abts_notfound(struct spdk_nvmf_fc_abts_ctx *ctx) poller_arg->cb_info.cb_thread = spdk_get_thread(); /* Send a Queue sync message to interested pollers */ - spdk_nvmf_fc_poller_api_func(poller_arg->hwqp, - SPDK_NVMF_FC_POLLER_API_QUEUE_SYNC, - poller_arg); + nvmf_fc_poller_api_func(poller_arg->hwqp, + SPDK_NVMF_FC_POLLER_API_QUEUE_SYNC, + poller_arg); } SPDK_DEBUGLOG(SPDK_LOG_NVMF_FC, @@ -652,7 +652,7 @@ nvmf_fc_abts_handled_cb(void *cb_data, enum spdk_nvmf_fc_poller_api_ret ret) return; } - nport = spdk_nvmf_fc_nport_find(ctx->port_hdl, ctx->nport_hdl); + nport = nvmf_fc_nport_find(ctx->port_hdl, ctx->nport_hdl); if (ctx->nport != nport) { /* Nport can be deleted while this abort is being @@ -689,8 +689,8 @@ nvmf_fc_abts_handled_cb(void *cb_data, enum spdk_nvmf_fc_poller_api_ret ret) } void -spdk_nvmf_fc_handle_abts_frame(struct spdk_nvmf_fc_nport *nport, uint16_t rpi, - uint16_t oxid, uint16_t rxid) +nvmf_fc_handle_abts_frame(struct spdk_nvmf_fc_nport *nport, uint16_t rpi, + uint16_t oxid, uint16_t rxid) { struct spdk_nvmf_fc_abts_ctx *ctx = NULL; struct spdk_nvmf_fc_poller_api_abts_recvd_args *args = NULL, *poller_arg; @@ -769,9 +769,9 @@ spdk_nvmf_fc_handle_abts_frame(struct spdk_nvmf_fc_nport *nport, uint16_t rpi, poller_arg->cb_info.cb_thread = spdk_get_thread(); poller_arg->ctx = ctx; - spdk_nvmf_fc_poller_api_func(poller_arg->hwqp, - SPDK_NVMF_FC_POLLER_API_ABTS_RECEIVED, - poller_arg); + nvmf_fc_poller_api_func(poller_arg->hwqp, + SPDK_NVMF_FC_POLLER_API_ABTS_RECEIVED, + poller_arg); } free(hwqps); @@ -794,7 +794,7 @@ bls_rej: * Returns true if the port is in offline state. */ bool -spdk_nvmf_fc_port_is_offline(struct spdk_nvmf_fc_port *fc_port) +nvmf_fc_port_is_offline(struct spdk_nvmf_fc_port *fc_port) { if (fc_port && (fc_port->hw_port_status == SPDK_FC_PORT_OFFLINE)) { return true; @@ -807,7 +807,7 @@ spdk_nvmf_fc_port_is_offline(struct spdk_nvmf_fc_port *fc_port) * Returns true if the port is in online state. */ bool -spdk_nvmf_fc_port_is_online(struct spdk_nvmf_fc_port *fc_port) +nvmf_fc_port_is_online(struct spdk_nvmf_fc_port *fc_port) { if (fc_port && (fc_port->hw_port_status == SPDK_FC_PORT_ONLINE)) { return true; @@ -817,7 +817,7 @@ spdk_nvmf_fc_port_is_online(struct spdk_nvmf_fc_port *fc_port) } int -spdk_nvmf_fc_port_set_online(struct spdk_nvmf_fc_port *fc_port) +nvmf_fc_port_set_online(struct spdk_nvmf_fc_port *fc_port) { if (fc_port && (fc_port->hw_port_status != SPDK_FC_PORT_ONLINE)) { fc_port->hw_port_status = SPDK_FC_PORT_ONLINE; @@ -828,7 +828,7 @@ spdk_nvmf_fc_port_set_online(struct spdk_nvmf_fc_port *fc_port) } int -spdk_nvmf_fc_port_set_offline(struct spdk_nvmf_fc_port *fc_port) +nvmf_fc_port_set_offline(struct spdk_nvmf_fc_port *fc_port) { if (fc_port && (fc_port->hw_port_status != SPDK_FC_PORT_OFFLINE)) { fc_port->hw_port_status = SPDK_FC_PORT_OFFLINE; @@ -839,7 +839,7 @@ spdk_nvmf_fc_port_set_offline(struct spdk_nvmf_fc_port *fc_port) } int -spdk_nvmf_fc_hwqp_set_online(struct spdk_nvmf_fc_hwqp *hwqp) +nvmf_fc_hwqp_set_online(struct spdk_nvmf_fc_hwqp *hwqp) { if (hwqp && (hwqp->state != SPDK_FC_HWQP_ONLINE)) { hwqp->state = SPDK_FC_HWQP_ONLINE; @@ -852,7 +852,7 @@ spdk_nvmf_fc_hwqp_set_online(struct spdk_nvmf_fc_hwqp *hwqp) } int -spdk_nvmf_fc_hwqp_set_offline(struct spdk_nvmf_fc_hwqp *hwqp) +nvmf_fc_hwqp_set_offline(struct spdk_nvmf_fc_hwqp *hwqp) { if (hwqp && (hwqp->state != SPDK_FC_HWQP_OFFLINE)) { hwqp->state = SPDK_FC_HWQP_OFFLINE; @@ -863,13 +863,13 @@ spdk_nvmf_fc_hwqp_set_offline(struct spdk_nvmf_fc_hwqp *hwqp) } void -spdk_nvmf_fc_port_add(struct spdk_nvmf_fc_port *fc_port) +nvmf_fc_port_add(struct spdk_nvmf_fc_port *fc_port) { TAILQ_INSERT_TAIL(&g_spdk_nvmf_fc_port_list, fc_port, link); } struct spdk_nvmf_fc_port * -spdk_nvmf_fc_port_lookup(uint8_t port_hdl) +nvmf_fc_port_lookup(uint8_t port_hdl) { struct spdk_nvmf_fc_port *fc_port = NULL; @@ -901,14 +901,14 @@ nvmf_fc_port_cleanup(void) } uint32_t -spdk_nvmf_fc_get_prli_service_params(void) +nvmf_fc_get_prli_service_params(void) { return (SPDK_NVMF_FC_DISCOVERY_SERVICE | SPDK_NVMF_FC_TARGET_FUNCTION); } int -spdk_nvmf_fc_port_add_nport(struct spdk_nvmf_fc_port *fc_port, - struct spdk_nvmf_fc_nport *nport) +nvmf_fc_port_add_nport(struct spdk_nvmf_fc_port *fc_port, + struct spdk_nvmf_fc_nport *nport) { if (fc_port) { TAILQ_INSERT_TAIL(&fc_port->nport_list, nport, link); @@ -920,8 +920,8 @@ spdk_nvmf_fc_port_add_nport(struct spdk_nvmf_fc_port *fc_port, } int -spdk_nvmf_fc_port_remove_nport(struct spdk_nvmf_fc_port *fc_port, - struct spdk_nvmf_fc_nport *nport) +nvmf_fc_port_remove_nport(struct spdk_nvmf_fc_port *fc_port, + struct spdk_nvmf_fc_nport *nport) { if (fc_port && nport) { TAILQ_REMOVE(&fc_port->nport_list, nport, link); @@ -947,11 +947,11 @@ nvmf_fc_nport_hdl_lookup(struct spdk_nvmf_fc_port *fc_port, uint16_t nport_hdl) } struct spdk_nvmf_fc_nport * -spdk_nvmf_fc_nport_find(uint8_t port_hdl, uint16_t nport_hdl) +nvmf_fc_nport_find(uint8_t port_hdl, uint16_t nport_hdl) { struct spdk_nvmf_fc_port *fc_port = NULL; - fc_port = spdk_nvmf_fc_port_lookup(port_hdl); + fc_port = nvmf_fc_port_lookup(port_hdl); if (fc_port) { return nvmf_fc_nport_hdl_lookup(fc_port, nport_hdl); } @@ -1001,7 +1001,7 @@ nvmf_fc_hwqp_find_nport_and_rport(struct spdk_nvmf_fc_hwqp *hwqp, /* Returns true if the Nport is empty of all rem_ports */ bool -spdk_nvmf_fc_nport_has_no_rport(struct spdk_nvmf_fc_nport *nport) +nvmf_fc_nport_has_no_rport(struct spdk_nvmf_fc_nport *nport) { if (nport && TAILQ_EMPTY(&nport->rem_port_list)) { assert(nport->rport_count == 0); @@ -1012,8 +1012,8 @@ spdk_nvmf_fc_nport_has_no_rport(struct spdk_nvmf_fc_nport *nport) } int -spdk_nvmf_fc_nport_set_state(struct spdk_nvmf_fc_nport *nport, - enum spdk_nvmf_fc_object_state state) +nvmf_fc_nport_set_state(struct spdk_nvmf_fc_nport *nport, + enum spdk_nvmf_fc_object_state state) { if (nport) { nport->nport_state = state; @@ -1024,8 +1024,8 @@ spdk_nvmf_fc_nport_set_state(struct spdk_nvmf_fc_nport *nport, } bool -spdk_nvmf_fc_nport_add_rem_port(struct spdk_nvmf_fc_nport *nport, - struct spdk_nvmf_fc_remote_port_info *rem_port) +nvmf_fc_nport_add_rem_port(struct spdk_nvmf_fc_nport *nport, + struct spdk_nvmf_fc_remote_port_info *rem_port) { if (nport && rem_port) { TAILQ_INSERT_TAIL(&nport->rem_port_list, rem_port, link); @@ -1037,8 +1037,8 @@ spdk_nvmf_fc_nport_add_rem_port(struct spdk_nvmf_fc_nport *nport, } bool -spdk_nvmf_fc_nport_remove_rem_port(struct spdk_nvmf_fc_nport *nport, - struct spdk_nvmf_fc_remote_port_info *rem_port) +nvmf_fc_nport_remove_rem_port(struct spdk_nvmf_fc_nport *nport, + struct spdk_nvmf_fc_remote_port_info *rem_port) { if (nport && rem_port) { TAILQ_REMOVE(&nport->rem_port_list, rem_port, link); @@ -1050,8 +1050,8 @@ spdk_nvmf_fc_nport_remove_rem_port(struct spdk_nvmf_fc_nport *nport, } int -spdk_nvmf_fc_rport_set_state(struct spdk_nvmf_fc_remote_port_info *rport, - enum spdk_nvmf_fc_object_state state) +nvmf_fc_rport_set_state(struct spdk_nvmf_fc_remote_port_info *rport, + enum spdk_nvmf_fc_object_state state) { if (rport) { rport->rport_state = state; @@ -1061,8 +1061,8 @@ spdk_nvmf_fc_rport_set_state(struct spdk_nvmf_fc_remote_port_info *rport, } } int -spdk_nvmf_fc_assoc_set_state(struct spdk_nvmf_fc_association *assoc, - enum spdk_nvmf_fc_object_state state) +nvmf_fc_assoc_set_state(struct spdk_nvmf_fc_association *assoc, + enum spdk_nvmf_fc_object_state state) { if (assoc) { assoc->assoc_state = state; @@ -1089,8 +1089,8 @@ nvmf_ctrlr_get_fc_assoc(struct spdk_nvmf_ctrlr *ctrlr) } bool -spdk_nvmf_ctrlr_is_on_nport(uint8_t port_hdl, uint16_t nport_hdl, - struct spdk_nvmf_ctrlr *ctrlr) +nvmf_ctrlr_is_on_nport(uint8_t port_hdl, uint16_t nport_hdl, + struct spdk_nvmf_ctrlr *ctrlr) { struct spdk_nvmf_fc_nport *fc_nport = NULL; struct spdk_nvmf_fc_association *assoc = NULL; @@ -1099,7 +1099,7 @@ spdk_nvmf_ctrlr_is_on_nport(uint8_t port_hdl, uint16_t nport_hdl, return false; } - fc_nport = spdk_nvmf_fc_nport_find(port_hdl, nport_hdl); + fc_nport = nvmf_fc_nport_find(port_hdl, nport_hdl); if (!fc_nport) { return false; } @@ -1171,7 +1171,7 @@ nvmf_fc_req_bdev_abort(void *arg1) } void -spdk_nvmf_fc_request_abort_complete(void *arg1) +nvmf_fc_request_abort_complete(void *arg1) { struct spdk_nvmf_fc_request *fc_req = (struct spdk_nvmf_fc_request *)arg1; @@ -1190,12 +1190,12 @@ spdk_nvmf_fc_request_abort_complete(void *arg1) SPDK_NOTICELOG("FC Request(%p) in state :%s aborted\n", fc_req, fc_req_state_strs[fc_req->state]); - spdk_nvmf_fc_request_free(fc_req); + _nvmf_fc_request_free(fc_req); } void -spdk_nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts, - spdk_nvmf_fc_caller_cb cb, void *cb_args) +nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts, + spdk_nvmf_fc_caller_cb cb, void *cb_args) { struct spdk_nvmf_fc_caller_ctx *ctx = NULL; bool kill_req = false; @@ -1219,8 +1219,8 @@ spdk_nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts, } /* If port is dead, skip abort wqe */ - kill_req = spdk_nvmf_fc_is_port_dead(fc_req->hwqp); - if (kill_req && spdk_nvmf_fc_req_in_xfer(fc_req)) { + kill_req = nvmf_fc_is_port_dead(fc_req->hwqp); + if (kill_req && nvmf_fc_req_in_xfer(fc_req)) { fc_req->is_aborted = true; goto complete; } @@ -1246,7 +1246,7 @@ spdk_nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts, /* Notify bdev */ spdk_thread_send_msg(fc_req->hwqp->thread, nvmf_fc_req_bdev_abort, (void *)fc_req); - } else if (spdk_nvmf_fc_req_in_xfer(fc_req)) { + } else if (nvmf_fc_req_in_xfer(fc_req)) { /* Notify HBA to abort this exchange */ nvmf_fc_issue_abort(fc_req->hwqp, fc_req->xchg, NULL, NULL); } else if (nvmf_fc_req_in_get_buff(fc_req)) { @@ -1265,9 +1265,9 @@ spdk_nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts, return; complete: - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_ABORTED); - spdk_nvmf_fc_poller_api_func(fc_req->hwqp, SPDK_NVMF_FC_POLLER_API_REQ_ABORT_COMPLETE, - (void *)fc_req); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_ABORTED); + nvmf_fc_poller_api_func(fc_req->hwqp, SPDK_NVMF_FC_POLLER_API_REQ_ABORT_COMPLETE, + (void *)fc_req); } static int @@ -1289,7 +1289,7 @@ static int nvmf_fc_request_execute(struct spdk_nvmf_fc_request *fc_req) { /* Allocate an XCHG if we dont use send frame for this command. */ - if (!spdk_nvmf_fc_use_send_frame(&fc_req->req)) { + if (!nvmf_fc_use_send_frame(&fc_req->req)) { fc_req->xchg = nvmf_fc_get_xri(fc_req->hwqp); if (!fc_req->xchg) { fc_req->hwqp->counters.no_xchg++; @@ -1309,20 +1309,20 @@ nvmf_fc_request_execute(struct spdk_nvmf_fc_request *fc_req) if (fc_req->req.xfer == SPDK_NVME_DATA_HOST_TO_CONTROLLER) { SPDK_DEBUGLOG(SPDK_LOG_NVMF_FC, "WRITE CMD.\n"); - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_WRITE_XFER); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_WRITE_XFER); if (nvmf_fc_recv_data(fc_req)) { /* Dropped return success to caller */ fc_req->hwqp->counters.unexpected_err++; - spdk_nvmf_fc_request_free(fc_req); + _nvmf_fc_request_free(fc_req); } } else { SPDK_DEBUGLOG(SPDK_LOG_NVMF_FC, "READ/NONE CMD\n"); if (fc_req->req.xfer == SPDK_NVME_DATA_CONTROLLER_TO_HOST) { - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_READ_BDEV); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_READ_BDEV); } else { - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_NONE_BDEV); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_NONE_BDEV); } spdk_nvmf_request_exec(&fc_req->req); } @@ -1335,7 +1335,7 @@ pending: fc_req->xchg = NULL; } - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_PENDING); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_PENDING); return -EAGAIN; } @@ -1374,7 +1374,7 @@ nvmf_fc_hwqp_handle_request(struct spdk_nvmf_fc_hwqp *hwqp, struct spdk_nvmf_fc_ rqst_conn_id = from_be64(&cmd_iu->conn_id); /* Check if conn id is valid */ - fc_conn = spdk_nvmf_fc_hwqp_find_fc_conn(hwqp, rqst_conn_id); + fc_conn = nvmf_fc_hwqp_find_fc_conn(hwqp, rqst_conn_id); if (!fc_conn) { SPDK_ERRLOG("IU CMD conn(%ld) invalid\n", rqst_conn_id); hwqp->counters.invalid_conn_err++; @@ -1436,7 +1436,7 @@ 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) +_nvmf_fc_request_free(struct spdk_nvmf_fc_request *fc_req) { struct spdk_nvmf_fc_hwqp *hwqp = fc_req->hwqp; struct spdk_nvmf_fc_poll_group *fgroup = hwqp->fgroup; @@ -1467,21 +1467,21 @@ spdk_nvmf_fc_request_free(struct spdk_nvmf_fc_request *fc_req) } void -spdk_nvmf_fc_request_set_state(struct spdk_nvmf_fc_request *fc_req, - enum spdk_nvmf_fc_request_state state) +nvmf_fc_request_set_state(struct spdk_nvmf_fc_request *fc_req, + enum spdk_nvmf_fc_request_state state) { assert(fc_req->magic != 0xDEADBEEF); SPDK_DEBUGLOG(SPDK_LOG_NVMF_FC, "FC Request(%p):\n\tState Old:%s New:%s\n", fc_req, - spdk_nvmf_fc_request_get_state_str(fc_req->state), - spdk_nvmf_fc_request_get_state_str(state)); + nvmf_fc_request_get_state_str(fc_req->state), + nvmf_fc_request_get_state_str(state)); nvmf_fc_record_req_trace_point(fc_req, state); fc_req->state = state; } char * -spdk_nvmf_fc_request_get_state_str(int state) +nvmf_fc_request_get_state_str(int state) { static char *unk_str = "unknown"; @@ -1490,11 +1490,11 @@ spdk_nvmf_fc_request_get_state_str(int state) } int -spdk_nvmf_fc_hwqp_process_frame(struct spdk_nvmf_fc_hwqp *hwqp, - uint32_t buff_idx, - struct spdk_nvmf_fc_frame_hdr *frame, - struct spdk_nvmf_fc_buffer_desc *buffer, - uint32_t plen) +nvmf_fc_hwqp_process_frame(struct spdk_nvmf_fc_hwqp *hwqp, + uint32_t buff_idx, + struct spdk_nvmf_fc_frame_hdr *frame, + struct spdk_nvmf_fc_buffer_desc *buffer, + uint32_t plen) { int rc = 0; uint32_t s_id, d_id; @@ -1573,7 +1573,7 @@ spdk_nvmf_fc_hwqp_process_frame(struct spdk_nvmf_fc_hwqp *hwqp, ls_rqst->xchg = nvmf_fc_get_xri(hwqp); if (ls_rqst->xchg) { /* Handover the request to LS module */ - spdk_nvmf_fc_handle_ls_rqst(ls_rqst); + nvmf_fc_handle_ls_rqst(ls_rqst); } else { /* No XCHG available. Add to pending list. */ hwqp->counters.no_xchg++; @@ -1595,7 +1595,7 @@ spdk_nvmf_fc_hwqp_process_frame(struct spdk_nvmf_fc_hwqp *hwqp, } void -spdk_nvmf_fc_hwqp_process_pending_reqs(struct spdk_nvmf_fc_hwqp *hwqp) +nvmf_fc_hwqp_process_pending_reqs(struct spdk_nvmf_fc_hwqp *hwqp) { struct spdk_nvmf_request *req = NULL, *tmp; struct spdk_nvmf_fc_request *fc_req; @@ -1624,7 +1624,7 @@ spdk_nvmf_fc_hwqp_process_pending_reqs(struct spdk_nvmf_fc_hwqp *hwqp) } void -spdk_nvmf_fc_hwqp_process_pending_ls_rqsts(struct spdk_nvmf_fc_hwqp *hwqp) +nvmf_fc_hwqp_process_pending_ls_rqsts(struct spdk_nvmf_fc_hwqp *hwqp) { struct spdk_nvmf_fc_ls_rqst *ls_rqst = NULL, *tmp; struct spdk_nvmf_fc_nport *nport = NULL; @@ -1664,7 +1664,7 @@ spdk_nvmf_fc_hwqp_process_pending_ls_rqsts(struct spdk_nvmf_fc_hwqp *hwqp) /* Got an XCHG */ TAILQ_REMOVE(&hwqp->ls_pending_queue, ls_rqst, ls_pending_link); /* Handover the request to LS module */ - spdk_nvmf_fc_handle_ls_rqst(ls_rqst); + nvmf_fc_handle_ls_rqst(ls_rqst); } else { /* No more XCHGs. Stop processing. */ hwqp->counters.no_xchg++; @@ -1674,23 +1674,23 @@ spdk_nvmf_fc_hwqp_process_pending_ls_rqsts(struct spdk_nvmf_fc_hwqp *hwqp) } int -spdk_nvmf_fc_handle_rsp(struct spdk_nvmf_fc_request *fc_req) +nvmf_fc_handle_rsp(struct spdk_nvmf_fc_request *fc_req) { int rc = 0; struct spdk_nvmf_request *req = &fc_req->req; struct spdk_nvmf_qpair *qpair = req->qpair; - struct spdk_nvmf_fc_conn *fc_conn = spdk_nvmf_fc_get_conn(qpair); + struct spdk_nvmf_fc_conn *fc_conn = nvmf_fc_get_conn(qpair); struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl; uint16_t ersp_len = 0; /* set sq head value in resp */ - rsp->sqhd = spdk_nvmf_fc_advance_conn_sqhead(qpair); + rsp->sqhd = nvmf_fc_advance_conn_sqhead(qpair); /* Increment connection responses */ fc_conn->rsp_count++; - if (spdk_nvmf_fc_send_ersp_required(fc_req, fc_conn->rsp_count, - fc_req->transfered_len)) { + if (nvmf_fc_send_ersp_required(fc_req, fc_conn->rsp_count, + fc_req->transfered_len)) { /* Fill ERSP Len */ to_be16(&ersp_len, (sizeof(struct spdk_nvmf_fc_ersp_iu) / sizeof(uint32_t))); @@ -1714,28 +1714,13 @@ spdk_nvmf_fc_handle_rsp(struct spdk_nvmf_fc_request *fc_req) return rc; } -int -spdk_nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *tgtport, - struct spdk_nvmf_fc_ls_rqst *ls_rqst) -{ - return nvmf_fc_xmt_ls_rsp(tgtport, ls_rqst); -} - -int -spdk_nvmf_fc_xmt_srsr_req(struct spdk_nvmf_fc_hwqp *hwqp, - struct spdk_nvmf_fc_srsr_bufs *srsr_bufs, - spdk_nvmf_fc_caller_cb cb, void *cb_args) -{ - return nvmf_fc_xmt_srsr_req(hwqp, srsr_bufs, cb, cb_args); -} - bool -spdk_nvmf_fc_send_ersp_required(struct spdk_nvmf_fc_request *fc_req, - uint32_t rsp_cnt, uint32_t xfer_len) +nvmf_fc_send_ersp_required(struct spdk_nvmf_fc_request *fc_req, + uint32_t rsp_cnt, uint32_t xfer_len) { struct spdk_nvmf_request *req = &fc_req->req; struct spdk_nvmf_qpair *qpair = req->qpair; - struct spdk_nvmf_fc_conn *fc_conn = spdk_nvmf_fc_get_conn(qpair); + struct spdk_nvmf_fc_conn *fc_conn = nvmf_fc_get_conn(qpair); struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd; struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl; uint16_t status = *((uint16_t *)&rsp->status); @@ -1758,52 +1743,44 @@ spdk_nvmf_fc_send_ersp_required(struct spdk_nvmf_fc_request *fc_req, return false; } -void -spdk_nvmf_fc_dump_all_queues(struct spdk_nvmf_fc_port *fc_port, - struct spdk_nvmf_fc_queue_dump_info *dump_info) -{ - nvmf_fc_dump_all_queues(&fc_port->ls_queue, fc_port->io_queues, - fc_port->num_io_queues, dump_info); -} - static int nvmf_fc_request_complete(struct spdk_nvmf_request *req) { int rc = 0; - struct spdk_nvmf_fc_request *fc_req = spdk_nvmf_fc_get_fc_req(req); + struct spdk_nvmf_fc_request *fc_req = nvmf_fc_get_fc_req(req); struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl; if (fc_req->is_aborted) { /* Defer this to make sure we dont call io cleanup in same context. */ - spdk_nvmf_fc_poller_api_func(fc_req->hwqp, SPDK_NVMF_FC_POLLER_API_REQ_ABORT_COMPLETE, - (void *)fc_req); + nvmf_fc_poller_api_func(fc_req->hwqp, SPDK_NVMF_FC_POLLER_API_REQ_ABORT_COMPLETE, + (void *)fc_req); } else if (rsp->status.sc == SPDK_NVME_SC_SUCCESS && req->xfer == SPDK_NVME_DATA_CONTROLLER_TO_HOST) { - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_READ_XFER); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_READ_XFER); rc = nvmf_fc_send_data(fc_req); } else { if (req->xfer == SPDK_NVME_DATA_HOST_TO_CONTROLLER) { - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_WRITE_RSP); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_WRITE_RSP); } else if (req->xfer == SPDK_NVME_DATA_CONTROLLER_TO_HOST) { - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_READ_RSP); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_READ_RSP); } else { - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_NONE_RSP); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_NONE_RSP); } - rc = spdk_nvmf_fc_handle_rsp(fc_req); + rc = nvmf_fc_handle_rsp(fc_req); } if (rc) { SPDK_ERRLOG("Error in request complete.\n"); - spdk_nvmf_fc_request_free(fc_req); + _nvmf_fc_request_free(fc_req); } return 0; } struct spdk_nvmf_tgt * -spdk_nvmf_fc_get_tgt(void) +nvmf_fc_get_tgt(void) { if (g_nvmf_ftransport) { return g_nvmf_ftransport->transport.tgt; @@ -2045,7 +2022,7 @@ nvmf_fc_poll_group_add(struct spdk_nvmf_transport_poll_group *group, } api_data = &fc_conn->create_opd->u.add_conn; - spdk_nvmf_fc_poller_api_func(hwqp, SPDK_NVMF_FC_POLLER_API_ADD_CONNECTION, &api_data->args); + nvmf_fc_poller_api_func(hwqp, SPDK_NVMF_FC_POLLER_API_ADD_CONNECTION, &api_data->args); return 0; err: return -1; @@ -2072,13 +2049,13 @@ nvmf_fc_poll_group_poll(struct spdk_nvmf_transport_poll_group *group) static int nvmf_fc_request_free(struct spdk_nvmf_request *req) { - struct spdk_nvmf_fc_request *fc_req = spdk_nvmf_fc_get_fc_req(req); + struct spdk_nvmf_fc_request *fc_req = nvmf_fc_get_fc_req(req); if (!fc_req->is_aborted) { - spdk_nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_BDEV_ABORTED); - spdk_nvmf_fc_request_abort(fc_req, true, NULL, NULL); + nvmf_fc_request_set_state(fc_req, SPDK_NVMF_FC_REQ_BDEV_ABORTED); + nvmf_fc_request_abort(fc_req, true, NULL, NULL); } else { - spdk_nvmf_fc_request_abort_complete(fc_req); + nvmf_fc_request_abort_complete(fc_req); } return 0; } @@ -2093,12 +2070,12 @@ nvmf_fc_close_qpair(struct spdk_nvmf_qpair *qpair) if (fc_conn->conn_id == NVMF_FC_INVALID_CONN_ID) { /* QP creation failure in FC tranport. Cleanup. */ - spdk_thread_send_msg(spdk_nvmf_fc_get_master_thread(), + spdk_thread_send_msg(nvmf_fc_get_master_thread(), nvmf_fc_handle_connection_failure, fc_conn); } else if (fc_conn->fc_assoc->assoc_id == fc_conn->conn_id && fc_conn->fc_assoc->assoc_state != SPDK_NVMF_FC_OBJECT_TO_BE_DELETED) { /* Admin connection */ - spdk_thread_send_msg(spdk_nvmf_fc_get_master_thread(), + spdk_thread_send_msg(nvmf_fc_get_master_thread(), nvmf_fc_handle_assoc_deletion, fc_conn); } } @@ -2175,27 +2152,27 @@ nvmf_fc_adm_hw_port_reinit_validate(struct spdk_nvmf_fc_port *fc_port, uint32_t i; /* Verify that the port was previously in offline or quiesced state */ - if (spdk_nvmf_fc_port_is_online(fc_port)) { + if (nvmf_fc_port_is_online(fc_port)) { SPDK_ERRLOG("SPDK FC port %d already initialized and online.\n", args->port_handle); return -EINVAL; } /* Reinit information in new LS queue from previous queue */ - spdk_nvmf_fc_hwqp_reinit_poller_queues(&fc_port->ls_queue, args->ls_queue); + nvmf_fc_hwqp_reinit_poller_queues(&fc_port->ls_queue, args->ls_queue); fc_port->fcp_rq_id = args->fcp_rq_id; /* Initialize the LS queue */ fc_port->ls_queue.queues = args->ls_queue; - spdk_nvmf_fc_init_poller_queues(fc_port->ls_queue.queues); + nvmf_fc_init_poller_queues(fc_port->ls_queue.queues); for (i = 0; i < fc_port->num_io_queues; i++) { /* Reinit information in new IO queue from previous queue */ - spdk_nvmf_fc_hwqp_reinit_poller_queues(&fc_port->io_queues[i], - args->io_queues[i]); + nvmf_fc_hwqp_reinit_poller_queues(&fc_port->io_queues[i], + args->io_queues[i]); fc_port->io_queues[i].queues = args->io_queues[i]; /* Initialize the IO queues */ - spdk_nvmf_fc_init_poller_queues(fc_port->io_queues[i].queues); + nvmf_fc_init_poller_queues(fc_port->io_queues[i].queues); } fc_port->hw_port_status = SPDK_FC_PORT_OFFLINE; @@ -2238,13 +2215,13 @@ nvmf_fc_adm_hw_port_data_init(struct spdk_nvmf_fc_port *fc_port, * Initialize the LS queue wherever needed. */ fc_port->ls_queue.queues = args->ls_queue; - fc_port->ls_queue.thread = spdk_nvmf_fc_get_master_thread(); + fc_port->ls_queue.thread = nvmf_fc_get_master_thread(); fc_port->ls_queue.hwqp_id = SPDK_MAX_NUM_OF_FC_PORTS * fc_port->num_io_queues; /* * Initialize the LS queue. */ - spdk_nvmf_fc_init_hwqp(fc_port, &fc_port->ls_queue); + nvmf_fc_init_hwqp(fc_port, &fc_port->ls_queue); /* * Initialize the IO queues. @@ -2254,13 +2231,13 @@ nvmf_fc_adm_hw_port_data_init(struct spdk_nvmf_fc_port *fc_port, hwqp->hwqp_id = i; hwqp->queues = args->io_queues[i]; hwqp->rq_size = args->io_queue_size; - spdk_nvmf_fc_init_hwqp(fc_port, hwqp); + nvmf_fc_init_hwqp(fc_port, hwqp); } /* * Initialize the LS processing for port */ - spdk_nvmf_fc_ls_init(fc_port); + nvmf_fc_ls_init(fc_port); /* * Initialize the list of nport on this HW port. @@ -2278,13 +2255,13 @@ nvmf_fc_adm_port_hwqp_offline_del_poller(struct spdk_nvmf_fc_port *fc_port) int i = 0; hwqp = &fc_port->ls_queue; - (void)spdk_nvmf_fc_hwqp_set_offline(hwqp); + (void)nvmf_fc_hwqp_set_offline(hwqp); /* Remove poller for all the io queues. */ for (i = 0; i < (int)fc_port->num_io_queues; i++) { hwqp = &fc_port->io_queues[i]; - (void)spdk_nvmf_fc_hwqp_set_offline(hwqp); - spdk_nvmf_fc_poll_group_remove_hwqp(hwqp); + (void)nvmf_fc_hwqp_set_offline(hwqp); + nvmf_fc_poll_group_remove_hwqp(hwqp); } } @@ -2347,7 +2324,7 @@ nvmf_fc_adm_hw_port_link_break_cb(uint8_t port_handle, goto out; } - fc_port = spdk_nvmf_fc_port_lookup(port_handle); + fc_port = nvmf_fc_port_lookup(port_handle); if (!fc_port) { DEV_VERIFY(!"port link break cb: fc_port is NULL."); SPDK_ERRLOG("port link break cb: Unable to find port:%d\n", @@ -2410,7 +2387,7 @@ nvmf_fc_adm_hw_port_offline_nport_delete(struct spdk_nvmf_fc_port *fc_port) /* Mark the nport states to be zombie, if they exist */ if (fc_port && !TAILQ_EMPTY(&fc_port->nport_list)) { TAILQ_FOREACH(nport, &fc_port->nport_list, link) { - (void)spdk_nvmf_fc_nport_set_state(nport, SPDK_NVMF_FC_OBJECT_ZOMBIE); + (void)nvmf_fc_nport_set_state(nport, SPDK_NVMF_FC_OBJECT_ZOMBIE); } } } @@ -2493,7 +2470,7 @@ nvmf_fc_adm_i_t_delete_assoc_cb(void *args, uint32_t err) */ if (0 == rport->assoc_count) { /* Remove the rport from the remote port list. */ - if (spdk_nvmf_fc_nport_remove_rem_port(nport, rport) != 0) { + if (nvmf_fc_nport_remove_rem_port(nport, rport) != 0) { SPDK_ERRLOG("Error while removing rport from list.\n"); DEV_VERIFY(!"Error while removing rport from list."); } @@ -2566,17 +2543,17 @@ nvmf_fc_adm_i_t_delete_assoc(struct spdk_nvmf_fc_nport *nport, TAILQ_FOREACH(assoc, &nport->fc_associations, link) { num_assoc++; if (assoc->s_id == s_id) { - assoc_err = spdk_nvmf_fc_delete_association(nport, - assoc->assoc_id, - false /* send abts */, false, - nvmf_fc_adm_i_t_delete_assoc_cb, cb_data); + assoc_err = nvmf_fc_delete_association(nport, + assoc->assoc_id, + false /* send abts */, false, + nvmf_fc_adm_i_t_delete_assoc_cb, cb_data); if (0 != assoc_err) { /* * Mark this association as zombie. */ err = -EINVAL; DEV_VERIFY(!"Error while deleting association"); - (void)spdk_nvmf_fc_assoc_set_state(assoc, SPDK_NVMF_FC_OBJECT_ZOMBIE); + (void)nvmf_fc_assoc_set_state(assoc, SPDK_NVMF_FC_OBJECT_ZOMBIE); } else { num_assoc_del_scheduled++; } @@ -2681,7 +2658,7 @@ nvmf_fc_adm_hw_queue_quiesce(struct spdk_nvmf_fc_hwqp *fc_hwqp, void *ctx, args->cb_info.cb_thread = spdk_get_thread(); SPDK_DEBUGLOG(SPDK_LOG_NVMF_FC_ADM_API, "Quiesce queue %d\n", fc_hwqp->hwqp_id); - rc = spdk_nvmf_fc_poller_api_func(fc_hwqp, SPDK_NVMF_FC_POLLER_API_QUIESCE_QUEUE, args); + rc = nvmf_fc_poller_api_func(fc_hwqp, SPDK_NVMF_FC_POLLER_API_QUIESCE_QUEUE, args); if (rc) { free(args); err = -EINVAL; @@ -2790,7 +2767,7 @@ nvmf_fc_adm_evnt_hw_port_init(void *arg) /* * 1. Check for duplicate initialization. */ - fc_port = spdk_nvmf_fc_port_lookup(args->port_handle); + fc_port = nvmf_fc_port_lookup(args->port_handle); if (fc_port != NULL) { /* Port already exists, check if it has to be re-initialized */ err = nvmf_fc_adm_hw_port_reinit_validate(fc_port, args); @@ -2833,7 +2810,7 @@ nvmf_fc_adm_evnt_hw_port_init(void *arg) /* * 4. Add this port to the global fc port list in the library. */ - spdk_nvmf_fc_port_add(fc_port); + nvmf_fc_port_add(fc_port); abort_port_init: if (err && fc_port) { @@ -2864,10 +2841,10 @@ nvmf_fc_adm_evnt_hw_port_online(void *arg) int i = 0; int err = 0; - fc_port = spdk_nvmf_fc_port_lookup(args->port_handle); + fc_port = nvmf_fc_port_lookup(args->port_handle); if (fc_port) { /* Set the port state to online */ - err = spdk_nvmf_fc_port_set_online(fc_port); + err = nvmf_fc_port_set_online(fc_port); if (err != 0) { SPDK_ERRLOG("Hw port %d online failed. err = %d\n", fc_port->port_hdl, err); DEV_VERIFY(!"Hw port online failed"); @@ -2876,14 +2853,14 @@ nvmf_fc_adm_evnt_hw_port_online(void *arg) hwqp = &fc_port->ls_queue; hwqp->context = NULL; - (void)spdk_nvmf_fc_hwqp_set_online(hwqp); + (void)nvmf_fc_hwqp_set_online(hwqp); /* Cycle through all the io queues and setup a hwqp poller for each. */ for (i = 0; i < (int)fc_port->num_io_queues; i++) { hwqp = &fc_port->io_queues[i]; hwqp->context = NULL; - (void)spdk_nvmf_fc_hwqp_set_online(hwqp); - spdk_nvmf_fc_poll_group_add_hwqp(hwqp); + (void)nvmf_fc_hwqp_set_online(hwqp); + nvmf_fc_poll_group_add_hwqp(hwqp); } } else { SPDK_ERRLOG("Unable to find the SPDK FC port %d\n", args->port_handle); @@ -2916,10 +2893,10 @@ nvmf_fc_adm_evnt_hw_port_offline(void *arg) int i = 0; int err = 0; - fc_port = spdk_nvmf_fc_port_lookup(args->port_handle); + fc_port = nvmf_fc_port_lookup(args->port_handle); if (fc_port) { /* Set the port state to offline, if it is not already. */ - err = spdk_nvmf_fc_port_set_offline(fc_port); + err = nvmf_fc_port_set_offline(fc_port); if (err != 0) { SPDK_ERRLOG("Hw port %d already offline. err = %d\n", fc_port->port_hdl, err); err = 0; @@ -2927,13 +2904,13 @@ nvmf_fc_adm_evnt_hw_port_offline(void *arg) } hwqp = &fc_port->ls_queue; - (void)spdk_nvmf_fc_hwqp_set_offline(hwqp); + (void)nvmf_fc_hwqp_set_offline(hwqp); /* Remove poller for all the io queues. */ for (i = 0; i < (int)fc_port->num_io_queues; i++) { hwqp = &fc_port->io_queues[i]; - (void)spdk_nvmf_fc_hwqp_set_offline(hwqp); - spdk_nvmf_fc_poll_group_remove_hwqp(hwqp); + (void)nvmf_fc_hwqp_set_offline(hwqp); + nvmf_fc_poll_group_remove_hwqp(hwqp); } /* @@ -2999,7 +2976,7 @@ nvmf_fc_adm_subsystem_paused_cb(struct spdk_nvmf_subsystem *subsystem, void *cb_ static int nvmf_fc_adm_add_rem_nport_listener(struct spdk_nvmf_fc_nport *nport, bool add) { - struct spdk_nvmf_tgt *tgt = spdk_nvmf_fc_get_tgt(); + struct spdk_nvmf_tgt *tgt = nvmf_fc_get_tgt(); struct spdk_nvmf_subsystem *subsystem; if (!tgt) { @@ -3016,9 +2993,9 @@ nvmf_fc_adm_add_rem_nport_listener(struct spdk_nvmf_fc_nport *nport, bool add) if (ctx) { ctx->add_listener = add; ctx->subsystem = subsystem; - spdk_nvmf_fc_create_trid(&ctx->trid, - nport->fc_nodename.u.wwn, - nport->fc_portname.u.wwn); + nvmf_fc_create_trid(&ctx->trid, + nport->fc_nodename.u.wwn, + nport->fc_portname.u.wwn); if (spdk_nvmf_tgt_listen(subsystem->tgt, &ctx->trid)) { SPDK_ERRLOG("Failed to add transport address %s to tgt listeners\n", @@ -3057,7 +3034,7 @@ nvmf_fc_adm_evnt_nport_create(void *arg) /* * Get the physical port. */ - fc_port = spdk_nvmf_fc_port_lookup(args->port_handle); + fc_port = nvmf_fc_port_lookup(args->port_handle); if (fc_port == NULL) { err = -EINVAL; goto out; @@ -3066,7 +3043,7 @@ nvmf_fc_adm_evnt_nport_create(void *arg) /* * Check for duplicate initialization. */ - nport = spdk_nvmf_fc_nport_find(args->port_handle, args->nport_handle); + nport = nvmf_fc_nport_find(args->port_handle, args->nport_handle); if (nport != NULL) { SPDK_ERRLOG("Duplicate SPDK FC nport %d exists for FC port:%d.\n", args->nport_handle, args->port_handle); @@ -3094,9 +3071,9 @@ nvmf_fc_adm_evnt_nport_create(void *arg) nport->fc_nodename = args->fc_nodename; nport->fc_portname = args->fc_portname; nport->d_id = args->d_id; - nport->fc_port = spdk_nvmf_fc_port_lookup(args->port_handle); + nport->fc_port = nvmf_fc_port_lookup(args->port_handle); - (void)spdk_nvmf_fc_nport_set_state(nport, SPDK_NVMF_FC_OBJECT_CREATED); + (void)nvmf_fc_nport_set_state(nport, SPDK_NVMF_FC_OBJECT_CREATED); TAILQ_INIT(&nport->rem_port_list); nport->rport_count = 0; TAILQ_INIT(&nport->fc_associations); @@ -3107,7 +3084,7 @@ nvmf_fc_adm_evnt_nport_create(void *arg) */ err = nvmf_fc_adm_add_rem_nport_listener(nport, true); - (void)spdk_nvmf_fc_port_add_nport(fc_port, nport); + (void)nvmf_fc_port_add_nport(fc_port, nport); out: if (err && nport) { free(nport); @@ -3153,13 +3130,13 @@ nvmf_fc_adm_delete_nport_cb(uint8_t port_handle, enum spdk_fc_event event_type, * Free the nport if this is the last rport being deleted and * execute the callback(s). */ - if (spdk_nvmf_fc_nport_has_no_rport(nport)) { + if (nvmf_fc_nport_has_no_rport(nport)) { if (0 != nport->assoc_count) { SPDK_ERRLOG("association count != 0\n"); DEV_VERIFY(!"association count != 0"); } - err = spdk_nvmf_fc_port_remove_nport(nport->fc_port, nport); + err = nvmf_fc_port_remove_nport(nport->fc_port, nport); if (0 != err) { SPDK_ERRLOG("Nport delete callback: Failed to remove " "nport from nport list. FC Port:%d Nport:%d\n", @@ -3205,7 +3182,7 @@ nvmf_fc_adm_evnt_nport_delete(void *arg) /* * Make sure that the nport exists. */ - nport = spdk_nvmf_fc_nport_find(args->port_handle, args->nport_handle); + nport = nvmf_fc_nport_find(args->port_handle, args->nport_handle); if (nport == NULL) { SPDK_ERRLOG("Unable to find the SPDK FC nport %d for FC Port: %d.\n", args->nport_handle, args->port_handle); @@ -3232,7 +3209,7 @@ nvmf_fc_adm_evnt_nport_delete(void *arg) * Begin nport tear down */ if (nport->nport_state == SPDK_NVMF_FC_OBJECT_CREATED) { - (void)spdk_nvmf_fc_nport_set_state(nport, SPDK_NVMF_FC_OBJECT_TO_BE_DELETED); + (void)nvmf_fc_nport_set_state(nport, SPDK_NVMF_FC_OBJECT_TO_BE_DELETED); } else if (nport->nport_state == SPDK_NVMF_FC_OBJECT_TO_BE_DELETED) { /* * Deletion of this nport already in progress. Register callback @@ -3255,7 +3232,7 @@ nvmf_fc_adm_evnt_nport_delete(void *arg) rc = nvmf_fc_adm_add_rem_nport_listener(nport, false); if (0 != rc) { - err = spdk_nvmf_fc_nport_set_state(nport, SPDK_NVMF_FC_OBJECT_ZOMBIE); + err = nvmf_fc_nport_set_state(nport, SPDK_NVMF_FC_OBJECT_ZOMBIE); SPDK_ERRLOG("Unable to remove the listen addr in the subsystems for nport %d.\n", nport->nport_hdl); goto out; @@ -3267,7 +3244,7 @@ nvmf_fc_adm_evnt_nport_delete(void *arg) /* TODO - Need to do this with a "first" and a "next" accessor function * for completeness. Look at app-subsystem as examples. */ - if (spdk_nvmf_fc_nport_has_no_rport(nport)) { + if (nvmf_fc_nport_has_no_rport(nport)) { /* No rports to delete. Complete the nport deletion. */ nvmf_fc_adm_delete_nport_cb(nport->port_hdl, SPDK_FC_NPORT_DELETE, cb_data, 0); goto out; @@ -3292,8 +3269,8 @@ nvmf_fc_adm_evnt_nport_delete(void *arg) it_del_args->rpi = rport_iter->rpi; it_del_args->s_id = rport_iter->s_id; - spdk_nvmf_fc_master_enqueue_event(SPDK_FC_IT_DELETE, (void *)it_del_args, - nvmf_fc_adm_delete_nport_cb); + nvmf_fc_master_enqueue_event(SPDK_FC_IT_DELETE, (void *)it_del_args, + nvmf_fc_adm_delete_nport_cb); } out: @@ -3338,7 +3315,7 @@ nvmf_fc_adm_evnt_i_t_add(void *arg) /* * Make sure the nport port exists. */ - nport = spdk_nvmf_fc_nport_find(args->port_handle, args->nport_handle); + nport = nvmf_fc_nport_find(args->port_handle, args->nport_handle); if (nport == NULL) { SPDK_ERRLOG("Unable to find the SPDK FC nport %d\n", args->nport_handle); err = -EINVAL; @@ -3370,7 +3347,7 @@ nvmf_fc_adm_evnt_i_t_add(void *arg) /* * Initialize the contents for the rport */ - (void)spdk_nvmf_fc_rport_set_state(rport, SPDK_NVMF_FC_OBJECT_CREATED); + (void)nvmf_fc_rport_set_state(rport, SPDK_NVMF_FC_OBJECT_CREATED); rport->s_id = args->s_id; rport->rpi = args->rpi; rport->fc_nodename = args->fc_nodename; @@ -3379,7 +3356,7 @@ nvmf_fc_adm_evnt_i_t_add(void *arg) /* * Add remote port to nport */ - if (spdk_nvmf_fc_nport_add_rem_port(nport, rport) != 0) { + if (nvmf_fc_nport_add_rem_port(nport, rport) != 0) { DEV_VERIFY(!"Error while adding rport to list"); }; @@ -3391,7 +3368,7 @@ nvmf_fc_adm_evnt_i_t_add(void *arg) * Get the targets service parameters from the library * to return back to the driver. */ - args->target_prli_info = spdk_nvmf_fc_get_prli_service_params(); + args->target_prli_info = nvmf_fc_get_prli_service_params(); out: if (api_data->cb_func != NULL) { @@ -3432,7 +3409,7 @@ nvmf_fc_adm_evnt_i_t_delete(void *arg) /* * Make sure the nport port exists. If it does not, error out. */ - nport = spdk_nvmf_fc_nport_find(args->port_handle, args->nport_handle); + nport = nvmf_fc_nport_find(args->port_handle, args->nport_handle); if (nport == NULL) { SPDK_ERRLOG("Unable to find the SPDK FC nport:%d\n", args->nport_handle); rc = -EINVAL; @@ -3484,7 +3461,7 @@ nvmf_fc_adm_evnt_i_t_delete(void *arg) * Validate rport object state. */ if (rport->rport_state == SPDK_NVMF_FC_OBJECT_CREATED) { - (void)spdk_nvmf_fc_rport_set_state(rport, SPDK_NVMF_FC_OBJECT_TO_BE_DELETED); + (void)nvmf_fc_rport_set_state(rport, SPDK_NVMF_FC_OBJECT_TO_BE_DELETED); } else if (rport->rport_state == SPDK_NVMF_FC_OBJECT_TO_BE_DELETED) { /* * Deletion of this rport already in progress. Register callback @@ -3557,7 +3534,7 @@ nvmf_fc_adm_evnt_abts_recv(void *arg) /* * 1. Make sure the nport port exists. */ - nport = spdk_nvmf_fc_nport_find(args->port_handle, args->nport_handle); + nport = nvmf_fc_nport_find(args->port_handle, args->nport_handle); if (nport == NULL) { SPDK_ERRLOG("Unable to find the SPDK FC nport %d\n", args->nport_handle); err = -EINVAL; @@ -3579,7 +3556,7 @@ nvmf_fc_adm_evnt_abts_recv(void *arg) /* * 3. Pass the received ABTS-LS to the library for handling. */ - spdk_nvmf_fc_handle_abts_frame(nport, args->rpi, args->oxid, args->rxid); + nvmf_fc_handle_abts_frame(nport, args->rpi, args->oxid, args->rxid); out: if (api_data->cb_func != NULL) { @@ -3634,7 +3611,7 @@ nvmf_fc_adm_hw_port_quiesce_reset_cb(void *ctx, int err) /* * Get the fc port. */ - fc_port = spdk_nvmf_fc_port_lookup(args->port_handle); + fc_port = nvmf_fc_port_lookup(args->port_handle); if (fc_port == NULL) { SPDK_ERRLOG("Unable to find the SPDK FC port %d\n", args->port_handle); err = -EINVAL; @@ -3658,12 +3635,13 @@ nvmf_fc_adm_hw_port_quiesce_reset_cb(void *ctx, int err) /* * Add the dump reason to the top of the buffer. */ - spdk_nvmf_fc_dump_buf_print(&dump_info, "%s\n", args->reason); + nvmf_fc_dump_buf_print(&dump_info, "%s\n", args->reason); /* * Dump the hwqp. */ - spdk_nvmf_fc_dump_all_queues(fc_port, &dump_info); + nvmf_fc_dump_all_queues(&fc_port->ls_queue, fc_port->io_queues, + fc_port->num_io_queues, &dump_info); out: SPDK_DEBUGLOG(SPDK_LOG_NVMF_FC_ADM_API, "HW port %d reset done, queues_dumped = %d, rc = %d.\n", @@ -3694,7 +3672,7 @@ nvmf_fc_adm_evnt_hw_port_reset(void *arg) /* * Make sure the physical port exists. */ - fc_port = spdk_nvmf_fc_port_lookup(args->port_handle); + fc_port = nvmf_fc_port_lookup(args->port_handle); if (fc_port == NULL) { SPDK_ERRLOG("Unable to find the SPDK FC port %d\n", args->port_handle); err = -EINVAL; @@ -3764,7 +3742,7 @@ nvmf_fc_adm_evnt_hw_port_link_break(void *arg) /* * Get the fc port using the port handle. */ - fc_port = spdk_nvmf_fc_port_lookup(args->port_handle); + fc_port = nvmf_fc_port_lookup(args->port_handle); if (!fc_port) { SPDK_ERRLOG("port link break: Unable to find the SPDK FC port %d\n", args->port_handle); @@ -3775,7 +3753,7 @@ nvmf_fc_adm_evnt_hw_port_link_break(void *arg) /* * Set the port state to offline, if it is not already. */ - err = spdk_nvmf_fc_port_set_offline(fc_port); + err = nvmf_fc_port_set_offline(fc_port); if (err != 0) { SPDK_ERRLOG("port link break: HW port %d already offline. rc = %d\n", fc_port->port_hdl, err); @@ -3809,9 +3787,9 @@ nvmf_fc_adm_evnt_hw_port_link_break(void *arg) nport_del_args->nport_handle = nport->nport_hdl; nport_del_args->cb_ctx = cb_data; - spdk_nvmf_fc_master_enqueue_event(SPDK_FC_NPORT_DELETE, - (void *)nport_del_args, - nvmf_fc_adm_hw_port_link_break_cb); + nvmf_fc_master_enqueue_event(SPDK_FC_NPORT_DELETE, + (void *)nport_del_args, + nvmf_fc_adm_hw_port_link_break_cb); nport_deletes_sent++; } @@ -3850,8 +3828,8 @@ out: static inline void nvmf_fc_adm_run_on_master_thread(spdk_msg_fn fn, void *args) { - if (spdk_nvmf_fc_get_master_thread()) { - spdk_thread_send_msg(spdk_nvmf_fc_get_master_thread(), fn, args); + if (nvmf_fc_get_master_thread()) { + spdk_thread_send_msg(nvmf_fc_get_master_thread(), fn, args); } } @@ -3860,8 +3838,8 @@ nvmf_fc_adm_run_on_master_thread(spdk_msg_fn fn, void *args) * Used by the FC driver to notify the SPDK master of FC related events. */ int -spdk_nvmf_fc_master_enqueue_event(enum spdk_fc_event event_type, void *args, - spdk_nvmf_fc_callback cb_func) +nvmf_fc_master_enqueue_event(enum spdk_fc_event event_type, void *args, + spdk_nvmf_fc_callback cb_func) { int err = 0; struct spdk_nvmf_fc_adm_api_data *api_data = NULL; diff --git a/lib/nvmf/fc_ls.c b/lib/nvmf/fc_ls.c index bcc1bced1..62d128dc9 100644 --- a/lib/nvmf/fc_ls.c +++ b/lib/nvmf/fc_ls.c @@ -355,8 +355,8 @@ nvmf_fc_ls_new_connection(struct spdk_nvmf_fc_association *assoc, uint16_t qid, /* save target port trid in connection (for subsystem * listener validation in fabric connect command) */ - spdk_nvmf_fc_create_trid(&fc_conn->trid, tgtport->fc_nodename.u.wwn, - tgtport->fc_portname.u.wwn); + nvmf_fc_create_trid(&fc_conn->trid, tgtport->fc_nodename.u.wwn, + tgtport->fc_portname.u.wwn); return fc_conn; } @@ -464,9 +464,9 @@ nvmf_fc_handle_xmt_ls_rsp_failure(struct spdk_nvmf_fc_association *assoc, api_data->args.cb_info.cb_func = nvmf_fc_ls_rsp_fail_del_conn_cb; api_data->args.cb_info.cb_data = opd; - spdk_nvmf_fc_poller_api_func(api_data->args.hwqp, - SPDK_NVMF_FC_POLLER_API_DEL_CONNECTION, - &api_data->args); + nvmf_fc_poller_api_func(api_data->args.hwqp, + SPDK_NVMF_FC_POLLER_API_DEL_CONNECTION, + &api_data->args); } /* callback from poller's ADD_Connection event */ @@ -690,9 +690,9 @@ nvmf_fc_del_all_conns_cb(void *cb_data, enum spdk_nvmf_fc_poller_api_ret ret) assoc->snd_disconn_bufs = NULL; SPDK_DEBUGLOG(SPDK_LOG_NVMF_FC_LS, "Send LS disconnect\n"); - if (spdk_nvmf_fc_xmt_srsr_req(&assoc->tgtport->fc_port->ls_queue, - srsr_bufs, nvmf_fs_send_ls_disconnect_cb, - (void *)srsr_bufs)) { + if (nvmf_fc_xmt_srsr_req(&assoc->tgtport->fc_port->ls_queue, + srsr_bufs, nvmf_fs_send_ls_disconnect_cb, + (void *)srsr_bufs)) { SPDK_ERRLOG("Error sending LS disconnect\n"); assoc->snd_disconn_bufs = srsr_bufs; } @@ -725,10 +725,10 @@ nvmf_fc_kill_io_del_all_conns_cb(void *cb_data, enum spdk_nvmf_fc_poller_api_ret /* Disconnect/delete (association) request functions */ static int -nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport, - uint64_t assoc_id, bool send_abts, bool backend_initiated, - spdk_nvmf_fc_del_assoc_cb del_assoc_cb, - void *cb_data, bool from_ls_rqst) +_nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport, + uint64_t assoc_id, bool send_abts, bool backend_initiated, + spdk_nvmf_fc_del_assoc_cb del_assoc_cb, + void *cb_data, bool from_ls_rqst) { struct nvmf_fc_ls_op_ctx *opd, *opd_tail, *opd_head = NULL; @@ -827,9 +827,9 @@ nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport, opd = opd_head; opd_head = opd->next_op_ctx; api_data = &opd->u.del_assoc; - spdk_nvmf_fc_poller_api_func(api_data->args.hwqp, - SPDK_NVMF_FC_POLLER_API_DEL_CONNECTION, - &api_data->args); + nvmf_fc_poller_api_func(api_data->args.hwqp, + SPDK_NVMF_FC_POLLER_API_DEL_CONNECTION, + &api_data->args); } return 0; @@ -890,10 +890,10 @@ nvmf_fc_ls_disconnect_assoc(struct spdk_nvmf_fc_nport *tgtport, api_data = &opd->u.disconn_assoc; api_data->tgtport = tgtport; api_data->ls_rqst = ls_rqst; - ret = nvmf_fc_delete_association(tgtport, assoc_id, - false, false, - nvmf_fc_ls_disconnect_assoc_cb, - api_data, true); + ret = _nvmf_fc_delete_association(tgtport, assoc_id, + false, false, + nvmf_fc_ls_disconnect_assoc_cb, + api_data, true); if (!ret) { return; } @@ -1287,17 +1287,17 @@ rjt_disc: /* external functions */ void -spdk_nvmf_fc_ls_init(struct spdk_nvmf_fc_port *fc_port) +nvmf_fc_ls_init(struct spdk_nvmf_fc_port *fc_port) { } void -spdk_nvmf_fc_ls_fini(struct spdk_nvmf_fc_port *fc_port) +nvmf_fc_ls_fini(struct spdk_nvmf_fc_port *fc_port) { } void -spdk_nvmf_fc_handle_ls_rqst(struct spdk_nvmf_fc_ls_rqst *ls_rqst) +nvmf_fc_handle_ls_rqst(struct spdk_nvmf_fc_ls_rqst *ls_rqst) { struct spdk_nvmf_fc_ls_rqst_w0 *w0 = (struct spdk_nvmf_fc_ls_rqst_w0 *)ls_rqst->rqstbuf.virt; @@ -1326,13 +1326,13 @@ spdk_nvmf_fc_handle_ls_rqst(struct spdk_nvmf_fc_ls_rqst *ls_rqst) } int -spdk_nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport, - uint64_t assoc_id, bool send_abts, bool backend_initiated, - spdk_nvmf_fc_del_assoc_cb del_assoc_cb, - void *cb_data) +nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport, + uint64_t assoc_id, bool send_abts, bool backend_initiated, + spdk_nvmf_fc_del_assoc_cb del_assoc_cb, + void *cb_data) { - return nvmf_fc_delete_association(tgtport, assoc_id, send_abts, backend_initiated, - del_assoc_cb, cb_data, false); + return _nvmf_fc_delete_association(tgtport, assoc_id, send_abts, backend_initiated, + del_assoc_cb, cb_data, false); } static void @@ -1369,8 +1369,8 @@ nvmf_fc_poller_api_add_connection(void *arg) conn_args->fc_conn->conn_id); /* make sure connection is not already in poller's list */ - fc_conn = spdk_nvmf_fc_hwqp_find_fc_conn(conn_args->fc_conn->hwqp, - conn_args->fc_conn->conn_id); + fc_conn = nvmf_fc_hwqp_find_fc_conn(conn_args->fc_conn->hwqp, + conn_args->fc_conn->conn_id); if (fc_conn) { SPDK_ERRLOG("duplicate connection found"); ret = SPDK_NVMF_FC_POLLER_API_DUP_CONN_ID; @@ -1402,9 +1402,9 @@ nvmf_fc_poller_api_quiesce_queue(void *arg) * is in progress. */ TAILQ_FOREACH_SAFE(fc_req, &q_args->hwqp->in_use_reqs, link, tmp) { - if (spdk_nvmf_fc_req_in_xfer(fc_req) && fc_req->is_aborted == true) { - spdk_nvmf_fc_poller_api_func(q_args->hwqp, SPDK_NVMF_FC_POLLER_API_REQ_ABORT_COMPLETE, - (void *)fc_req); + if (nvmf_fc_req_in_xfer(fc_req) && fc_req->is_aborted == true) { + nvmf_fc_poller_api_func(q_args->hwqp, SPDK_NVMF_FC_POLLER_API_REQ_ABORT_COMPLETE, + (void *)fc_req); } } @@ -1480,7 +1480,7 @@ nvmf_fc_poller_api_del_connection(void *arg) conn_args->fc_conn->conn_id); /* find the connection in poller's list */ - fc_conn = spdk_nvmf_fc_hwqp_find_fc_conn(hwqp, conn_args->fc_conn->conn_id); + fc_conn = nvmf_fc_hwqp_find_fc_conn(hwqp, conn_args->fc_conn->conn_id); if (!fc_conn) { /* perform callback */ nvmf_fc_poller_api_perform_cb(&conn_args->cb_info, SPDK_NVMF_FC_POLLER_API_NO_CONN_ID); @@ -1498,9 +1498,9 @@ nvmf_fc_poller_api_del_connection(void *arg) } conn_args->fc_request_cnt += 1; - spdk_nvmf_fc_request_abort(fc_req, conn_args->send_abts, - nvmf_fc_poller_conn_abort_done, - conn_args); + nvmf_fc_request_abort(fc_req, conn_args->send_abts, + nvmf_fc_poller_conn_abort_done, + conn_args); } } @@ -1539,8 +1539,8 @@ nvmf_fc_poller_api_abts_received(void *arg) TAILQ_FOREACH(fc_req, &hwqp->in_use_reqs, link) { if ((fc_req->rpi == args->ctx->rpi) && (fc_req->oxid == args->ctx->oxid)) { - spdk_nvmf_fc_request_abort(fc_req, false, - nvmf_fc_poller_abts_done, args); + nvmf_fc_request_abort(fc_req, false, + nvmf_fc_poller_abts_done, args); return; } } @@ -1612,8 +1612,8 @@ nvmf_fc_poller_api_remove_hwqp(void *arg) } enum spdk_nvmf_fc_poller_api_ret -spdk_nvmf_fc_poller_api_func(struct spdk_nvmf_fc_hwqp *hwqp, enum spdk_nvmf_fc_poller_api api, - void *api_args) { +nvmf_fc_poller_api_func(struct spdk_nvmf_fc_hwqp *hwqp, enum spdk_nvmf_fc_poller_api api, + void *api_args) { switch (api) { case SPDK_NVMF_FC_POLLER_API_ADD_CONNECTION: @@ -1645,7 +1645,7 @@ spdk_nvmf_fc_poller_api_func(struct spdk_nvmf_fc_hwqp *hwqp, enum spdk_nvmf_fc_p case SPDK_NVMF_FC_POLLER_API_REQ_ABORT_COMPLETE: spdk_thread_send_msg(hwqp->thread, - spdk_nvmf_fc_request_abort_complete, api_args); + nvmf_fc_request_abort_complete, api_args); break; case SPDK_NVMF_FC_POLLER_API_QUEUE_SYNC: diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index 5d487b79e..264295eb7 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -97,7 +97,7 @@ nvmf_poll_group_poll(void *ctx) struct spdk_nvmf_transport_poll_group *tgroup; TAILQ_FOREACH(tgroup, &group->tgroups, link) { - rc = spdk_nvmf_transport_poll_group_poll(tgroup); + rc = nvmf_transport_poll_group_poll(tgroup); if (rc < 0) { return -1; } @@ -158,7 +158,7 @@ nvmf_tgt_destroy_poll_group(void *io_device, void *ctx_buf) TAILQ_FOREACH_SAFE(tgroup, &group->tgroups, link, tmp) { TAILQ_REMOVE(&group->tgroups, tgroup, link); - spdk_nvmf_transport_poll_group_destroy(tgroup); + nvmf_transport_poll_group_destroy(tgroup); } for (sid = 0; sid < group->num_sgroups; sid++) { @@ -713,7 +713,7 @@ spdk_nvmf_tgt_accept(struct spdk_nvmf_tgt *tgt, new_qpair_fn cb_fn, void *cb_arg struct spdk_nvmf_transport *transport, *tmp; TAILQ_FOREACH_SAFE(transport, &tgt->transports, link, tmp) { - spdk_nvmf_transport_accept(transport, cb_fn, cb_arg); + nvmf_transport_accept(transport, cb_fn, cb_arg); } } @@ -756,7 +756,7 @@ spdk_nvmf_poll_group_add(struct spdk_nvmf_poll_group *group, TAILQ_FOREACH(tgroup, &group->tgroups, link) { if (tgroup->transport == qpair->transport) { - rc = spdk_nvmf_transport_poll_group_add(tgroup, qpair); + rc = nvmf_transport_poll_group_add(tgroup, qpair); break; } } @@ -783,7 +783,7 @@ _nvmf_transport_qpair_fini(void *ctx) { struct spdk_nvmf_qpair *qpair = ctx; - spdk_nvmf_transport_qpair_fini(qpair); + nvmf_transport_qpair_fini(qpair); } static void @@ -826,7 +826,7 @@ _nvmf_qpair_destroy(void *ctx, int status) /* Find the tgroup and remove the qpair from the tgroup */ TAILQ_FOREACH(tgroup, &qpair->group->tgroups, link) { if (tgroup->transport == qpair->transport) { - rc = spdk_nvmf_transport_poll_group_remove(tgroup, qpair); + rc = nvmf_transport_poll_group_remove(tgroup, qpair); if (rc && (rc != ENOTSUP)) { SPDK_ERRLOG("Cannot remove qpair=%p from transport group=%p\n", qpair, tgroup); @@ -840,7 +840,7 @@ _nvmf_qpair_destroy(void *ctx, int status) TAILQ_FOREACH_SAFE(req, &sgroup->queued, link, tmp) { if (req->qpair == qpair) { TAILQ_REMOVE(&sgroup->queued, req, link); - if (spdk_nvmf_transport_req_free(req)) { + if (nvmf_transport_req_free(req)) { SPDK_ERRLOG("Transport request free error!\n"); } } @@ -850,7 +850,7 @@ _nvmf_qpair_destroy(void *ctx, int status) TAILQ_REMOVE(&qpair->group->qpairs, qpair, link); if (!ctrlr || !ctrlr->thread) { - spdk_nvmf_transport_qpair_fini(qpair); + nvmf_transport_qpair_fini(qpair); if (qpair_ctx->cb_fn) { spdk_thread_send_msg(qpair_ctx->thread, qpair_ctx->cb_fn, qpair_ctx->ctx); } @@ -870,7 +870,7 @@ spdk_nvmf_qpair_disconnect(struct spdk_nvmf_qpair *qpair, nvmf_qpair_disconnect_ /* If we get a qpair in the uninitialized state, we can just destroy it immediately */ if (qpair->state == SPDK_NVMF_QPAIR_UNINITIALIZED) { - spdk_nvmf_transport_qpair_fini(qpair); + nvmf_transport_qpair_fini(qpair); if (cb_fn) { cb_fn(ctx); } @@ -924,21 +924,21 @@ int spdk_nvmf_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair, struct spdk_nvme_transport_id *trid) { - return spdk_nvmf_transport_qpair_get_peer_trid(qpair, trid); + return nvmf_transport_qpair_get_peer_trid(qpair, trid); } int spdk_nvmf_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair, struct spdk_nvme_transport_id *trid) { - return spdk_nvmf_transport_qpair_get_local_trid(qpair, trid); + return nvmf_transport_qpair_get_local_trid(qpair, trid); } int spdk_nvmf_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair, struct spdk_nvme_transport_id *trid) { - return spdk_nvmf_transport_qpair_get_listen_trid(qpair, trid); + return nvmf_transport_qpair_get_listen_trid(qpair, trid); } int @@ -954,7 +954,7 @@ nvmf_poll_group_add_transport(struct spdk_nvmf_poll_group *group, } } - tgroup = spdk_nvmf_transport_poll_group_create(transport); + tgroup = nvmf_transport_poll_group_create(transport); if (!tgroup) { SPDK_ERRLOG("Unable to create poll group for transport\n"); return -1; @@ -1350,7 +1350,7 @@ spdk_nvmf_get_optimal_poll_group(struct spdk_nvmf_qpair *qpair) { struct spdk_nvmf_transport_poll_group *tgroup; - tgroup = spdk_nvmf_transport_get_optimal_poll_group(qpair->transport, qpair); + tgroup = nvmf_transport_get_optimal_poll_group(qpair->transport, qpair); if (tgroup == NULL) { return NULL; diff --git a/lib/nvmf/nvmf_fc.h b/lib/nvmf/nvmf_fc.h index 5eca88746..e5443af69 100644 --- a/lib/nvmf/nvmf_fc.h +++ b/lib/nvmf/nvmf_fc.h @@ -750,9 +750,9 @@ typedef void (*spdk_nvmf_fc_callback)(uint8_t port_handle, * \return 0 on success, non-zero on failure. */ int -spdk_nvmf_fc_master_enqueue_event(enum spdk_fc_event event_type, - void *args, - spdk_nvmf_fc_callback cb_func); +nvmf_fc_master_enqueue_event(enum spdk_fc_event event_type, + void *args, + spdk_nvmf_fc_callback cb_func); /* * dump info @@ -764,7 +764,7 @@ struct spdk_nvmf_fc_queue_dump_info { #define SPDK_FC_HW_DUMP_BUF_SIZE (10 * 4096) static inline void -spdk_nvmf_fc_dump_buf_print(struct spdk_nvmf_fc_queue_dump_info *dump_info, char *fmt, ...) +nvmf_fc_dump_buf_print(struct spdk_nvmf_fc_queue_dump_info *dump_info, char *fmt, ...) { uint64_t buffer_size = SPDK_FC_HW_DUMP_BUF_SIZE; int32_t avail = (int32_t)(buffer_size - dump_info->offset); @@ -812,14 +812,14 @@ struct spdk_nvmf_fc_xchg_info { */ static inline struct spdk_nvmf_fc_request * -spdk_nvmf_fc_get_fc_req(struct spdk_nvmf_request *req) +nvmf_fc_get_fc_req(struct spdk_nvmf_request *req) { return (struct spdk_nvmf_fc_request *) ((uintptr_t)req - offsetof(struct spdk_nvmf_fc_request, req)); } static inline bool -spdk_nvmf_fc_is_port_dead(struct spdk_nvmf_fc_hwqp *hwqp) +nvmf_fc_is_port_dead(struct spdk_nvmf_fc_hwqp *hwqp) { switch (hwqp->fc_port->hw_port_status) { case SPDK_FC_PORT_QUIESCED: @@ -830,7 +830,7 @@ spdk_nvmf_fc_is_port_dead(struct spdk_nvmf_fc_hwqp *hwqp) } static inline bool -spdk_nvmf_fc_req_in_xfer(struct spdk_nvmf_fc_request *fc_req) +nvmf_fc_req_in_xfer(struct spdk_nvmf_fc_request *fc_req) { switch (fc_req->state) { case SPDK_NVMF_FC_REQ_READ_XFER: @@ -845,7 +845,7 @@ spdk_nvmf_fc_req_in_xfer(struct spdk_nvmf_fc_request *fc_req) } static inline void -spdk_nvmf_fc_create_trid(struct spdk_nvme_transport_id *trid, uint64_t n_wwn, uint64_t p_wwn) +nvmf_fc_create_trid(struct spdk_nvme_transport_id *trid, uint64_t n_wwn, uint64_t p_wwn) { spdk_nvme_trid_populate_transport(trid, SPDK_NVME_TRANSPORT_FC); trid->adrfam = SPDK_NVMF_ADRFAM_FC; @@ -853,116 +853,106 @@ spdk_nvmf_fc_create_trid(struct spdk_nvme_transport_id *trid, uint64_t n_wwn, ui snprintf(trid->traddr, sizeof(trid->traddr), "nn-0x%lx:pn-0x%lx", n_wwn, p_wwn); } -void spdk_nvmf_fc_ls_init(struct spdk_nvmf_fc_port *fc_port); +void nvmf_fc_ls_init(struct spdk_nvmf_fc_port *fc_port); -void spdk_nvmf_fc_ls_fini(struct spdk_nvmf_fc_port *fc_port); +void nvmf_fc_ls_fini(struct spdk_nvmf_fc_port *fc_port); -void spdk_nvmf_fc_handle_ls_rqst(struct spdk_nvmf_fc_ls_rqst *ls_rqst); +void nvmf_fc_handle_ls_rqst(struct spdk_nvmf_fc_ls_rqst *ls_rqst); void nvmf_fc_ls_add_conn_failure( struct spdk_nvmf_fc_association *assoc, struct spdk_nvmf_fc_ls_rqst *ls_rqst, struct spdk_nvmf_fc_conn *fc_conn, bool aq_conn); -int spdk_nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *tgtport, - struct spdk_nvmf_fc_ls_rqst *ls_rqst); +void nvmf_fc_init_hwqp(struct spdk_nvmf_fc_port *fc_port, struct spdk_nvmf_fc_hwqp *hwqp); -void spdk_nvmf_fc_init_hwqp(struct spdk_nvmf_fc_port *fc_port, struct spdk_nvmf_fc_hwqp *hwqp); +void nvmf_fc_init_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp); -void spdk_nvmf_fc_init_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp); - -struct spdk_nvmf_fc_conn *spdk_nvmf_fc_hwqp_find_fc_conn(struct spdk_nvmf_fc_hwqp *hwqp, +struct spdk_nvmf_fc_conn *nvmf_fc_hwqp_find_fc_conn(struct spdk_nvmf_fc_hwqp *hwqp, uint64_t conn_id); -void spdk_nvmf_fc_hwqp_reinit_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp, void *queues_curr); +void nvmf_fc_hwqp_reinit_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp, void *queues_curr); -struct spdk_nvmf_fc_port *spdk_nvmf_fc_port_lookup(uint8_t port_hdl); +struct spdk_nvmf_fc_port *nvmf_fc_port_lookup(uint8_t port_hdl); -bool spdk_nvmf_fc_port_is_offline(struct spdk_nvmf_fc_port *fc_port); +bool nvmf_fc_port_is_offline(struct spdk_nvmf_fc_port *fc_port); -int spdk_nvmf_fc_port_set_offline(struct spdk_nvmf_fc_port *fc_port); +int nvmf_fc_port_set_offline(struct spdk_nvmf_fc_port *fc_port); -bool spdk_nvmf_fc_port_is_online(struct spdk_nvmf_fc_port *fc_port); +bool nvmf_fc_port_is_online(struct spdk_nvmf_fc_port *fc_port); -int spdk_nvmf_fc_port_set_online(struct spdk_nvmf_fc_port *fc_port); +int nvmf_fc_port_set_online(struct spdk_nvmf_fc_port *fc_port); -int spdk_nvmf_fc_rport_set_state(struct spdk_nvmf_fc_remote_port_info *rport, - enum spdk_nvmf_fc_object_state state); +int nvmf_fc_rport_set_state(struct spdk_nvmf_fc_remote_port_info *rport, + enum spdk_nvmf_fc_object_state state); -void spdk_nvmf_fc_port_add(struct spdk_nvmf_fc_port *fc_port); +void nvmf_fc_port_add(struct spdk_nvmf_fc_port *fc_port); -int spdk_nvmf_fc_port_add_nport(struct spdk_nvmf_fc_port *fc_port, - struct spdk_nvmf_fc_nport *nport); +int nvmf_fc_port_add_nport(struct spdk_nvmf_fc_port *fc_port, + struct spdk_nvmf_fc_nport *nport); -int spdk_nvmf_fc_port_remove_nport(struct spdk_nvmf_fc_port *fc_port, - struct spdk_nvmf_fc_nport *nport); +int nvmf_fc_port_remove_nport(struct spdk_nvmf_fc_port *fc_port, + struct spdk_nvmf_fc_nport *nport); -struct spdk_nvmf_fc_nport *spdk_nvmf_fc_nport_find(uint8_t port_hdl, uint16_t nport_hdl); +struct spdk_nvmf_fc_nport *nvmf_fc_nport_find(uint8_t port_hdl, uint16_t nport_hdl); -int spdk_nvmf_fc_nport_set_state(struct spdk_nvmf_fc_nport *nport, - enum spdk_nvmf_fc_object_state state); +int nvmf_fc_nport_set_state(struct spdk_nvmf_fc_nport *nport, + enum spdk_nvmf_fc_object_state state); -bool spdk_nvmf_fc_nport_add_rem_port(struct spdk_nvmf_fc_nport *nport, - struct spdk_nvmf_fc_remote_port_info *rem_port); +bool nvmf_fc_nport_add_rem_port(struct spdk_nvmf_fc_nport *nport, + struct spdk_nvmf_fc_remote_port_info *rem_port); -bool spdk_nvmf_fc_nport_remove_rem_port(struct spdk_nvmf_fc_nport *nport, - struct spdk_nvmf_fc_remote_port_info *rem_port); +bool nvmf_fc_nport_remove_rem_port(struct spdk_nvmf_fc_nport *nport, + struct spdk_nvmf_fc_remote_port_info *rem_port); -bool spdk_nvmf_fc_nport_has_no_rport(struct spdk_nvmf_fc_nport *nport); +bool nvmf_fc_nport_has_no_rport(struct spdk_nvmf_fc_nport *nport); -int spdk_nvmf_fc_assoc_set_state(struct spdk_nvmf_fc_association *assoc, - enum spdk_nvmf_fc_object_state state); +int nvmf_fc_assoc_set_state(struct spdk_nvmf_fc_association *assoc, + enum spdk_nvmf_fc_object_state state); -int spdk_nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport, - uint64_t assoc_id, bool send_abts, bool backend_initiated, - spdk_nvmf_fc_del_assoc_cb del_assoc_cb, - void *cb_data); +int nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport, + uint64_t assoc_id, bool send_abts, bool backend_initiated, + spdk_nvmf_fc_del_assoc_cb del_assoc_cb, + void *cb_data); -bool spdk_nvmf_ctrlr_is_on_nport(uint8_t port_hdl, uint16_t nport_hdl, - struct spdk_nvmf_ctrlr *ctrlr); +bool nvmf_ctrlr_is_on_nport(uint8_t port_hdl, uint16_t nport_hdl, + struct spdk_nvmf_ctrlr *ctrlr); -void spdk_nvmf_fc_assign_queue_to_master_thread(struct spdk_nvmf_fc_hwqp *hwqp); +void nvmf_fc_assign_queue_to_master_thread(struct spdk_nvmf_fc_hwqp *hwqp); -void spdk_nvmf_fc_poll_group_add_hwqp(struct spdk_nvmf_fc_hwqp *hwqp); +void nvmf_fc_poll_group_add_hwqp(struct spdk_nvmf_fc_hwqp *hwqp); -void spdk_nvmf_fc_poll_group_remove_hwqp(struct spdk_nvmf_fc_hwqp *hwqp); +void nvmf_fc_poll_group_remove_hwqp(struct spdk_nvmf_fc_hwqp *hwqp); -int spdk_nvmf_fc_hwqp_set_online(struct spdk_nvmf_fc_hwqp *hwqp); +int nvmf_fc_hwqp_set_online(struct spdk_nvmf_fc_hwqp *hwqp); -int spdk_nvmf_fc_hwqp_set_offline(struct spdk_nvmf_fc_hwqp *hwqp); +int nvmf_fc_hwqp_set_offline(struct spdk_nvmf_fc_hwqp *hwqp); -uint32_t spdk_nvmf_fc_get_prli_service_params(void); +uint32_t nvmf_fc_get_prli_service_params(void); -void spdk_nvmf_fc_handle_abts_frame(struct spdk_nvmf_fc_nport *nport, uint16_t rpi, uint16_t oxid, - uint16_t rxid); +void nvmf_fc_handle_abts_frame(struct spdk_nvmf_fc_nport *nport, uint16_t rpi, uint16_t oxid, + uint16_t rxid); -void spdk_nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts, - spdk_nvmf_fc_caller_cb cb, void *cb_args); +void nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts, + spdk_nvmf_fc_caller_cb cb, void *cb_args); -int spdk_nvmf_fc_xmt_srsr_req(struct spdk_nvmf_fc_hwqp *hwqp, - struct spdk_nvmf_fc_srsr_bufs *srsr_bufs, - spdk_nvmf_fc_caller_cb cb, void *cb_args); +struct spdk_nvmf_tgt *nvmf_fc_get_tgt(void); -struct spdk_nvmf_tgt *spdk_nvmf_fc_get_tgt(void); - -void spdk_nvmf_fc_dump_all_queues(struct spdk_nvmf_fc_port *fc_port, - struct spdk_nvmf_fc_queue_dump_info *dump_info); - -struct spdk_thread *spdk_nvmf_fc_get_master_thread(void); +struct spdk_thread *nvmf_fc_get_master_thread(void); /* * These functions are called by low level FC driver */ static inline struct spdk_nvmf_fc_conn * -spdk_nvmf_fc_get_conn(struct spdk_nvmf_qpair *qpair) +nvmf_fc_get_conn(struct spdk_nvmf_qpair *qpair) { return (struct spdk_nvmf_fc_conn *) ((uintptr_t)qpair - offsetof(struct spdk_nvmf_fc_conn, qpair)); } static inline uint16_t -spdk_nvmf_fc_advance_conn_sqhead(struct spdk_nvmf_qpair *qpair) +nvmf_fc_advance_conn_sqhead(struct spdk_nvmf_qpair *qpair) { /* advance sq_head pointer - wrap if needed */ qpair->sq_head = (qpair->sq_head == qpair->sq_head_max) ? @@ -971,7 +961,7 @@ spdk_nvmf_fc_advance_conn_sqhead(struct spdk_nvmf_qpair *qpair) } static inline bool -spdk_nvmf_fc_use_send_frame(struct spdk_nvmf_request *req) +nvmf_fc_use_send_frame(struct spdk_nvmf_request *req) { /* For now use for only keepalives. */ if (req->qpair->qid == 0 && @@ -981,31 +971,31 @@ spdk_nvmf_fc_use_send_frame(struct spdk_nvmf_request *req) return false; } -enum spdk_nvmf_fc_poller_api_ret spdk_nvmf_fc_poller_api_func( +enum spdk_nvmf_fc_poller_api_ret nvmf_fc_poller_api_func( struct spdk_nvmf_fc_hwqp *hwqp, enum spdk_nvmf_fc_poller_api api, void *api_args); -int spdk_nvmf_fc_hwqp_process_frame(struct spdk_nvmf_fc_hwqp *hwqp, uint32_t buff_idx, - struct spdk_nvmf_fc_frame_hdr *frame, - struct spdk_nvmf_fc_buffer_desc *buffer, uint32_t plen); +int nvmf_fc_hwqp_process_frame(struct spdk_nvmf_fc_hwqp *hwqp, uint32_t buff_idx, + struct spdk_nvmf_fc_frame_hdr *frame, + struct spdk_nvmf_fc_buffer_desc *buffer, uint32_t plen); -void spdk_nvmf_fc_hwqp_process_pending_reqs(struct spdk_nvmf_fc_hwqp *hwqp); +void nvmf_fc_hwqp_process_pending_reqs(struct spdk_nvmf_fc_hwqp *hwqp); -void spdk_nvmf_fc_hwqp_process_pending_ls_rqsts(struct spdk_nvmf_fc_hwqp *hwqp); +void nvmf_fc_hwqp_process_pending_ls_rqsts(struct spdk_nvmf_fc_hwqp *hwqp); -void spdk_nvmf_fc_request_set_state(struct spdk_nvmf_fc_request *fc_req, - enum spdk_nvmf_fc_request_state state); +void nvmf_fc_request_set_state(struct spdk_nvmf_fc_request *fc_req, + enum spdk_nvmf_fc_request_state state); -char *spdk_nvmf_fc_request_get_state_str(int state); +char *nvmf_fc_request_get_state_str(int state); -void spdk_nvmf_fc_request_free(struct spdk_nvmf_fc_request *fc_req); +void _nvmf_fc_request_free(struct spdk_nvmf_fc_request *fc_req); -void spdk_nvmf_fc_request_abort_complete(void *arg1); +void nvmf_fc_request_abort_complete(void *arg1); -bool spdk_nvmf_fc_send_ersp_required(struct spdk_nvmf_fc_request *fc_req, - uint32_t rsp_cnt, uint32_t xfer_len); +bool nvmf_fc_send_ersp_required(struct spdk_nvmf_fc_request *fc_req, + uint32_t rsp_cnt, uint32_t xfer_len); -int spdk_nvmf_fc_handle_rsp(struct spdk_nvmf_fc_request *req); +int nvmf_fc_handle_rsp(struct spdk_nvmf_fc_request *req); #endif diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h index 0126c0ccf..e6ca39e1b 100644 --- a/lib/nvmf/nvmf_internal.h +++ b/lib/nvmf/nvmf_internal.h @@ -277,7 +277,6 @@ void nvmf_get_discovery_log_page(struct spdk_nvmf_tgt *tgt, const char *hostnqn, void nvmf_ctrlr_destruct(struct spdk_nvmf_ctrlr *ctrlr); int nvmf_ctrlr_process_fabrics_cmd(struct spdk_nvmf_request *req); -int spdk_nvmf_ctrlr_connect(struct spdk_nvmf_request *req); int nvmf_ctrlr_process_admin_cmd(struct spdk_nvmf_request *req); int nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req); bool nvmf_ctrlr_dsm_supported(struct spdk_nvmf_ctrlr *ctrlr); diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c index 16994c4e4..ebe8d9a8e 100644 --- a/lib/nvmf/subsystem.c +++ b/lib/nvmf/subsystem.c @@ -305,7 +305,7 @@ spdk_nvmf_subsystem_create(struct spdk_nvmf_tgt *tgt, } static void -_spdk_nvmf_subsystem_remove_host(struct spdk_nvmf_subsystem *subsystem, struct spdk_nvmf_host *host) +nvmf_subsystem_remove_host(struct spdk_nvmf_subsystem *subsystem, struct spdk_nvmf_host *host) { TAILQ_REMOVE(&subsystem->hosts, host, link); free(host); @@ -347,7 +347,7 @@ spdk_nvmf_subsystem_destroy(struct spdk_nvmf_subsystem *subsystem) nvmf_subsystem_remove_all_listeners(subsystem, false); TAILQ_FOREACH_SAFE(host, &subsystem->hosts, link, host_tmp) { - _spdk_nvmf_subsystem_remove_host(subsystem, host); + nvmf_subsystem_remove_host(subsystem, host); } TAILQ_FOREACH_SAFE(ctrlr, &subsystem->ctrlrs, link, ctrlr_tmp) { @@ -614,7 +614,7 @@ spdk_nvmf_subsystem_get_next(struct spdk_nvmf_subsystem *subsystem) } static struct spdk_nvmf_host * -_spdk_nvmf_subsystem_find_host(struct spdk_nvmf_subsystem *subsystem, const char *hostnqn) +nvmf_subsystem_find_host(struct spdk_nvmf_subsystem *subsystem, const char *hostnqn) { struct spdk_nvmf_host *host = NULL; @@ -641,7 +641,7 @@ spdk_nvmf_subsystem_add_host(struct spdk_nvmf_subsystem *subsystem, const char * return -EAGAIN; } - if (_spdk_nvmf_subsystem_find_host(subsystem, hostnqn)) { + if (nvmf_subsystem_find_host(subsystem, hostnqn)) { /* This subsystem already allows the specified host. */ return 0; } @@ -669,12 +669,12 @@ spdk_nvmf_subsystem_remove_host(struct spdk_nvmf_subsystem *subsystem, const cha return -EAGAIN; } - host = _spdk_nvmf_subsystem_find_host(subsystem, hostnqn); + host = nvmf_subsystem_find_host(subsystem, hostnqn); if (host == NULL) { return -ENOENT; } - _spdk_nvmf_subsystem_remove_host(subsystem, host); + nvmf_subsystem_remove_host(subsystem, host); return 0; } @@ -708,7 +708,7 @@ spdk_nvmf_subsystem_host_allowed(struct spdk_nvmf_subsystem *subsystem, const ch return true; } - return _spdk_nvmf_subsystem_find_host(subsystem, hostnqn) != NULL; + return nvmf_subsystem_find_host(subsystem, hostnqn) != NULL; } struct spdk_nvmf_host * diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index e32911999..c80083dac 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -522,7 +522,7 @@ nvmf_tcp_create(struct spdk_nvmf_transport_opts *opts) } static int -_spdk_nvmf_tcp_trsvcid_to_int(const char *trsvcid) +nvmf_tcp_trsvcid_to_int(const char *trsvcid) { unsigned long long ull; char *end = NULL; @@ -544,12 +544,12 @@ _spdk_nvmf_tcp_trsvcid_to_int(const char *trsvcid) * Canonicalize a listen address trid. */ static int -_spdk_nvmf_tcp_canon_listen_trid(struct spdk_nvme_transport_id *canon_trid, - const struct spdk_nvme_transport_id *trid) +nvmf_tcp_canon_listen_trid(struct spdk_nvme_transport_id *canon_trid, + const struct spdk_nvme_transport_id *trid) { int trsvcid_int; - trsvcid_int = _spdk_nvmf_tcp_trsvcid_to_int(trid->trsvcid); + trsvcid_int = nvmf_tcp_trsvcid_to_int(trid->trsvcid); if (trsvcid_int < 0) { return -EINVAL; } @@ -569,13 +569,13 @@ _spdk_nvmf_tcp_canon_listen_trid(struct spdk_nvme_transport_id *canon_trid, * Caller must hold ttransport->lock. */ static struct spdk_nvmf_tcp_port * -_spdk_nvmf_tcp_find_port(struct spdk_nvmf_tcp_transport *ttransport, - const struct spdk_nvme_transport_id *trid) +nvmf_tcp_find_port(struct spdk_nvmf_tcp_transport *ttransport, + const struct spdk_nvme_transport_id *trid) { struct spdk_nvme_transport_id canon_trid; struct spdk_nvmf_tcp_port *port; - if (_spdk_nvmf_tcp_canon_listen_trid(&canon_trid, trid) != 0) { + if (nvmf_tcp_canon_listen_trid(&canon_trid, trid) != 0) { return NULL; } @@ -600,7 +600,7 @@ nvmf_tcp_listen(struct spdk_nvmf_transport *transport, ttransport = SPDK_CONTAINEROF(transport, struct spdk_nvmf_tcp_transport, transport); - trsvcid_int = _spdk_nvmf_tcp_trsvcid_to_int(trid->trsvcid); + trsvcid_int = nvmf_tcp_trsvcid_to_int(trid->trsvcid); if (trsvcid_int < 0) { SPDK_ERRLOG("Invalid trsvcid '%s'\n", trid->trsvcid); return -EINVAL; @@ -667,7 +667,7 @@ nvmf_tcp_stop_listen(struct spdk_nvmf_transport *transport, trid->traddr, trid->trsvcid); pthread_mutex_lock(&ttransport->lock); - port = _spdk_nvmf_tcp_find_port(ttransport, trid); + port = nvmf_tcp_find_port(ttransport, trid); if (port) { TAILQ_REMOVE(&ttransport->ports, port, link); spdk_sock_close(&port->listen_sock); @@ -871,10 +871,10 @@ nvmf_tcp_qpair_sock_init(struct spdk_nvmf_tcp_qpair *tqpair) } static void -_spdk_nvmf_tcp_handle_connect(struct spdk_nvmf_transport *transport, - struct spdk_nvmf_tcp_port *port, - struct spdk_sock *sock, - new_qpair_fn cb_fn, void *cb_arg) +nvmf_tcp_handle_connect(struct spdk_nvmf_transport *transport, + struct spdk_nvmf_tcp_port *port, + struct spdk_sock *sock, + new_qpair_fn cb_fn, void *cb_arg) { struct spdk_nvmf_tcp_qpair *tqpair; int rc; @@ -919,7 +919,7 @@ nvmf_tcp_port_accept(struct spdk_nvmf_transport *transport, struct spdk_nvmf_tcp if (sock == NULL) { break; } - _spdk_nvmf_tcp_handle_connect(transport, port, sock, cb_fn, cb_arg); + nvmf_tcp_handle_connect(transport, port, sock, cb_fn, cb_arg); } } diff --git a/lib/nvmf/transport.c b/lib/nvmf/transport.c index 25ead06f5..add9e52dc 100644 --- a/lib/nvmf/transport.c +++ b/lib/nvmf/transport.c @@ -255,21 +255,21 @@ spdk_nvmf_transport_stop_listen(struct spdk_nvmf_transport *transport, } void -spdk_nvmf_transport_accept(struct spdk_nvmf_transport *transport, new_qpair_fn cb_fn, void *cb_arg) +nvmf_transport_accept(struct spdk_nvmf_transport *transport, new_qpair_fn cb_fn, void *cb_arg) { transport->ops->accept(transport, cb_fn, cb_arg); } void -spdk_nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport, - struct spdk_nvme_transport_id *trid, - struct spdk_nvmf_discovery_log_page_entry *entry) +nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport, + struct spdk_nvme_transport_id *trid, + struct spdk_nvmf_discovery_log_page_entry *entry) { transport->ops->listener_discover(transport, trid, entry); } struct spdk_nvmf_transport_poll_group * -spdk_nvmf_transport_poll_group_create(struct spdk_nvmf_transport *transport) +nvmf_transport_poll_group_create(struct spdk_nvmf_transport *transport) { struct spdk_nvmf_transport_poll_group *group; struct spdk_nvmf_transport_pg_cache_buf *buf; @@ -300,8 +300,8 @@ spdk_nvmf_transport_poll_group_create(struct spdk_nvmf_transport *transport) } struct spdk_nvmf_transport_poll_group * -spdk_nvmf_transport_get_optimal_poll_group(struct spdk_nvmf_transport *transport, - struct spdk_nvmf_qpair *qpair) +nvmf_transport_get_optimal_poll_group(struct spdk_nvmf_transport *transport, + struct spdk_nvmf_qpair *qpair) { if (transport->ops->get_optimal_poll_group) { return transport->ops->get_optimal_poll_group(qpair); @@ -311,7 +311,7 @@ spdk_nvmf_transport_get_optimal_poll_group(struct spdk_nvmf_transport *transport } void -spdk_nvmf_transport_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group) +nvmf_transport_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group) { struct spdk_nvmf_transport_pg_cache_buf *buf, *tmp; @@ -327,8 +327,8 @@ spdk_nvmf_transport_poll_group_destroy(struct spdk_nvmf_transport_poll_group *gr } int -spdk_nvmf_transport_poll_group_add(struct spdk_nvmf_transport_poll_group *group, - struct spdk_nvmf_qpair *qpair) +nvmf_transport_poll_group_add(struct spdk_nvmf_transport_poll_group *group, + struct spdk_nvmf_qpair *qpair) { if (qpair->transport) { assert(qpair->transport == group->transport); @@ -343,8 +343,8 @@ spdk_nvmf_transport_poll_group_add(struct spdk_nvmf_transport_poll_group *group, } int -spdk_nvmf_transport_poll_group_remove(struct spdk_nvmf_transport_poll_group *group, - struct spdk_nvmf_qpair *qpair) +nvmf_transport_poll_group_remove(struct spdk_nvmf_transport_poll_group *group, + struct spdk_nvmf_qpair *qpair) { int rc = ENOTSUP; @@ -357,46 +357,46 @@ spdk_nvmf_transport_poll_group_remove(struct spdk_nvmf_transport_poll_group *gro } int -spdk_nvmf_transport_poll_group_poll(struct spdk_nvmf_transport_poll_group *group) +nvmf_transport_poll_group_poll(struct spdk_nvmf_transport_poll_group *group) { return group->transport->ops->poll_group_poll(group); } int -spdk_nvmf_transport_req_free(struct spdk_nvmf_request *req) +nvmf_transport_req_free(struct spdk_nvmf_request *req) { return req->qpair->transport->ops->req_free(req); } int -spdk_nvmf_transport_req_complete(struct spdk_nvmf_request *req) +nvmf_transport_req_complete(struct spdk_nvmf_request *req) { return req->qpair->transport->ops->req_complete(req); } void -spdk_nvmf_transport_qpair_fini(struct spdk_nvmf_qpair *qpair) +nvmf_transport_qpair_fini(struct spdk_nvmf_qpair *qpair) { qpair->transport->ops->qpair_fini(qpair); } int -spdk_nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair, - struct spdk_nvme_transport_id *trid) +nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair, + struct spdk_nvme_transport_id *trid) { return qpair->transport->ops->qpair_get_peer_trid(qpair, trid); } int -spdk_nvmf_transport_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair, - struct spdk_nvme_transport_id *trid) +nvmf_transport_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair, + struct spdk_nvme_transport_id *trid) { return qpair->transport->ops->qpair_get_local_trid(qpair, trid); } int -spdk_nvmf_transport_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair, - struct spdk_nvme_transport_id *trid) +nvmf_transport_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair, + struct spdk_nvme_transport_id *trid) { return qpair->transport->ops->qpair_get_listen_trid(qpair, trid); } diff --git a/lib/nvmf/transport.h b/lib/nvmf/transport.h index 150638617..30427fb8d 100644 --- a/lib/nvmf/transport.h +++ b/lib/nvmf/transport.h @@ -40,44 +40,41 @@ #include "spdk/nvmf.h" #include "spdk/nvmf_transport.h" -void spdk_nvmf_transport_accept(struct spdk_nvmf_transport *transport, new_qpair_fn cb_fn, - void *cb_arg); +void nvmf_transport_accept(struct spdk_nvmf_transport *transport, new_qpair_fn cb_fn, + void *cb_arg); -void spdk_nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport, - struct spdk_nvme_transport_id *trid, - struct spdk_nvmf_discovery_log_page_entry *entry); +void nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport, + struct spdk_nvme_transport_id *trid, + struct spdk_nvmf_discovery_log_page_entry *entry); -struct spdk_nvmf_transport_poll_group *spdk_nvmf_transport_poll_group_create( +struct spdk_nvmf_transport_poll_group *nvmf_transport_poll_group_create( struct spdk_nvmf_transport *transport); -struct spdk_nvmf_transport_poll_group *spdk_nvmf_transport_get_optimal_poll_group( +struct spdk_nvmf_transport_poll_group *nvmf_transport_get_optimal_poll_group( struct spdk_nvmf_transport *transport, struct spdk_nvmf_qpair *qpair); -void spdk_nvmf_transport_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group); +void nvmf_transport_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group); -int spdk_nvmf_transport_poll_group_add(struct spdk_nvmf_transport_poll_group *group, - struct spdk_nvmf_qpair *qpair); +int nvmf_transport_poll_group_add(struct spdk_nvmf_transport_poll_group *group, + struct spdk_nvmf_qpair *qpair); -int spdk_nvmf_transport_poll_group_remove(struct spdk_nvmf_transport_poll_group *group, - struct spdk_nvmf_qpair *qpair); +int nvmf_transport_poll_group_remove(struct spdk_nvmf_transport_poll_group *group, + struct spdk_nvmf_qpair *qpair); -int spdk_nvmf_transport_poll_group_poll(struct spdk_nvmf_transport_poll_group *group); +int nvmf_transport_poll_group_poll(struct spdk_nvmf_transport_poll_group *group); -int spdk_nvmf_transport_req_free(struct spdk_nvmf_request *req); +int nvmf_transport_req_free(struct spdk_nvmf_request *req); -int spdk_nvmf_transport_req_complete(struct spdk_nvmf_request *req); +int nvmf_transport_req_complete(struct spdk_nvmf_request *req); -void spdk_nvmf_transport_qpair_fini(struct spdk_nvmf_qpair *qpair); +void nvmf_transport_qpair_fini(struct spdk_nvmf_qpair *qpair); -int spdk_nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair, +int nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair, + struct spdk_nvme_transport_id *trid); + +int nvmf_transport_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair, + struct spdk_nvme_transport_id *trid); + +int nvmf_transport_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair, struct spdk_nvme_transport_id *trid); -int spdk_nvmf_transport_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair, - struct spdk_nvme_transport_id *trid); - -int spdk_nvmf_transport_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair, - struct spdk_nvme_transport_id *trid); - -bool spdk_nvmf_transport_opts_init(const char *transport_name, - struct spdk_nvmf_transport_opts *opts); - #endif /* SPDK_NVMF_TRANSPORT_H */ diff --git a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c index 5b2182b01..66b1bf654 100644 --- a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c +++ b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c @@ -167,7 +167,7 @@ DEFINE_STUB(nvmf_bdev_ctrlr_nvme_passthru_io, struct spdk_nvmf_request *req), 0); -DEFINE_STUB(spdk_nvmf_transport_req_complete, +DEFINE_STUB(nvmf_transport_req_complete, int, (struct spdk_nvmf_request *req), 0); diff --git a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c index c61686895..29e923de8 100644 --- a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c +++ b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c @@ -94,9 +94,9 @@ nvmf_transport_find_listener(struct spdk_nvmf_transport *transport, } void -spdk_nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport, - struct spdk_nvme_transport_id *trid, - struct spdk_nvmf_discovery_log_page_entry *entry) +nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport, + struct spdk_nvme_transport_id *trid, + struct spdk_nvmf_discovery_log_page_entry *entry) { entry->trtype = 42; } diff --git a/test/unit/lib/nvmf/fc.c/fc_ut.c b/test/unit/lib/nvmf/fc.c/fc_ut.c index a3a202c29..5ae1ac8e0 100644 --- a/test/unit/lib/nvmf/fc.c/fc_ut.c +++ b/test/unit/lib/nvmf/fc.c/fc_ut.c @@ -344,11 +344,11 @@ create_fc_port_test(void) init_args.io_queues = (void *)lld_q; set_thread(0); - err = spdk_nvmf_fc_master_enqueue_event(SPDK_FC_HW_PORT_INIT, (void *)&init_args, port_init_cb); + err = nvmf_fc_master_enqueue_event(SPDK_FC_HW_PORT_INIT, (void *)&init_args, port_init_cb); CU_ASSERT(err == 0); poll_thread(0); - fc_port = spdk_nvmf_fc_port_lookup(g_fc_port_handle); + fc_port = nvmf_fc_port_lookup(g_fc_port_handle); CU_ASSERT(fc_port != NULL); } @@ -361,12 +361,12 @@ online_fc_port_test(void) SPDK_CU_ASSERT_FATAL(g_nvmf_tprt != NULL); - fc_port = spdk_nvmf_fc_port_lookup(g_fc_port_handle); + fc_port = nvmf_fc_port_lookup(g_fc_port_handle); SPDK_CU_ASSERT_FATAL(fc_port != NULL); set_thread(0); args.port_handle = g_fc_port_handle; - err = spdk_nvmf_fc_master_enqueue_event(SPDK_FC_HW_PORT_ONLINE, (void *)&args, port_init_cb); + err = nvmf_fc_master_enqueue_event(SPDK_FC_HW_PORT_ONLINE, (void *)&args, port_init_cb); CU_ASSERT(err == 0); poll_threads(); set_thread(0); @@ -406,7 +406,7 @@ poll_group_poll_test(void) SPDK_CU_ASSERT_FATAL(g_nvmf_tprt != NULL); set_thread(0); - fc_port = spdk_nvmf_fc_port_lookup(g_fc_port_handle); + fc_port = nvmf_fc_port_lookup(g_fc_port_handle); SPDK_CU_ASSERT_FATAL(fc_port != NULL); for (i = 0; i < fc_port->num_io_queues; i++) { @@ -432,11 +432,11 @@ remove_hwqps_from_poll_groups_test(void) SPDK_CU_ASSERT_FATAL(g_nvmf_tprt != NULL); - fc_port = spdk_nvmf_fc_port_lookup(g_fc_port_handle); + fc_port = nvmf_fc_port_lookup(g_fc_port_handle); SPDK_CU_ASSERT_FATAL(fc_port != NULL); for (i = 0; i < fc_port->num_io_queues; i++) { - spdk_nvmf_fc_poll_group_remove_hwqp(&fc_port->io_queues[i]); + nvmf_fc_poll_group_remove_hwqp(&fc_port->io_queues[i]); poll_threads(); CU_ASSERT(fc_port->io_queues[i].fgroup == 0); } diff --git a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c index 22a84c4c7..ac78df568 100644 --- a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c +++ b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c @@ -77,14 +77,11 @@ static struct spdk_nvmf_transport_opts g_nvmf_transport_opts = { static uint32_t g_hw_queue_depth = 1024; static struct spdk_nvmf_subsystem g_nvmf_subsystem; - -int spdk_nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *g_tgt_port, - struct spdk_nvmf_fc_ls_rqst *ls_rqst); -void spdk_nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts, - spdk_nvmf_fc_caller_cb cb, void *cb_args); +void nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts, + spdk_nvmf_fc_caller_cb cb, void *cb_args); void spdk_bdev_io_abort(struct spdk_bdev_io *bdev_io, void *ctx); -void spdk_nvmf_fc_request_abort_complete(void *arg1); -bool spdk_nvmf_fc_req_in_xfer(struct spdk_nvmf_fc_request *fc_req); +void nvmf_fc_request_abort_complete(void *arg1); +bool nvmf_fc_req_in_xfer(struct spdk_nvmf_fc_request *fc_req); struct spdk_nvmf_subsystem * spdk_nvmf_tgt_find_subsystem(struct spdk_nvmf_tgt *tgt, const char *subnqn) @@ -177,7 +174,7 @@ new_qpair(struct spdk_nvmf_qpair *qpair, void *cb_arg) fc_conn->fc_assoc->assoc_id = fc_conn->conn_id; } - spdk_nvmf_fc_poller_api_func(sel_hwqp, SPDK_NVMF_FC_POLLER_API_ADD_CONNECTION, &api_data->args); + nvmf_fc_poller_api_func(sel_hwqp, SPDK_NVMF_FC_POLLER_API_ADD_CONNECTION, &api_data->args); return; err: @@ -186,7 +183,7 @@ err: } struct spdk_nvmf_fc_conn * -spdk_nvmf_fc_hwqp_find_fc_conn(struct spdk_nvmf_fc_hwqp *hwqp, uint64_t conn_id) +nvmf_fc_hwqp_find_fc_conn(struct spdk_nvmf_fc_hwqp *hwqp, uint64_t conn_id) { struct spdk_nvmf_fc_conn *fc_conn; @@ -279,12 +276,6 @@ nvmf_fc_free_srsr_bufs(struct spdk_nvmf_fc_srsr_bufs *srsr_bufs) } } -int -nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *tgtport, struct spdk_nvmf_fc_ls_rqst *ls_rqst) -{ - return spdk_nvmf_fc_xmt_ls_rsp(tgtport, ls_rqst); -} - /* * The Tests */ @@ -341,7 +332,7 @@ run_create_assoc_test(const char *subnqn, ls_rqst.rport = &g_rem_port; ls_rqst.nvmf_tgt = &g_nvmf_tgt; - spdk_nvmf_fc_handle_ls_rqst(&ls_rqst); + nvmf_fc_handle_ls_rqst(&ls_rqst); poll_thread(0); } @@ -391,7 +382,7 @@ run_create_conn_test(struct spdk_nvmf_host *host, ls_rqst.rport = &g_rem_port; ls_rqst.nvmf_tgt = &g_nvmf_tgt; - spdk_nvmf_fc_handle_ls_rqst(&ls_rqst); + nvmf_fc_handle_ls_rqst(&ls_rqst); poll_thread(0); } @@ -435,7 +426,7 @@ run_disconn_test(struct spdk_nvmf_fc_nport *tgt_port, ls_rqst.rport = &g_rem_port; ls_rqst.nvmf_tgt = &g_nvmf_tgt; - spdk_nvmf_fc_handle_ls_rqst(&ls_rqst); + nvmf_fc_handle_ls_rqst(&ls_rqst); poll_thread(0); } @@ -713,7 +704,7 @@ ls_tests_init(void) hwqp->fgroup = &g_fgroup[i]; } - spdk_nvmf_fc_ls_init(&g_fc_port); + nvmf_fc_ls_init(&g_fc_port); bzero(&g_tgt_port, sizeof(struct spdk_nvmf_fc_nport)); g_tgt_port.fc_port = &g_fc_port; TAILQ_INIT(&g_tgt_port.rem_port_list); @@ -728,7 +719,7 @@ ls_tests_init(void) static int ls_tests_fini(void) { - spdk_nvmf_fc_ls_fini(&g_fc_port); + nvmf_fc_ls_fini(&g_fc_port); free_threads(); return 0; } @@ -829,8 +820,8 @@ create_max_aq_conns_test(void) for (i = 0; i < create_assoc_test_cnt; i++) { int ret; g_spdk_nvmf_fc_xmt_srsr_req = false; - ret = spdk_nvmf_fc_delete_association(&g_tgt_port, from_be64(&assoc_id[i]), true, false, - disconnect_assoc_cb, 0); + ret = nvmf_fc_delete_association(&g_tgt_port, from_be64(&assoc_id[i]), true, false, + disconnect_assoc_cb, 0); CU_ASSERT(ret == 0); poll_thread(0); @@ -869,8 +860,8 @@ disconnect_bad_assoc_test(void) */ int -spdk_nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *g_tgt_port, - struct spdk_nvmf_fc_ls_rqst *ls_rqst) +nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *g_tgt_port, + struct spdk_nvmf_fc_ls_rqst *ls_rqst) { switch (g_test_run_type) { case TEST_RUN_TYPE_CREATE_ASSOC: @@ -904,9 +895,9 @@ spdk_nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *g_tgt_port, } int -spdk_nvmf_fc_xmt_srsr_req(struct spdk_nvmf_fc_hwqp *hwqp, - struct spdk_nvmf_fc_srsr_bufs *srsr_bufs, - spdk_nvmf_fc_caller_cb cb, void *cb_args) +nvmf_fc_xmt_srsr_req(struct spdk_nvmf_fc_hwqp *hwqp, + struct spdk_nvmf_fc_srsr_bufs *srsr_bufs, + spdk_nvmf_fc_caller_cb cb, void *cb_args) { struct spdk_nvmf_fc_ls_disconnect_rqst *dc_rqst = (struct spdk_nvmf_fc_ls_disconnect_rqst *) @@ -931,10 +922,10 @@ spdk_nvmf_fc_xmt_srsr_req(struct spdk_nvmf_fc_hwqp *hwqp, return 0; } -DEFINE_STUB_V(spdk_nvmf_fc_request_abort, (struct spdk_nvmf_fc_request *fc_req, - bool send_abts, spdk_nvmf_fc_caller_cb cb, void *cb_args)); +DEFINE_STUB_V(nvmf_fc_request_abort, (struct spdk_nvmf_fc_request *fc_req, + bool send_abts, spdk_nvmf_fc_caller_cb cb, void *cb_args)); DEFINE_STUB_V(spdk_bdev_io_abort, (struct spdk_bdev_io *bdev_io, void *ctx)); -DEFINE_STUB_V(spdk_nvmf_fc_request_abort_complete, (void *arg1)); +DEFINE_STUB_V(nvmf_fc_request_abort_complete, (void *arg1)); static void usage(const char *program_name) diff --git a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c index d83cffb25..149c22da1 100644 --- a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c +++ b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c @@ -72,9 +72,9 @@ spdk_nvmf_transport_listen(struct spdk_nvmf_transport *transport, } void -spdk_nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport, - struct spdk_nvme_transport_id *trid, - struct spdk_nvmf_discovery_log_page_entry *entry) +nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport, + struct spdk_nvme_transport_id *trid, + struct spdk_nvmf_discovery_log_page_entry *entry) { entry->trtype = 42; } diff --git a/test/unit/lib/nvmf/tcp.c/tcp_ut.c b/test/unit/lib/nvmf/tcp.c/tcp_ut.c index 2c1a6de2a..d82402926 100644 --- a/test/unit/lib/nvmf/tcp.c/tcp_ut.c +++ b/test/unit/lib/nvmf/tcp.c/tcp_ut.c @@ -168,7 +168,7 @@ DEFINE_STUB(nvmf_bdev_ctrlr_get_dif_ctx, (struct spdk_bdev *bdev, struct spdk_nvme_cmd *cmd, struct spdk_dif_ctx *dif_ctx), false); -DEFINE_STUB(spdk_nvmf_transport_req_complete, +DEFINE_STUB(nvmf_transport_req_complete, int, (struct spdk_nvmf_request *req), 0);