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

nvme: don't reset controller when processing NS mangement commands

Browse Source 
For attach/detach command, the identify namespace data should be
updated during the namespace attribute notice event callback, while
here, in case of the driver may not set aer callback, so update the
namespace identify same with attach command.

Change-Id: Ie594b2ff646a67488d03af2771c00f9947395aba
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/412884
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Changpeng Liu 2018-05-29 01:19:33 -04:00 committed by Daniel Verkamp
parent 0dc36fe97d
commit 4c4c8ca269
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/nvme/nvme_ctrlr.c
View File

@ -2038,6 +2038,7 @@ spdk_nvme_ctrlr_attach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid,
{ {
struct nvme_completion_poll_status status; struct nvme_completion_poll_status status;
int res; int res;
struct spdk_nvme_ns *ns;
res = nvme_ctrlr_cmd_attach_ns(ctrlr, nsid, payload, res = nvme_ctrlr_cmd_attach_ns(ctrlr, nsid, payload,
nvme_completion_poll_cb, &status); nvme_completion_poll_cb, &status);
@ -2049,7 +2050,13 @@ spdk_nvme_ctrlr_attach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid,
return -ENXIO; return -ENXIO;
} }
return spdk_nvme_ctrlr_reset(ctrlr); res = nvme_ctrlr_identify_active_ns(ctrlr);
if (res) {
return res;
}
ns = &ctrlr->ns[nsid - 1];
return nvme_ns_construct(ns, nsid, ctrlr);
} }
int int
@ -2058,6 +2065,7 @@ spdk_nvme_ctrlr_detach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid,
{ {
struct nvme_completion_poll_status status; struct nvme_completion_poll_status status;
int res; int res;
struct spdk_nvme_ns *ns;
res = nvme_ctrlr_cmd_detach_ns(ctrlr, nsid, payload, res = nvme_ctrlr_cmd_detach_ns(ctrlr, nsid, payload,
nvme_completion_poll_cb, &status); nvme_completion_poll_cb, &status);
@ -2069,7 +2077,16 @@ spdk_nvme_ctrlr_detach_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid,
return -ENXIO; return -ENXIO;
} }
return spdk_nvme_ctrlr_reset(ctrlr); res = nvme_ctrlr_identify_active_ns(ctrlr);
if (res) {
return res;
}
ns = &ctrlr->ns[nsid - 1];
/* Inactive NS */
nvme_ns_destruct(ns);
return 0;
} }
uint32_t uint32_t
@ -2077,6 +2094,8 @@ spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_dat
{ {
struct nvme_completion_poll_status status; struct nvme_completion_poll_status status;
int res; int res;
uint32_t nsid;
struct spdk_nvme_ns *ns;
res = nvme_ctrlr_cmd_create_ns(ctrlr, payload, nvme_completion_poll_cb, &status); res = nvme_ctrlr_cmd_create_ns(ctrlr, payload, nvme_completion_poll_cb, &status);
if (res) { if (res) {
@ -2087,13 +2106,16 @@ spdk_nvme_ctrlr_create_ns(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns_dat
return 0; return 0;
} }
res = spdk_nvme_ctrlr_reset(ctrlr); nsid = status.cpl.cdw0;
ns = &ctrlr->ns[nsid - 1];
/* Inactive NS */
res = nvme_ns_construct(ns, nsid, ctrlr);
if (res) { if (res) {
return 0; return 0;
} }
/* Return the namespace ID that was created */ /* Return the namespace ID that was created */
return status.cpl.cdw0; return nsid;
} }
int int
@ -2101,6 +2123,7 @@ spdk_nvme_ctrlr_delete_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid)
{ {
struct nvme_completion_poll_status status; struct nvme_completion_poll_status status;
int res; int res;
struct spdk_nvme_ns *ns;
res = nvme_ctrlr_cmd_delete_ns(ctrlr, nsid, nvme_completion_poll_cb, &status); res = nvme_ctrlr_cmd_delete_ns(ctrlr, nsid, nvme_completion_poll_cb, &status);
if (res) { if (res) {
@ -2111,7 +2134,15 @@ spdk_nvme_ctrlr_delete_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid)
return -ENXIO; return -ENXIO;
} }
return spdk_nvme_ctrlr_reset(ctrlr); res = nvme_ctrlr_identify_active_ns(ctrlr);
if (res) {
return res;
}
ns = &ctrlr->ns[nsid - 1];
nvme_ns_destruct(ns);
return 0;
} }
int int