| Message ID | 20210222070615.9177-2-its@irrelevant.dk |
|---|---|
| State | New |
| Headers | show |
| Series | hw/block/nvme: misc fixes | expand |
On 21-02-22 08:06:13, Klaus Jensen wrote: > From: Gollu Appalanaidu <anaidu.gollu@samsung.com> > > Remove an unnecessary le_to_cpu conversion and add trace event for > Identify. > > Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com> > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > --- > hw/block/nvme.c | 5 ++++- > hw/block/trace-events | 1 + > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index 1cd82fa3c9fe..ddc83f7f7a19 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -3415,7 +3415,10 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequest *req) > { > NvmeIdentify *c = (NvmeIdentify *)&req->cmd; > > - switch (le32_to_cpu(c->cns)) { > + trace_pci_nvme_identify(nvme_cid(req), c->cns, le16_to_cpu(c->ctrlid), > + c->csi); I think it would be great if it can be separated into two. Anyway, changes look good to me. Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com> > + > + switch (c->cns) { > case NVME_ID_CNS_NS: > /* fall through */ > case NVME_ID_CNS_NS_PRESENT: > diff --git a/hw/block/trace-events b/hw/block/trace-events > index b04f7a3e1890..1f958d09d2a9 100644 > --- a/hw/block/trace-events > +++ b/hw/block/trace-events > @@ -61,6 +61,7 @@ pci_nvme_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, > pci_nvme_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, uint16_t qflags, int ien) "create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16", ien=%d" > pci_nvme_del_sq(uint16_t qid) "deleting submission queue sqid=%"PRIu16"" > pci_nvme_del_cq(uint16_t cqid) "deleted completion queue, cqid=%"PRIu16"" > +pci_nvme_identify(uint16_t cid, uint8_t cns, uint16_t ctrlid, uint8_t csi) "cid %"PRIu16" cns 0x%"PRIx8" ctrlid %"PRIu16" csi 0x%"PRIx8"" > pci_nvme_identify_ctrl(void) "identify controller" > pci_nvme_identify_ctrl_csi(uint8_t csi) "identify controller, csi=0x%"PRIx8"" > pci_nvme_identify_ns(uint32_t ns) "nsid %"PRIu32"" > -- > 2.30.1 > >
On 2/22/21 1:00 PM, Minwoo Im wrote: > On 21-02-22 08:06:13, Klaus Jensen wrote: >> From: Gollu Appalanaidu <anaidu.gollu@samsung.com> >> >> Remove an unnecessary le_to_cpu conversion and add trace event for >> Identify. >> >> Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com> >> Signed-off-by: Klaus Jensen <k.jensen@samsung.com> >> --- >> hw/block/nvme.c | 5 ++++- >> hw/block/trace-events | 1 + >> 2 files changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/hw/block/nvme.c b/hw/block/nvme.c >> index 1cd82fa3c9fe..ddc83f7f7a19 100644 >> --- a/hw/block/nvme.c >> +++ b/hw/block/nvme.c >> @@ -3415,7 +3415,10 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequest *req) >> { >> NvmeIdentify *c = (NvmeIdentify *)&req->cmd; >> >> - switch (le32_to_cpu(c->cns)) { >> + trace_pci_nvme_identify(nvme_cid(req), c->cns, le16_to_cpu(c->ctrlid), >> + c->csi); > > I think it would be great if it can be separated into two. Agreed. > Anyway, changes look good to me. > > Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 1cd82fa3c9fe..ddc83f7f7a19 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -3415,7 +3415,10 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeRequest *req) { NvmeIdentify *c = (NvmeIdentify *)&req->cmd; - switch (le32_to_cpu(c->cns)) { + trace_pci_nvme_identify(nvme_cid(req), c->cns, le16_to_cpu(c->ctrlid), + c->csi); + + switch (c->cns) { case NVME_ID_CNS_NS: /* fall through */ case NVME_ID_CNS_NS_PRESENT: diff --git a/hw/block/trace-events b/hw/block/trace-events index b04f7a3e1890..1f958d09d2a9 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -61,6 +61,7 @@ pci_nvme_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, pci_nvme_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, uint16_t qflags, int ien) "create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16", ien=%d" pci_nvme_del_sq(uint16_t qid) "deleting submission queue sqid=%"PRIu16"" pci_nvme_del_cq(uint16_t cqid) "deleted completion queue, cqid=%"PRIu16"" +pci_nvme_identify(uint16_t cid, uint8_t cns, uint16_t ctrlid, uint8_t csi) "cid %"PRIu16" cns 0x%"PRIx8" ctrlid %"PRIu16" csi 0x%"PRIx8"" pci_nvme_identify_ctrl(void) "identify controller" pci_nvme_identify_ctrl_csi(uint8_t csi) "identify controller, csi=0x%"PRIx8"" pci_nvme_identify_ns(uint32_t ns) "nsid %"PRIu32""