Commit 4525fc89 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

nvme/pcie: use common trid -> ctrlr function 



Simplify the PCIe transport by using an existing function to look up a
controller by transport ID.

Change-Id: I261865df1ba23069b052ca64944b7637d70c85ba
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/388701


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 1804f3c5

lib/nvme/nvme.c

+14 −7
Original line number Diff line number Diff line
@@ -416,21 +416,28 @@ nvme_init_controllers(void *cb_ctx, spdk_nvme_attach_cb attach_cb) 
static struct spdk_nvme_ctrlr *

spdk_nvme_get_ctrlr_by_trid(const struct spdk_nvme_transport_id *trid)

{

	struct spdk_nvme_ctrlr *ctrlr = NULL;

	bool found = false;

	struct spdk_nvme_ctrlr *ctrlr;



	nvme_robust_mutex_lock(&g_spdk_nvme_driver->lock);

	ctrlr = spdk_nvme_get_ctrlr_by_trid_unsafe(trid);

	nvme_robust_mutex_unlock(&g_spdk_nvme_driver->lock);



	return ctrlr;

}



/* This function must be called while holding g_spdk_nvme_driver->lock */

struct spdk_nvme_ctrlr *

spdk_nvme_get_ctrlr_by_trid_unsafe(const struct spdk_nvme_transport_id *trid)

{

	struct spdk_nvme_ctrlr *ctrlr;



	TAILQ_FOREACH(ctrlr, &g_spdk_nvme_driver->attached_ctrlrs, tailq) {

		if (spdk_nvme_transport_id_compare(&ctrlr->trid, trid) == 0) {

			found = true;

			break;

			return ctrlr;

		}

	}



	nvme_robust_mutex_unlock(&g_spdk_nvme_driver->lock);



	return (found == true) ? ctrlr : NULL;

	return NULL;

}



/* This function must only be called while holding g_spdk_nvme_driver->lock */

lib/nvme/nvme_internal.h

+3 −0
Original line number Diff line number Diff line
@@ -602,6 +602,9 @@ bool nvme_completion_is_retry(const struct spdk_nvme_cpl *cpl); 
void	nvme_qpair_print_command(struct spdk_nvme_qpair *qpair, struct spdk_nvme_cmd *cmd);

void	nvme_qpair_print_completion(struct spdk_nvme_qpair *qpair, struct spdk_nvme_cpl *cpl);



struct spdk_nvme_ctrlr *spdk_nvme_get_ctrlr_by_trid_unsafe(

	const struct spdk_nvme_transport_id *trid);



/* Transport specific functions */

#define DECLARE_TRANSPORT(name) \

	struct spdk_nvme_ctrlr *nvme_ ## name ## _ctrlr_construct(const struct spdk_nvme_transport_id *trid, const struct spdk_nvme_ctrlr_opts *opts, \

lib/nvme/nvme_pcie.c

+14 −19
Original line number Diff line number Diff line
@@ -238,15 +238,14 @@ _nvme_pcie_hotplug_monitor(void *cb_ctx, spdk_nvme_probe_cb probe_cb, 
					}

				}

			} else if (event.action == SPDK_NVME_UEVENT_REMOVE) {

				bool in_list = false;

				struct spdk_nvme_transport_id trid;



				TAILQ_FOREACH(ctrlr, &g_spdk_nvme_driver->attached_ctrlrs, tailq) {

					if (strcmp(event.traddr, ctrlr->trid.traddr) == 0) {

						in_list = true;

						break;

					}

				}

				if (in_list == false) {

				memset(&trid, 0, sizeof(trid));

				trid.trtype = SPDK_NVME_TRANSPORT_PCIE;

				snprintf(trid.traddr, sizeof(trid.traddr), "%s", event.traddr);



				ctrlr = spdk_nvme_get_ctrlr_by_trid_unsafe(&trid);

				if (ctrlr == NULL) {

					return 0;

				}

				SPDK_DEBUGLOG(SPDK_TRACE_NVME, "remove nvme address: %s\n",
@@ -578,7 +577,6 @@ pcie_nvme_enum_cb(void *ctx, struct spdk_pci_device *pci_dev) 
	struct spdk_nvme_transport_id trid = {};

	struct nvme_pcie_enum_ctx *enum_ctx = ctx;

	struct spdk_nvme_ctrlr *ctrlr;

	int rc = 0;

	struct spdk_pci_addr pci_addr;



	pci_addr = spdk_pci_device_get_addr(pci_dev);
@@ -587,16 +585,13 @@ pcie_nvme_enum_cb(void *ctx, struct spdk_pci_device *pci_dev) 
	spdk_pci_addr_fmt(trid.traddr, sizeof(trid.traddr), &pci_addr);



	/* Verify that this controller is not already attached */

	TAILQ_FOREACH(ctrlr, &g_spdk_nvme_driver->attached_ctrlrs, tailq) {

		/* NOTE: In the case like multi-process environment where the device handle is

		 * different per each process, we compare by BDF to determine whether it is the

		 * same controller.

		 */

		if (strcmp(trid.traddr, ctrlr->trid.traddr) == 0) {

			if (!spdk_process_is_primary()) {

				rc = nvme_ctrlr_add_process(ctrlr, pci_dev);

			}

			return rc;

	ctrlr = spdk_nvme_get_ctrlr_by_trid_unsafe(&trid);

	if (ctrlr) {

		if (spdk_process_is_primary()) {

			/* Already attached */

			return 0;

		} else {

			return nvme_ctrlr_add_process(ctrlr, pci_dev);

		}

	}

test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c

+6 −0
Original line number Diff line number Diff line
@@ -268,6 +268,12 @@ nvme_qpair_enable(struct spdk_nvme_qpair *qpair) 
	abort();

}



struct spdk_nvme_ctrlr *

spdk_nvme_get_ctrlr_by_trid_unsafe(const struct spdk_nvme_transport_id *trid)

{

	return NULL;

}





#if 0 /* TODO: update PCIe-specific unit test */

static void