Commit 493fb55e authored by lorneli's avatar lorneli Committed by Jim Harris
Browse files

bdev: add _spdk_bdev_io_do_submit function 



Move actual submission code to _spdk_bdev_io_do_submit, used by
both normal submission path and QoS path.

Previous patch(review.gerrithub.io/c/442127) adds the missing
bdev_io->internal.in_submit_request flag to QoS submission path.
But QoS submission path doesn't handle nomem_io yet.

This patch makes QoS submission path handle nomem_io in the same way
as the normal path and extracts actual submission code into do_submit
function, so that further modification of the submission logic will
apply to both paths automatically.

Change-Id: I41fa88d239c3a2bd9783d812826e32e7c887818d
Signed-off-by: default avatarlorneli <lorneli@163.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455252


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarGangCao <gang.cao@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 6ee44c69

lib/bdev/bdev.c

+26 −17
Original line number Diff line number Diff line
@@ -1397,12 +1397,28 @@ _spdk_bdev_qos_set_ops(struct spdk_bdev_qos *qos) 
	}

}



static inline void

_spdk_bdev_io_do_submit(struct spdk_bdev_channel *bdev_ch, struct spdk_bdev_io *bdev_io)

{

	struct spdk_bdev *bdev = bdev_io->bdev;

	struct spdk_io_channel *ch = bdev_ch->channel;

	struct spdk_bdev_shared_resource *shared_resource = bdev_ch->shared_resource;



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

		bdev_ch->io_outstanding++;

		shared_resource->io_outstanding++;

		bdev_io->internal.in_submit_request = true;

		bdev->fn_table->submit_request(ch, bdev_io);

		bdev_io->internal.in_submit_request = false;

	} else {

		TAILQ_INSERT_TAIL(&shared_resource->nomem_io, bdev_io, internal.link);

	}

}



static int

_spdk_bdev_qos_io_submit(struct spdk_bdev_channel *ch, struct spdk_bdev_qos *qos)

{

	struct spdk_bdev_io		*bdev_io = NULL, *tmp = NULL;

	struct spdk_bdev		*bdev = ch->bdev;

	struct spdk_bdev_shared_resource *shared_resource = ch->shared_resource;

	int				i, submitted_ios = 0;



	TAILQ_FOREACH_SAFE(bdev_io, &qos->queued, internal.link, tmp) {
@@ -1427,11 +1443,7 @@ _spdk_bdev_qos_io_submit(struct spdk_bdev_channel *ch, struct spdk_bdev_qos *qos 
		}



		TAILQ_REMOVE(&qos->queued, bdev_io, internal.link);

		ch->io_outstanding++;

		shared_resource->io_outstanding++;

		bdev_io->internal.in_submit_request = true;

		bdev->fn_table->submit_request(ch->channel, bdev_io);

		bdev_io->internal.in_submit_request = false;

		_spdk_bdev_io_do_submit(ch, bdev_io);

		submitted_ios++;

	}
@@ -1682,25 +1694,22 @@ _spdk_bdev_io_submit(void *ctx) 
	struct spdk_bdev_io *bdev_io = ctx;

	struct spdk_bdev *bdev = bdev_io->bdev;

	struct spdk_bdev_channel *bdev_ch = bdev_io->internal.ch;

	struct spdk_io_channel *ch = bdev_ch->channel;

	struct spdk_bdev_shared_resource *shared_resource = bdev_ch->shared_resource;

	uint64_t tsc;



	tsc = spdk_get_ticks();

	bdev_io->internal.submit_tsc = tsc;

	spdk_trace_record_tsc(tsc, TRACE_BDEV_IO_START, 0, 0, (uintptr_t)bdev_io, bdev_io->type);



	if (spdk_likely(bdev_ch->flags == 0)) {

		_spdk_bdev_io_do_submit(bdev_ch, bdev_io);

		return;

	}



	bdev_ch->io_outstanding++;

	shared_resource->io_outstanding++;

	bdev_io->internal.in_submit_request = true;

	if (spdk_likely(bdev_ch->flags == 0)) {

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

			bdev->fn_table->submit_request(ch, bdev_io);

		} else {

			bdev_ch->io_outstanding--;

			shared_resource->io_outstanding--;

			TAILQ_INSERT_TAIL(&shared_resource->nomem_io, bdev_io, internal.link);

		}

	} else if (bdev_ch->flags & BDEV_CH_RESET_IN_PROGRESS) {

	if (bdev_ch->flags & BDEV_CH_RESET_IN_PROGRESS) {

		spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);

	} else if (bdev_ch->flags & BDEV_CH_QOS_ENABLED) {

		bdev_ch->io_outstanding--;