Commit 8684b0f5 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Jim Harris
Browse files

lib/vhost: move coalescing to rte_vhost_user 



Changing the vsession coalescing setting is specific
to rte_vhost as such it should be moved the rte_vhost_user
that focues on rte_vhost specific functionality.
Renamed with vhost_user_* prefix to match the file.

Since the rte_vhost functions are still called directly from
vhost.c, temporarily they are added to vhost_internal.h.
Once implementing virtio transport abstraction is complete,
some will be removed and others will be replaced with
a generic callback structure.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I98b3746952cfe09fb724c49e4050efc0c42985a5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10630


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent ef873d21

lib/vhost/rte_vhost_user.c

+60 −0
Original line number Diff line number Diff line
@@ -386,3 +386,63 @@ vhost_get_negotiated_features(int vid, uint64_t *negotiated_features) 
{

	return rte_vhost_get_negotiated_features(vid, negotiated_features);

}



int

vhost_user_dev_set_coalescing(struct spdk_vhost_dev *vdev, uint32_t delay_base_us,

			 uint32_t iops_threshold)

{

	uint64_t delay_time_base = delay_base_us * spdk_get_ticks_hz() / 1000000ULL;

	uint32_t io_rate = iops_threshold * SPDK_VHOST_STATS_CHECK_INTERVAL_MS / 1000U;



	if (delay_time_base >= UINT32_MAX) {

		SPDK_ERRLOG("Delay time of %"PRIu32" is to big\n", delay_base_us);

		return -EINVAL;

	} else if (io_rate == 0) {

		SPDK_ERRLOG("IOPS rate of %"PRIu32" is too low. Min is %u\n", io_rate,

			    1000U / SPDK_VHOST_STATS_CHECK_INTERVAL_MS);

		return -EINVAL;

	}



	vdev->coalescing_delay_us = delay_base_us;

	vdev->coalescing_iops_threshold = iops_threshold;

	return 0;

}



int

vhost_user_session_set_coalescing(struct spdk_vhost_dev *vdev,

			     struct spdk_vhost_session *vsession, void *ctx)

{

	vsession->coalescing_delay_time_base =

		vdev->coalescing_delay_us * spdk_get_ticks_hz() / 1000000ULL;

	vsession->coalescing_io_rate_threshold =

		vdev->coalescing_iops_threshold * SPDK_VHOST_STATS_CHECK_INTERVAL_MS / 1000U;

	return 0;

}



int

spdk_vhost_set_coalescing(struct spdk_vhost_dev *vdev, uint32_t delay_base_us,

			  uint32_t iops_threshold)

{

	int rc;



	rc = vhost_user_dev_set_coalescing(vdev, delay_base_us, iops_threshold);

	if (rc != 0) {

		return rc;

	}



	vhost_dev_foreach_session(vdev, vhost_user_session_set_coalescing, NULL, NULL);

	return 0;

}



void

spdk_vhost_get_coalescing(struct spdk_vhost_dev *vdev, uint32_t *delay_base_us,

			  uint32_t *iops_threshold)

{

	if (delay_base_us) {

		*delay_base_us = vdev->coalescing_delay_us;

	}



	if (iops_threshold) {

		*iops_threshold = vdev->coalescing_iops_threshold;

	}

}

lib/vhost/vhost.c

+3 −63
Original line number Diff line number Diff line
@@ -484,66 +484,6 @@ vhost_session_used_signal(struct spdk_vhost_session *vsession) 
	}

}



static int

vhost_session_set_coalescing(struct spdk_vhost_dev *vdev,

			     struct spdk_vhost_session *vsession, void *ctx)

{

	vsession->coalescing_delay_time_base =

		vdev->coalescing_delay_us * spdk_get_ticks_hz() / 1000000ULL;

	vsession->coalescing_io_rate_threshold =

		vdev->coalescing_iops_threshold * SPDK_VHOST_STATS_CHECK_INTERVAL_MS / 1000U;

	return 0;

}



static int

vhost_dev_set_coalescing(struct spdk_vhost_dev *vdev, uint32_t delay_base_us,

			 uint32_t iops_threshold)

{

	uint64_t delay_time_base = delay_base_us * spdk_get_ticks_hz() / 1000000ULL;

	uint32_t io_rate = iops_threshold * SPDK_VHOST_STATS_CHECK_INTERVAL_MS / 1000U;



	if (delay_time_base >= UINT32_MAX) {

		SPDK_ERRLOG("Delay time of %"PRIu32" is to big\n", delay_base_us);

		return -EINVAL;

	} else if (io_rate == 0) {

		SPDK_ERRLOG("IOPS rate of %"PRIu32" is too low. Min is %u\n", io_rate,

			    1000U / SPDK_VHOST_STATS_CHECK_INTERVAL_MS);

		return -EINVAL;

	}



	vdev->coalescing_delay_us = delay_base_us;

	vdev->coalescing_iops_threshold = iops_threshold;

	return 0;

}



int

spdk_vhost_set_coalescing(struct spdk_vhost_dev *vdev, uint32_t delay_base_us,

			  uint32_t iops_threshold)

{

	int rc;



	rc = vhost_dev_set_coalescing(vdev, delay_base_us, iops_threshold);

	if (rc != 0) {

		return rc;

	}



	vhost_dev_foreach_session(vdev, vhost_session_set_coalescing, NULL, NULL);

	return 0;

}



void

spdk_vhost_get_coalescing(struct spdk_vhost_dev *vdev, uint32_t *delay_base_us,

			  uint32_t *iops_threshold)

{

	if (delay_base_us) {

		*delay_base_us = vdev->coalescing_delay_us;

	}



	if (iops_threshold) {

		*iops_threshold = vdev->coalescing_iops_threshold;

	}

}



/*

 * Enqueue id and len to used ring.

 */
@@ -976,7 +916,7 @@ vhost_dev_register(struct spdk_vhost_dev *vdev, const char *name, const char *ma 
	vdev->backend = backend;

	TAILQ_INIT(&vdev->vsessions);



	vhost_dev_set_coalescing(vdev, SPDK_VHOST_COALESCING_DELAY_BASE_US,

	vhost_user_dev_set_coalescing(vdev, SPDK_VHOST_COALESCING_DELAY_BASE_US,

				      SPDK_VHOST_VQ_IOPS_COALESCING_THRESHOLD);



	if (vhost_register_unix_socket(path, name, vdev->virtio_features, vdev->disabled_features,
@@ -1384,7 +1324,7 @@ vhost_start_device_cb(int vid) 
		}

	}



	vhost_session_set_coalescing(vdev, vsession, NULL);

	vhost_user_session_set_coalescing(vdev, vsession, NULL);

	vhost_session_mem_register(vsession->mem);

	vsession->initialized = true;

	rc = vdev->backend->start_session(vsession);

lib/vhost/vhost_internal.h

+7 −0
Original line number Diff line number Diff line
@@ -506,4 +506,11 @@ int vhost_get_negotiated_features(int vid, uint64_t *negotiated_features); 


int remove_vhost_controller(struct spdk_vhost_dev *vdev);



/* Function calls from vhost.c to rte_vhost_user.c,

 * shall removed once virtio transport abstraction is complete. */

int vhost_user_session_set_coalescing(struct spdk_vhost_dev *vdev,

				      struct spdk_vhost_session *vsession, void *ctx);

int vhost_user_dev_set_coalescing(struct spdk_vhost_dev *vdev, uint32_t delay_base_us,

				  uint32_t iops_threshold);



#endif /* SPDK_VHOST_INTERNAL_H */