Commit 20e6c821 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme: save timeout_tsc in nvme_completion_poll_status 



This is needed to enable using the nvme_completion_poll
machinery in an asynchronous mode.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I8009ab81bcc02cba685f560be3d6540aab7ef3f3
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8600


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 avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 45d63e98

lib/nvme/nvme.c

+5 −3
Original line number Diff line number Diff line
@@ -285,11 +285,13 @@ nvme_wait_for_completion_robust_lock_timeout( 
	pthread_mutex_t *robust_mutex,

	uint64_t timeout_in_usecs)

{

	uint64_t timeout_tsc = 0;

	int rc = 0;



	if (timeout_in_usecs) {

		timeout_tsc = spdk_get_ticks() + timeout_in_usecs * spdk_get_ticks_hz() / SPDK_SEC_TO_USEC;

		status->timeout_tsc = spdk_get_ticks() + timeout_in_usecs *

				      spdk_get_ticks_hz() / SPDK_SEC_TO_USEC;

	} else {

		status->timeout_tsc = 0;

	}



	while (status->done == false) {
@@ -313,7 +315,7 @@ nvme_wait_for_completion_robust_lock_timeout( 
			status->cpl.status.sc = SPDK_NVME_SC_ABORTED_SQ_DELETION;

			break;

		}

		if (timeout_tsc && spdk_get_ticks() > timeout_tsc) {

		if (status->timeout_tsc && spdk_get_ticks() > status->timeout_tsc) {

			rc = -1;

			break;

		}

lib/nvme/nvme_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ struct nvme_request { 


struct nvme_completion_poll_status {

	struct spdk_nvme_cpl	cpl;

	uint64_t		timeout_tsc;

	bool			done;

	/* This flag indicates that the request has been timed out and the memory

	   must be freed in a completion callback */