On 7/30/25 5:11 AM, Neeraj Kumar wrote:
> Added cxl v2.1 format region label deletion routine. This function is
> used to delete region label from LSA
>
> Signed-off-by: Neeraj Kumar <s.nee...@samsung.com>
> ---
> drivers/nvdimm/label.c | 77 ++++++++++++++++++++++++++++++---
> drivers/nvdimm/label.h | 6 +++
> drivers/nvdimm/namespace_devs.c | 12 +++++
> drivers/nvdimm/nd.h | 9 ++++
> include/linux/libnvdimm.h | 1 +
> 5 files changed, 100 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
> index 94f2d0ba7aca..be18278d6cea 100644
> --- a/drivers/nvdimm/label.c
> +++ b/drivers/nvdimm/label.c
> @@ -1044,7 +1044,8 @@ static int init_labels(struct nd_mapping *nd_mapping,
> int num_labels)
> return max(num_labels, old_num_labels);
> }
>
> -static int del_labels(struct nd_mapping *nd_mapping, uuid_t *uuid)
> +static int del_labels(struct nd_mapping *nd_mapping, uuid_t *uuid,
> + enum label_type ltype)
> {
> struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);
> struct nd_label_ent *label_ent, *e;
> @@ -1068,8 +1069,23 @@ static int del_labels(struct nd_mapping *nd_mapping,
> uuid_t *uuid)
> if (!nd_label)
> continue;
> active++;
> - if (!nsl_uuid_equal(ndd, &nd_label->ns_label, uuid))
> - continue;
> +
> + switch (ltype) {
> + case NS_LABEL_TYPE:
> + if (!nsl_uuid_equal(ndd, &nd_label->ns_label, uuid))
> + continue;
> +
> + break;
> + case RG_LABEL_TYPE:
> + if (!rgl_uuid_equal(&nd_label->rg_label, uuid))
> + continue;
> +
> + break;
> + default:
> + dev_err(ndd->dev, "Invalid label type\n");
> + return 0;
> + }
> +
> active--;
> slot = to_slot(ndd, nd_label);
> nd_label_free_slot(ndd, slot);
> @@ -1079,7 +1095,7 @@ static int del_labels(struct nd_mapping *nd_mapping,
> uuid_t *uuid)
> }
> list_splice_tail_init(&list, &nd_mapping->labels);
>
> - if (active == 0) {
> + if ((ltype == NS_LABEL_TYPE) && (active == 0)) {
> nd_mapping_free_labels(nd_mapping);
> dev_dbg(ndd->dev, "no more active labels\n");
> }
> @@ -1101,7 +1117,8 @@ int nd_pmem_namespace_label_update(struct nd_region
> *nd_region,
> int count = 0;
>
> if (size == 0) {
> - rc = del_labels(nd_mapping, nspm->uuid);
> + rc = del_labels(nd_mapping, nspm->uuid,
> + NS_LABEL_TYPE);
> if (rc)
> return rc;
> continue;
> @@ -1268,6 +1285,56 @@ int nd_pmem_region_label_update(struct nd_region
> *nd_region)
> return 0;
> }
>
> +int nd_pmem_region_label_delete(struct nd_region *nd_region)
> +{
> + int i, rc;
> + struct nd_interleave_set *nd_set = nd_region->nd_set;
> + struct nd_label_ent *label_ent;
> + int ns_region_cnt = 0;
reverse xmas tree pls
> +
> + for (i = 0; i < nd_region->ndr_mappings; i++) {
> + struct nd_mapping *nd_mapping = &nd_region->mapping[i];
> + struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);
> +
> + /* Find non cxl format supported ndr_mappings */
> + if (!ndd->cxl) {
> + dev_info(&nd_region->dev, "Region label unsupported\n");
> + return -EINVAL;
> + }
> +
> + /* Find if any NS label using this region */
> + mutex_lock(&nd_mapping->lock);
> + list_for_each_entry(label_ent, &nd_mapping->labels, list) {
> + if (!label_ent->label)
> + continue;
> +
> + /*
> + * Check if any available NS labels has same
> + * region_uuid in LSA
> + */
> + if (nsl_region_uuid_equal(&label_ent->label->ns_label,
> + &nd_set->uuid))
> + ns_region_cnt++;
> + }
> + mutex_unlock(&nd_mapping->lock);
> + }
> +
> + if (ns_region_cnt) {
> + dev_dbg(&nd_region->dev, "Region/Namespace label in use\n");
> + return -EBUSY;
> + }
> +
> + for (i = 0; i < nd_region->ndr_mappings; i++) {
> + struct nd_mapping *nd_mapping = &nd_region->mapping[i];
> +
> + rc = del_labels(nd_mapping, &nd_set->uuid, RG_LABEL_TYPE);
> + if (rc)
> + return rc;
> + }
> +
> + return 0;
> +}
> +
> int __init nd_label_init(void)
> {
> WARN_ON(guid_parse(NVDIMM_BTT_GUID, &nvdimm_btt_guid));
> diff --git a/drivers/nvdimm/label.h b/drivers/nvdimm/label.h
> index 0f428695017d..cc14068511cf 100644
> --- a/drivers/nvdimm/label.h
> +++ b/drivers/nvdimm/label.h
> @@ -30,6 +30,11 @@ enum {
> ND_NSINDEX_INIT = 0x1,
> };
>
> +enum label_type {
> + RG_LABEL_TYPE,
REGION_LABEL_TYPE preferred
> + NS_LABEL_TYPE,
> +};
> +
> /**
> * struct nd_namespace_index - label set superblock
> * @sig: NAMESPACE_INDEX\0
> @@ -235,4 +240,5 @@ struct nd_namespace_pmem;
> int nd_pmem_namespace_label_update(struct nd_region *nd_region,
> struct nd_namespace_pmem *nspm, resource_size_t size);
> int nd_pmem_region_label_update(struct nd_region *nd_region);
> +int nd_pmem_region_label_delete(struct nd_region *nd_region);
> #endif /* __LABEL_H__ */
> diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
> index 02ae8162566c..e5c2f78ca7dd 100644
> --- a/drivers/nvdimm/namespace_devs.c
> +++ b/drivers/nvdimm/namespace_devs.c
> @@ -244,6 +244,18 @@ int nd_region_label_update(struct nd_region *nd_region)
> }
> EXPORT_SYMBOL_GPL(nd_region_label_update);
>
> +int nd_region_label_delete(struct nd_region *nd_region)
> +{
> + int rc;
> +
> + nvdimm_bus_lock(&nd_region->dev);
> + rc = nd_pmem_region_label_delete(nd_region);
> + nvdimm_bus_unlock(&nd_region->dev);
> +
> + return rc;
> +}
> +EXPORT_SYMBOL_GPL(nd_region_label_delete);
> +
> static int nd_namespace_label_update(struct nd_region *nd_region,
> struct device *dev)
> {
> diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
> index 15d94e3937f0..6585747154c2 100644
> --- a/drivers/nvdimm/nd.h
> +++ b/drivers/nvdimm/nd.h
> @@ -322,6 +322,15 @@ static inline void nsl_set_region_uuid(struct
> nvdimm_drvdata *ndd,
> export_uuid(ns_label->cxl.region_uuid, uuid);
> }
>
> +static inline bool nsl_region_uuid_equal(struct nd_namespace_label *ns_label,
> + const uuid_t *uuid)
> +{
> + uuid_t tmp;
s/tmp/uuid/
> +
> + import_uuid(&tmp, ns_label->cxl.region_uuid);
> + return uuid_equal(&tmp, uuid);
> +}
> +
> static inline bool rgl_uuid_equal(struct cxl_region_label *rg_label,
> const uuid_t *uuid)
> {
> diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h
> index b06bd45373f4..b2e16914ab52 100644
> --- a/include/linux/libnvdimm.h
> +++ b/include/linux/libnvdimm.h
> @@ -310,6 +310,7 @@ int nvdimm_has_cache(struct nd_region *nd_region);
> int nvdimm_in_overwrite(struct nvdimm *nvdimm);
> bool is_nvdimm_sync(struct nd_region *nd_region);
> int nd_region_label_update(struct nd_region *nd_region);
> +int nd_region_label_delete(struct nd_region *nd_region);
>
> static inline int nvdimm_ctl(struct nvdimm *nvdimm, unsigned int cmd, void
> *buf,
> unsigned int buf_len, int *cmd_rc)
