Commit fcb00f37 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Ben Walker
Browse files

nvme: expand probe information to a struct 



spdk_nvme_probe() will now provide a struct spdk_nvme_probe_info to the
probe and attach callbacks in place of the PCI device pointer.

This struct contains the useful information that could be retrieved from
the PCI device during probe.

The goal of this change is to allow expansion of the probe information
in the future when other transports (specifically, NVMe over Fabrics)
are added that do not necessarily use PCI addressing or device IDs.

Change-Id: I59a2a9e874e248ce5fa1d7f4b57c8056962ff3cd
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent bbd7e1c4

app/nvmf_tgt/conf.c

+16 −9
Original line number Diff line number Diff line
@@ -334,17 +334,17 @@ spdk_nvmf_parse_addr(char *listen_addr, char **host, char **port) 
}



static bool

probe_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr_opts *opts)

probe_cb(void *cb_ctx, const struct spdk_nvme_probe_info *probe_info,

	 struct spdk_nvme_ctrlr_opts *opts)

{

	struct spdk_nvmf_probe_ctx *ctx = cb_ctx;

	struct spdk_pci_addr pci_addr = spdk_pci_device_get_addr(dev);



	if (ctx->any && !ctx->found) {

		ctx->found = true;

		return true;

	}



	if (spdk_pci_addr_compare(&pci_addr, &ctx->pci_addr) == 0) {

	if (spdk_pci_addr_compare(&probe_info->pci_addr, &ctx->pci_addr) == 0) {

		ctx->found = true;

		return true;

	}
@@ -353,20 +353,27 @@ probe_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr_opts 
}



static void

attach_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr *ctrlr,

	  const struct spdk_nvme_ctrlr_opts *opts)

attach_cb(void *cb_ctx, const struct spdk_nvme_probe_info *probe_info,

	  struct spdk_nvme_ctrlr *ctrlr, const struct spdk_nvme_ctrlr_opts *opts)

{

	struct spdk_nvmf_probe_ctx *ctx = cb_ctx;

	struct spdk_pci_addr pci_addr = spdk_pci_device_get_addr(dev);

	int rc;

	char path[MAX_STRING_LEN];

	int numa_node = -1;



	SPDK_NOTICELOG("Attaching NVMe device %p at %x:%x:%x.%x to subsystem %p\n",

		       ctrlr, pci_addr.domain, pci_addr.bus, pci_addr.dev, pci_addr.func, ctx->subsystem);

		       ctrlr,

		       probe_info->pci_addr.domain,

		       probe_info->pci_addr.bus,

		       probe_info->pci_addr.dev,

		       probe_info->pci_addr.func,

		       ctx->subsystem);



	snprintf(path, sizeof(path), "/sys/bus/pci/devices/%04x:%02x:%02x.%1u/numa_node",

		 pci_addr.domain, pci_addr.bus, pci_addr.dev, pci_addr.func);

		 probe_info->pci_addr.domain,

		 probe_info->pci_addr.bus,

		 probe_info->pci_addr.dev,

		 probe_info->pci_addr.func);



	numa_node = spdk_get_numa_node_value(path);

	if (numa_node >= 0) {
@@ -379,7 +386,7 @@ attach_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr *ctr 
		}

	}



	rc = nvmf_subsystem_add_ctrlr(ctx->subsystem, ctrlr, &pci_addr);

	rc = nvmf_subsystem_add_ctrlr(ctx->subsystem, ctrlr, &probe_info->pci_addr);

	if (rc < 0) {

		SPDK_ERRLOG("Failed to add controller to subsystem\n");

	}

examples/nvme/arbitration/arbitration.c

+12 −11
Original line number Diff line number Diff line
@@ -865,29 +865,30 @@ register_workers(void) 
}



static bool

probe_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr_opts *opts)

probe_cb(void *cb_ctx, const struct spdk_nvme_probe_info *probe_info,

	 struct spdk_nvme_ctrlr_opts *opts)

