SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/nvme: be compliant wrt. dsm processing limits

Browse Source 
The specification states that,

> The controller shall set all three processing limit fields (i.e., the
> DMRL, DMRSL and DMSL fields) to non-zero values or shall clear all
> three processing limit fields to 0h.

So, set the DMRL and DMSL fields in addition to DMRSL.

Reviewed-by: Jesper Wendel Devantier <foss@defmacro.it>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
This commit is contained in:
Klaus Jensen 2024-12-16 13:53:06 +01:00
parent b202fb549d
commit d96a32de3f
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/nvme/ctrl.c
View File

@ -5639,7 +5639,9 @@ static uint16_t nvme_identify_ctrl_csi(NvmeCtrl *n, NvmeRequest *req)
switch (c->csi) { switch (c->csi) {
case NVME_CSI_NVM: case NVME_CSI_NVM:
id_nvm->vsl = n->params.vsl; id_nvm->vsl = n->params.vsl;
id_nvm->dmrl = NVME_ID_CTRL_NVM_DMRL_MAX;
id_nvm->dmrsl = cpu_to_le32(n->dmrsl); id_nvm->dmrsl = cpu_to_le32(n->dmrsl);
id_nvm->dmsl = NVME_ID_CTRL_NVM_DMRL_MAX * n->dmrsl;
break; break;
case NVME_CSI_ZONED: case NVME_CSI_ZONED:
@ -6696,18 +6698,23 @@ static uint16_t nvme_aer(NvmeCtrl *n, NvmeRequest *req)
return NVME_NO_COMPLETE; return NVME_NO_COMPLETE;
} }
static void nvme_update_dmrsl(NvmeCtrl *n) static void nvme_update_dsm_limits(NvmeCtrl *n, NvmeNamespace *ns)
{ {
int nsid; if (ns) {
n->dmrsl =
MIN_NON_ZERO(n->dmrsl, BDRV_REQUEST_MAX_BYTES / nvme_l2b(ns, 1));
for (nsid = 1; nsid <= NVME_MAX_NAMESPACES; nsid++) { return;
NvmeNamespace *ns = nvme_ns(n, nsid); }
for (uint32_t nsid = 1; nsid <= NVME_MAX_NAMESPACES; nsid++) {
ns = nvme_ns(n, nsid);
if (!ns) { if (!ns) {
continue; continue;
} }
n->dmrsl = MIN_NON_ZERO(n->dmrsl, n->dmrsl =
BDRV_REQUEST_MAX_BYTES / nvme_l2b(ns, 1)); MIN_NON_ZERO(n->dmrsl, BDRV_REQUEST_MAX_BYTES / nvme_l2b(ns, 1));
} }
} }
@ -6795,7 +6802,7 @@ static uint16_t nvme_ns_attachment(NvmeCtrl *n, NvmeRequest *req)
ctrl->namespaces[nsid] = NULL; ctrl->namespaces[nsid] = NULL;
ns->attached--; ns->attached--;
nvme_update_dmrsl(ctrl); nvme_update_dsm_limits(ctrl, NULL);
break; break;
@ -8902,8 +8909,7 @@ void nvme_attach_ns(NvmeCtrl *n, NvmeNamespace *ns)
n->namespaces[nsid] = ns; n->namespaces[nsid] = ns;
ns->attached++; ns->attached++;
n->dmrsl = MIN_NON_ZERO(n->dmrsl, nvme_update_dsm_limits(n, ns);
BDRV_REQUEST_MAX_BYTES / nvme_l2b(ns, 1));
} }
static void nvme_realize(PCIDevice *pci_dev, Error **errp) static void nvme_realize(PCIDevice *pci_dev, Error **errp)

2
include/block/nvme.h
View File

@ -1207,6 +1207,8 @@ typedef struct NvmeIdCtrlZoned {
uint8_t rsvd1[4095]; uint8_t rsvd1[4095];
} NvmeIdCtrlZoned; } NvmeIdCtrlZoned;
#define NVME_ID_CTRL_NVM_DMRL_MAX 255
typedef struct NvmeIdCtrlNvm { typedef struct NvmeIdCtrlNvm {
uint8_t vsl; uint8_t vsl;
uint8_t wzsl; uint8_t wzsl;