dm zoned: introduce dmz_metadata_label() to format device name

Introduce dmz_metadata_label() to format the device-mapper device
name and use it instead of the device name of the underlying device.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Bob Liu <bob.liu@oracle.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

diff --git a/drivers/md/dm-zoned-metadata.c b/drivers/md/dm-zoned-metadata.c
index b844ff0..7cda486 100644 (file)
--- a/drivers/md/dm-zoned-metadata.c
+++ b/drivers/md/dm-zoned-metadata.c
@@ -134,6 +134,8 @@ struct dmz_sb {
 struct dmz_metadata {
        struct dmz_dev          *dev;
 
+       char                    devname[BDEVNAME_SIZE];
+
        sector_t                zone_bitmap_size;
        unsigned int            zone_nr_bitmap_blocks;
        unsigned int            zone_bits_per_mblk;
@@ -260,6 +262,11 @@ unsigned int dmz_nr_unmap_seq_zones(struct dmz_metadata *zmd)
        return atomic_read(&zmd->unmap_nr_seq);
 }
 
+const char *dmz_metadata_label(struct dmz_metadata *zmd)
+{
+       return (const char *)zmd->devname;
+}
+
 /*
  * Lock/unlock mapping table.
  * The map lock also protects all the zone lists.
@@ -2439,7 +2446,8 @@ static void dmz_cleanup_metadata(struct dmz_metadata *zmd)
 /*
  * Initialize the zoned metadata.
  */
-int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata)
+int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata,
+                    const char *devname)
 {
        struct dmz_metadata *zmd;
        unsigned int i;
@@ -2450,6 +2458,7 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata)
        if (!zmd)
                return -ENOMEM;
 
+       strcpy(zmd->devname, devname);
        zmd->dev = dev;
        zmd->mblk_rbtree = RB_ROOT;
        init_rwsem(&zmd->mblk_sem);

diff --git a/drivers/md/dm-zoned-reclaim.c b/drivers/md/dm-zoned-reclaim.c
index 5aa5e51..699c414 100644 (file)
--- a/drivers/md/dm-zoned-reclaim.c
+++ b/drivers/md/dm-zoned-reclaim.c
@@ -480,15 +480,16 @@ static void dmz_reclaim_work(struct work_struct *work)
                zrc->kc_throttle.throttle = min(75U, 100U - p_unmap_rnd / 2);
        }
 
-       dmz_dev_debug(zrc->dev,
-                     "Reclaim (%u): %s, %u%% free rnd zones (%u/%u)",
-                     zrc->kc_throttle.throttle,
-                     (dmz_target_idle(zrc) ? "Idle" : "Busy"),
-                     p_unmap_rnd, nr_unmap_rnd, nr_rnd);
+       DMDEBUG("(%s): Reclaim (%u): %s, %u%% free rnd zones (%u/%u)",
+               dmz_metadata_label(zmd),
+               zrc->kc_throttle.throttle,
+               (dmz_target_idle(zrc) ? "Idle" : "Busy"),
+               p_unmap_rnd, nr_unmap_rnd, nr_rnd);
 
        ret = dmz_do_reclaim(zrc);
        if (ret) {
-               dmz_dev_debug(zrc->dev, "Reclaim error %d\n", ret);
+               DMDEBUG("(%s): Reclaim error %d\n",
+                       dmz_metadata_label(zmd), ret);
                if (!dmz_check_bdev(zrc->dev))
                        return;
        }
@@ -524,7 +525,7 @@ int dmz_ctr_reclaim(struct dmz_dev *dev, struct dmz_metadata *zmd,
        /* Reclaim work */
        INIT_DELAYED_WORK(&zrc->work, dmz_reclaim_work);
        zrc->wq = alloc_ordered_workqueue("dmz_rwq_%s", WQ_MEM_RECLAIM,
-                                         dev->name);
+                                         dmz_metadata_label(zmd));
        if (!zrc->wq) {
                ret = -ENOMEM;
                goto err;

diff --git a/drivers/md/dm-zoned-target.c b/drivers/md/dm-zoned-target.c
index 68c5684..ba5b8c5 100644 (file)
--- a/drivers/md/dm-zoned-target.c
+++ b/drivers/md/dm-zoned-target.c
@@ -178,11 +178,12 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone,
                return 0;
        }
 
