Commit f4b3ad77 authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Jim Harris
Browse files

bdev: align pollers period values and defines 



Change-Id: I5c67c740e04298a5aa20d0177fbdf8e8b31d53f3
Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/25757


Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent 41946ae1

include/spdk/util.h

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ extern "C" { 
#define SPDK_SEC_TO_USEC 1000000ULL

#define SPDK_SEC_TO_NSEC 1000000000ULL



#define SPDK_MSEC_TO_USEC 1000ULL



/* Ceiling division of unsigned integers */

#define SPDK_CEIL_DIV(x,y) (((x)+(y)-1)/(y))

lib/bdev/bdev.c

+5 −9
Original line number Diff line number Diff line
@@ -49,13 +49,12 @@ int __itt_init_ittlib(const char *, __itt_group_id); 
#define SPDK_BDEV_QOS_MIN_BYTES_PER_SEC		(1024 * 1024)

#define SPDK_BDEV_QOS_MAX_MBYTES_PER_SEC	(UINT64_MAX / (1024 * 1024))

#define SPDK_BDEV_QOS_LIMIT_NOT_DEFINED		UINT64_MAX

#define SPDK_BDEV_IO_POLL_INTERVAL_IN_MSEC	1000



/* The maximum number of children requests for a UNMAP or WRITE ZEROES command

 * when splitting into children requests at a time.

 */

#define SPDK_BDEV_MAX_CHILDREN_UNMAP_WRITE_ZEROES_REQS (8)

#define BDEV_RESET_CHECK_OUTSTANDING_IO_PERIOD 1000000

#define BDEV_RESET_CHECK_OUTSTANDING_IO_PERIOD_IN_USEC SPDK_SEC_TO_USEC



/* The maximum number of children requests for a COPY command

 * when splitting into children requests at a time.
@@ -1727,7 +1726,7 @@ _bdev_io_handle_no_mem(struct spdk_bdev_io *bdev_io, enum bdev_io_retry_state st 
			 * Any IOs submitted may trigger retry of queued IOs. This poller handles a case when no

			 * new IOs submitted, e.g. qd==1 */

			shared_resource->nomem_poller = SPDK_POLLER_REGISTER(bdev_no_mem_poller, shared_resource,

							SPDK_BDEV_IO_POLL_INTERVAL_IN_MSEC * 10);

							10 * SPDK_MSEC_TO_USEC);

		}

		/* If bdev module completed an I/O that has an accel sequence with NOMEM status, the

		 * ownership of that sequence is transferred back to the bdev layer, so we need to
@@ -4411,10 +4410,7 @@ spdk_bdev_set_timeout(struct spdk_bdev_desc *desc, uint64_t timeout_in_sec, 


	if (timeout_in_sec) {

		assert(cb_fn != NULL);

		desc->io_timeout_poller = SPDK_POLLER_REGISTER(bdev_poll_timeout_io,

					  desc,

					  SPDK_BDEV_IO_POLL_INTERVAL_IN_MSEC * SPDK_SEC_TO_USEC /

					  1000);

		desc->io_timeout_poller = SPDK_POLLER_REGISTER(bdev_poll_timeout_io, desc, SPDK_SEC_TO_USEC);

		if (desc->io_timeout_poller == NULL) {

			SPDK_ERRLOG("can not register the desc timeout IO poller\n");

			return -1;
@@ -6868,7 +6864,7 @@ bdev_reset_check_outstanding_io_done(struct spdk_bdev *bdev, void *_ctx, int sta 
	if (status == -EBUSY) {

		if (spdk_get_ticks() < bdev_io->u.reset.wait_poller.stop_time_tsc) {

			bdev_io->u.reset.wait_poller.poller = SPDK_POLLER_REGISTER(bdev_reset_poll_for_outstanding_io,

							      bdev_io, BDEV_RESET_CHECK_OUTSTANDING_IO_PERIOD);

							      bdev_io, BDEV_RESET_CHECK_OUTSTANDING_IO_PERIOD_IN_USEC);

		} else {

			if (TAILQ_EMPTY(&ch->io_memory_domain) && TAILQ_EMPTY(&ch->io_accel_exec)) {

				/* If outstanding IOs are still present and reset_io_drain_timeout
@@ -8940,7 +8936,7 @@ spdk_bdev_open_async(const char *bdev_name, bool write, spdk_bdev_event_cb_t eve 
		return -ENOMEM;

	}



	ctx->poller = SPDK_POLLER_REGISTER(bdev_open_async, ctx, 100 * 1000);

	ctx->poller = SPDK_POLLER_REGISTER(bdev_open_async, ctx, 100 * SPDK_MSEC_TO_USEC);

	if (ctx->poller == NULL) {

		SPDK_ERRLOG("Failed to register bdev_open_async poller\n");

		free(ctx->bdev_name);

test/unit/lib/bdev/mt/bdev.c/bdev_ut.c

+2 −2
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ reset_completions(void) 
	CU_ASSERT(status_reset == SPDK_BDEV_IO_STATUS_PENDING);

	stub_complete_io(g_bdev.io_target, 0);

	poll_threads();

	spdk_delay_us(BDEV_RESET_CHECK_OUTSTANDING_IO_PERIOD);

	spdk_delay_us(BDEV_RESET_CHECK_OUTSTANDING_IO_PERIOD_IN_USEC);

	poll_threads();

	poll_threads();

	CU_ASSERT(status_reset == SPDK_BDEV_IO_STATUS_SUCCESS);
@@ -969,7 +969,7 @@ reset_completions(void) 
	/* Let the poller wait for reset_io_drain_timeout seconds. */

	for (iter = 0; iter < bdev->reset_io_drain_timeout; iter++) {

		CU_ASSERT(count_queued_resets(g_bdev.io_target) == 0);

		spdk_delay_us(BDEV_RESET_CHECK_OUTSTANDING_IO_PERIOD);

		spdk_delay_us(BDEV_RESET_CHECK_OUTSTANDING_IO_PERIOD_IN_USEC);

		poll_threads();

		poll_threads();

	}