{

	/* Update with user specified arbitration configuration */

	opts->arb_mechanism = g_arbitration.arbitration_mechanism;



	printf("Attaching to %04x:%02x:%02x.%02x\n",

	       spdk_pci_device_get_domain(dev),

	       spdk_pci_device_get_bus(dev),

	       spdk_pci_device_get_dev(dev),

	       spdk_pci_device_get_func(dev));

	       probe_info->pci_addr.domain,

	       probe_info->pci_addr.bus,

	       probe_info->pci_addr.dev,

	       probe_info->pci_addr.func);



	return true;

}



static void

attach_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr *ctrlr,

	  const struct spdk_nvme_ctrlr_opts *opts)

attach_cb(void *cb_ctx, const struct spdk_nvme_probe_info *probe_info,

	  struct spdk_nvme_ctrlr *ctrlr, const struct spdk_nvme_ctrlr_opts *opts)

{

	printf("Attached to %04x:%02x:%02x.%02x\n",

	       spdk_pci_device_get_domain(dev),

	       spdk_pci_device_get_bus(dev),

	       spdk_pci_device_get_dev(dev),

	       spdk_pci_device_get_func(dev));

	       probe_info->pci_addr.domain,

	       probe_info->pci_addr.bus,

	       probe_info->pci_addr.dev,

	       probe_info->pci_addr.func);



	/* Update with actual arbitration configuration in use */

	g_arbitration.arbitration_mechanism = opts->arb_mechanism;

examples/nvme/fio_plugin/fio_plugin.c

+11 −11
Original line number Diff line number Diff line
@@ -87,11 +87,9 @@ struct spdk_fio_thread { 
};



static bool

probe_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr_opts *opts)

probe_cb(void *cb_ctx, const struct spdk_nvme_probe_info *probe_info,

	 struct spdk_nvme_ctrlr_opts *opts)

{

	int found_bus    = spdk_pci_device_get_bus(dev);

	int found_slot   = spdk_pci_device_get_dev(dev);

	int found_func   = spdk_pci_device_get_func(dev);

	struct fio_file		*f;

	unsigned int		i;

	struct thread_data 	*td = cb_ctx;
@@ -105,7 +103,9 @@ probe_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr_opts 
			fprintf(stderr, "Invalid filename: %s\n", f->file_name);

			continue;

		}

		if (bus == found_bus && slot == found_slot && func == found_func) {

		if (bus == probe_info->pci_addr.bus &&

		    slot == probe_info->pci_addr.dev &&

		    func == probe_info->pci_addr.func) {

			return true;

		}

	}
@@ -114,12 +114,9 @@ probe_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr_opts 
}



static void

attach_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr *ctrlr,

	  const struct spdk_nvme_ctrlr_opts *opts)

attach_cb(void *cb_ctx, const struct spdk_nvme_probe_info *probe_info,

	  struct spdk_nvme_ctrlr *ctrlr, const struct spdk_nvme_ctrlr_opts *opts)

{

	int found_bus    = spdk_pci_device_get_bus(dev);

	int found_slot   = spdk_pci_device_get_dev(dev);

	int found_func   = spdk_pci_device_get_func(dev);

	struct thread_data 	*td = cb_ctx;

	struct spdk_fio_thread	*fio_thread = td->io_ops->data;

