Commit 14bad452 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

bdev: Make in_submit_request a 1 bit flag 



Turn the bool into 1 bit.

Change-Id: I19932159bc25022ee05b580d617c5b61ed8f1be5
Signed-off-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22004


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 7fee8002

include/spdk/bdev_module.h

+4 −9
Original line number Diff line number Diff line
@@ -962,7 +962,10 @@ struct spdk_bdev_io_internal_fields { 
			/** Whether the bounce_buf data structure is valid */

			uint8_t has_bounce_buf			: 1;



			uint8_t reserved			: 3;

			/** Whether we are currently inside the submit request call */

			uint8_t in_submit_request		: 1;



			uint8_t reserved			: 2;

		};

		uint8_t raw;

	} f;
@@ -998,14 +1001,6 @@ struct spdk_bdev_io_internal_fields { 
		int aio_result;

	} error;



	/**

	 * Set to true while the bdev module submit_request function is in progress.

	 *

	 * This is used to decide whether spdk_bdev_io_complete() can complete the I/O directly

	 * or if completion must be deferred via an event.

	 */

	bool in_submit_request;



	/** Status for the IO */

	int8_t status;

lib/bdev/bdev.c

+8 −8
Original line number Diff line number Diff line
@@ -2784,10 +2784,10 @@ _bdev_io_complete_in_submit(struct spdk_bdev_channel *bdev_ch, 
			    struct spdk_bdev_io *bdev_io,

			    enum spdk_bdev_io_status status)

{

	bdev_io->internal.in_submit_request = true;

	bdev_io->internal.f.in_submit_request = true;

	bdev_io_increment_outstanding(bdev_ch, bdev_ch->shared_resource);

	spdk_bdev_io_complete(bdev_io, status);

	bdev_io->internal.in_submit_request = false;

	bdev_io->internal.f.in_submit_request = false;

}



static inline void
@@ -2820,9 +2820,9 @@ bdev_io_do_submit(struct spdk_bdev_channel *bdev_ch, struct spdk_bdev_io *bdev_i 


	if (spdk_likely(TAILQ_EMPTY(&shared_resource->nomem_io))) {

		bdev_io_increment_outstanding(bdev_ch, shared_resource);

		bdev_io->internal.in_submit_request = true;

		bdev_io->internal.f.in_submit_request = true;

		bdev_submit_request(bdev, ch, bdev_io);

		bdev_io->internal.in_submit_request = false;

		bdev_io->internal.f.in_submit_request = false;

	} else {

		bdev_queue_nomem_io_tail(shared_resource, bdev_io, BDEV_IO_RETRY_STATE_SUBMIT);

		if (shared_resource->nomem_threshold == 0 && shared_resource->io_outstanding == 0) {
@@ -3722,9 +3722,9 @@ bdev_io_submit_reset(struct spdk_bdev_io *bdev_io) 


	assert(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_PENDING);



	bdev_io->internal.in_submit_request = true;

	bdev_io->internal.f.in_submit_request = true;

	bdev_submit_request(bdev, ch, bdev_io);

	bdev_io->internal.in_submit_request = false;

	bdev_io->internal.f.in_submit_request = false;

}



void
@@ -3737,7 +3737,7 @@ bdev_io_init(struct spdk_bdev_io *bdev_io, 
	bdev_io->internal.caller_ctx = cb_arg;

	bdev_io->internal.cb = cb;

	bdev_io->internal.status = SPDK_BDEV_IO_STATUS_PENDING;

	bdev_io->internal.in_submit_request = false;

	bdev_io->internal.f.in_submit_request = false;

	bdev_io->internal.error.nvme.cdw0 = 0;

	bdev_io->num_retries = 0;

	bdev_io->internal.get_buf_cb = NULL;
@@ -7381,7 +7381,7 @@ bdev_io_complete(void *ctx) 
	struct spdk_bdev_channel *bdev_ch = bdev_io->internal.ch;

	uint64_t tsc, tsc_diff;



	if (spdk_unlikely(bdev_io->internal.in_submit_request)) {

	if (spdk_unlikely(bdev_io->internal.f.in_submit_request)) {

		/*

		 * Defer completion to avoid potential infinite recursion if the

		 * user's completion callback issues a new I/O.

test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c

+118 −118

File changed.

Preview size limit exceeded, changes collapsed.