Commit 364e0fa9 authored by Dariusz Stojaczyk's avatar Dariusz Stojaczyk Committed by Daniel Verkamp
Browse files

vhost: switch to the new rte_vhost API for GPA translation 



DPDK will deprecate the old API soon.

Change-Id: I0522d47d9cc0b80fb0e2ceb9cc47c45ff51a5077
Signed-off-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/408722


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent bac6830a

lib/vhost/vhost.c

+16 −5
Original line number Diff line number Diff line
@@ -88,9 +88,19 @@ static TAILQ_HEAD(, spdk_vhost_dev) g_spdk_vhost_devices = TAILQ_HEAD_INITIALIZE 
			g_spdk_vhost_devices);

static pthread_mutex_t g_spdk_vhost_mutex = PTHREAD_MUTEX_INITIALIZER;



void *spdk_vhost_gpa_to_vva(struct spdk_vhost_dev *vdev, uint64_t addr)

void *spdk_vhost_gpa_to_vva(struct spdk_vhost_dev *vdev, uint64_t addr, uint64_t len)

{

	return (void *)rte_vhost_gpa_to_vva(vdev->mem, addr);

	void *vva;

	uint64_t newlen;



	newlen = len;

	vva = (void *)rte_vhost_va_from_guest_pa(vdev->mem, addr, &newlen);

	if (newlen != len) {

		return NULL;

	}



	return vva;



}