	struct spdk_fio_ctrlr	*fio_ctrlr;
@@ -139,7 +136,10 @@ attach_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr *ctr 
	for_each_file(fio_thread->td, f, i) {

		int domain, bus, slot, func, nsid, rc;

		rc = sscanf(f->file_name, "%x.%x.%x.%x/%x", &domain, &bus, &slot, &func, &nsid);

		if (rc == 5 && bus == found_bus && slot == found_slot && func == found_func) {

		if (rc == 5 &&

		    bus == probe_info->pci_addr.bus &&

		    slot == probe_info->pci_addr.dev &&

		    func == probe_info->pci_addr.func) {

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

			if (fio_ns == NULL) {

				continue;

examples/nvme/hello_world/hello_world.c

+12 −11
Original line number Diff line number Diff line
@@ -238,20 +238,21 @@ hello_world(void) 
}



static bool

probe_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr_opts *opts)

probe_cb(void *cb_ctx, const struct spdk_nvme_probe_info *probe_info,

	 struct spdk_nvme_ctrlr_opts *opts)

{

	printf("Attaching to %04x:%02x:%02x.%02x\n",

	       spdk_pci_device_get_domain(dev),

	       spdk_pci_device_get_bus(dev),

	       spdk_pci_device_get_dev(dev),

	       spdk_pci_device_get_func(dev));

	       probe_info->pci_addr.domain,

	       probe_info->pci_addr.bus,

	       probe_info->pci_addr.dev,

	       probe_info->pci_addr.func);



	return true;

}



static void

attach_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr *ctrlr,

	  const struct spdk_nvme_ctrlr_opts *opts)

attach_cb(void *cb_ctx, const struct spdk_nvme_probe_info *probe_info,

	  struct spdk_nvme_ctrlr *ctrlr, const struct spdk_nvme_ctrlr_opts *opts)

{

	int nsid, num_ns;

	struct ctrlr_entry *entry;
@@ -264,10 +265,10 @@ attach_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr *ctr 
	}



	printf("Attached to %04x:%02x:%02x.%02x\n",

	       spdk_pci_device_get_domain(dev),

	       spdk_pci_device_get_bus(dev),

	       spdk_pci_device_get_dev(dev),

	       spdk_pci_device_get_func(dev));

	       probe_info->pci_addr.domain,

	       probe_info->pci_addr.bus,

	       probe_info->pci_addr.dev,

	       probe_info->pci_addr.func);



	snprintf(entry->name, sizeof(entry->name), "%-20.20s (%-20.20s)", cdata->mn, cdata->sn);

examples/nvme/identify/identify.c

+7 −7
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ print_namespace(struct spdk_nvme_ns *ns) 
}



static void

print_controller(struct spdk_nvme_ctrlr *ctrlr, struct spdk_pci_device *pci_dev)

print_controller(struct spdk_nvme_ctrlr *ctrlr, const struct spdk_pci_addr *pci_addr)

{

	const struct spdk_nvme_ctrlr_data	*cdata;

	union spdk_nvme_cap_register		cap;
@@ -402,8 +402,7 @@ print_controller(struct spdk_nvme_ctrlr *ctrlr, struct spdk_pci_device *pci_dev) 


	printf("=====================================================\n");

	printf("NVMe Controller at PCI bus %d, device %d, function %d\n",

	       spdk_pci_device_get_bus(pci_dev), spdk_pci_device_get_dev(pci_dev),

	       spdk_pci_device_get_func(pci_dev));

	       pci_addr->bus, pci_addr->dev, pci_addr->func);

	printf("=====================================================\n");



	if (g_hex_dump) {
@@ -872,16 +871,17 @@ parse_args(int argc, char **argv) 
}



static bool

probe_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr_opts *opts)

probe_cb(void *cb_ctx, const struct spdk_nvme_probe_info *probe_info,

	 struct spdk_nvme_ctrlr_opts *opts)

{

	return true;

}



static void

attach_cb(void *cb_ctx, struct spdk_pci_device *pci_dev, struct spdk_nvme_ctrlr *ctrlr,

	  const struct spdk_nvme_ctrlr_opts *opts)

attach_cb(void *cb_ctx, const struct spdk_nvme_probe_info *probe_info,

	  struct spdk_nvme_ctrlr *ctrlr, const struct spdk_nvme_ctrlr_opts *opts)

{

	print_controller(ctrlr, pci_dev);

	print_controller(ctrlr, &probe_info->pci_addr);

	spdk_nvme_detach(ctrlr);

}