From 5de5ca05eb6d2d244368c7546678336012bcb054 Mon Sep 17 00:00:00 2001 From: Klaus Jensen Date: Wed, 8 Mar 2023 11:57:15 +0100 Subject: [PATCH] hw/nvme: add trace event for abort Add a descriptive trace event for the Abort command. Signed-off-by: Klaus Jensen --- hw/nvme/ctrl.c | 6 +++++- hw/nvme/trace-events | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index c581106b06..920f7087d3 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -5713,7 +5713,11 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequest *req) static uint16_t nvme_abort(NvmeCtrl *n, NvmeRequest *req) { - uint16_t sqid = le32_to_cpu(req->cmd.cdw10) & 0xffff; + uint32_t dw10 = le32_to_cpu(req->cmd.cdw10); + uint16_t sqid = dw10 & 0xffff; + uint16_t cid = (dw10 >> 16) & 0xffff; + + trace_pci_nvme_abort(sqid, cid); req->cqe.result = 1; if (nvme_check_sqid(n, sqid)) { diff --git a/hw/nvme/trace-events b/hw/nvme/trace-events index 7a982b8313..c360914ffe 100644 --- a/hw/nvme/trace-events +++ b/hw/nvme/trace-events @@ -119,6 +119,7 @@ pci_nvme_zoned_zrwa_implicit_flush(uint64_t zslba, uint32_t nlb) "zslba 0x%"PRIx pci_nvme_pci_reset(void) "PCI Function Level Reset" pci_nvme_virt_mngmt(uint16_t cid, uint16_t act, uint16_t cntlid, const char* rt, uint16_t nr) "cid %"PRIu16", act=0x%"PRIx16", ctrlid=%"PRIu16" %s nr=%"PRIu16"" pci_nvme_fdp_ruh_change(uint16_t rgid, uint16_t ruhid) "change RU on RUH rgid=%"PRIu16", ruhid=%"PRIu16"" +pci_nvme_abort(uint16_t sqid, uint16_t cid) "sqid %"PRIu16" cid %"PRIu16"" # error conditions pci_nvme_err_mdts(size_t len) "len %zu" -- 2.50.1