[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/17] hw/block/nvme: add nvme_check_rw helper
From: |
Klaus Jensen |
Subject: |
[PATCH 16/17] hw/block/nvme: add nvme_check_rw helper |
Date: |
Mon, 29 Jun 2020 21:50:16 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Move various request checks to a separate function.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/block/nvme.c | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index d836319f068a..ec08841f74b6 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -632,6 +632,28 @@ static inline uint16_t nvme_check_bounds(NvmeCtrl *n,
NvmeNamespace *ns,
return NVME_SUCCESS;
}
+static uint16_t nvme_check_rw(NvmeCtrl *n, NvmeRequest *req)
+{
+ NvmeNamespace *ns = req->ns;
+ size_t len = req->nlb << nvme_ns_lbads(ns);
+ uint16_t status;
+
+ status = nvme_check_mdts(n, len);
+ if (status) {
+ trace_pci_nvme_err_mdts(nvme_cid(req), len);
+ return status;
+ }
+
+ status = nvme_check_bounds(n, ns, req->slba, req->nlb);
+ if (status) {
+ trace_pci_nvme_err_invalid_lba_range(req->slba, req->nlb,
+ ns->id_ns.nsze);
+ return status;
+ }
+
+ return NVME_SUCCESS;
+}
+
static void nvme_rw_cb(NvmeRequest *req, void *opaque)
{
NvmeSQueue *sq = req->sq;
@@ -822,16 +844,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req)
trace_pci_nvme_rw(nvme_req_is_write(req) ? "write" : "read", req->nlb,
len, req->slba);
- status = nvme_check_mdts(n, len);
+ status = nvme_check_rw(n, req);
if (status) {
- trace_pci_nvme_err_mdts(nvme_cid(req), len);
- goto invalid;
- }
-
- status = nvme_check_bounds(n, ns, req->slba, req->nlb);
- if (status) {
- trace_pci_nvme_err_invalid_lba_range(req->slba, req->nlb,
- ns->id_ns.nsze);
goto invalid;
}
--
2.27.0
- [PATCH 01/17] hw/block/nvme: memset preallocated requests structures, (continued)
- [PATCH 01/17] hw/block/nvme: memset preallocated requests structures, Klaus Jensen, 2020/06/29
- [PATCH 04/17] hw/block/nvme: remove redundant has_sg member, Klaus Jensen, 2020/06/29
- [PATCH 05/17] hw/block/nvme: refactor dma read/write, Klaus Jensen, 2020/06/29
- [PATCH 02/17] hw/block/nvme: add mapping helpers, Klaus Jensen, 2020/06/29
- [PATCH 06/17] hw/block/nvme: pass request along for tracing, Klaus Jensen, 2020/06/29
- [PATCH 08/17] hw/block/nvme: verify validity of prp lists in the cmb, Klaus Jensen, 2020/06/29
- [PATCH 10/17] hw/block/nvme: add check for mdts, Klaus Jensen, 2020/06/29
- [PATCH 07/17] hw/block/nvme: add request mapping helper, Klaus Jensen, 2020/06/29
- [PATCH 09/17] hw/block/nvme: refactor request bounds checking, Klaus Jensen, 2020/06/29
- [PATCH 13/17] hw/block/nvme: consolidate qsg/iov clearing, Klaus Jensen, 2020/06/29
- [PATCH 16/17] hw/block/nvme: add nvme_check_rw helper,
Klaus Jensen <=
- [PATCH 14/17] hw/block/nvme: remove NvmeCmd parameter, Klaus Jensen, 2020/06/29
- [PATCH 11/17] hw/block/nvme: be consistent about zeros vs zeroes, Klaus Jensen, 2020/06/29
- [PATCH 17/17] hw/block/nvme: use preallocated qsg/iov in nvme_dma_prp, Klaus Jensen, 2020/06/29
- [PATCH 15/17] hw/block/nvme: allow multiple aios per command, Klaus Jensen, 2020/06/29
- [PATCH 12/17] hw/block/nvme: refactor NvmeRequest clearing, Klaus Jensen, 2020/06/29