blk-integrity: register sysfs attributes on struct device

Upstream commit ff53cd52d9bdbf4074d2bbe9b591729997780bd3.

The "integrity" kobject only acted as a holder for static sysfs entries.
It also was embedded into struct gendisk without managing it, violating
assumptions of the driver core.

Instead register the sysfs entries directly onto the struct device.

Also drop the now unused member integrity_kobj from struct gendisk.

Suggested-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20230309-kobj_release-gendisk_integrity-v3-3-ceccb4493c46@weissschuh.net
Signed-off-by: Jens Axboe <axboe@kernel.dk>
[cascardo: conflict because of constification of integrity_ktype]
[cascardo: struct gendisk is defined at include/linux/genhd.h]
[cascardo: there is no blk_trace_attr_group]
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 8868b1e01d58bc8812469d1cc1714c6f979d126d..fbbb38cc9e8aa34191dc55398e055b7584f2c248 100644 (file)
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -212,31 +212,6 @@ bool blk_integrity_merge_bio(struct request_queue *q, struct request *req,
        return true;
 }
 
-static ssize_t integrity_attr_show(struct kobject *kobj, struct attribute *attr,
-                                  char *page)
-{
-       struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
-       struct device *dev = disk_to_dev(disk);
-       struct device_attribute *dev_attr =
-               container_of(attr, struct device_attribute, attr);
-
-       return dev_attr->show(dev, dev_attr, page);
-}
-
-static ssize_t integrity_attr_store(struct kobject *kobj,
-                                   struct attribute *attr, const char *page,
-                                   size_t count)
-{
-       struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
-       struct device *dev = disk_to_dev(disk);
-       struct device_attribute *dev_attr =
-               container_of(attr, struct device_attribute, attr);
-
-       if (!dev_attr->store)
-               return 0;
-       return dev_attr->store(dev, dev_attr, page, count);
-}
-
 static inline struct blk_integrity *dev_to_bi(struct device *dev)
 {
        return &dev_to_disk(dev)->queue->integrity;
@@ -345,16 +320,10 @@ static struct attribute *integrity_attrs[] = {
        &dev_attr_device_is_integrity_capable.attr,
        NULL
 };
-ATTRIBUTE_GROUPS(integrity);
 
-static const struct sysfs_ops integrity_ops = {
-       .show   = &integrity_attr_show,
-       .store  = &integrity_attr_store,
-};
-
-static struct kobj_type integrity_ktype = {
-       .default_groups = integrity_groups,
-       .sysfs_ops      = &integrity_ops,
+const struct attribute_group blk_integrity_attr_group = {
+       .name = "integrity",
+       .attrs = integrity_attrs,
 };
 
 static blk_status_t blk_integrity_nop_fn(struct blk_integrity_iter *iter)
@@ -431,21 +400,3 @@ void blk_integrity_unregister(struct gendisk *disk)
        memset(bi, 0, sizeof(*bi));
 }
 EXPORT_SYMBOL(blk_integrity_unregister);
-
-int blk_integrity_add(struct gendisk *disk)
-{
-       int ret;
-
-       ret = kobject_init_and_add(&disk->integrity_kobj, &integrity_ktype,
-                                  &disk_to_dev(disk)->kobj, "%s", "integrity");
-       if (!ret)
-               kobject_uevent(&disk->integrity_kobj, KOBJ_ADD);
-       return ret;
-}
-
-void blk_integrity_del(struct gendisk *disk)
-{
-       kobject_uevent(&disk->integrity_kobj, KOBJ_REMOVE);
-       kobject_del(&disk->integrity_kobj);
-       kobject_put(&disk->integrity_kobj);
-}

diff --git a/block/blk.h b/block/blk.h
index aab72194d2266fbe75fa416dfd9106894df4ab32..e90a5e3485128a4e11e524c1603370234ad64d4f 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -130,8 +130,7 @@ static inline bool integrity_req_gap_front_merge(struct request *req,
                                bip_next->bip_vec[0].bv_offset);
 }
 
-int blk_integrity_add(struct gendisk *disk);
-void blk_integrity_del(struct gendisk *);
+extern const struct attribute_group blk_integrity_attr_group;
 #else /* CONFIG_BLK_DEV_INTEGRITY */
 static inline bool blk_integrity_merge_rq(struct request_queue *rq,
                struct request *r1, struct request *r2)
@@ -164,13 +163,6 @@ static inline bool bio_integrity_endio(struct bio *bio)
 static inline void bio_integrity_free(struct bio *bio)
 {
 }
-static inline int blk_integrity_add(struct gendisk *disk)
-{
-       return 0;
-}
-static inline void blk_integrity_del(struct gendisk *disk)
-{
-}
 #endif /* CONFIG_BLK_DEV_INTEGRITY */
 
 unsigned long blk_rq_timeout(unsigned long timeout);

diff --git a/block/genhd.c b/block/genhd.c
index 4d28f1d5f9b0e0bd0841ca6b260ed0b7e8c7f15b..88d1a6385a2423313482c2bf1e4384e38307604e 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -467,15 +467,11 @@ int device_add_disk(struct device *parent, struct gendisk *disk,
         */
        pm_runtime_set_memalloc_noio(ddev, true);
 
-       ret = blk_integrity_add(disk);
-       if (ret)
-               goto out_del_block_link;
-
        disk->part0->bd_holder_dir =
                kobject_create_and_add("holders", &ddev->kobj);
        if (!disk->part0->bd_holder_dir) {
                ret = -ENOMEM;
-               goto out_del_integrity;
+               goto out_del_block_link;
        }
        disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj);
        if (!disk->slave_dir) {
@@ -535,8 +531,6 @@ out_put_slave_dir:
        disk->slave_dir = NULL;
 out_put_holder_dir:
        kobject_put(disk->part0->bd_holder_dir);
-out_del_integrity:
-       blk_integrity_del(disk);
 out_del_block_link:
        if (!sysfs_deprecated)
                sysfs_remove_link(block_depr, dev_name(ddev));
@@ -592,7 +586,6 @@ void del_gendisk(struct gendisk *disk)
        if (WARN_ON_ONCE(!disk_live(disk) && !(disk->flags & GENHD_FL_HIDDEN)))
                return;
 
-       blk_integrity_del(disk);
        disk_del_events(disk);
 
        mutex_lock(&disk->open_mutex);
@@ -1084,6 +1077,9 @@ static struct attribute_group disk_attr_group = {
 
 static const struct attribute_group *disk_attr_groups[] = {
        &disk_attr_group,
+#ifdef CONFIG_BLK_DEV_INTEGRITY
+       &blk_integrity_attr_group,
+#endif
        NULL
 };
 

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 690b7f7996d151856edbc978f90a40b03aae879b..3f49a3a30e9bc8da4a000ecadbe5f4208e6c73de 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -144,9 +144,6 @@ struct gendisk {
        struct timer_rand_state *random;
        atomic_t sync_io;               /* RAID */
        struct disk_events *ev;
-#ifdef  CONFIG_BLK_DEV_INTEGRITY
-       struct kobject integrity_kobj;
-#endif /* CONFIG_BLK_DEV_INTEGRITY */
 #if IS_ENABLED(CONFIG_CDROM)
        struct cdrom_device_info *cdi;
 #endif