From: Klaus Jensen <its@irrelevant.dk>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
Klaus Jensen <k.jensen@samsung.com>,
Max Reitz <mreitz@redhat.com>, Klaus Jensen <its@irrelevant.dk>,
Keith Busch <kbusch@kernel.org>
Subject: [PATCH v2 06/17] hw/block/nvme: add a lba to bytes helper
Date: Fri, 18 Sep 2020 22:36:10 +0200 [thread overview]
Message-ID: <20200918203621.602915-7-its@irrelevant.dk> (raw)
In-Reply-To: <20200918203621.602915-1-its@irrelevant.dk>
From: Klaus Jensen <k.jensen@samsung.com>
Add the nvme_l2b helper and use it for converting NLB and SLBA to byte
counts and offsets.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/block/nvme.h | 6 ++++++
hw/block/nvme.c | 12 ++++--------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/hw/block/nvme.h b/hw/block/nvme.h
index 52ba794f2e9a..1675c1e0755c 100644
--- a/hw/block/nvme.h
+++ b/hw/block/nvme.h
@@ -77,6 +77,12 @@ static inline uint8_t nvme_ns_lbads(NvmeNamespace *ns)
return nvme_ns_lbaf(ns)->ds;
}
+/* convert an LBA to the equivalent in bytes */
+static inline size_t nvme_l2b(NvmeNamespace *ns, uint64_t lba)
+{
+ return lba << nvme_ns_lbads(ns);
+}
+
#define TYPE_NVME "nvme"
#define NVME(obj) \
OBJECT_CHECK(NvmeCtrl, (obj), TYPE_NVME)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 10568cbf8761..62db87460413 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -644,12 +644,10 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeRequest *req)
{
NvmeRwCmd *rw = (NvmeRwCmd *)&req->cmd;
NvmeNamespace *ns = req->ns;
- const uint8_t lba_index = NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas);
- const uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds;
uint64_t slba = le64_to_cpu(rw->slba);
uint32_t nlb = le16_to_cpu(rw->nlb) + 1;
- uint64_t offset = slba << data_shift;
- uint32_t count = nlb << data_shift;
+ uint64_t offset = nvme_l2b(ns, slba);
+ uint32_t count = nvme_l2b(ns, nlb);
uint16_t status;
trace_pci_nvme_write_zeroes(nvme_cid(req), slba, nlb);
@@ -674,10 +672,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req)
uint32_t nlb = le32_to_cpu(rw->nlb) + 1;
uint64_t slba = le64_to_cpu(rw->slba);
- uint8_t lba_index = NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas);
- uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds;
- uint64_t data_size = (uint64_t)nlb << data_shift;
- uint64_t data_offset = slba << data_shift;
+ uint64_t data_size = nvme_l2b(ns, nlb);
+ uint64_t data_offset = nvme_l2b(ns, slba);
int is_write = rw->opcode == NVME_CMD_WRITE ? 1 : 0;
enum BlockAcctType acct = is_write ? BLOCK_ACCT_WRITE : BLOCK_ACCT_READ;
uint16_t status;
--
2.28.0
next prev parent reply other threads:[~2020-09-18 20:51 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 20:36 [PATCH v2 00/17] hw/block/nvme: multiple namespaces support Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 01/17] hw/block/nvme: fix typo in trace event Klaus Jensen
2020-09-21 15:49 ` Philippe Mathieu-Daudé
2020-09-18 20:36 ` [PATCH v2 02/17] pci: pass along the return value of dma_memory_rw Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 03/17] hw/block/nvme: handle dma errors Klaus Jensen
2020-09-21 16:50 ` Keith Busch
2020-09-21 19:47 ` Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 04/17] hw/block/nvme: commonize nvme_rw error handling Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 05/17] hw/block/nvme: alignment style fixes Klaus Jensen
2020-09-18 20:36 ` Klaus Jensen [this message]
2020-09-18 20:36 ` [PATCH v2 07/17] hw/block/nvme: fix endian conversion Klaus Jensen
2020-09-21 15:51 ` Philippe Mathieu-Daudé
2020-09-18 20:36 ` [PATCH v2 08/17] hw/block/nvme: add symbolic command name to trace events Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 09/17] hw/block/nvme: refactor aio submission Klaus Jensen
2020-09-21 15:20 ` Keith Busch
2020-09-21 17:56 ` Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 10/17] hw/block/nvme: default request status to success Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 11/17] hw/block/nvme: harden cmb access Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 12/17] hw/block/nvme: add support for scatter gather lists Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 13/17] hw/block/nvme: add support for sgl bit bucket descriptor Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 14/17] hw/block/nvme: refactor identify active namespace id list Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 15/17] hw/block/nvme: support multiple namespaces Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 16/17] pci: allocate pci id for nvme Klaus Jensen
2020-09-18 20:36 ` [PATCH v2 17/17] hw/block/nvme: change controller pci id Klaus Jensen
2020-09-21 19:26 ` [PATCH v2 00/17] hw/block/nvme: multiple namespaces support Keith Busch
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=20200918203621.602915-7-its@irrelevant.dk \
--to=its@irrelevant.dk \
--cc=ehabkost@redhat.com \
--cc=k.jensen@samsung.com \
--cc=kbusch@kernel.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).