static void
@@ -215,8 +225,9 @@ spdk_vhost_vq_get_desc(struct spdk_vhost_dev *vdev, struct spdk_vhost_virtqueue 


	if (spdk_vhost_vring_desc_is_indirect(*desc)) {

		assert(spdk_vhost_dev_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC));

		*desc_table = spdk_vhost_gpa_to_vva(vdev, (*desc)->addr);

		*desc_table_size = (*desc)->len / sizeof(**desc);

		*desc_table = spdk_vhost_gpa_to_vva(vdev, (*desc)->addr,

						    sizeof(**desc) * *desc_table_size);

		*desc = *desc_table;

		if (*desc == NULL) {

			return -1;
@@ -425,7 +436,7 @@ spdk_vhost_vring_desc_to_iov(struct spdk_vhost_dev *vdev, struct iovec *iov, 
			SPDK_ERRLOG("SPDK_VHOST_IOVS_MAX(%d) reached\n", SPDK_VHOST_IOVS_MAX);

			return -1;

		}

		vva = (uintptr_t)spdk_vhost_gpa_to_vva(vdev, payload);

		vva = (uintptr_t)rte_vhost_gpa_to_vva(vdev->mem, payload);

		if (vva == 0) {

			SPDK_ERRLOG("gpa_to_vva(%p) == NULL\n", (void *)payload);

			return -1;
@@ -444,7 +455,7 @@ spdk_vhost_vring_desc_to_iov(struct spdk_vhost_dev *vdev, struct iovec *iov, 
			 */

			len = to_boundary;

			while (len < remaining) {

				if (vva + len != (uintptr_t)spdk_vhost_gpa_to_vva(vdev, payload + len)) {

				if (vva + len != (uintptr_t)rte_vhost_gpa_to_vva(vdev->mem, payload + len)) {

					break;

				}

				len += spdk_min(remaining - len, 0x200000);

lib/vhost/vhost_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ struct spdk_vhost_dev { 


struct spdk_vhost_dev *spdk_vhost_dev_find(const char *ctrlr_name);



void *spdk_vhost_gpa_to_vva(struct spdk_vhost_dev *vdev, uint64_t addr);

void *spdk_vhost_gpa_to_vva(struct spdk_vhost_dev *vdev, uint64_t addr, uint64_t len);



uint16_t spdk_vhost_vq_avail_ring_get(struct spdk_vhost_virtqueue *vq, uint16_t *reqs,

				      uint16_t reqs_len);

lib/vhost/vhost_scsi.c

+7 −7
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ eventq_enqueue(struct spdk_vhost_scsi_dev *svdev, unsigned scsi_dev_num, uint32_ 
		goto out;

	}



	desc_ev = spdk_vhost_gpa_to_vva(&svdev->vdev, desc->addr);

	desc_ev = spdk_vhost_gpa_to_vva(&svdev->vdev, desc->addr, sizeof(*desc_ev));

	if (desc_ev == NULL) {

		SPDK_ERRLOG("Controller %s: Eventq descriptor at index %"PRIu16" points to unmapped guest memory address %p.\n",

			    svdev->vdev.name, req, (void *)(uintptr_t)desc->addr);
@@ -325,7 +325,7 @@ process_ctrl_request(struct spdk_vhost_scsi_task *task) 
		goto out;

	}



	ctrl_req = spdk_vhost_gpa_to_vva(vdev, desc->addr);

	ctrl_req = spdk_vhost_gpa_to_vva(vdev, desc->addr, sizeof(*ctrl_req));



	SPDK_DEBUGLOG(SPDK_LOG_VHOST_SCSI_QUEUE,

		      "Processing controlq descriptor: desc %d/%p, desc_addr %p, len %d, flags %d, last_used_idx %d; kickfd %d; size %d\n",
@@ -346,7 +346,7 @@ process_ctrl_request(struct spdk_vhost_scsi_task *task) 
	/* Process the TMF request */

	switch (ctrl_req->type) {

	case VIRTIO_SCSI_T_TMF:

		task->tmf_resp = spdk_vhost_gpa_to_vva(vdev, desc->addr);

		task->tmf_resp = spdk_vhost_gpa_to_vva(vdev, desc->addr, sizeof(*task->tmf_resp));

		if (spdk_unlikely(desc->len < sizeof(struct virtio_scsi_ctrl_tmf_resp) || task->tmf_resp == NULL)) {

			SPDK_ERRLOG("%s: TMF response descriptor at index %d points to invalid guest memory region\n",

				    vdev->name, task->req_idx);
@@ -375,7 +375,7 @@ process_ctrl_request(struct spdk_vhost_scsi_task *task) 
		break;

	case VIRTIO_SCSI_T_AN_QUERY:

	case VIRTIO_SCSI_T_AN_SUBSCRIBE: {

		an_resp = spdk_vhost_gpa_to_vva(vdev, desc->addr);

		an_resp = spdk_vhost_gpa_to_vva(vdev, desc->addr, sizeof(*an_resp));

		if (spdk_unlikely(desc->len < sizeof(struct virtio_scsi_ctrl_an_resp) || an_resp == NULL)) {

			SPDK_WARNLOG("%s: Asynchronous response descriptor points to invalid guest memory region\n",

				     vdev->name);
@@ -424,7 +424,7 @@ task_data_setup(struct spdk_vhost_scsi_task *task, 
		goto invalid_task;

	}



	*req = spdk_vhost_gpa_to_vva(vdev, desc->addr);

	*req = spdk_vhost_gpa_to_vva(vdev, desc->addr, sizeof(**req));

	if (spdk_unlikely(*req == NULL)) {

		SPDK_WARNLOG("%s: Request descriptor at index %d points to invalid guest memory region\n",

			     vdev->name, task->req_idx);
@@ -446,7 +446,7 @@ task_data_setup(struct spdk_vhost_scsi_task *task, 
		/*

		 * FROM_DEV (READ): [RD_req][WR_resp][WR_buf0]...[WR_bufN]

		 */

		task->resp = spdk_vhost_gpa_to_vva(vdev, desc->addr);

		task->resp = spdk_vhost_gpa_to_vva(vdev, desc->addr, sizeof(*task->resp));

		if (spdk_unlikely(desc->len < sizeof(struct virtio_scsi_cmd_resp) || task->resp == NULL)) {

			SPDK_WARNLOG("%s: Response descriptor at index %d points to invalid guest memory region\n",

				     vdev->name, task->req_idx);
@@ -516,7 +516,7 @@ task_data_setup(struct spdk_vhost_scsi_task *task, 
			}

		}



		task->resp = spdk_vhost_gpa_to_vva(vdev, desc->addr);

		task->resp = spdk_vhost_gpa_to_vva(vdev, desc->addr, sizeof(*task->resp));

		if (spdk_unlikely(desc->len < sizeof(struct virtio_scsi_cmd_resp) || task->resp == NULL)) {

			SPDK_WARNLOG("%s: Response descriptor at index %d points to invalid guest memory region\n",

				     vdev->name, task->req_idx);

test/unit/lib/vhost/test_vhost.c

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ DEFINE_STUB(spdk_env_get_current_core, uint32_t, (void), 0); 
DEFINE_STUB_V(spdk_vhost_call_external_event, (const char *ctrlr_name, spdk_vhost_event_fn fn,

		void *arg));

DEFINE_STUB(spdk_vhost_vring_desc_has_next, bool, (struct vring_desc *cur_desc), false);

DEFINE_STUB_VP(spdk_vhost_gpa_to_vva, (struct spdk_vhost_dev *vdev, uint64_t addr), {0});

DEFINE_STUB_VP(spdk_vhost_gpa_to_vva, (struct spdk_vhost_dev *vdev, uint64_t addr, uint64_t len),

{0});

DEFINE_STUB(spdk_scsi_dev_get_id, int, (const struct spdk_scsi_dev *dev), {0});



/* This sets spdk_vhost_dev_unregister to either to fail or success */