From 9f860cc4b4d79764b3fc88cff08ffbe81c3ea6ed Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 3 Nov 2016 16:50:16 +0800 Subject: [PATCH] nvme: replace trace log with error log for error conditions Change-Id: I634573f8d9b5ed05d850960f8c45c10d96fa3a7a Signed-off-by: Changpeng Liu --- lib/nvme/nvme_ctrlr.c | 40 ++++++++++++++++++++-------------------- lib/nvme/nvme_pcie.c | 14 +++++++------- lib/nvme/nvme_qpair.c | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index b811c5773..4b1036a7e 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -90,7 +90,7 @@ spdk_nvme_ctrlr_alloc_io_qpair(struct spdk_nvme_ctrlr *ctrlr, union spdk_nvme_cc_register cc; if (nvme_ctrlr_get_cc(ctrlr, &cc)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "get_cc failed\n"); + SPDK_ERRLOG("get_cc failed\n"); return NULL; } @@ -115,14 +115,14 @@ spdk_nvme_ctrlr_alloc_io_qpair(struct spdk_nvme_ctrlr *ctrlr, */ qid = spdk_bit_array_find_first_set(ctrlr->free_io_qids, 1); if (qid > ctrlr->opts.num_io_queues) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "No free I/O queue IDs\n"); + SPDK_ERRLOG("No free I/O queue IDs\n"); pthread_mutex_unlock(&ctrlr->ctrlr_lock); return NULL; } qpair = ctrlr->transport->ctrlr_create_io_qpair(ctrlr, qid, qprio); if (qpair == NULL) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "transport->ctrlr_create_io_qpair() failed\n"); + SPDK_ERRLOG("transport->ctrlr_create_io_qpair() failed\n"); pthread_mutex_unlock(&ctrlr->ctrlr_lock); return NULL; } @@ -307,14 +307,14 @@ nvme_ctrlr_shutdown(struct spdk_nvme_ctrlr *ctrlr) int ms_waited = 0; if (nvme_ctrlr_get_cc(ctrlr, &cc)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "get_cc() failed\n"); + SPDK_ERRLOG("get_cc() failed\n"); return; } cc.bits.shn = SPDK_NVME_SHN_NORMAL; if (nvme_ctrlr_set_cc(ctrlr, &cc)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "set_cc() failed\n"); + SPDK_ERRLOG("set_cc() failed\n"); return; } @@ -326,7 +326,7 @@ nvme_ctrlr_shutdown(struct spdk_nvme_ctrlr *ctrlr) */ do { if (nvme_ctrlr_get_csts(ctrlr, &csts)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "get_csts() failed\n"); + SPDK_ERRLOG("get_csts() failed\n"); return; } @@ -350,12 +350,12 @@ nvme_ctrlr_enable(struct spdk_nvme_ctrlr *ctrlr) rc = ctrlr->transport->ctrlr_enable(ctrlr); if (rc != 0) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "transport ctrlr_enable failed\n"); + SPDK_ERRLOG("transport ctrlr_enable failed\n"); return rc; } if (nvme_ctrlr_get_cc(ctrlr, &cc)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "get_cc() failed\n"); + SPDK_ERRLOG("get_cc() failed\n"); return -EIO; } @@ -393,7 +393,7 @@ nvme_ctrlr_enable(struct spdk_nvme_ctrlr *ctrlr) cc.bits.ams = ctrlr->opts.arb_mechanism; if (nvme_ctrlr_set_cc(ctrlr, &cc)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "set_cc() failed\n"); + SPDK_ERRLOG("set_cc() failed\n"); return -EIO; } @@ -586,7 +586,7 @@ nvme_ctrlr_set_keep_alive_timeout(struct spdk_nvme_ctrlr *ctrlr) ctrlr->opts.keep_alive_timeout_ms, 0, NULL, 0, nvme_completion_poll_cb, &status); if (rc != 0) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "Keep alive timeout Set Feature failed: %d\n", rc); + SPDK_ERRLOG("Keep alive timeout Set Feature failed: %d\n", rc); ctrlr->opts.keep_alive_timeout_ms = 0; return rc; } @@ -595,8 +595,8 @@ nvme_ctrlr_set_keep_alive_timeout(struct spdk_nvme_ctrlr *ctrlr) spdk_nvme_qpair_process_completions(ctrlr->adminq, 0); } if (spdk_nvme_cpl_is_error(&status.cpl)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "Keep alive timeout Set Feature failed: SC %x SCT %x\n", - status.cpl.status.sc, status.cpl.status.sct); + SPDK_ERRLOG("Keep alive timeout Set Feature failed: SC %x SCT %x\n", + status.cpl.status.sc, status.cpl.status.sct); ctrlr->opts.keep_alive_timeout_ms = 0; return -ENXIO; } @@ -605,7 +605,7 @@ nvme_ctrlr_set_keep_alive_timeout(struct spdk_nvme_ctrlr *ctrlr) rc = spdk_nvme_ctrlr_cmd_get_feature(ctrlr, SPDK_NVME_FEAT_KEEP_ALIVE_TIMER, 0, NULL, 0, nvme_completion_poll_cb, &status); if (rc != 0) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "Keep alive timeout Get Feature failed: %d\n", rc); + SPDK_ERRLOG("Keep alive timeout Get Feature failed: %d\n", rc); ctrlr->opts.keep_alive_timeout_ms = 0; return rc; } @@ -614,8 +614,8 @@ nvme_ctrlr_set_keep_alive_timeout(struct spdk_nvme_ctrlr *ctrlr) spdk_nvme_qpair_process_completions(ctrlr->adminq, 0); } if (spdk_nvme_cpl_is_error(&status.cpl)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "Keep alive timeout Get Feature failed: SC %x SCT %x\n", - status.cpl.status.sc, status.cpl.status.sct); + SPDK_ERRLOG("Keep alive timeout Get Feature failed: SC %x SCT %x\n", + status.cpl.status.sc, status.cpl.status.sct); ctrlr->opts.keep_alive_timeout_ms = 0; return -ENXIO; } @@ -872,7 +872,7 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) if (nvme_ctrlr_get_cc(ctrlr, &cc) || nvme_ctrlr_get_csts(ctrlr, &csts)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "get registers failed\n"); + SPDK_ERRLOG("get registers failed\n"); nvme_ctrlr_fail(ctrlr); return -EIO; } @@ -900,7 +900,7 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) /* CC.EN = 1 && CSTS.RDY == 1, so we can immediately disable the controller. */ cc.bits.en = 0; if (nvme_ctrlr_set_cc(ctrlr, &cc)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "set_cc() failed\n"); + SPDK_ERRLOG("set_cc() failed\n"); nvme_ctrlr_fail(ctrlr); return -EIO; } @@ -938,7 +938,7 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) /* CC.EN = 1 && CSTS.RDY = 1, so we can set CC.EN = 0 now. */ cc.bits.en = 0; if (nvme_ctrlr_set_cc(ctrlr, &cc)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "set_cc() failed\n"); + SPDK_ERRLOG("set_cc() failed\n"); nvme_ctrlr_fail(ctrlr); return -EIO; } @@ -1015,7 +1015,7 @@ nvme_ctrlr_start(struct spdk_nvme_ctrlr *ctrlr) } if (nvme_ctrlr_set_keep_alive_timeout(ctrlr) != 0) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "Setting keep alive timeout failed\n"); + SPDK_ERRLOG("Setting keep alive timeout failed\n"); return -1; } @@ -1132,7 +1132,7 @@ nvme_ctrlr_keep_alive(struct spdk_nvme_ctrlr *ctrlr) rc = nvme_ctrlr_submit_admin_request(ctrlr, req); if (rc != 0) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "Submitting Keep Alive failed\n"); + SPDK_ERRLOG("Submitting Keep Alive failed\n"); } ctrlr->next_keep_alive_tick = now + ctrlr->keep_alive_interval_ticks; diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c index 02ae93c3f..923625c6e 100644 --- a/lib/nvme/nvme_pcie.c +++ b/lib/nvme/nvme_pcie.c @@ -288,7 +288,7 @@ nvme_pcie_ctrlr_map_cmb(struct nvme_pcie_ctrlr *pctrlr) if (nvme_pcie_ctrlr_get_cmbsz(pctrlr, &cmbsz) || nvme_pcie_ctrlr_get_cmbloc(pctrlr, &cmbloc)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "get registers failed\n"); + SPDK_ERRLOG("get registers failed\n"); goto exit; } @@ -346,7 +346,7 @@ nvme_pcie_ctrlr_unmap_cmb(struct nvme_pcie_ctrlr *pctrlr) if (addr) { if (nvme_pcie_ctrlr_get_cmbloc(pctrlr, &cmbloc)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "get_cmbloc() failed\n"); + SPDK_ERRLOG("get_cmbloc() failed\n"); return -EIO; } rc = spdk_pci_device_unmap_bar(pctrlr->ctrlr.devhandle, cmbloc.bits.bir, addr); @@ -460,7 +460,7 @@ static struct spdk_nvme_ctrlr *nvme_pcie_ctrlr_construct(void *devhandle) spdk_pci_device_cfg_write32(pci_dev, cmd_reg, 4); if (nvme_ctrlr_get_cap(&pctrlr->ctrlr, &cap)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "get_cap() failed\n"); + SPDK_ERRLOG("get_cap() failed\n"); spdk_free(pctrlr); return NULL; } @@ -507,12 +507,12 @@ nvme_pcie_ctrlr_enable(struct spdk_nvme_ctrlr *ctrlr) union spdk_nvme_aqa_register aqa; if (nvme_pcie_ctrlr_set_asq(pctrlr, padminq->cmd_bus_addr)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "set_asq() failed\n"); + SPDK_ERRLOG("set_asq() failed\n"); return -EIO; } if (nvme_pcie_ctrlr_set_acq(pctrlr, padminq->cpl_bus_addr)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "set_acq() failed\n"); + SPDK_ERRLOG("set_acq() failed\n"); return -EIO; } @@ -522,7 +522,7 @@ nvme_pcie_ctrlr_enable(struct spdk_nvme_ctrlr *ctrlr) aqa.bits.asqs = ctrlr->adminq->num_entries - 1; if (nvme_pcie_ctrlr_set_aqa(pctrlr, &aqa)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "set_aqa() failed\n"); + SPDK_ERRLOG("set_aqa() failed\n"); return -EIO; } @@ -1175,7 +1175,7 @@ nvme_pcie_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid, rc = _nvme_pcie_ctrlr_create_io_qpair(ctrlr, qpair, qid); if (rc != 0) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "I/O queue creation failed\n"); + SPDK_ERRLOG("I/O queue creation failed\n"); free(pqpair); return NULL; } diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c index 60a327f70..440ab1911 100644 --- a/lib/nvme/nvme_qpair.c +++ b/lib/nvme/nvme_qpair.c @@ -351,7 +351,7 @@ nvme_qpair_construct(struct spdk_nvme_qpair *qpair, uint16_t id, STAILQ_INIT(&qpair->queued_req); if (qpair->transport->qpair_construct(qpair)) { - SPDK_TRACELOG(SPDK_TRACE_NVME, "qpair_construct() failed\n"); + SPDK_ERRLOG("qpair_construct() failed\n"); nvme_qpair_destroy(qpair); return -1; }