From: Klaus Jensen <its@irrelevant.dk>
To: qemu-devel@nongnu.org
Cc: Fam Zheng <fam@euphon.net>, Kevin Wolf <kwolf@redhat.com>,
qemu-block@nongnu.org, Klaus Jensen <k.jensen@samsung.com>,
Max Reitz <mreitz@redhat.com>, Klaus Jensen <its@irrelevant.dk>,
Stefan Hajnoczi <stefanha@redhat.com>,
Keith Busch <kbusch@kernel.org>
Subject: [PATCH v2 01/12] hw/block/nvme: add size to mmio read/write trace events
Date: Mon, 18 Jan 2021 10:46:54 +0100 [thread overview]
Message-ID: <20210118094705.56772-2-its@irrelevant.dk> (raw)
In-Reply-To: <20210118094705.56772-1-its@irrelevant.dk>
From: Klaus Jensen <k.jensen@samsung.com>
Add the size of the mmio read/write to the trace event.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/block/nvme.c | 4 ++--
hw/block/trace-events | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 47da73ce2364..bd7e258c3c26 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -3840,7 +3840,7 @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr, unsigned size)
uint8_t *ptr = (uint8_t *)&n->bar;
uint64_t val = 0;
- trace_pci_nvme_mmio_read(addr);
+ trace_pci_nvme_mmio_read(addr, size);
if (unlikely(addr & (sizeof(uint32_t) - 1))) {
NVME_GUEST_ERR(pci_nvme_ub_mmiord_misaligned32,
@@ -4004,7 +4004,7 @@ static void nvme_mmio_write(void *opaque, hwaddr addr, uint64_t data,
{
NvmeCtrl *n = (NvmeCtrl *)opaque;
- trace_pci_nvme_mmio_write(addr, data);
+ trace_pci_nvme_mmio_write(addr, data, size);
if (addr < sizeof(n->bar)) {
nvme_write_bar(n, addr, data, size);
diff --git a/hw/block/trace-events b/hw/block/trace-events
index 78d76b0a71c1..a104d7f4da80 100644
--- a/hw/block/trace-events
+++ b/hw/block/trace-events
@@ -80,8 +80,8 @@ pci_nvme_enqueue_event_noqueue(int queued) "queued %d"
pci_nvme_enqueue_event_masked(uint8_t typ) "type 0x%"PRIx8""
pci_nvme_no_outstanding_aers(void) "ignoring event; no outstanding AERs"
pci_nvme_enqueue_req_completion(uint16_t cid, uint16_t cqid, uint16_t status) "cid %"PRIu16" cqid %"PRIu16" status 0x%"PRIx16""
-pci_nvme_mmio_read(uint64_t addr) "addr 0x%"PRIx64""
-pci_nvme_mmio_write(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64""
+pci_nvme_mmio_read(uint64_t addr, unsigned size) "addr 0x%"PRIx64" size %d"
+pci_nvme_mmio_write(uint64_t addr, uint64_t data, unsigned size) "addr 0x%"PRIx64" data 0x%"PRIx64" size %d"
pci_nvme_mmio_doorbell_cq(uint16_t cqid, uint16_t new_head) "cqid %"PRIu16" new_head %"PRIu16""
pci_nvme_mmio_doorbell_sq(uint16_t sqid, uint16_t new_tail) "sqid %"PRIu16" new_tail %"PRIu16""
pci_nvme_mmio_intm_set(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask set, data=0x%"PRIx64", new_mask=0x%"PRIx64""
--
2.30.0
next prev parent reply other threads:[~2021-01-18 9:51 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 9:46 [PATCH v2 00/12] hw/block/nvme: misc cmb/pmr patches and bump to v1.4 Klaus Jensen
2021-01-18 9:46 ` Klaus Jensen [this message]
2021-01-18 12:29 ` [PATCH v2 01/12] hw/block/nvme: add size to mmio read/write trace events Minwoo Im
2021-01-18 9:46 ` [PATCH v2 02/12] hw/block/nvme: fix 64 bit register hi/lo split writes Klaus Jensen
2021-01-18 12:41 ` Minwoo Im
2021-01-18 12:53 ` Klaus Jensen
2021-01-18 12:59 ` Minwoo Im
2021-01-18 19:53 ` Klaus Jensen
2021-01-19 2:09 ` Minwoo Im
2021-01-19 18:58 ` Keith Busch
2021-01-18 9:46 ` [PATCH v2 03/12] hw/block/nvme: indicate CMB support through controller capabilities register Klaus Jensen
2021-01-18 12:42 ` Minwoo Im
2021-01-18 9:46 ` [PATCH v2 04/12] hw/block/nvme: move msix table and pba to BAR 0 Klaus Jensen
2021-01-18 12:48 ` Minwoo Im
2021-01-18 9:46 ` [PATCH v2 05/12] hw/block/nvme: allow cmb and pmr to coexist Klaus Jensen
2021-01-18 12:50 ` Minwoo Im
2021-01-18 9:46 ` [PATCH v2 06/12] hw/block/nvme: rename PMR/CMB shift/mask fields Klaus Jensen
2021-01-18 12:52 ` Minwoo Im
2021-01-18 9:47 ` [PATCH v2 07/12] hw/block/nvme: remove redundant zeroing of PMR registers Klaus Jensen
2021-01-18 12:55 ` Minwoo Im
2021-01-18 13:02 ` Klaus Jensen
2021-01-18 9:47 ` [PATCH v2 08/12] hw/block/nvme: disable PMR at boot up Klaus Jensen
2021-01-18 9:47 ` [PATCH v2 09/12] hw/block/nvme: add PMR RDS/WDS support Klaus Jensen
2021-01-18 9:47 ` [PATCH v2 10/12] hw/block/nvme: move cmb logic to v1.4 Klaus Jensen
2021-01-18 12:58 ` Minwoo Im
2021-01-18 13:04 ` Klaus Jensen
2021-01-18 13:09 ` Minwoo Im
2021-01-18 13:10 ` Klaus Jensen
2021-01-18 13:12 ` Minwoo Im
2021-01-18 13:22 ` Klaus Jensen
2021-01-18 19:23 ` Klaus Jensen
2021-01-19 2:11 ` Minwoo Im
2021-01-18 9:47 ` [PATCH v2 11/12] hw/block/nvme: bump " Klaus Jensen
2021-01-18 9:47 ` [PATCH v2 12/12] hw/block/nvme: lift cmb restrictions Klaus Jensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210118094705.56772-2-its@irrelevant.dk \
--to=its@irrelevant.dk \
--cc=fam@euphon.net \
--cc=k.jensen@samsung.com \
--cc=kbusch@kernel.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).