From 7b05b29d48bfd4e454747a6819184c46a31f1f45 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 11 Aug 2022 11:40:15 +0000 Subject: [PATCH] nvme/pcie: use 4-byte trace arguments where possible Signed-off-by: Jim Harris Change-Id: I24c3fd545cadc403ac1f3589c6242a08a7a2f517 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14000 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Ben Walker Reviewed-by: Jacek Kalwas Reviewed-by: Tomasz Zawadzki --- lib/nvme/nvme_pcie_common.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/nvme/nvme_pcie_common.c b/lib/nvme/nvme_pcie_common.c index 3657d1f83..bf8a10c41 100644 --- a/lib/nvme/nvme_pcie_common.c +++ b/lib/nvme/nvme_pcie_common.c @@ -630,7 +630,8 @@ nvme_pcie_qpair_submit_tracker(struct spdk_nvme_qpair *qpair, struct nvme_tracke assert(req != NULL); spdk_trace_record(TRACE_NVME_PCIE_SUBMIT, qpair->id, 0, (uintptr_t)req, - req->cmd.cid, req->cmd.opc, req->cmd.cdw10, req->cmd.cdw11, req->cmd.cdw12); + (uint32_t)req->cmd.cid, (uint32_t)req->cmd.opc, + req->cmd.cdw10, req->cmd.cdw11, req->cmd.cdw12); if (req->cmd.fuse) { /* @@ -675,7 +676,8 @@ nvme_pcie_qpair_complete_tracker(struct spdk_nvme_qpair *qpair, struct nvme_trac req = tr->req; - spdk_trace_record(TRACE_NVME_PCIE_COMPLETE, qpair->id, 0, (uintptr_t)req, req->cmd.cid); + spdk_trace_record(TRACE_NVME_PCIE_COMPLETE, qpair->id, 0, (uintptr_t)req, + (uint32_t)req->cmd.cid); assert(req != NULL); @@ -1816,17 +1818,17 @@ SPDK_TRACE_REGISTER_FN(nvme_pcie, "nvme_pcie", TRACE_GROUP_NVME_PCIE) { "NVME_PCIE_SUBMIT", TRACE_NVME_PCIE_SUBMIT, OWNER_NVME_PCIE_QP, OBJECT_NVME_PCIE_TR, 1, - { { "cid", SPDK_TRACE_ARG_TYPE_INT, 8 }, - { "opc", SPDK_TRACE_ARG_TYPE_INT, 8 }, - { "dw10", SPDK_TRACE_ARG_TYPE_PTR, 8 }, - { "dw11", SPDK_TRACE_ARG_TYPE_PTR, 8 }, - { "dw12", SPDK_TRACE_ARG_TYPE_PTR, 8 } + { { "cid", SPDK_TRACE_ARG_TYPE_INT, 4 }, + { "opc", SPDK_TRACE_ARG_TYPE_INT, 4 }, + { "dw10", SPDK_TRACE_ARG_TYPE_PTR, 4 }, + { "dw11", SPDK_TRACE_ARG_TYPE_PTR, 4 }, + { "dw12", SPDK_TRACE_ARG_TYPE_PTR, 4 } } }, { "NVME_PCIE_COMPLETE", TRACE_NVME_PCIE_COMPLETE, OWNER_NVME_PCIE_QP, OBJECT_NVME_PCIE_TR, 0, - {{ "cid", SPDK_TRACE_ARG_TYPE_INT, 8 }} + {{ "cid", SPDK_TRACE_ARG_TYPE_INT, 4 }} }, };