Commit 2a893d9d authored Aug 19, 2024 by Jim Harris Committed by Konrad Sztyber Aug 28, 2024

nvme: add nvme_request_abort_match() helper function



Signed-off-by: Jim Harris <jim.harris@samsung.com>
Change-Id: I341e35bdd6ac7d2b50bc58730c99852882494c08
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24597


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Tomasz Zawadzki <tomasz@tzawadzki.com>

parent 8bcec341

lib/nvme/nvme_ctrlr_cmd.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -714,8 +714,7 @@ nvme_request_add_abort(struct nvme_request req, void arg)

		cmd_cb_arg = parent->user_cb_arg;

		if (req->cb_arg != cmd_cb_arg &&
		(req->parent == NULL \|\| req->parent->cb_arg != cmd_cb_arg)) {
		if (!nvme_request_abort_match(req, cmd_cb_arg)) {
		return 0;
		}

lib/nvme/nvme_internal.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -1515,6 +1515,13 @@ nvme_cleanup_user_req(struct nvme_request *req)
		req->user_cb_fn = NULL;
		}

		static inline bool
		nvme_request_abort_match(struct nvme_request req, void cmd_cb_arg)
		{
		return req->cb_arg == cmd_cb_arg \|\|
		(req->parent != NULL && req->parent->cb_arg == cmd_cb_arg);
		}

		static inline void
		nvme_qpair_set_state(struct spdk_nvme_qpair *qpair, enum nvme_qpair_state state)
		{

lib/nvme/nvme_qpair.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -616,8 +616,7 @@ nvme_qpair_abort_queued_reqs_with_cbarg(struct spdk_nvme_qpair qpair, void cmd
		uint32_t aborting = 0;

		STAILQ_FOREACH_SAFE(req, &qpair->queued_req, stailq, tmp) {
		if ((req->cb_arg != cmd_cb_arg) &&
		(req->parent == NULL \|\| req->parent->cb_arg != cmd_cb_arg)) {
		if (!nvme_request_abort_match(req, cmd_cb_arg)) {
		continue;
		}