-       dmz_dev_debug(dmz->dev, "READ chunk %llu -> %s zone %u, block %llu, %u blocks",
-                     (unsigned long long)dmz_bio_chunk(zmd, bio),
-                     (dmz_is_rnd(zone) ? "RND" : "SEQ"),
-                     zone->id,
-                     (unsigned long long)chunk_block, nr_blocks);
+       DMDEBUG("(%s): READ chunk %llu -> %s zone %u, block %llu, %u blocks",
+               dmz_metadata_label(zmd),
+               (unsigned long long)dmz_bio_chunk(zmd, bio),
+               (dmz_is_rnd(zone) ? "RND" : "SEQ"),
+               zone->id,
+               (unsigned long long)chunk_block, nr_blocks);
 
        /* Check block validity to determine the read location */
        bzone = zone->bzone;
@@ -316,11 +317,12 @@ static int dmz_handle_write(struct dmz_target *dmz, struct dm_zone *zone,
        if (!zone)
                return -ENOSPC;
 
-       dmz_dev_debug(dmz->dev, "WRITE chunk %llu -> %s zone %u, block %llu, %u blocks",
-                     (unsigned long long)dmz_bio_chunk(zmd, bio),
-                     (dmz_is_rnd(zone) ? "RND" : "SEQ"),
-                     zone->id,
-                     (unsigned long long)chunk_block, nr_blocks);
+       DMDEBUG("(%s): WRITE chunk %llu -> %s zone %u, block %llu, %u blocks",
+               dmz_metadata_label(zmd),
+               (unsigned long long)dmz_bio_chunk(zmd, bio),
+               (dmz_is_rnd(zone) ? "RND" : "SEQ"),
+               zone->id,
+               (unsigned long long)chunk_block, nr_blocks);
 
        if (dmz_is_rnd(zone) || chunk_block == zone->wp_block) {
                /*
@@ -357,10 +359,11 @@ static int dmz_handle_discard(struct dmz_target *dmz, struct dm_zone *zone,
        if (dmz_is_readonly(zone))
                return -EROFS;
 
-       dmz_dev_debug(dmz->dev, "DISCARD chunk %llu -> zone %u, block %llu, %u blocks",
-                     (unsigned long long)dmz_bio_chunk(zmd, bio),
-                     zone->id,
-                     (unsigned long long)chunk_block, nr_blocks);
+       DMDEBUG("(%s): DISCARD chunk %llu -> zone %u, block %llu, %u blocks",
+               dmz_metadata_label(dmz->metadata),
+               (unsigned long long)dmz_bio_chunk(zmd, bio),
+               zone->id,
+               (unsigned long long)chunk_block, nr_blocks);
 
        /*
         * Invalidate blocks in the data zone and its
@@ -429,8 +432,8 @@ static void dmz_handle_bio(struct dmz_target *dmz, struct dm_chunk_work *cw,
                ret = dmz_handle_discard(dmz, zone, bio);
                break;
        default:
-               dmz_dev_err(dmz->dev, "Unsupported BIO operation 0x%x",
-                           bio_op(bio));
+               DMERR("(%s): Unsupported BIO operation 0x%x",
+                     dmz_metadata_label(dmz->metadata), bio_op(bio));
                ret = -EIO;
        }
 
@@ -504,7 +507,8 @@ static void dmz_flush_work(struct work_struct *work)
        /* Flush dirty metadata blocks */
        ret = dmz_flush_metadata(dmz->metadata);
        if (ret)
-               dmz_dev_debug(dmz->dev, "Metadata flush failed, rc=%d\n", ret);
+               DMDEBUG("(%s): Metadata flush failed, rc=%d\n",
+                       dmz_metadata_label(dmz->metadata), ret);
 
        /* Process queued flush requests */
        while (1) {
@@ -631,11 +635,12 @@ static int dmz_map(struct dm_target *ti, struct bio *bio)
        if (dmz_bdev_is_dying(dmz->dev))
                return DM_MAPIO_KILL;
 
-       dmz_dev_debug(dev, "BIO op %d sector %llu + %u => chunk %llu, block %llu, %u blocks",
-                     bio_op(bio), (unsigned long long)sector, nr_sectors,
-                     (unsigned long long)dmz_bio_chunk(zmd, bio),
-                     (unsigned long long)dmz_chunk_block(zmd, dmz_bio_block(bio)),
-                     (unsigned int)dmz_bio_blocks(bio));
+       DMDEBUG("(%s): BIO op %d sector %llu + %u => chunk %llu, block %llu, %u blocks",
+               dmz_metadata_label(zmd),
+               bio_op(bio), (unsigned long long)sector, nr_sectors,
+               (unsigned long long)dmz_bio_chunk(zmd, bio),
+               (unsigned long long)dmz_chunk_block(zmd, dmz_bio_block(bio)),
+               (unsigned int)dmz_bio_blocks(bio));
 
        bio_set_dev(bio, dev->bdev);
 
@@ -669,10 +674,10 @@ static int dmz_map(struct dm_target *ti, struct bio *bio)
        /* Now ready to handle this BIO */
        ret = dmz_queue_chunk_work(dmz, bio);
        if (ret) {
-               dmz_dev_debug(dmz->dev,
-                             "BIO op %d, can't process chunk %llu, err %i\n",
-                             bio_op(bio), (u64)dmz_bio_chunk(zmd, bio),
-                             ret);
+               DMDEBUG("(%s): BIO op %d, can't process chunk %llu, err %i\n",
+                       dmz_metadata_label(zmd),
+                       bio_op(bio), (u64)dmz_bio_chunk(zmd, bio),
+                       ret);
                return DM_MAPIO_REQUEUE;
        }
 
@@ -782,7 +787,8 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
        /* Initialize metadata */
        dev = dmz->dev;
-       ret = dmz_ctr_metadata(dev, &dmz->metadata);
+       ret = dmz_ctr_metadata(dev, &dmz->metadata,
+                              dm_table_device_name(ti->table));
        if (ret) {
                ti->error = "Metadata initialization failed";
                goto err_dev;
@@ -811,8 +817,9 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        /* Chunk BIO work */
        mutex_init(&dmz->chunk_lock);
        INIT_RADIX_TREE(&dmz->chunk_rxtree, GFP_NOIO);
-       dmz->chunk_wq = alloc_workqueue("dmz_cwq_%s", WQ_MEM_RECLAIM | WQ_UNBOUND,
-                                       0, dev->name);
+       dmz->chunk_wq = alloc_workqueue("dmz_cwq_%s",
+                                       WQ_MEM_RECLAIM | WQ_UNBOUND, 0,
+                                       dmz_metadata_label(dmz->metadata));
        if (!dmz->chunk_wq) {
                ti->error = "Create chunk workqueue failed";
                ret = -ENOMEM;
@@ -824,7 +831,7 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        bio_list_init(&dmz->flush_list);
        INIT_DELAYED_WORK(&dmz->flush_work, dmz_flush_work);
        dmz->flush_wq = alloc_ordered_workqueue("dmz_fwq_%s", WQ_MEM_RECLAIM,
-                                               dev->name);
+                                               dmz_metadata_label(dmz->metadata));
        if (!dmz->flush_wq) {
                ti->error = "Create flush workqueue failed";
                ret = -ENOMEM;
@@ -839,9 +846,10 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                goto err_fwq;
        }
 
-       dmz_dev_info(dev, "Target device: %llu 512-byte logical sectors (%llu blocks)",
-                    (unsigned long long)ti->len,
-                    (unsigned long long)dmz_sect2blk(ti->len));
+       DMINFO("(%s): Target device: %llu 512-byte logical sectors (%llu blocks)",
+              dmz_metadata_label(dmz->metadata),
+              (unsigned long long)ti->len,
+              (unsigned long long)dmz_sect2blk(ti->len));
 
        return 0;
 err_fwq:

diff --git a/drivers/md/dm-zoned.h b/drivers/md/dm-zoned.h
index f997ad6..dd768dc 100644 (file)
--- a/drivers/md/dm-zoned.h
+++ b/drivers/md/dm-zoned.h
@@ -163,7 +163,8 @@ struct dmz_reclaim;
 /*
  * Functions defined in dm-zoned-metadata.c
  */
-int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **zmd);
+int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **zmd,
+                    const char *devname);
 void dmz_dtr_metadata(struct dmz_metadata *zmd);
 int dmz_resume_metadata(struct dmz_metadata *zmd);
 
@@ -174,6 +175,7 @@ void dmz_unlock_metadata(struct dmz_metadata *zmd);
 void dmz_lock_flush(struct dmz_metadata *zmd);
 void dmz_unlock_flush(struct dmz_metadata *zmd);
 int dmz_flush_metadata(struct dmz_metadata *zmd);
+const char *dmz_metadata_label(struct dmz_metadata *zmd);
 
 sector_t dmz_start_sect(struct dmz_metadata *zmd, struct dm_zone *zone);
 sector_t dmz_start_block(struct dmz_metadata *zmd, struct dm_zone *zone);