ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: Support UnbindFromKernel option for NVMe identification

Browse Source 
Change-Id: I8174ca97ef406622cf9dfc81330e64cc9b1fda9b
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
This commit is contained in:
Ziye Yang 2016-06-08 10:25:37 +08:00
parent 4de0491a1b
commit f634c1245a
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/nvmf/controller.c
View File

@ -51,6 +51,7 @@ struct nvme_bdf_whitelist {
struct spdk_nvmf_probe_ctx { struct spdk_nvmf_probe_ctx {
bool claim_all; bool claim_all;
bool unbind_from_kernel;
int whitelist_count; int whitelist_count;
struct nvme_bdf_whitelist whitelist[SPDK_NVMF_MAX_NVME_DEVICES]; struct nvme_bdf_whitelist whitelist[SPDK_NVMF_MAX_NVME_DEVICES];
}; };
@ -139,27 +140,37 @@ probe_cb(void *cb_ctx, struct spdk_pci_device *dev, struct spdk_nvme_ctrlr_opts
uint8_t found_dev = spdk_pci_device_get_dev(dev); uint8_t found_dev = spdk_pci_device_get_dev(dev);
uint8_t found_func = spdk_pci_device_get_func(dev); uint8_t found_func = spdk_pci_device_get_func(dev);
int i; int i;
bool claim_device = false;
SPDK_NOTICELOG("Probing device %x:%x:%x.%x\n", SPDK_NOTICELOG("Probing device %x:%x:%x.%x\n",
found_domain, found_bus, found_dev, found_func); found_domain, found_bus, found_dev, found_func);
if (spdk_pci_device_has_non_uio_driver(dev)) { if (ctx->claim_all) {
SPDK_NOTICELOG("Skipping device %x:%x:%x.%x because it is bound to the kernel\n", claim_device = true;
found_domain, found_bus, found_dev, found_func); } else {
for (i = 0; i < SPDK_NVMF_MAX_NVME_DEVICES; i++) {
if (found_domain == ctx->whitelist[i].domain &&
found_bus == ctx->whitelist[i].bus &&
found_dev == ctx->whitelist[i].dev &&
found_func == ctx->whitelist[i].func) {
claim_device = true;
break;
}
}
}
if (!claim_device) {
return false; return false;
} }
if (ctx->claim_all) { if (spdk_pci_device_has_non_uio_driver(dev)) {
return true; if (ctx->unbind_from_kernel) {
} if (spdk_pci_device_switch_to_uio_driver(dev) == 0) {
return true;
for (i = 0; i < SPDK_NVMF_MAX_NVME_DEVICES; i++) { }
if (found_domain == ctx->whitelist[i].domain &&
found_bus == ctx->whitelist[i].bus &&
found_dev == ctx->whitelist[i].dev &&
found_func == ctx->whitelist[i].func) {
return true;
} }
} else {
return true;
} }
return false; return false;
@ -224,6 +235,13 @@ spdk_nvmf_init_nvme(void)
} }
} }
val = spdk_conf_section_get_val(sp, "UnbindFromKernel");
if (val != NULL) {
if (!strcmp(val, "Yes")) {
ctx.unbind_from_kernel = true;
}
}
if (!ctx.claim_all) { if (!ctx.claim_all) {
for (i = 0; ; i++) { for (i = 0; ; i++) {
unsigned int domain, bus, dev, func; unsigned int domain, bus, dev, func;