[PATCH] block: hide badblocks attribute by default

[PATCH] block: hide badblocks attribute by default

[Dan Williams]

Commit 99e6608c9e74 "block: Add badblock management for gendisks"
allowed for drivers like pmem and software-raid to advertise a list of
bad media areas. However, it inadvertently added a 'badblocks' to all
block devices. Lets clean this up by having the 'badblocks' attribute
not be visible when the driver has not populated a 'struct badblocks'
instance in the gendisk.

Cc: Jens Axboe <axboe@fb.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Reported-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 block/genhd.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/block/genhd.c b/block/genhd.c
index a9c516a8b37d..12acd48e1210 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1060,8 +1060,19 @@ static struct attribute *disk_attrs[] = {
 	NULL
 };
 
+static umode_t disk_visible(struct kobject *kobj, struct attribute *a, int n)
+{
+	struct device *dev = container_of(kobj, typeof(*dev), kobj);
+	struct gendisk *disk = dev_to_disk(dev);
+
+	if (a == &dev_attr_badblocks.attr && !disk->bb)
+		return 0;
+	return a->mode;
+}
+
 static struct attribute_group disk_attr_group = {
 	.attrs = disk_attrs,
+	.is_visible = disk_visible,
 };
 
 static const struct attribute_group *disk_attr_groups[] = {

Re: [PATCH] block: hide badblocks attribute by default

[Verma, Vishal L]

T24gVGh1LCAyMDE3LTA0LTI3IGF0IDE0OjQ2IC0wNzAwLCBEYW4gV2lsbGlhbXMgd3JvdGU6DQo+
IENvbW1pdCA5OWU2NjA4YzllNzQgImJsb2NrOiBBZGQgYmFkYmxvY2sgbWFuYWdlbWVudCBmb3Ig
Z2VuZGlza3MiDQo+IGFsbG93ZWQgZm9yIGRyaXZlcnMgbGlrZSBwbWVtIGFuZCBzb2Z0d2FyZS1y
YWlkIHRvIGFkdmVydGlzZSBhIGxpc3Qgb2YNCj4gYmFkIG1lZGlhIGFyZWFzLiBIb3dldmVyLCBp
dCBpbmFkdmVydGVudGx5IGFkZGVkIGEgJ2JhZGJsb2NrcycgdG8gYWxsDQo+IGJsb2NrIGRldmlj
ZXMuIExldHMgY2xlYW4gdGhpcyB1cCBieSBoYXZpbmcgdGhlICdiYWRibG9ja3MnIGF0dHJpYnV0
ZQ0KPiBub3QgYmUgdmlzaWJsZSB3aGVuIHRoZSBkcml2ZXIgaGFzIG5vdCBwb3B1bGF0ZWQgYSAn
c3RydWN0IGJhZGJsb2NrcycNCj4gaW5zdGFuY2UgaW4gdGhlIGdlbmRpc2suDQo+IA0KPiBDYzog
SmVucyBBeGJvZSA8YXhib2VAZmIuY29tPg0KPiBDYzogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBs
c3QuZGU+DQo+IENjOiBNYXJ0aW4gSy4gUGV0ZXJzZW4gPG1hcnRpbi5wZXRlcnNlbkBvcmFjbGUu
Y29tPg0KPiBSZXBvcnRlZC1ieTogVmlzaGFsIFZlcm1hIDx2aXNoYWwubC52ZXJtYUBpbnRlbC5j
b20+DQo+IFNpZ25lZC1vZmYtYnk6IERhbiBXaWxsaWFtcyA8ZGFuLmoud2lsbGlhbXNAaW50ZWwu
Y29tPg0KPiAtLS0NCj4gwqBibG9jay9nZW5oZC5jIHzCoMKgwqAxMSArKysrKysrKysrKw0KPiDC
oDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspDQo+IA0KVGVzdGVkIHRoYXQgdGhpcyBy
ZW1vdmVzIHRoZSBiYWRibG9ja3MgYXR0cmlidXRlIGZvciBibG9jayBkZXZpY2VzIHRoYXQNCmRv
bid0IHVzZSB0aGVtOg0KDQokIGNhdCAvc3lzL2Jsb2NrL3BtZW02L2JhZGJsb2Nrc8KgDQo2MTU3
NiA4DQoNCiQgY2F0IC9zeXMvYmxvY2svdmRhL2JhZGJsb2Nrc8KgDQpjYXQ6IC9zeXMvYmxvY2sv
dmRhL2JhZGJsb2NrczogTm8gc3VjaCBmaWxlIG9yIGRpcmVjdG9yeQ0KDQpUZXN0ZWQtYnk6IFZp
c2hhbCBWZXJtYSA8dmlzaGFsLmwudmVybWFAaW50ZWwuY29tPg==

Re: [PATCH] block: hide badblocks attribute by default

[Verma, Vishal L]

On Thu, 2017-04-27 at 14:46 -0700, Dan Williams wrote:
> Commit 99e6608c9e74 "block: Add badblock management for gendisks"
> allowed for drivers like pmem and software-raid to advertise a list of
> bad media areas. However, it inadvertently added a 'badblocks' to all
> block devices. Lets clean this up by having the 'badblocks' attribute
> not be visible when the driver has not populated a 'struct badblocks'
> instance in the gendisk.
> 
> Cc: Jens Axboe <axboe@fb.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Martin K. Petersen <martin.petersen@oracle.com>
> Reported-by: Vishal Verma <vishal.l.verma@intel.com>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> ---
>  block/genhd.c |   11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
Tested that this removes the badblocks attribute for block devices that
don't use them:

$ cat /sys/block/pmem6/badblocks 
61576 8

$ cat /sys/block/vda/badblocks 
cat: /sys/block/vda/badblocks: No such file or directory

Tested-by: Vishal Verma <vishal.l.verma@intel.com>

Re: [PATCH] block: hide badblocks attribute by default

[Jens Axboe]

On Thu, Apr 27 2017, Dan Williams wrote:
> Commit 99e6608c9e74 "block: Add badblock management for gendisks"
> allowed for drivers like pmem and software-raid to advertise a list of
> bad media areas. However, it inadvertently added a 'badblocks' to all
> block devices. Lets clean this up by having the 'badblocks' attribute
> not be visible when the driver has not populated a 'struct badblocks'
> instance in the gendisk.

Thanks Dan, added.

-- 
Jens Axboe