@@ -103,12 +103,12 @@ Parameters:
``auto-ns-path=<path to nvme storage location>``
If specified indicates a support for dynamic management of nvme namespaces
- by means of nvme create-ns command. This path points
+ by means of nvme create-ns and nvme delete-ns commands. This path points
to the storage area for backend images must exist. Additionally it requires
that parameter `ns-subsys` must be specified whereas parameter `drive`
must not. The legacy namespace backend is disabled, instead, a pair of
files 'nvme_<ctrl SN>_ns_<NS-ID>.cfg' and 'nvme_<ctrl SN>_ns_<NS-ID>.img'
- will refer to respective namespaces. The create-ns, attach-ns
+ will refer to respective namespaces. The create-ns, delete-ns, attach-ns
and detach-ns commands, issued at the guest side, will make changes to
those files accordingly.
For each namespace exists an image file in raw format and a config file
@@ -140,8 +140,9 @@ Please note that ``nvme-ns`` device is not required to support of dynamic
namespaces management feature. It is not prohibited to assign a such device to
``nvme`` device specified to support dynamic namespace management if one has
an use case to do so, however, it will only coexist and be out of the scope of
-Namespaces Management. NsIds will be consistently managed, creation (create-ns)
-of a namespace will not allocate the NsId already being taken. If ``nvme-ns``
+Namespaces Management. Deletion (delete-ns) will render an error for this
+namespace. NsIds will be consistently managed, creation (create-ns) of
+a namespace will not allocate the NsId already being taken. If ``nvme-ns``
device conflicts with previously created one by create-ns (the same NsId),
it will break QEMU's start up.
@@ -144,12 +144,12 @@
*
* - `auto-ns-path`
* If specified indicates a support for dynamic management of nvme namespaces
- * by means of nvme create-ns command. This path pointing
+ * by means of nvme create-ns and nvme delete-ns commands. This path pointing
* to a storage area for backend images must exist. Additionally it requires
* that parameter `ns-subsys` must be specified whereas parameter `drive`
* must not. The legacy namespace backend is disabled, instead, a pair of
* files 'nvme_<ctrl SN>_ns_<NS-ID>.cfg' and 'nvme_<ctrl SN>_ns_<NS-ID>.img'
- * will refer to respective namespaces. The create-ns, attach-ns
+ * will refer to respective namespaces. The create-ns, delete-ns, attach-ns
* and detach-ns commands, issued at the guest side, will make changes to
* those files accordingly.
* For each namespace exists an image file in raw format and a config file
@@ -5738,6 +5738,23 @@ static NvmeNamespace *nvme_ns_mgmt_create(NvmeCtrl *n, uint32_t nsid, NvmeIdNsMg
return ns;
}
+static void nvme_ns_mgmt_delete(NvmeCtrl *n, uint32_t nsid, Error **errp)
+{
+ Error *local_err = NULL;
+
+ if (!n->params.ns_directory) {
+ error_setg(&local_err, "delete-ns not supported if 'auto-ns-path' is not specified");
+ } else if (n->namespace.blkconf.blk) {
+ error_setg(&local_err, "delete-ns not supported if 'drive' is specified");
+ } else {
+ nvme_ns_delete(n, nsid, &local_err);
+ }
+
+ if (local_err) {
+ error_propagate(errp, local_err);
+ }
+}
+
static uint16_t nvme_ns_mgmt(NvmeCtrl *n, NvmeRequest *req)
{
NvmeIdCtrl *id = &n->id_ctrl;
@@ -5750,6 +5767,7 @@ static uint16_t nvme_ns_mgmt(NvmeCtrl *n, NvmeRequest *req)
uint8_t sel = dw10 & 0xf;
uint8_t csi = (dw11 >> 24) & 0xf;
uint16_t i;
+ uint64_t image_size;
uint16_t ret;
Error *local_err = NULL;
@@ -5807,14 +5825,15 @@ static uint16_t nvme_ns_mgmt(NvmeCtrl *n, NvmeRequest *req)
return NVME_INVALID_FIELD | NVME_DNR;
}
+ /* ns->size is the real image size after creation */
if (nvme_cfg_update(n, ns->size, NVME_NS_ALLOC_CHK)) {
- /* place for delete-ns */
+ nvme_ns_mgmt_delete(n, nsid, NULL);
return NVME_NS_INSUFFICIENT_CAPAC | NVME_DNR;
}
(void)nvme_cfg_update(n, ns->size, NVME_NS_ALLOC);
if (nvme_cfg_save(n)) {
(void)nvme_cfg_update(n, ns->size, NVME_NS_DEALLOC);
- /* place for delete-ns */
+ nvme_ns_mgmt_delete(n, nsid, NULL);
return NVME_INVALID_FIELD | NVME_DNR;
}
req->cqe.result = cpu_to_le32(nsid);
@@ -5825,6 +5844,65 @@ static uint16_t nvme_ns_mgmt(NvmeCtrl *n, NvmeRequest *req)
return NVME_INVALID_FIELD | NVME_DNR;
}
break;
+ case NVME_NS_MANAGEMENT_DELETE:
+ switch (csi) {
+ case NVME_CSI_NVM:
+ if (!nsid) {
+ return NVME_INVALID_FIELD | NVME_DNR;
+ }
+
+ if (nsid != NVME_NSID_BROADCAST) {
+ ns = nvme_subsys_ns(n->subsys, nsid);
+ if (n->params.ns_directory && ns && ns_auto_check(n, ns, nsid)) {
+ error_setg(&local_err, "ns[%"PRIu32"] cannot be deleted, configured via '-device nvme-ns...'", nsid);
+ } else if (ns) {
+ image_size = ns->size;
+ nvme_ns_mgmt_delete(n, nsid, &local_err);
+ if (!local_err) {
+ (void)nvme_cfg_update(n, image_size, NVME_NS_DEALLOC);
+ if (nvme_cfg_save(n)) {
+ error_setg(&local_err, "Could not save nvme-cfg");
+ }
+ }
+ } else {
+ return NVME_INVALID_FIELD | NVME_DNR;
+ }
+ } else {
+ for (i = 1; i <= NVME_MAX_NAMESPACES; i++) {
+ ns = nvme_subsys_ns(n->subsys, (uint32_t)i);
+ if (n->params.ns_directory && ns && ns_auto_check(n, ns, (uint32_t)i)) {
+ error_setg(&local_err, "ns[%"PRIu32"] cannot be deleted, configured via '-device nvme-ns...'", i);
+ error_report_err(local_err);
+ local_err = NULL; /* we are skipping */
+ } else if (ns) {
+ image_size = ns->size;
+ nvme_ns_mgmt_delete(n, (uint16_t)i, &local_err);
+ if (!local_err) {
+ (void)nvme_cfg_update(n, image_size, NVME_NS_DEALLOC);
+ if (nvme_cfg_save(n)) {
+ error_setg(&local_err, "Could not save nvme-cfg");
+ }
+ }
+ }
+ if (local_err) {
+ break;
+ }
+ }
+ }
+
+ if (local_err) {
+ error_report_err(local_err);
+ return NVME_INVALID_FIELD | NVME_DNR;
+ }
+
+ nvme_update_dmrsl(n);
+ break;
+ case NVME_CSI_ZONED:
+ /* fall through for now */
+ default:
+ return NVME_INVALID_FIELD | NVME_DNR;
+ }
+ break;
default:
return NVME_INVALID_FIELD | NVME_DNR;
}
@@ -76,6 +76,11 @@ void ns_blockdev_activate(BlockBackend *blk, uint64_t image_size, Error **errp)
errp);
}
+void ns_blockdev_deactivate(BlockBackend *blk, Error **errp)
+{
+ ns_blockdev_activate(blk, 0, errp);
+}
+
int ns_storage_path_check(NvmeCtrl *n, Error **errp)
{
return storage_path_check(n->params.ns_directory, n->params.serial, errp);
@@ -592,6 +592,8 @@ NvmeNamespace * nvme_ns_create(NvmeCtrl *n, uint32_t nsid, NvmeIdNsMgmt *id_ns,
blk = NULL;
}
object_unref(OBJECT(dev));
+ } else if (ns) { /* in a very rare case when ns_cfg_save() failed */
+ nvme_ns_delete(n, nsid, NULL);
}
error_propagate(errp, local_err);
ns = NULL;
@@ -600,6 +602,78 @@ NvmeNamespace * nvme_ns_create(NvmeCtrl *n, uint32_t nsid, NvmeIdNsMgmt *id_ns,
return ns;
}
+static void nvme_ns_unrealize(DeviceState *dev);
+
+void nvme_ns_delete(NvmeCtrl *n, uint32_t nsid, Error **errp)
+{
+ NvmeNamespace *ns = NULL;
+ NvmeSubsystem *subsys = n->subsys;
+ int i;
+ int ret = 0;
+ Error *local_err = NULL;
+
+ trace_pci_nvme_ns_delete(nsid);
+
+ if (subsys) {
+ ns = nvme_subsys_ns(subsys, (uint32_t)nsid);
+ if (ns) {
+ if (ns->params.shared) {
+ for (i = 0; i < ARRAY_SIZE(subsys->ctrls); i++) {
+ NvmeCtrl *ctrl = subsys->ctrls[i];
+
+ if (ctrl && ctrl->namespaces[nsid]) {
+ ctrl->namespaces[nsid] = NULL;
+ ns->attached--;
+ }
+ }
+ }
+ subsys->namespaces[nsid] = NULL;
+ }
+ }
+
+ if (!ns) {
+ ns = nvme_ns(n, (uint32_t)nsid);
+ }
+
+ if (!ns) {
+ error_setg(&local_err, "Namespace %d does not exist", nsid);
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ n->namespaces[nsid] = NULL;
+ if (ns->attached > 0) {
+ error_setg(&local_err, "Could not detach all ns references for ns[%d], still %d left", nsid, ns->attached);
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ /* here is actual deletion */
+ nvme_ns_unrealize(&ns->parent_obj);
+ qdev_unrealize(&ns->parent_obj);
+ ns_blockdev_deactivate(ns->blkconf.blk, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ ns->params.detached = true;
+ ns_cfg_clear(ns);
+ ret = ns_cfg_save(n, ns, nsid);
+ if (ret == -1) {
+ error_setg(&local_err, "Unable to save ns-cnf");
+ error_propagate(errp, local_err);
+ return;
+ } else if (ret == 1) { /* should not occur here, check and error message prior to call to nvme_ns_delete() */
+ return;
+ }
+
+ /* disassociating refernces to the back-end and keeping it as preloaded */
+ n->preloaded_blk[nsid] = ns->blkconf.blk;
+ ns->blkconf.blk = NULL;
+
+}
+
int nvme_ns_setup(NvmeNamespace *ns, Error **errp)
{
if (nvme_ns_check_constraints(ns, errp)) {
@@ -280,6 +280,7 @@ void nvme_ns_shutdown(NvmeNamespace *ns);
void nvme_ns_cleanup(NvmeNamespace *ns);
void nvme_validate_flbas(uint8_t flbas, Error **errp);
NvmeNamespace * nvme_ns_create(NvmeCtrl *n, uint32_t nsid, NvmeIdNsMgmt *id_ns, Error **errp);
+void nvme_ns_delete(NvmeCtrl *n, uint32_t nsid, Error **errp);
typedef struct NvmeAsyncEvent {
QTAILQ_ENTRY(NvmeAsyncEvent) entry;
@@ -582,6 +583,7 @@ static inline NvmeSecCtrlEntry *nvme_sctrl_for_cntlid(NvmeCtrl *n,
BlockBackend *ns_blockdev_init(const char *file, Error **errp);
void ns_blockdev_activate(BlockBackend *blk, uint64_t image_size, Error **errp);
+void ns_blockdev_deactivate(BlockBackend *blk, Error **errp);
int nvme_ns_backend_setup(NvmeCtrl *n, Error **errp);
void nvme_attach_ns(NvmeCtrl *n, NvmeNamespace *ns);
uint16_t nvme_bounce_data(NvmeCtrl *n, void *ptr, uint32_t len,
@@ -79,6 +79,7 @@ pci_nvme_aer_masked(uint8_t type, uint8_t mask) "type 0x%"PRIx8" mask 0x%"PRIx8"
pci_nvme_aer_post_cqe(uint8_t typ, uint8_t info, uint8_t log_page) "type 0x%"PRIx8" info 0x%"PRIx8" lid 0x%"PRIx8""
pci_nvme_ns_mgmt(uint16_t cid, uint32_t nsid, uint8_t sel, uint8_t csi, uint8_t psdt) "cid %"PRIu16", nsid=%"PRIu32", sel=0x%"PRIx8", csi=0x%"PRIx8", psdt=0x%"PRIx8""
pci_nvme_ns_create(uint16_t nsid, uint64_t nsze, uint64_t ncap, uint8_t flbas) "nsid %"PRIu16", nsze=%"PRIu64", ncap=%"PRIu64", flbas=%"PRIu8""
+pci_nvme_ns_delete(uint16_t nsid) "nsid %"PRIu16""
pci_nvme_ns_attachment(uint16_t cid, uint8_t sel) "cid %"PRIu16", sel=0x%"PRIx8""
pci_nvme_ns_attachment_attach(uint16_t cntlid, uint32_t nsid) "cntlid=0x%"PRIx16", nsid=0x%"PRIx32""
pci_nvme_enqueue_event(uint8_t typ, uint8_t info, uint8_t log_page) "type 0x%"PRIx8" info 0x%"PRIx8" lid 0x%"PRIx8""
@@ -1191,6 +1191,7 @@ enum NvmeIdCtrlCmic {
enum NvmeNsManagementOperation {
NVME_NS_MANAGEMENT_CREATE = 0x0,
+ NVME_NS_MANAGEMENT_DELETE = 0x1,
};
enum NvmeNsAttachmentOperation {