| Message ID | 20200520225026.29426-1-vishal.l.verma@intel.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 543094e19c82b5d171e139d09a1a3ea0a7361117 |
| Headers | show |
| Series | nvdimm/region: always show the 'align' attribute | expand |
On Wed, May 20, 2020 at 3:50 PM Vishal Verma <vishal.l.verma@intel.com> wrote: > > It is possible that a platform that is capable of 'namespace labels' > comes up without the labels properly initialized. In this case, the > region's 'align' attribute is hidden. Howerver, once the user does > initialize he labels, the 'align' attribute still stays hidden, which is > unexpected. > > The sysfs_update_group() API is meant to address this, and could be > called during region probe, but it has entanglements with the device > 'lockdep_mutex'. Therefore, simply make the 'align' attribute always Looks good, I would just say "device_lock" here. The "lockdep_mutex" is just a stand-in to show "device_lock" problems since the mutex that device_lock() acquires is marked like this: lockdep_set_novalidate_class(&dev->mutex); ...I can fix this up on applying. > visible. It doesn't matter what it says for label-less namespaces, since > it is not possible to change their allocation anyway. > > Cc: Dan Williams <dan.j.williams@intel.com> > Suggested-by: Dan Williams <dan.j.williams@intel.com> > Signed-off-by: Vishal Verma <vishal.l.verma@intel.com> > --- > drivers/nvdimm/region_devs.c | 14 ++------------ > 1 file changed, 2 insertions(+), 12 deletions(-) > > diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c > index ccbb5b43b8b2..4502f9c4708d 100644 > --- a/drivers/nvdimm/region_devs.c > +++ b/drivers/nvdimm/region_devs.c > @@ -679,18 +679,8 @@ static umode_t region_visible(struct kobject *kobj, struct attribute *a, int n) > return a->mode; > } > > - if (a == &dev_attr_align.attr) { > - int i; > - > - for (i = 0; i < nd_region->ndr_mappings; i++) { > - struct nd_mapping *nd_mapping = &nd_region->mapping[i]; > - struct nvdimm *nvdimm = nd_mapping->nvdimm; > - > - if (test_bit(NDD_LABELING, &nvdimm->flags)) > - return a->mode; > - } > - return 0; > - } > + if (a == &dev_attr_align.attr) > + return a->mode; > > if (a != &dev_attr_set_cookie.attr > && a != &dev_attr_available_size.attr) > -- > 2.26.2 >
diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c index ccbb5b43b8b2..4502f9c4708d 100644 --- a/drivers/nvdimm/region_devs.c +++ b/drivers/nvdimm/region_devs.c @@ -679,18 +679,8 @@ static umode_t region_visible(struct kobject *kobj, struct attribute *a, int n) return a->mode; } - if (a == &dev_attr_align.attr) { - int i; - - for (i = 0; i < nd_region->ndr_mappings; i++) { - struct nd_mapping *nd_mapping = &nd_region->mapping[i]; - struct nvdimm *nvdimm = nd_mapping->nvdimm; - - if (test_bit(NDD_LABELING, &nvdimm->flags)) - return a->mode; - } - return 0; - } + if (a == &dev_attr_align.attr) + return a->mode; if (a != &dev_attr_set_cookie.attr && a != &dev_attr_available_size.attr)
It is possible that a platform that is capable of 'namespace labels' comes up without the labels properly initialized. In this case, the region's 'align' attribute is hidden. Howerver, once the user does initialize he labels, the 'align' attribute still stays hidden, which is unexpected. The sysfs_update_group() API is meant to address this, and could be called during region probe, but it has entanglements with the device 'lockdep_mutex'. Therefore, simply make the 'align' attribute always visible. It doesn't matter what it says for label-less namespaces, since it is not possible to change their allocation anyway. Cc: Dan Williams <dan.j.williams@intel.com> Suggested-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com> --- drivers/nvdimm/region_devs.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)