git: 0fe77ad6131b - releng/12.2 - Fix NVMe iovec construction for large IOs.

Gordon Tetlow gordon at FreeBSD.org
Tue Aug 24 18:29:33 UTC 2021


The branch releng/12.2 has been updated by gordon:

URL: https://cgit.FreeBSD.org/src/commit/?id=0fe77ad6131bcb92268d52c38b81cbc1cb6f213f

commit 0fe77ad6131bcb92268d52c38b81cbc1cb6f213f
Author:     Gordon Tetlow <gordon at FreeBSD.org>
AuthorDate: 2021-08-24 17:28:37 +0000
Commit:     Gordon Tetlow <gordon at FreeBSD.org>
CommitDate: 2021-08-24 17:28:37 +0000

    Fix NVMe iovec construction for large IOs.
    
    Approved by:    so
    Security:       EN-21:25.bhyve
---
 usr.sbin/bhyve/pci_nvme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c
index 0d95a702124e..189e8a3d8522 100644
--- a/usr.sbin/bhyve/pci_nvme.c
+++ b/usr.sbin/bhyve/pci_nvme.c
@@ -1968,7 +1968,7 @@ nvme_write_read_blockif(struct pci_nvme_softc *sc,
 		/* PRP2 is pointer to a physical region page list */
 		while (bytes) {
 			/* Last entry in list points to the next list */
-			if (prp_list == last) {
+			if ((prp_list == last) && (bytes > PAGE_SIZE)) {
 				uint64_t prp = *prp_list;
 
 				prp_list = paddr_guest2host(vmctx, prp,


More information about the dev-commits-src-branches mailing list