mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/nvme: remove assert from nvme_get_zone_by_slba

Browse Source 
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>
This commit is contained in:
Klaus Jensen 2021-06-17 21:06:51 +02:00
parent 0ca5c3ccac
commit 189a8bf7f6
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/nvme/ctrl.c
View File

@ -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); 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]; 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, static uint16_t nvme_check_zone_read(NvmeNamespace *ns, uint64_t slba,
uint32_t nlb) uint32_t nlb)
{ {
NvmeZone *zone = nvme_get_zone_by_slba(ns, slba); NvmeZone *zone;
uint64_t bndry = nvme_zone_rd_boundary(ns, zone); uint64_t bndry, end;
uint64_t end = slba + nlb;
uint16_t status; 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); status = nvme_check_zone_state_for_read(zone);
if (status) { if (status) {
; ;
@ -1790,6 +1798,7 @@ static void nvme_finalize_zoned_write(NvmeNamespace *ns, NvmeRequest *req)
slba = le64_to_cpu(rw->slba); slba = le64_to_cpu(rw->slba);
nlb = le16_to_cpu(rw->nlb) + 1; nlb = le16_to_cpu(rw->nlb) + 1;
zone = nvme_get_zone_by_slba(ns, slba); zone = nvme_get_zone_by_slba(ns, slba);
assert(zone);
nvme_advance_zone_wp(ns, zone, nlb); 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) { if (ns->params.zoned) {
zone = nvme_get_zone_by_slba(ns, slba); zone = nvme_get_zone_by_slba(ns, slba);
assert(zone);
if (append) { if (append) {
bool piremap = !!(ctrl & NVME_RW_PIREMAP); bool piremap = !!(ctrl & NVME_RW_PIREMAP);