From: Jon Derrick <jonathan.derrick@intel.com> To: Stephen Bates <sbates@raithlin.com> Cc: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, axboe@fb.com, sagi@grimberg.me, james_p_freyensee@linux.intel.com Subject: Re: [PATCH 2/2] nvme: improve cmb sysfs reporting Date: Mon, 19 Dec 2016 08:42:56 -0700 [thread overview] Message-ID: <20161219154256.GB3512@localhost.localdomain> (raw) In-Reply-To: <1481914491-21456-3-git-send-email-sbates@raithlin.com> Minor nit below On Fri, Dec 16, 2016 at 11:54:51AM -0700, Stephen Bates wrote: > Add more information to the NVMe CMB sysfs entry. This includes > information about the CMB size, location and capabilities. > > Signed-off-by: Stephen Bates <sbates@raithlin.com> > --- > drivers/nvme/host/pci.c | 31 +++++++++++++++++++++++++++++-- > include/linux/nvme.h | 8 ++++++++ > 2 files changed, 37 insertions(+), 2 deletions(-) > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index be10860..1f70630 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -98,6 +98,7 @@ struct nvme_dev { > void __iomem *cmb; > dma_addr_t cmb_dma_addr; > u64 cmb_size; > + u64 cmb_offset; > u32 cmbsz; > u32 cmbloc; > struct nvme_ctrl ctrl; > @@ -1326,14 +1327,39 @@ static int nvme_create_io_queues(struct nvme_dev *dev) > return ret >= 0 ? 0 : ret; > } > > +static const char * const cmb_caps[] = { > + [NVME_CMB_CAP_SQS] = "SQS", > + [NVME_CMB_CAP_CQS] = "CQS", > + [NVME_CMB_CAP_LISTS] = "LISTS", > + [NVME_CMB_CAP_RDS] = "RDS", > + [NVME_CMB_CAP_WDS] = "WDS", > +}; > + > static ssize_t nvme_cmb_show(struct device *dev, > struct device_attribute *attr, > char *buf) > { > struct nvme_dev *ndev = to_nvme_dev(dev_get_drvdata(dev)); > + unsigned int i, len = 0; > + > + len += scnprintf(buf+len, PAGE_SIZE-len, > + "cmbloc : 0x%08x\ncmbsz : 0x%08x\n\n", > + ndev->cmbloc, ndev->cmbsz); > + > + len += scnprintf(buf+len, PAGE_SIZE-len, > + "OFFSET : 0x%016llx\nSIZE : %llu Bytes\n" \ > + "DMA ADDR : %pad\n\n", > + ndev->cmb_offset, ndev->cmb_size, > + &ndev->cmb_dma_addr); > + > + for (i = NVME_CMB_CAP_SQS; i <= NVME_CMB_CAP_WDS; i++) I'd prefer seeing (i = 0; i < ARRAY_SIZE(..); i++) because it provides automatic bounds checking against future code. > + len += scnprintf(buf+len, PAGE_SIZE-len, "%-7s: %s\n", > + cmb_caps[i], > + ((ndev->cmbsz) & (1<<i)) ? "SUPPORTED" : > + "NOT SUPPORTED"); > + > + return len; > > - return scnprintf(buf, PAGE_SIZE, "cmbloc : x%08x\ncmbsz : x%08x\n", > - ndev->cmbloc, ndev->cmbsz); > } > static DEVICE_ATTR(cmb, S_IRUGO, nvme_cmb_show, NULL); > > @@ -1376,6 +1402,7 @@ static void __iomem *nvme_map_cmb(struct nvme_dev *dev) > > dev->cmb_dma_addr = dma_addr; > dev->cmb_size = size; > + dev->cmb_offset = offset; > return cmb; > } > > diff --git a/include/linux/nvme.h b/include/linux/nvme.h > index fc3c242..cd0d324 100644 > --- a/include/linux/nvme.h > +++ b/include/linux/nvme.h > @@ -121,6 +121,14 @@ enum { > #define NVME_CMB_CQS(cmbsz) ((cmbsz) & 0x2) > #define NVME_CMB_SQS(cmbsz) ((cmbsz) & 0x1) > > +enum { > + NVME_CMB_CAP_SQS = 0, > + NVME_CMB_CAP_CQS, > + NVME_CMB_CAP_LISTS, > + NVME_CMB_CAP_RDS, > + NVME_CMB_CAP_WDS, > +}; > + > /* > * Submission and Completion Queue Entry Sizes for the NVM command set. > * (In bytes and specified as a power of two (2^n)). > -- > 2.1.4 >
WARNING: multiple messages have this Message-ID (diff)
From: jonathan.derrick@intel.com (Jon Derrick) Subject: [PATCH 2/2] nvme: improve cmb sysfs reporting Date: Mon, 19 Dec 2016 08:42:56 -0700 [thread overview] Message-ID: <20161219154256.GB3512@localhost.localdomain> (raw) In-Reply-To: <1481914491-21456-3-git-send-email-sbates@raithlin.com> Minor nit below On Fri, Dec 16, 2016@11:54:51AM -0700, Stephen Bates wrote: > Add more information to the NVMe CMB sysfs entry. This includes > information about the CMB size, location and capabilities. > > Signed-off-by: Stephen Bates <sbates at raithlin.com> > --- > drivers/nvme/host/pci.c | 31 +++++++++++++++++++++++++++++-- > include/linux/nvme.h | 8 ++++++++ > 2 files changed, 37 insertions(+), 2 deletions(-) > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index be10860..1f70630 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -98,6 +98,7 @@ struct nvme_dev { > void __iomem *cmb; > dma_addr_t cmb_dma_addr; > u64 cmb_size; > + u64 cmb_offset; > u32 cmbsz; > u32 cmbloc; > struct nvme_ctrl ctrl; > @@ -1326,14 +1327,39 @@ static int nvme_create_io_queues(struct nvme_dev *dev) > return ret >= 0 ? 0 : ret; > } > > +static const char * const cmb_caps[] = { > + [NVME_CMB_CAP_SQS] = "SQS", > + [NVME_CMB_CAP_CQS] = "CQS", > + [NVME_CMB_CAP_LISTS] = "LISTS", > + [NVME_CMB_CAP_RDS] = "RDS", > + [NVME_CMB_CAP_WDS] = "WDS", > +}; > + > static ssize_t nvme_cmb_show(struct device *dev, > struct device_attribute *attr, > char *buf) > { > struct nvme_dev *ndev = to_nvme_dev(dev_get_drvdata(dev)); > + unsigned int i, len = 0; > + > + len += scnprintf(buf+len, PAGE_SIZE-len, > + "cmbloc : 0x%08x\ncmbsz : 0x%08x\n\n", > + ndev->cmbloc, ndev->cmbsz); > + > + len += scnprintf(buf+len, PAGE_SIZE-len, > + "OFFSET : 0x%016llx\nSIZE : %llu Bytes\n" \ > + "DMA ADDR : %pad\n\n", > + ndev->cmb_offset, ndev->cmb_size, > + &ndev->cmb_dma_addr); > + > + for (i = NVME_CMB_CAP_SQS; i <= NVME_CMB_CAP_WDS; i++) I'd prefer seeing (i = 0; i < ARRAY_SIZE(..); i++) because it provides automatic bounds checking against future code. > + len += scnprintf(buf+len, PAGE_SIZE-len, "%-7s: %s\n", > + cmb_caps[i], > + ((ndev->cmbsz) & (1<<i)) ? "SUPPORTED" : > + "NOT SUPPORTED"); > + > + return len; > > - return scnprintf(buf, PAGE_SIZE, "cmbloc : x%08x\ncmbsz : x%08x\n", > - ndev->cmbloc, ndev->cmbsz); > } > static DEVICE_ATTR(cmb, S_IRUGO, nvme_cmb_show, NULL); > > @@ -1376,6 +1402,7 @@ static void __iomem *nvme_map_cmb(struct nvme_dev *dev) > > dev->cmb_dma_addr = dma_addr; > dev->cmb_size = size; > + dev->cmb_offset = offset; > return cmb; > } > > diff --git a/include/linux/nvme.h b/include/linux/nvme.h > index fc3c242..cd0d324 100644 > --- a/include/linux/nvme.h > +++ b/include/linux/nvme.h > @@ -121,6 +121,14 @@ enum { > #define NVME_CMB_CQS(cmbsz) ((cmbsz) & 0x2) > #define NVME_CMB_SQS(cmbsz) ((cmbsz) & 0x1) > > +enum { > + NVME_CMB_CAP_SQS = 0, > + NVME_CMB_CAP_CQS, > + NVME_CMB_CAP_LISTS, > + NVME_CMB_CAP_RDS, > + NVME_CMB_CAP_WDS, > +}; > + > /* > * Submission and Completion Queue Entry Sizes for the NVM command set. > * (In bytes and specified as a power of two (2^n)). > -- > 2.1.4 >
next prev parent reply other threads:[~2016-12-19 15:42 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-16 18:54 [PATCH 0/2] nvme: Improvements in sysfs entry for NVMe CMBs Stephen Bates 2016-12-16 18:54 ` [PATCH 1/2] nvme : Use correct scnprintf in cmb show Stephen Bates 2016-12-19 15:20 ` Jon Derrick 2016-12-19 15:20 ` Jon Derrick 2016-12-16 18:54 ` [PATCH 2/2] nvme: improve cmb sysfs reporting Stephen Bates 2016-12-16 18:54 ` Stephen Bates 2016-12-16 18:54 ` Stephen Bates 2016-12-19 15:42 ` Jon Derrick [this message] 2016-12-19 15:42 ` Jon Derrick 2017-01-09 19:37 ` Stephen Bates 2017-01-09 19:37 ` Stephen Bates 2016-12-16 19:23 ` [PATCH 0/2] nvme: Improvements in sysfs entry for NVMe CMBs Jens Axboe 2016-12-16 19:23 ` Jens Axboe 2016-12-16 19:37 ` Stephen Bates 2016-12-16 19:37 ` Stephen Bates 2016-12-16 19:37 ` Stephen Bates 2016-12-19 15:36 ` Jens Axboe 2016-12-19 15:36 ` Jens Axboe 2016-12-19 15:36 ` Jens Axboe 2017-01-09 19:35 ` Stephen Bates 2017-01-09 19:35 ` Stephen Bates
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=20161219154256.GB3512@localhost.localdomain \ --to=jonathan.derrick@intel.com \ --cc=axboe@fb.com \ --cc=james_p_freyensee@linux.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=sbates@raithlin.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.