openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/block/nvme: improve invalid zasl value reporting 

The Zone Append Size Limit (ZASL) must be at least 4096 bytes, so
improve the user experience by adding an early parameter check in
nvme_check_constraints.

When ZASL is still too small due to the host configuring the device for
an even larger page size, convert the trace point in nvme_start_ctrl to
an NVME_GUEST_ERR such that this is logged by QEMU instead of only
traced.

Reported-by: Corne <info@dantalion.nl>
Cc: Dmitry Fomichev <Dmitry.Fomichev@wdc.com>
Reviewed-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
This commit is contained in:
Klaus Jensen 2021-02-08 09:19:41 +01:00
parent 9ae3900461
commit 2c7e2ad243
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/block/nvme.c
View File

@ -3997,8 +3997,10 @@ static int nvme_start_ctrl(NvmeCtrl *n)
n->zasl = n->params.mdts; n->zasl = n->params.mdts;
} else { } else {
if (n->params.zasl_bs < n->page_size) { if (n->params.zasl_bs < n->page_size) {
trace_pci_nvme_err_startfail_zasl_too_small(n->params.zasl_bs, NVME_GUEST_ERR(pci_nvme_err_startfail_zasl_too_small,
n->page_size); "Zone Append Size Limit (ZASL) of %d bytes is too "
"small; must be at least %d bytes",
n->params.zasl_bs, n->page_size);
return -1; return -1;
} }
n->zasl = 31 - clz32(n->params.zasl_bs / n->page_size); n->zasl = 31 - clz32(n->params.zasl_bs / n->page_size);
@ -4517,6 +4519,12 @@ static void nvme_check_constraints(NvmeCtrl *n, Error **errp)
error_setg(errp, "zone append size limit has to be a power of 2"); error_setg(errp, "zone append size limit has to be a power of 2");
return; return;
} }
if (n->params.zasl_bs < 4096) {
error_setg(errp, "zone append size limit must be at least "
"4096 bytes");
return;
}
} }
} }