Commit 0f068506 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme: complete register_operations in the correct process 



In multi-process, we need to make sure we don't
complete a register_operation in the wrong process.  So
save the pid in the nvme_register_completion structure
when it is inserted into the STAILQ, then only complete
operations where the pid matches.

Fixes issue #2630.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I58c995237db486fecdd89d95e9e7a64379d0b0e5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13940


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDong Yi <dongx.yi@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 43ebecdf

lib/nvme/nvme_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -845,6 +845,7 @@ struct nvme_register_completion { 
	spdk_nvme_reg_cb			cb_fn;

	void					*cb_ctx;

	STAILQ_ENTRY(nvme_register_completion)	stailq;

	pid_t					pid;

};



/*

lib/nvme/nvme_qpair.c

+12 −3
Original line number Diff line number Diff line
@@ -670,13 +670,22 @@ nvme_qpair_resubmit_requests(struct spdk_nvme_qpair *qpair, uint32_t num_request 
static void

nvme_complete_register_operations(struct spdk_nvme_qpair *qpair)

{

	struct nvme_register_completion *ctx;

	struct nvme_register_completion *ctx, *tmp;

	struct spdk_nvme_ctrlr *ctrlr = qpair->ctrlr;

	STAILQ_HEAD(, nvme_register_completion) operations;



	STAILQ_INIT(&operations);

	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);

	STAILQ_SWAP(&ctrlr->register_operations, &operations, nvme_register_completion);

	STAILQ_FOREACH_SAFE(ctx, &ctrlr->register_operations, stailq, tmp) {

		/* We need to make sure we complete the register operation in

		 * the correct process.

		 */

		if (ctx->pid != getpid()) {

			continue;

		}

		STAILQ_REMOVE(&ctrlr->register_operations, ctx, nvme_register_completion, stailq);

		STAILQ_INSERT_TAIL(&operations, ctx, stailq);

	}

	nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);



	while (!STAILQ_EMPTY(&operations)) {
@@ -685,7 +694,7 @@ nvme_complete_register_operations(struct spdk_nvme_qpair *qpair) 
		if (ctx->cb_fn != NULL) {

			ctx->cb_fn(ctx->cb_ctx, ctx->value, &ctx->cpl);

		}

		free(ctx);

		spdk_free(ctx);

	}

}

lib/nvme/nvme_transport.c

+2 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ nvme_queue_register_operation_completion(struct spdk_nvme_ctrlr *ctrlr, uint64_t 
{

	struct nvme_register_completion *ctx;



	ctx = calloc(1, sizeof(*ctx));

	ctx = spdk_zmalloc(sizeof(*ctx), 0, NULL, SPDK_ENV_SOCKET_ID_ANY, SPDK_MALLOC_SHARE);

	if (ctx == NULL) {

		return -ENOMEM;

	}
@@ -206,6 +206,7 @@ nvme_queue_register_operation_completion(struct spdk_nvme_ctrlr *ctrlr, uint64_t 
	ctx->cb_fn = cb_fn;

	ctx->cb_ctx = cb_ctx;

	ctx->value = value;

	ctx->pid = getpid();



	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);

	STAILQ_INSERT_TAIL(&ctrlr->register_operations, ctx, stailq);