Commit 1554a344 authored Jun 04, 2019 by Shuhei Matsumoto Committed by Darek Stojaczyk Jun 05, 2019

env: Add free_space parameter to spdk_ring_enqueue



DPDK rte_ring_enqueue_bulk() has free_space parameter to return
the amount of space in the ring after enqueue operation has finished.
This parameter can be used to wait when the ring is almost full and
wake up when there is enough space available in the ring.

Hence we add free_space to spdk_ring_enqueue() and spdk_ring_enqueue()
passes it to rte_ring_enqueue_bulk() simply.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I9b9d6a5a097cf6dc4b97dfda7442f2c4b0aed4d3
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456734


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>

parent 5f284438

CHANGELOG.md

+6 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,12 @@ taken into account if trying to achieve an artificial latency on top of an nvme
		Added spdk_nvme_ctrlr_get_transport_id() to get the transport ID from a
		previously attached controller.

		### env

		The parameter `free_space` has been added to spdk_ring_enqueue() to wait when
		the ring is almost full and resume when there is enough space available in
		the ring.

		## v19.04:

		### nvme

include/spdk/env.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -582,10 +582,12 @@ size_t spdk_ring_count(struct spdk_ring *ring);
		* \param ring A pointer to the ring.
		* \param objs A pointer to the array to be queued.
		* \param count Length count of the array of objects.
		* \param free_space If non-NULL, amount of free space after the enqueue has finished.
		*
		* \return the number of objects enqueued.
		*/
		size_t spdk_ring_enqueue(struct spdk_ring ring, void *objs, size_t count);
		size_t spdk_ring_enqueue(struct spdk_ring ring, void *objs, size_t count,
		size_t *free_space);

		/**
		* Dequeue count objects from the ring into the array objs.

lib/bdev/nvme/bdev_ftl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -247,7 +247,7 @@ bdev_ftl_cb(void *arg, int status)

		io->status = status;

		cnt = spdk_ring_enqueue(io->ring, (void **)&io, 1);
		cnt = spdk_ring_enqueue(io->ring, (void **)&io, 1, NULL);
		assert(cnt == 1);
		}

lib/bdev/virtio/bdev_virtio_scsi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -570,7 +570,7 @@ bdev_virtio_reset(struct spdk_io_channel ch, struct spdk_bdev_io bdev_io)
		tmf_req->type = VIRTIO_SCSI_T_TMF;
		tmf_req->subtype = VIRTIO_SCSI_T_TMF_LOGICAL_UNIT_RESET;

		enqueued_count = spdk_ring_enqueue(svdev->ctrlq_ring, (void **)&bdev_io, 1);
		enqueued_count = spdk_ring_enqueue(svdev->ctrlq_ring, (void **)&bdev_io, 1, NULL);
		if (spdk_likely(enqueued_count == 1)) {
		return;
		} else {

lib/env_dpdk/env.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -393,9 +393,11 @@ spdk_ring_count(struct spdk_ring *ring)
		}

		size_t
		spdk_ring_enqueue(struct spdk_ring ring, void *objs, size_t count)
		spdk_ring_enqueue(struct spdk_ring ring, void *objs, size_t count,
		size_t *free_space)
		{
		return rte_ring_enqueue_bulk((struct rte_ring *)ring, objs, count, NULL);
		return rte_ring_enqueue_bulk((struct rte_ring *)ring, objs, count,
		(unsigned int *)free_space);
		}

		size_t