From: "hch@lst.de" <hch@lst.de>
To: Keith Busch <keith.busch@intel.com>
Cc: yupeng <yupeng0921@gmail.com>,
"linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-nvme@lists.infradead.org" <linux-nvme@lists.infradead.org>,
"axboe@fb.com" <axboe@fb.com>, "hch@lst.de" <hch@lst.de>,
"sagi@grimberg.me" <sagi@grimberg.me>,
"jthumshirn@suse.de" <jthumshirn@suse.de>
Subject: Re: [PATCH v4 2/2] trace nvme submit queue status
Date: Tue, 18 Dec 2018 18:47:50 +0100 [thread overview]
Message-ID: <20181218174750.GA14416@lst.de> (raw)
In-Reply-To: <20181218172645.GB13768@localhost.localdomain>
On Tue, Dec 18, 2018 at 10:26:46AM -0700, Keith Busch wrote:
> No need for a space after the %s. __print_disk_name already appends a
> space if there's a disk name, and we don't want the extra space if there
> isn't one. Also, every other nvme trace has a ',' after each entry. Not
> a big deal, just minor format consistency.
Yeah. What about something like this incremental patch to make the
trace formatting and argument passing match what we otherwise do:
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 2477bd906904..5a0bf6a24d50 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1004,8 +1004,7 @@ static inline void nvme_handle_cqe(struct nvme_queue *nvmeq, u16 idx)
}
req = blk_mq_tag_to_rq(*nvmeq->tags, cqe->command_id);
- trace_nvme_sq(req->rq_disk, nvmeq->qid, le16_to_cpu(cqe->sq_head),
- nvmeq->sq_tail);
+ trace_nvme_sq(req, cqe->sq_head, nvmeq->sq_tail);
nvme_end_request(req, cqe->status, cqe->result);
}
diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h
index cf666709bc50..3564120aa7b3 100644
--- a/drivers/nvme/host/trace.h
+++ b/drivers/nvme/host/trace.h
@@ -185,22 +185,24 @@ TRACE_EVENT(nvme_async_event,
#undef aer_name
TRACE_EVENT(nvme_sq,
- TP_PROTO(void *rq_disk, int qid, int sq_head, int sq_tail),
- TP_ARGS(rq_disk, qid, sq_head, sq_tail),
+ TP_PROTO(struct request *req, __le16 sq_head, int sq_tail),
+ TP_ARGS(req, sq_head, sq_tail),
TP_STRUCT__entry(
+ __field(int, ctrl_id)
__array(char, disk, DISK_NAME_LEN)
__field(int, qid)
- __field(int, sq_head)
- __field(int, sq_tail)
+ __field(u16, sq_head)
+ __field(u16, sq_tail)
),
TP_fast_assign(
- __assign_disk_name(__entry->disk, rq_disk);
- __entry->qid = qid;
- __entry->sq_head = sq_head;
+ __entry->ctrl_id = nvme_req(req)->ctrl->instance;
+ __assign_disk_name(__entry->disk, req->rq_disk);
+ __entry->qid = nvme_req_qid(req);
+ __entry->sq_head = le16_to_cpu(sq_head);
__entry->sq_tail = sq_tail;
),
- TP_printk("nvme: %s qid=%d head=%d tail=%d",
- __print_disk_name(__entry->disk),
+ TP_printk("nvme%d: %sqid=%d, head=%u, tail=%u",
+ __entry->ctrl_id, __print_disk_name(__entry->disk),
__entry->qid, __entry->sq_head, __entry->sq_tail
)
);
next prev parent reply other threads:[~2018-12-18 17:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-18 4:51 [PATCH v4 1/2] export trace.c helper functions to other modules yupeng
2018-12-18 4:51 ` [PATCH v4 2/2] trace nvme submit queue status yupeng
2018-12-18 7:26 ` Sagi Grimberg
2018-12-18 7:44 ` peng yu
2018-12-18 17:03 ` Christoph Hellwig
2018-12-18 17:26 ` Keith Busch
2018-12-18 17:47 ` hch [this message]
2018-12-18 18:03 ` Keith Busch
2018-12-19 1:19 ` peng yu
2018-12-19 7:36 ` hch
2018-12-18 7:26 ` [PATCH v4 1/2] export trace.c helper functions to other modules Sagi Grimberg
2018-12-18 16:57 ` Christoph Hellwig
2018-12-18 16:58 ` Christoph Hellwig
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=20181218174750.GA14416@lst.de \
--to=hch@lst.de \
--cc=axboe@fb.com \
--cc=jthumshirn@suse.de \
--cc=keith.busch@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
--cc=yupeng0921@gmail.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).