d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bhyve: NVMe queue create must init head/tail

Browse Source 
The NVMe emulation code did not explicitly initialize queue head and
tail pointers on queue creation. As these pointers are part of
calloc()'ed memory, this only becomes a problem if the queues are
deleted and then recreated.

This error can manifest with messages about completions not matching a
command.
This commit is contained in:
Chuck Tuffli 2020-08-24 01:51:21 +00:00
parent c4a86c1fc0
commit 71a51f69a4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/bhyve/pci_nvme.c
View File

@ -932,6 +932,7 @@ nvme_opc_create_io_sq(struct pci_nvme_softc* sc, struct nvme_command* command,
NVME_SC_MAXIMUM_QUEUE_SIZE_EXCEEDED); NVME_SC_MAXIMUM_QUEUE_SIZE_EXCEEDED);
return (1); return (1);
} }
nsq->head = nsq->tail = 0;
nsq->cqid = (command->cdw11 >> 16) & 0xffff; nsq->cqid = (command->cdw11 >> 16) & 0xffff;
if ((nsq->cqid == 0) || (nsq->cqid > sc->num_cqueues)) { if ((nsq->cqid == 0) || (nsq->cqid > sc->num_cqueues)) {
@ -1053,6 +1054,7 @@ nvme_opc_create_io_cq(struct pci_nvme_softc* sc, struct nvme_command* command,
NVME_SC_MAXIMUM_QUEUE_SIZE_EXCEEDED); NVME_SC_MAXIMUM_QUEUE_SIZE_EXCEEDED);
return (1); return (1);
} }
ncq->head = ncq->tail = 0;
ncq->qbase = vm_map_gpa(sc->nsc_pi->pi_vmctx, ncq->qbase = vm_map_gpa(sc->nsc_pi->pi_vmctx,
command->prp1, command->prp1,
sizeof(struct nvme_command) * (size_t)ncq->size); sizeof(struct nvme_command) * (size_t)ncq->size);