Commit a86029b9 authored Mar 15, 2019 by Darek Stojaczyk Committed by Changpeng Liu Mar 20, 2019

virtio/pci: don't rely on phys_addr retrieved from spdk_malloc()



The phys_addr param in spdk_*malloc() is about to be
deprecated, so use a separate spdk_vtophys() call to
retrieve physical addresses.

This patch also adds error checks against SPDK_VTOPHYS_ERROR.
The error handling paths are already there to account for
spdk_*malloc() failures themselves, so reuse them in case
of vtophys failures.

Change-Id: I6d71a4c361f5ec1770d96676f3bb8f57ecd62716
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/448167


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>

parent 27c42e31

lib/virtio/virtio_pci.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -272,11 +272,17 @@ modern_setup_queue(struct virtio_dev dev, struct virtqueue vq)
		return -ENOMEM;
		}

		queue_mem = spdk_dma_zmalloc(vq->vq_ring_size, VALUE_2MB, &queue_mem_phys_addr);
		queue_mem = spdk_dma_zmalloc(vq->vq_ring_size, VALUE_2MB, NULL);
		if (queue_mem == NULL) {
		return -ENOMEM;
		}

		queue_mem_phys_addr = spdk_vtophys(queue_mem, NULL);
		if (queue_mem_phys_addr == SPDK_VTOPHYS_ERROR) {
		spdk_dma_free(queue_mem);
		return -EFAULT;
		}

		vq->vq_ring_mem = queue_mem_phys_addr;
		vq->vq_ring_virt_mem = queue_mem;