[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/23] hw/nvme: remove assert from nvme_get_zone_by_slba
From: |
Klaus Jensen |
Subject: |
[PULL 12/23] hw/nvme: remove assert from nvme_get_zone_by_slba |
Date: |
Tue, 29 Jun 2021 20:47:32 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Make nvme_get_zone_by_slba() return NULL if the slba is out of range.
This allows the function to be used without guarding the call with a
call to nvme_check_bounds(), in preparation for the next patch.
Add asserts after calling nvme_get_zone_by_slba() instead.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
---
hw/nvme/ctrl.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 699919ad1ab1..a984b80a18f3 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -1542,7 +1542,10 @@ static inline NvmeZone
*nvme_get_zone_by_slba(NvmeNamespace *ns, uint64_t slba)
{
uint32_t zone_idx = nvme_zone_idx(ns, slba);
- assert(zone_idx < ns->num_zones);
+ if (zone_idx >= ns->num_zones) {
+ return NULL;
+ }
+
return &ns->zone_array[zone_idx];
}
@@ -1619,11 +1622,16 @@ static uint16_t nvme_check_zone_state_for_read(NvmeZone
*zone)
static uint16_t nvme_check_zone_read(NvmeNamespace *ns, uint64_t slba,
uint32_t nlb)
{
- NvmeZone *zone = nvme_get_zone_by_slba(ns, slba);
- uint64_t bndry = nvme_zone_rd_boundary(ns, zone);
- uint64_t end = slba + nlb;
+ NvmeZone *zone;
+ uint64_t bndry, end;
uint16_t status;
+ zone = nvme_get_zone_by_slba(ns, slba);
+ assert(zone);
+
+ bndry = nvme_zone_rd_boundary(ns, zone);
+ end = slba + nlb;
+
status = nvme_check_zone_state_for_read(zone);
if (status) {
;
@@ -1790,6 +1798,7 @@ static void nvme_finalize_zoned_write(NvmeNamespace *ns,
NvmeRequest *req)
slba = le64_to_cpu(rw->slba);
nlb = le16_to_cpu(rw->nlb) + 1;
zone = nvme_get_zone_by_slba(ns, slba);
+ assert(zone);
nvme_advance_zone_wp(ns, zone, nlb);
}
@@ -3186,6 +3195,7 @@ static uint16_t nvme_do_write(NvmeCtrl *n, NvmeRequest
*req, bool append,
if (ns->params.zoned) {
zone = nvme_get_zone_by_slba(ns, slba);
+ assert(zone);
if (append) {
bool piremap = !!(ctrl & NVME_RW_PIREMAP);
--
2.32.0
- [PULL 02/23] hw/nvme: add identify namespace flbas/mc enums, (continued)
- [PULL 02/23] hw/nvme: add identify namespace flbas/mc enums, Klaus Jensen, 2021/06/29
- [PULL 03/23] hw/nvme: fix lbaf formats initialization, Klaus Jensen, 2021/06/29
- [PULL 05/23] hw/nvme: fix csi field for cns 0x00 and 0x11, Klaus Jensen, 2021/06/29
- [PULL 04/23] hw/nvme: add param to control auto zone transitioning to zone state closed, Klaus Jensen, 2021/06/29
- [PULL 07/23] hw/nvme: default for namespace EUI-64, Klaus Jensen, 2021/06/29
- [PULL 09/23] hw/nvme: add nvme_block_status_all helper, Klaus Jensen, 2021/06/29
- [PULL 08/23] hw/nvme: reimplement flush to allow cancellation, Klaus Jensen, 2021/06/29
- [PULL 11/23] hw/nvme: save reftag when generating pi, Klaus Jensen, 2021/06/29
- [PULL 06/23] hw/nvme: namespace parameter for EUI-64, Klaus Jensen, 2021/06/29
- [PULL 10/23] hw/nvme: reimplement dsm to allow cancellation, Klaus Jensen, 2021/06/29
- [PULL 12/23] hw/nvme: remove assert from nvme_get_zone_by_slba,
Klaus Jensen <=
- [PULL 13/23] hw/nvme: use prinfo directly in nvme_check_prinfo and nvme_dif_check, Klaus Jensen, 2021/06/29
- [PULL 14/23] hw/nvme: add dw0/1 to the req completion trace event, Klaus Jensen, 2021/06/29
- [PULL 15/23] hw/nvme: reimplement the copy command to allow aio cancellation, Klaus Jensen, 2021/06/29
- [PULL 16/23] hw/nvme: reimplement zone reset to allow cancellation, Klaus Jensen, 2021/06/29
- [PULL 17/23] hw/nvme: reimplement format nvm to allow cancellation, Klaus Jensen, 2021/06/29
- [PULL 18/23] Partially revert "hw/block/nvme: drain namespaces on sq deletion", Klaus Jensen, 2021/06/29
- [PULL 19/23] hw/nvme: fix endianess conversion and add controller list, Klaus Jensen, 2021/06/29
- [PULL 20/23] hw/nvme: documentation fix, Klaus Jensen, 2021/06/29
- [PULL 23/23] hw/nvme: add 'zoned.zasl' to documentation, Klaus Jensen, 2021/06/29
- [PULL 22/23] hw/nvme: fix pin-based interrupt behavior (again), Klaus Jensen, 2021/06/29