dm-zoned: metadata version 2
v2 cover dm-zoned: metadata version 2
Hi all,
this patchset adds a new metadata version 2, which brings the following improvements:
- UUIDs and labels: Adding three more fields to the metadata containing the dm-zoned device UUID and label, and the device UUID. This allows for an unique identification of the devices, so that several dm-zoned sets can coexist and have a persistent identification.
- Extend random zones by an additional regular disk device: A regular block device can be added together with the zoned block device, providing additional (emulated) random write zones. With this it's possible to handle sequential zones only devices; also there will be a speed-up if the regular block device resides on a fast medium. The regular block device is placed logically in front of the zoned block device, so that metadata and mapping tables reside on the regular block device, not the zoned device.
- Tertiary superblock support: In addition to the two existing sets of metadata another, tertiary, superblock is written to the first block of the zoned block device. This superblock is for identification only; the generation number is set to '0' and the block itself it never updated. The additional metadate like bitmap tables etc are not copied.
To handle this, some changes to the original handling are introduced:
- Zones are now equidistant. Originally, runt zones were ignored, and not counted when sizing the mapping tables. With the dual device setup runt zones might occur at the end of the regular block device, making direct translation between zone number and sector/block number complex. For metadata version 2 all zones are considered to be of the same size, and runt zones are simply marked as 'offline' to have them ignored when allocating a new zone.
- The block number in the superblock is now the global number, and refers to the location of the superblock relative to the resulting device-mapper device. Which means that the tertiary superblock contains absolute block addresses, which needs to be translated to the relative device addresses to find the referenced block.
There is an accompanying patchset for dm-zoned-tools for writing and checking this new metadata.
As usual, comments and reviews are welcome.
Hannes Reinecke (11):
dm-zoned: store zone id within the zone structure
dm-zoned: use array for superblock zones
dm-zoned: store device in struct dmz_sb
dm-zoned: move fields from struct dmz_dev to dmz_metadata
dm-zoned: introduce dmz_metadata_label() to format device name
dm-zoned: remove 'dev' argument from reclaim
dm-zoned: use device as argument for bio handler functions
dm-zoned: use dmz_zone_to_dev() when handling metadata I/O
dm-zoned: add metadata logging functions
dm-zoned: ignore metadata zone in dmz_alloc_zone()
dm-zoned: metadata version 2
drivers/md/dm-zoned-metadata.c | 580 ++++++++++++++++++++++++--------- drivers/md/dm-zoned-reclaim.c | 67 ++-- drivers/md/dm-zoned-target.c | 286 +++++++++------- drivers/md/dm-zoned.h | 28 +- 4 files changed, 655 insertions(+), 306 deletions(-)
Signature · 1 line
2.25.0
PATCH v2 1/11 dm-zoned: store zone id within the zone structure
Instead of calculating the zone index by the offset within the zone array store the index within the structure itself.
--- drivers/md/dm-zoned-metadata.c | 3 ++- drivers/md/dm-zoned.h | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/md/dm-zoned-metadata.c +2 -1
@@ -189,7 +189,7 @@ struct dmz_metadata {*/ unsigned int dmz_id (struct dmz_metadata *zmd,struct dm_zone *zone) { -return ((unsigned int )(zone - zmd->zones)); +return zone->id; }sector_t dmz_start_sect (struct dmz_metadata *zmd,struct dm_zone *zone)
@@ -1119,6 +1119,7 @@ static int dmz_init_zone(struct blk_zone *blkz, unsigned int idx, void *data)INIT_LIST_HEAD (&zone->link);atomic_set (&zone->refcount,0 ); + zone->id = idx; zone->chunk =DMZ_MAP_UNMAPPED ;switch (blkz->type) {
drivers/md/dm-zoned.h +3 -0
@@ -87,6 +87,9 @@ struct dm_zone {/* Zone activation reference count */ atomic_t refcount; +/* Zone id */ +unsigned int id; +/* Zone write pointer block (relative to the zone start block) */ unsigned int wp_block;
Signature · 1 line
2.25.0
Re: [PATCH 01/11] dm-zoned: store zone id within the zone structure
Quoted 14 lines · Hannes Reinecke
Instead of calculating the zone index by the offset within the zone array store the index within the structure itself.
Signed-off-by Hannes Reinecke <[email protected]>--- drivers/md/dm-zoned-metadata.c | 3 ++- drivers/md/dm-zoned.h | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)drivers/md/dm-zoned-metadata.c +0
-0
drivers/md/dm-zoned-metadata.c struct dmz_metadata { · line 192
Quoted 5 lines
drivers/md/dm-zoned-metadata.c +1
-1@@ -189,7 +189,7 @@ struct dmz_metadata {*/ unsigned int dmz_id (struct dmz_metadata *zmd,struct dm_zone *zone) { -return ((unsigned int )(zone - zmd->zones)); +return zone->id;
The zmd argument is now unused, and the helper does not make much sense anymore. Why not just drop it entirely ? Callers directly referencing the ->id field of a zone is simple and clear.
Quoted 26 lines
drivers/md/dm-zoned-metadata.c +1
-0}sector_t dmz_start_sect (struct dmz_metadata *zmd,struct dm_zone *zone)@@ -1119,6 +1119,7 @@ static int dmz_init_zone(struct blk_zone *blkz, unsigned int idx, void *data)INIT_LIST_HEAD (&zone->link);atomic_set (&zone->refcount,0 ); + zone->id = idx; zone->chunk =DMZ_MAP_UNMAPPED ;switch (blkz->type) {drivers/md/dm-zoned.h +3
-0@@ -87,6 +87,9 @@ struct dm_zone {/* Zone activation reference count */ atomic_t refcount; +/* Zone id */ +unsigned int id; +/* Zone write pointer block (relative to the zone start block) */ unsigned int wp_block;
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 01/11] dm-zoned: store zone id within the zone structure
Quoted 44 lines · Damien Le Moal
Quoted 14 lines · Hannes Reinecke
Instead of calculating the zone index by the offset within the zone array store the index within the structure itself.
Signed-off-by Hannes Reinecke <[email protected]>--- drivers/md/dm-zoned-metadata.c | 3 ++- drivers/md/dm-zoned.h | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)drivers/md/dm-zoned-metadata.c +0
-0drivers/md/dm-zoned-metadata.c struct dmz_metadata { · line 192
Quoted 5 lines
drivers/md/dm-zoned-metadata.c +1
-1@@ -189,7 +189,7 @@ struct dmz_metadata {*/ unsigned int dmz_id (struct dmz_metadata *zmd,struct dm_zone *zone) { -return ((unsigned int )(zone - zmd->zones)); +return zone->id;The zmd argument is now unused, and the helper does not make much sense anymore. Why not just drop it entirely ? Callers directly referencing the ->id field of a zone is simple and clear.
Quoted 19 lines
drivers/md/dm-zoned-metadata.c +1
-0}sector_t dmz_start_sect (struct dmz_metadata *zmd,struct dm_zone *zone)@@ -1119,6 +1119,7 @@ static int dmz_init_zone(struct blk_zone *blkz, unsigned int idx, void *data)INIT_LIST_HEAD (&zone->link);atomic_set (&zone->refcount,0 ); + zone->id = idx; zone->chunk =DMZ_MAP_UNMAPPED ;switch (blkz->type) {drivers/md/dm-zoned.h +0
-0@@ -87,6 +87,9 @@ struct dm_zone {/* Zone activation reference count */ atomic_t refcount;
Quoted 9 lines
drivers/md/dm-zoned.h struct dm_zone { · line 95
Quoted 7 lines
drivers/md/dm-zoned.h +3
-0+/* Zone id */ +unsigned int id; +/* Zone write pointer block (relative to the zone start block) */ unsigned int wp_block;
Indeed, you are right. Will be doing so for the next round.
Cheers,
Hannes
Signature · 10 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
PATCH v2 2/11 dm-zoned: use array for superblock zones
In reply to Hannes ReineckeInstead of storing just the first superblock zone and calculate the secondary relative to that we should be using an array for holding the superblock zones.
--- drivers/md/dm-zoned-metadata.c | 41 +++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 16 deletions(-)
drivers/md/dm-zoned-metadata.c +25 -16
@@ -124,6 +124,7 @@ struct dmz_sb {sector_t block;struct dmz_mblock *mblk;struct dmz_super *sb; +struct dm_zone *zone; };/*
@@ -150,7 +151,6 @@ struct dmz_metadata {/* Zone information array */ struct dm_zone *zones; -struct dm_zone *sb_zone;struct dmz_sb sb[2 ];unsigned int mblk_primary;u64 sb_gen;
@@ -844,8 +844,9 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)/* * Check super block. */ -static int dmz_check_sb (struct dmz_metadata *zmd,struct dmz_super *sb) +static int dmz_check_sb (struct dmz_metadata *zmd,unsigned int set) { +struct dmz_super *sb = zmd->sb[set].sb;unsigned int nr_meta_zones, nr_data_zones;struct dmz_dev *dev = zmd->dev;u32 crc, stored_crc;
@@ -937,16 +938,20 @@ static int dmz_lookup_secondary_sb(struct dmz_metadata *zmd)/* Bad first super block: search for the second one */ zmd->sb[1 ].block = zmd->sb[0 ].block + zone_nr_blocks; + zmd->sb[1 ].zone = zmd->sb[0 ].zone +1 ;for (i =0 ; i < zmd->nr_rnd_zones -1 ; i++) {if (dmz_read_sb (zmd,1 ) !=0 )break ; -if (le32_to_cpu (zmd->sb[1 ].sb->magic) ==DMZ_MAGIC ) +if (le32_to_cpu (zmd->sb[1 ].sb->magic) ==DMZ_MAGIC ) { + zmd->sb[1 ].zone += i;return 0 ; + } zmd->sb[1 ].block += zone_nr_blocks; }dmz_free_mblock (zmd, mblk); zmd->sb[1 ].mblk =NULL ; + zmd->sb[1 ].zone =NULL ;return -EIO ; }
@@ -990,11 +995,9 @@ static int dmz_recover_mblocks(struct dmz_metadata *zmd, unsigned int dst_set)dmz_dev_warn (zmd->dev,"Metadata set %u invalid: recovering" , dst_set);if (dst_set ==0 ) - zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb_zone); -else { - zmd->sb[1 ].block = zmd->sb[0 ].block + - (zmd->nr_meta_zones << zmd->dev->zone_nr_blocks_shift); - } + zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb[0 ].zone); +else + zmd->sb[1 ].block =dmz_start_block (zmd, zmd->sb[1 ].zone); page =alloc_page (GFP_NOIO );if (!page)
@@ -1038,21 +1041,27 @@ static int dmz_load_sb(struct dmz_metadata *zmd)u64 sb_gen[2 ] = {0 ,0 };int ret; +if (!zmd->sb[0 ].zone) { +dmz_dev_err (zmd->dev,"Primary super block zone not set" ); +return -ENXIO ; + } +/* Read and check the primary super block */ - zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb_zone); + zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb[0 ].zone); ret =dmz_get_sb (zmd,0 );if (ret) {dmz_dev_err (zmd->dev,"Read primary super block failed" );return ret; } - ret =dmz_check_sb (zmd, zmd->sb[0 ].sb); + ret =dmz_check_sb (zmd,0 );/* Read and check secondary super block */ if (ret ==0 ) { sb_good[0 ] = true; - zmd->sb[1 ].block = zmd->sb[0 ].block + - (zmd->nr_meta_zones << zmd->dev->zone_nr_blocks_shift); +if (!zmd->sb[1 ].zone) + zmd->sb[1 ].zone = zmd->sb[0 ].zone + zmd->nr_meta_zones; + zmd->sb[1 ].block =dmz_start_block (zmd, zmd->sb[1 ].zone); ret =dmz_get_sb (zmd,1 ); }else ret =dmz_lookup_secondary_sb (zmd);
@@ -1062,7 +1071,7 @@ static int dmz_load_sb(struct dmz_metadata *zmd)return ret; } - ret =dmz_check_sb (zmd, zmd->sb[1 ].sb); + ret =dmz_check_sb (zmd,1 );if (ret ==0 ) sb_good[1 ] = true;
@@ -1147,9 +1156,9 @@ static int dmz_init_zone(struct blk_zone *blkz, unsigned int idx, void *data) zmd->nr_useable_zones++;if (dmz_is_rnd (zone)) { zmd->nr_rnd_zones++; -if (!zmd->sb_zone) { +if (!zmd->sb[0 ].zone) {/* Super block zone */ - zmd->sb_zone = zone; + zmd->sb[0 ].zone = zone; } } }
@@ -2420,7 +2429,7 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata) goto err;/* Set metadata zones starting from sb_zone */ - zid =dmz_id (zmd, zmd->sb_zone); + zid =dmz_id (zmd, zmd->sb[0 ].zone);for (i =0 ; i < zmd->nr_meta_zones <<1 ; i++) { zone =dmz_get (zmd, zid + i);if (!dmz_is_rnd (zone))
Signature · 1 line
2.25.0
Re: [PATCH 02/11] dm-zoned: use array for superblock zones
Quoted 132 lines · Hannes Reinecke
Instead of storing just the first superblock zone and calculate the secondary relative to that we should be using an array for holding the superblock zones.
Signed-off-by Hannes Reinecke <[email protected]>--- drivers/md/dm-zoned-metadata.c | 41 +++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 16 deletions(-)drivers/md/dm-zoned-metadata.c +24
-15@@ -124,6 +124,7 @@ struct dmz_sb {sector_t block;struct dmz_mblock *mblk;struct dmz_super *sb; +struct dm_zone *zone; };/* @@ -150,7 +151,6 @@ struct dmz_metadata {/* Zone information array */ struct dm_zone *zones; -struct dm_zone *sb_zone;struct dmz_sb sb[2 ];unsigned int mblk_primary;u64 sb_gen;@@ -844,8 +844,9 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)/* * Check super block. */ -static int dmz_check_sb (struct dmz_metadata *zmd,struct dmz_super *sb) +static int dmz_check_sb (struct dmz_metadata *zmd,unsigned int set) { +struct dmz_super *sb = zmd->sb[set].sb;unsigned int nr_meta_zones, nr_data_zones;struct dmz_dev *dev = zmd->dev;u32 crc, stored_crc;@@ -937,16 +938,20 @@ static int dmz_lookup_secondary_sb(struct dmz_metadata *zmd)/* Bad first super block: search for the second one */ zmd->sb[1 ].block = zmd->sb[0 ].block + zone_nr_blocks; + zmd->sb[1 ].zone = zmd->sb[0 ].zone +1 ;for (i =0 ; i < zmd->nr_rnd_zones -1 ; i++) {if (dmz_read_sb (zmd,1 ) !=0 )break ; -if (le32_to_cpu (zmd->sb[1 ].sb->magic) ==DMZ_MAGIC ) +if (le32_to_cpu (zmd->sb[1 ].sb->magic) ==DMZ_MAGIC ) { + zmd->sb[1 ].zone += i;return 0 ; + } zmd->sb[1 ].block += zone_nr_blocks; }dmz_free_mblock (zmd, mblk); zmd->sb[1 ].mblk =NULL ; + zmd->sb[1 ].zone =NULL ;return -EIO ; }@@ -990,11 +995,9 @@ static int dmz_recover_mblocks(struct dmz_metadata *zmd, unsigned int dst_set)dmz_dev_warn (zmd->dev,"Metadata set %u invalid: recovering" , dst_set);if (dst_set ==0 ) - zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb_zone); -else { - zmd->sb[1 ].block = zmd->sb[0 ].block + - (zmd->nr_meta_zones << zmd->dev->zone_nr_blocks_shift); - } + zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb[0 ].zone); +else + zmd->sb[1 ].block =dmz_start_block (zmd, zmd->sb[1 ].zone); page =alloc_page (GFP_NOIO );if (!page)@@ -1038,21 +1041,27 @@ static int dmz_load_sb(struct dmz_metadata *zmd)u64 sb_gen[2 ] = {0 ,0 };int ret; +if (!zmd->sb[0 ].zone) { +dmz_dev_err (zmd->dev,"Primary super block zone not set" ); +return -ENXIO ; + } +/* Read and check the primary super block */ - zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb_zone); + zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb[0 ].zone); ret =dmz_get_sb (zmd,0 );if (ret) {dmz_dev_err (zmd->dev,"Read primary super block failed" );return ret; } - ret =dmz_check_sb (zmd, zmd->sb[0 ].sb); + ret =dmz_check_sb (zmd,0 );/* Read and check secondary super block */ if (ret ==0 ) { sb_good[0 ] = true; - zmd->sb[1 ].block = zmd->sb[0 ].block + - (zmd->nr_meta_zones << zmd->dev->zone_nr_blocks_shift); +if (!zmd->sb[1 ].zone) + zmd->sb[1 ].zone = zmd->sb[0 ].zone + zmd->nr_meta_zones; + zmd->sb[1 ].block =dmz_start_block (zmd, zmd->sb[1 ].zone); ret =dmz_get_sb (zmd,1 ); }else ret =dmz_lookup_secondary_sb (zmd);@@ -1062,7 +1071,7 @@ static int dmz_load_sb(struct dmz_metadata *zmd)return ret; } - ret =dmz_check_sb (zmd, zmd->sb[1 ].sb); + ret =dmz_check_sb (zmd,1 );if (ret ==0 ) sb_good[1 ] = true;@@ -1147,9 +1156,9 @@ static int dmz_init_zone(struct blk_zone *blkz, unsigned int idx, void *data) zmd->nr_useable_zones++;if (dmz_is_rnd (zone)) { zmd->nr_rnd_zones++; -if (!zmd->sb_zone) { +if (!zmd->sb[0 ].zone) {/* Super block zone */ - zmd->sb_zone = zone; + zmd->sb[0 ].zone = zone; } } }
drivers/md/dm-zoned-metadata.c int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata) · line 2435
Quoted 8 lines
drivers/md/dm-zoned-metadata.c +1
-1@@ -2420,7 +2429,7 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata) goto err;/* Set metadata zones starting from sb_zone */ - zid =dmz_id (zmd, zmd->sb_zone); + zid =dmz_id (zmd, zmd->sb[0 ].zone);for (i =0 ; i < zmd->nr_meta_zones <<1 ; i++) { zone =dmz_get (zmd, zid + i);if (!dmz_is_rnd (zone))
Looks good.
Signature · 2 lines
Damien Le Moal Western Digital Research
PATCH v2 3/11 dm-zoned: store device in struct dmz_sb
In reply to Hannes ReineckeStore the device together with the superblock so that we don't have to recur to the metadata to find it.
--- drivers/md/dm-zoned-metadata.c | 90 ++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 31 deletions(-)
drivers/md/dm-zoned-metadata.c +59 -31
@@ -122,6 +122,7 @@ enum {*/ struct dmz_sb {sector_t block; +struct dmz_dev *dev;struct dmz_mblock *mblk;struct dmz_super *sb;struct dm_zone *zone;
@@ -202,6 +203,11 @@ sector_t dmz_start_block(struct dmz_metadata *zmd, struct dm_zone *zone)return (sector_t )dmz_id (zmd, zone) << zmd->dev->zone_nr_blocks_shift; } +struct dmz_dev *dmz_zone_to_dev (struct dmz_metadata *zmd,struct dm_zone *zone) +{ +return &zmd->dev[0 ]; +} +unsigned int dmz_nr_zones (struct dmz_metadata *zmd) {return zmd->dev->nr_zones;
@@ -417,9 +423,10 @@ static struct dmz_mblock *dmz_get_mblock_slow(struct dmz_metadata *zmd, {struct dmz_mblock *mblk, *m;sector_t block = zmd->sb[zmd->mblk_primary].block + mblk_no; +struct dmz_dev *dev = zmd->sb[zmd->mblk_primary].dev;struct bio *bio; -if (dmz_bdev_is_dying (zmd->dev)) +if (dmz_bdev_is_dying (dev))return ERR_PTR (-EIO );/* Get a new block and a BIO to read it */
@@ -455,7 +462,7 @@ static struct dmz_mblock *dmz_get_mblock_slow(struct dmz_metadata *zmd,/* Submit read BIO */ bio->bi_iter.bi_sector =dmz_blk2sect (block); -bio_set_dev (bio, zmd->dev->bdev); +bio_set_dev (bio, dev->bdev); bio->bi_private = mblk; bio->bi_end_io = dmz_mblock_bio_end_io;bio_set_op_attrs (bio,REQ_OP_READ ,REQ_META |REQ_PRIO );
@@ -552,6 +559,7 @@ static struct dmz_mblock *dmz_get_mblock(struct dmz_metadata *zmd, sector_t mblk_no) {struct dmz_mblock *mblk; +struct dmz_dev *dev = zmd->sb[zmd->mblk_primary].dev;/* Check rbtree */ spin_lock (&zmd->mblk_lock);
@@ -570,7 +578,7 @@ static struct dmz_mblock *dmz_get_mblock(struct dmz_metadata *zmd, TASK_UNINTERRUPTIBLE);if (test_bit (DMZ_META_ERROR , &mblk->state)) {dmz_release_mblock (zmd, mblk); -dmz_check_bdev (zmd->dev); +dmz_check_bdev (dev);return ERR_PTR (-EIO ); }
@@ -594,10 +602,11 @@ static void dmz_dirty_mblock(struct dmz_metadata *zmd, struct dmz_mblock *mblk)static int dmz_write_mblock (struct dmz_metadata *zmd,struct dmz_mblock *mblk,unsigned int set) { +struct dmz_dev *dev = zmd->sb[set].dev;sector_t block = zmd->sb[set].block + mblk->no;struct bio *bio; -if (dmz_bdev_is_dying (zmd->dev)) +if (dmz_bdev_is_dying (dev))return -EIO ; bio =bio_alloc (GFP_NOIO ,1 );
@@ -609,7 +618,7 @@ static int dmz_write_mblock(struct dmz_metadata *zmd, struct dmz_mblock *mblk,set_bit (DMZ_META_WRITING , &mblk->state); bio->bi_iter.bi_sector =dmz_blk2sect (block); -bio_set_dev (bio, zmd->dev->bdev); +bio_set_dev (bio, dev->bdev); bio->bi_private = mblk; bio->bi_end_io = dmz_mblock_bio_end_io;bio_set_op_attrs (bio,REQ_OP_WRITE ,REQ_META |REQ_PRIO );
@@ -622,13 +631,13 @@ static int dmz_write_mblock(struct dmz_metadata *zmd, struct dmz_mblock *mblk,/* * Read/write a metadata block. */ -static int dmz_rdwr_block (struct dmz_metadata *zmd,int op,sector_t block, -struct page *page) +static int dmz_rdwr_block (struct dmz_dev *dev,int op, +sector_t block,struct page *page) {struct bio *bio;int ret; -if (dmz_bdev_is_dying (zmd->dev)) +if (dmz_bdev_is_dying (dev))return -EIO ; bio =bio_alloc (GFP_NOIO ,1 );
@@ -636,14 +645,14 @@ static int dmz_rdwr_block(struct dmz_metadata *zmd, int op, sector_t block,return -ENOMEM ; bio->bi_iter.bi_sector =dmz_blk2sect (block); -bio_set_dev (bio, zmd->dev->bdev); +bio_set_dev (bio, dev->bdev);bio_set_op_attrs (bio, op,REQ_SYNC |REQ_META |REQ_PRIO );bio_add_page (bio, page,DMZ_BLOCK_SIZE ,0 ); ret =submit_bio_wait (bio);bio_put (bio);if (ret) -dmz_check_bdev (zmd->dev); +dmz_check_bdev (dev);return ret; }
@@ -655,6 +664,7 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set)sector_t block = zmd->sb[set].block;struct dmz_mblock *mblk = zmd->sb[set].mblk;struct dmz_super *sb = zmd->sb[set].sb; +struct dmz_dev *dev = zmd->sb[set].dev;u64 sb_gen = zmd->sb_gen +1 ;int ret;
@@ -674,9 +684,9 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set) sb->crc =0 ; sb->crc =cpu_to_le32 (crc32_le (sb_gen, (unsigned char *)sb,DMZ_BLOCK_SIZE )); - ret =dmz_rdwr_block (zmd,REQ_OP_WRITE , block, mblk->page); + ret =dmz_rdwr_block (dev,REQ_OP_WRITE , block, mblk->page);if (ret ==0 ) - ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO ,NULL ); + ret =blkdev_issue_flush (dev->bdev,GFP_NOIO ,NULL );return ret; }
@@ -689,6 +699,7 @@ static int dmz_write_dirty_mblocks(struct dmz_metadata *zmd, unsigned int set) {struct dmz_mblock *mblk; +struct dmz_dev *dev = zmd->sb[set].dev;struct blk_plug plug;int ret =0 , nr_mblks_submitted =0 ;
@@ -710,7 +721,7 @@ static int dmz_write_dirty_mblocks(struct dmz_metadata *zmd, TASK_UNINTERRUPTIBLE);if (test_bit (DMZ_META_ERROR , &mblk->state)) {clear_bit (DMZ_META_ERROR , &mblk->state); -dmz_check_bdev (zmd->dev); +dmz_check_bdev (dev); ret = -EIO ; } nr_mblks_submitted--;
@@ -718,7 +729,7 @@ static int dmz_write_dirty_mblocks(struct dmz_metadata *zmd,/* Flush drive cache (this will also sync data) */ if (ret ==0 ) - ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO ,NULL ); + ret =blkdev_issue_flush (dev->bdev,GFP_NOIO ,NULL );return ret; }
@@ -755,6 +766,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd) {struct dmz_mblock *mblk;struct list_head write_list; +struct dmz_dev *dev;int ret;if (WARN_ON (!zmd))
@@ -768,6 +780,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)* from modifying metadata. */ down_write (&zmd->mblk_sem); + dev = zmd->sb[zmd->mblk_primary].dev;/* * This is called from the target flush work and reclaim work.
@@ -775,7 +788,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)*/ dmz_lock_flush (zmd); -if (dmz_bdev_is_dying (zmd->dev)) { +if (dmz_bdev_is_dying (dev)) { ret = -EIO ; goto out; }
@@ -787,7 +800,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)/* If there are no dirty metadata blocks, just flush the device cache */ if (list_empty (&write_list)) { - ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO ,NULL ); + ret =blkdev_issue_flush (dev->bdev,GFP_NOIO ,NULL ); goto err; }
@@ -836,7 +849,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)list_splice (&write_list, &zmd->mblk_dirty_list);spin_unlock (&zmd->mblk_lock); } -if (!dmz_check_bdev (zmd->dev)) +if (!dmz_check_bdev (dev)) ret = -EIO ; goto out; }
@@ -847,8 +860,8 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)static int dmz_check_sb (struct dmz_metadata *zmd,unsigned int set) {struct dmz_super *sb = zmd->sb[set].sb; +struct dmz_dev *dev = zmd->sb[set].dev;unsigned int nr_meta_zones, nr_data_zones; -struct dmz_dev *dev = zmd->dev;u32 crc, stored_crc;u64 gen;
@@ -913,8 +926,8 @@ static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set)*/ static int dmz_read_sb (struct dmz_metadata *zmd,unsigned int set) { -return dmz_rdwr_block (zmd,REQ_OP_READ , zmd->sb[set].block, - zmd->sb[set].mblk->page); +return dmz_rdwr_block (zmd->sb[set].dev,REQ_OP_READ , + zmd->sb[set].block, zmd->sb[set].mblk->page); }/*
@@ -939,6 +952,7 @@ static int dmz_lookup_secondary_sb(struct dmz_metadata *zmd)/* Bad first super block: search for the second one */ zmd->sb[1 ].block = zmd->sb[0 ].block + zone_nr_blocks; zmd->sb[1 ].zone = zmd->sb[0 ].zone +1 ; + zmd->sb[1 ].dev =dmz_zone_to_dev (zmd, zmd->sb[1 ].zone);for (i =0 ; i < zmd->nr_rnd_zones -1 ; i++) {if (dmz_read_sb (zmd,1 ) !=0 )break ;
@@ -947,11 +961,13 @@ static int dmz_lookup_secondary_sb(struct dmz_metadata *zmd)return 0 ; } zmd->sb[1 ].block += zone_nr_blocks; + zmd->sb[1 ].dev =dmz_zone_to_dev (zmd, zmd->sb[1 ].zone + i); }dmz_free_mblock (zmd, mblk); zmd->sb[1 ].mblk =NULL ; zmd->sb[1 ].zone =NULL ; + zmd->sb[1 ].dev =NULL ;return -EIO ; }
@@ -992,7 +1008,8 @@ static int dmz_recover_mblocks(struct dmz_metadata *zmd, unsigned int dst_set)struct page *page;int i, ret; -dmz_dev_warn (zmd->dev,"Metadata set %u invalid: recovering" , dst_set); +dmz_dev_warn (zmd->sb[dst_set].dev, +"Metadata set %u invalid: recovering" , dst_set);if (dst_set ==0 ) zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb[0 ].zone);
@@ -1005,11 +1022,11 @@ static int dmz_recover_mblocks(struct dmz_metadata *zmd, unsigned int dst_set)/* Copy metadata blocks */ for (i =1 ; i < zmd->nr_meta_blocks; i++) { - ret =dmz_rdwr_block (zmd,REQ_OP_READ , + ret =dmz_rdwr_block (zmd->sb[src_set].dev,REQ_OP_READ , zmd->sb[src_set].block + i, page);if (ret) goto out; - ret =dmz_rdwr_block (zmd,REQ_OP_WRITE , + ret =dmz_rdwr_block (zmd->sb[dst_set].dev,REQ_OP_WRITE , zmd->sb[dst_set].block + i, page);if (ret) goto out;
@@ -1048,9 +1065,10 @@ static int dmz_load_sb(struct dmz_metadata *zmd)/* Read and check the primary super block */ zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb[0 ].zone); + zmd->sb[0 ].dev =dmz_zone_to_dev (zmd, zmd->sb[0 ].zone); ret =dmz_get_sb (zmd,0 );if (ret) { -dmz_dev_err (zmd->dev,"Read primary super block failed" ); +dmz_dev_err (zmd->sb[0 ].dev,"Read primary super block failed" );return ret; }
@@ -1062,12 +1080,13 @@ static int dmz_load_sb(struct dmz_metadata *zmd)if (!zmd->sb[1 ].zone) zmd->sb[1 ].zone = zmd->sb[0 ].zone + zmd->nr_meta_zones; zmd->sb[1 ].block =dmz_start_block (zmd, zmd->sb[1 ].zone); + zmd->sb[1 ].dev =dmz_zone_to_dev (zmd, zmd->sb[1 ].zone); ret =dmz_get_sb (zmd,1 ); }else ret =dmz_lookup_secondary_sb (zmd);if (ret) { -dmz_dev_err (zmd->dev,"Read secondary super block failed" ); +dmz_dev_err (zmd->sb[1 ].dev,"Read secondary super block failed" );return ret; }
@@ -1083,17 +1102,25 @@ static int dmz_load_sb(struct dmz_metadata *zmd)if (sb_good[0 ]) sb_gen[0 ] =le64_to_cpu (zmd->sb[0 ].sb->gen); -else +else { ret =dmz_recover_mblocks (zmd,0 ); +if (ret) { +dmz_dev_err (zmd->sb[0 ].dev, +"Recovery of superblock 0 failed" ); +return -EIO ; + } + }if (sb_good[1 ]) sb_gen[1 ] =le64_to_cpu (zmd->sb[1 ].sb->gen); -else +else { ret =dmz_recover_mblocks (zmd,1 ); -if (ret) { -dmz_dev_err (zmd->dev,"Recovery failed" ); -return -EIO ; +if (ret) { +dmz_dev_err (zmd->sb[1 ].dev, +"Recovery of superblock 1 failed" ); +return -EIO ; + } }if (sb_gen[0 ] >= sb_gen[1 ]) {
@@ -1104,7 +1131,8 @@ static int dmz_load_sb(struct dmz_metadata *zmd) zmd->mblk_primary =1 ; } -dmz_dev_debug (zmd->dev,"Using super block %u (gen %llu)" , +dmz_dev_debug (zmd->sb[zmd->mblk_primary].dev, +"Using super block %u (gen %llu)" , zmd->mblk_primary, zmd->sb_gen);return 0 ;
Signature · 1 line
2.25.0
Re: [PATCH 03/11] dm-zoned: store device in struct dmz_sb
Quoted 4 lines · Hannes Reinecke
Store the device together with the superblock so that we don't have to recur to the metadata to find it.
Signed-off-by Hannes Reinecke <[email protected]>
Looks good.
Quoted 347 lines
--- drivers/md/dm-zoned-metadata.c | 90 ++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 31 deletions(-)drivers/md/dm-zoned-metadata.c +59
-31@@ -122,6 +122,7 @@ enum {*/ struct dmz_sb {sector_t block; +struct dmz_dev *dev;struct dmz_mblock *mblk;struct dmz_super *sb;struct dm_zone *zone;@@ -202,6 +203,11 @@ sector_t dmz_start_block(struct dmz_metadata *zmd, struct dm_zone *zone)return (sector_t )dmz_id (zmd, zone) << zmd->dev->zone_nr_blocks_shift; } +struct dmz_dev *dmz_zone_to_dev (struct dmz_metadata *zmd,struct dm_zone *zone) +{ +return &zmd->dev[0 ]; +} +unsigned int dmz_nr_zones (struct dmz_metadata *zmd) {return zmd->dev->nr_zones;@@ -417,9 +423,10 @@ static struct dmz_mblock *dmz_get_mblock_slow(struct dmz_metadata *zmd, {struct dmz_mblock *mblk, *m;sector_t block = zmd->sb[zmd->mblk_primary].block + mblk_no; +struct dmz_dev *dev = zmd->sb[zmd->mblk_primary].dev;struct bio *bio; -if (dmz_bdev_is_dying (zmd->dev)) +if (dmz_bdev_is_dying (dev))return ERR_PTR (-EIO );/* Get a new block and a BIO to read it */ @@ -455,7 +462,7 @@ static struct dmz_mblock *dmz_get_mblock_slow(struct dmz_metadata *zmd,/* Submit read BIO */ bio->bi_iter.bi_sector =dmz_blk2sect (block); -bio_set_dev (bio, zmd->dev->bdev); +bio_set_dev (bio, dev->bdev); bio->bi_private = mblk; bio->bi_end_io = dmz_mblock_bio_end_io;bio_set_op_attrs (bio,REQ_OP_READ ,REQ_META |REQ_PRIO );@@ -552,6 +559,7 @@ static struct dmz_mblock *dmz_get_mblock(struct dmz_metadata *zmd, sector_t mblk_no) {struct dmz_mblock *mblk; +struct dmz_dev *dev = zmd->sb[zmd->mblk_primary].dev;/* Check rbtree */ spin_lock (&zmd->mblk_lock);@@ -570,7 +578,7 @@ static struct dmz_mblock *dmz_get_mblock(struct dmz_metadata *zmd, TASK_UNINTERRUPTIBLE);if (test_bit (DMZ_META_ERROR , &mblk->state)) {dmz_release_mblock (zmd, mblk); -dmz_check_bdev (zmd->dev); +dmz_check_bdev (dev);return ERR_PTR (-EIO ); }@@ -594,10 +602,11 @@ static void dmz_dirty_mblock(struct dmz_metadata *zmd, struct dmz_mblock *mblk)static int dmz_write_mblock (struct dmz_metadata *zmd,struct dmz_mblock *mblk,unsigned int set) { +struct dmz_dev *dev = zmd->sb[set].dev;sector_t block = zmd->sb[set].block + mblk->no;struct bio *bio; -if (dmz_bdev_is_dying (zmd->dev)) +if (dmz_bdev_is_dying (dev))return -EIO ; bio =bio_alloc (GFP_NOIO ,1 );@@ -609,7 +618,7 @@ static int dmz_write_mblock(struct dmz_metadata *zmd, struct dmz_mblock *mblk,set_bit (DMZ_META_WRITING , &mblk->state); bio->bi_iter.bi_sector =dmz_blk2sect (block); -bio_set_dev (bio, zmd->dev->bdev); +bio_set_dev (bio, dev->bdev); bio->bi_private = mblk; bio->bi_end_io = dmz_mblock_bio_end_io;bio_set_op_attrs (bio,REQ_OP_WRITE ,REQ_META |REQ_PRIO );@@ -622,13 +631,13 @@ static int dmz_write_mblock(struct dmz_metadata *zmd, struct dmz_mblock *mblk,/* * Read/write a metadata block. */ -static int dmz_rdwr_block (struct dmz_metadata *zmd,int op,sector_t block, -struct page *page) +static int dmz_rdwr_block (struct dmz_dev *dev,int op, +sector_t block,struct page *page) {struct bio *bio;int ret; -if (dmz_bdev_is_dying (zmd->dev)) +if (dmz_bdev_is_dying (dev))return -EIO ; bio =bio_alloc (GFP_NOIO ,1 );@@ -636,14 +645,14 @@ static int dmz_rdwr_block(struct dmz_metadata *zmd, int op, sector_t block,return -ENOMEM ; bio->bi_iter.bi_sector =dmz_blk2sect (block); -bio_set_dev (bio, zmd->dev->bdev); +bio_set_dev (bio, dev->bdev);bio_set_op_attrs (bio, op,REQ_SYNC |REQ_META |REQ_PRIO );bio_add_page (bio, page,DMZ_BLOCK_SIZE ,0 ); ret =submit_bio_wait (bio);bio_put (bio);if (ret) -dmz_check_bdev (zmd->dev); +dmz_check_bdev (dev);return ret; }@@ -655,6 +664,7 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set)sector_t block = zmd->sb[set].block;struct dmz_mblock *mblk = zmd->sb[set].mblk;struct dmz_super *sb = zmd->sb[set].sb; +struct dmz_dev *dev = zmd->sb[set].dev;u64 sb_gen = zmd->sb_gen +1 ;int ret;@@ -674,9 +684,9 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set) sb->crc =0 ; sb->crc =cpu_to_le32 (crc32_le (sb_gen, (unsigned char *)sb,DMZ_BLOCK_SIZE )); - ret =dmz_rdwr_block (zmd,REQ_OP_WRITE , block, mblk->page); + ret =dmz_rdwr_block (dev,REQ_OP_WRITE , block, mblk->page);if (ret ==0 ) - ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO ,NULL ); + ret =blkdev_issue_flush (dev->bdev,GFP_NOIO ,NULL );return ret; }@@ -689,6 +699,7 @@ static int dmz_write_dirty_mblocks(struct dmz_metadata *zmd, unsigned int set) {struct dmz_mblock *mblk; +struct dmz_dev *dev = zmd->sb[set].dev;struct blk_plug plug;int ret =0 , nr_mblks_submitted =0 ;@@ -710,7 +721,7 @@ static int dmz_write_dirty_mblocks(struct dmz_metadata *zmd, TASK_UNINTERRUPTIBLE);if (test_bit (DMZ_META_ERROR , &mblk->state)) {clear_bit (DMZ_META_ERROR , &mblk->state); -dmz_check_bdev (zmd->dev); +dmz_check_bdev (dev); ret = -EIO ; } nr_mblks_submitted--;@@ -718,7 +729,7 @@ static int dmz_write_dirty_mblocks(struct dmz_metadata *zmd,/* Flush drive cache (this will also sync data) */ if (ret ==0 ) - ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO ,NULL ); + ret =blkdev_issue_flush (dev->bdev,GFP_NOIO ,NULL );return ret; }@@ -755,6 +766,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd) {struct dmz_mblock *mblk;struct list_head write_list; +struct dmz_dev *dev;int ret;if (WARN_ON (!zmd))@@ -768,6 +780,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)* from modifying metadata. */ down_write (&zmd->mblk_sem); + dev = zmd->sb[zmd->mblk_primary].dev;/* * This is called from the target flush work and reclaim work. @@ -775,7 +788,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)*/ dmz_lock_flush (zmd); -if (dmz_bdev_is_dying (zmd->dev)) { +if (dmz_bdev_is_dying (dev)) { ret = -EIO ; goto out; }@@ -787,7 +800,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)/* If there are no dirty metadata blocks, just flush the device cache */ if (list_empty (&write_list)) { - ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO ,NULL ); + ret =blkdev_issue_flush (dev->bdev,GFP_NOIO ,NULL ); goto err; }@@ -836,7 +849,7 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)list_splice (&write_list, &zmd->mblk_dirty_list);spin_unlock (&zmd->mblk_lock); } -if (!dmz_check_bdev (zmd->dev)) +if (!dmz_check_bdev (dev)) ret = -EIO ; goto out; }@@ -847,8 +860,8 @@ int dmz_flush_metadata(struct dmz_metadata *zmd)static int dmz_check_sb (struct dmz_metadata *zmd,unsigned int set) {struct dmz_super *sb = zmd->sb[set].sb; +struct dmz_dev *dev = zmd->sb[set].dev;unsigned int nr_meta_zones, nr_data_zones; -struct dmz_dev *dev = zmd->dev;u32 crc, stored_crc;u64 gen;@@ -913,8 +926,8 @@ static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set)*/ static int dmz_read_sb (struct dmz_metadata *zmd,unsigned int set) { -return dmz_rdwr_block (zmd,REQ_OP_READ , zmd->sb[set].block, - zmd->sb[set].mblk->page); +return dmz_rdwr_block (zmd->sb[set].dev,REQ_OP_READ , + zmd->sb[set].block, zmd->sb[set].mblk->page); }/* @@ -939,6 +952,7 @@ static int dmz_lookup_secondary_sb(struct dmz_metadata *zmd)/* Bad first super block: search for the second one */ zmd->sb[1 ].block = zmd->sb[0 ].block + zone_nr_blocks; zmd->sb[1 ].zone = zmd->sb[0 ].zone +1 ; + zmd->sb[1 ].dev =dmz_zone_to_dev (zmd, zmd->sb[1 ].zone);for (i =0 ; i < zmd->nr_rnd_zones -1 ; i++) {if (dmz_read_sb (zmd,1 ) !=0 )break ;@@ -947,11 +961,13 @@ static int dmz_lookup_secondary_sb(struct dmz_metadata *zmd)return 0 ; } zmd->sb[1 ].block += zone_nr_blocks; + zmd->sb[1 ].dev =dmz_zone_to_dev (zmd, zmd->sb[1 ].zone + i); }dmz_free_mblock (zmd, mblk); zmd->sb[1 ].mblk =NULL ; zmd->sb[1 ].zone =NULL ; + zmd->sb[1 ].dev =NULL ;return -EIO ; }@@ -992,7 +1008,8 @@ static int dmz_recover_mblocks(struct dmz_metadata *zmd, unsigned int dst_set)struct page *page;int i, ret; -dmz_dev_warn (zmd->dev,"Metadata set %u invalid: recovering" , dst_set); +dmz_dev_warn (zmd->sb[dst_set].dev, +"Metadata set %u invalid: recovering" , dst_set);if (dst_set ==0 ) zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb[0 ].zone);@@ -1005,11 +1022,11 @@ static int dmz_recover_mblocks(struct dmz_metadata *zmd, unsigned int dst_set)/* Copy metadata blocks */ for (i =1 ; i < zmd->nr_meta_blocks; i++) { - ret =dmz_rdwr_block (zmd,REQ_OP_READ , + ret =dmz_rdwr_block (zmd->sb[src_set].dev,REQ_OP_READ , zmd->sb[src_set].block + i, page);if (ret) goto out; - ret =dmz_rdwr_block (zmd,REQ_OP_WRITE , + ret =dmz_rdwr_block (zmd->sb[dst_set].dev,REQ_OP_WRITE , zmd->sb[dst_set].block + i, page);if (ret) goto out;@@ -1048,9 +1065,10 @@ static int dmz_load_sb(struct dmz_metadata *zmd)/* Read and check the primary super block */ zmd->sb[0 ].block =dmz_start_block (zmd, zmd->sb[0 ].zone); + zmd->sb[0 ].dev =dmz_zone_to_dev (zmd, zmd->sb[0 ].zone); ret =dmz_get_sb (zmd,0 );if (ret) { -dmz_dev_err (zmd->dev,"Read primary super block failed" ); +dmz_dev_err (zmd->sb[0 ].dev,"Read primary super block failed" );return ret; }@@ -1062,12 +1080,13 @@ static int dmz_load_sb(struct dmz_metadata *zmd)if (!zmd->sb[1 ].zone) zmd->sb[1 ].zone = zmd->sb[0 ].zone + zmd->nr_meta_zones; zmd->sb[1 ].block =dmz_start_block (zmd, zmd->sb[1 ].zone); + zmd->sb[1 ].dev =dmz_zone_to_dev (zmd, zmd->sb[1 ].zone); ret =dmz_get_sb (zmd,1 ); }else ret =dmz_lookup_secondary_sb (zmd);if (ret) { -dmz_dev_err (zmd->dev,"Read secondary super block failed" ); +dmz_dev_err (zmd->sb[1 ].dev,"Read secondary super block failed" );return ret; }@@ -1083,17 +1102,25 @@ static int dmz_load_sb(struct dmz_metadata *zmd)if (sb_good[0 ]) sb_gen[0 ] =le64_to_cpu (zmd->sb[0 ].sb->gen); -else +else { ret =dmz_recover_mblocks (zmd,0 ); +if (ret) { +dmz_dev_err (zmd->sb[0 ].dev, +"Recovery of superblock 0 failed" ); +return -EIO ; + } + }if (sb_good[1 ]) sb_gen[1 ] =le64_to_cpu (zmd->sb[1 ].sb->gen); -else +else { ret =dmz_recover_mblocks (zmd,1 ); -if (ret) { -dmz_dev_err (zmd->dev,"Recovery failed" ); -return -EIO ; +if (ret) { +dmz_dev_err (zmd->sb[1 ].dev, +"Recovery of superblock 1 failed" ); +return -EIO ; + } }if (sb_gen[0 ] >= sb_gen[1 ]) {@@ -1104,7 +1131,8 @@ static int dmz_load_sb(struct dmz_metadata *zmd) zmd->mblk_primary =1 ; } -dmz_dev_debug (zmd->dev,"Using super block %u (gen %llu)" , +dmz_dev_debug (zmd->sb[zmd->mblk_primary].dev, +"Using super block %u (gen %llu)" , zmd->mblk_primary, zmd->sb_gen);return 0 ;
Signature · 2 lines
Damien Le Moal Western Digital Research
PATCH v2 4/11 dm-zoned: move fields from struct dmz_dev to dmz_metadata
In reply to Hannes ReineckeMove fields from the device structure into the metadata structure and provide accessor functions.
--- drivers/md/dm-zoned-metadata.c | 88 +++++++++++++++++++++++----------- drivers/md/dm-zoned-reclaim.c | 8 ++-- drivers/md/dm-zoned-target.c | 52 ++++++++++---------- drivers/md/dm-zoned.h | 14 +++--- 4 files changed, 97 insertions(+), 65 deletions(-)
drivers/md/dm-zoned-metadata.c +60 -28
@@ -138,9 +138,16 @@ struct dmz_metadata {unsigned int zone_nr_bitmap_blocks;unsigned int zone_bits_per_mblk; +sector_t zone_nr_blocks; +sector_t zone_nr_blocks_shift; + +sector_t zone_nr_sectors; +sector_t zone_nr_sectors_shift; +unsigned int nr_bitmap_blocks;unsigned int nr_map_blocks; +unsigned int nr_zones;unsigned int nr_useable_zones;unsigned int nr_meta_blocks;unsigned int nr_meta_zones;
@@ -195,12 +202,12 @@ unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone)sector_t dmz_start_sect (struct dmz_metadata *zmd,struct dm_zone *zone) { -return (sector_t )dmz_id (zmd, zone) << zmd->dev->zone_nr_sectors_shift; +return (sector_t )dmz_id (zmd, zone) << zmd->zone_nr_sectors_shift; }sector_t dmz_start_block (struct dmz_metadata *zmd,struct dm_zone *zone) { -return (sector_t )dmz_id (zmd, zone) << zmd->dev->zone_nr_blocks_shift; +return (sector_t )dmz_id (zmd, zone) << zmd->zone_nr_blocks_shift; }struct dmz_dev *dmz_zone_to_dev (struct dmz_metadata *zmd,struct dm_zone *zone)
@@ -208,9 +215,29 @@ struct dmz_dev *dmz_zone_to_dev(struct dmz_metadata *zmd, struct dm_zone *zone)return &zmd->dev[0 ]; } +unsigned int dmz_zone_nr_blocks (struct dmz_metadata *zmd) +{ +return zmd->zone_nr_blocks; +} + +unsigned int dmz_zone_nr_blocks_shift (struct dmz_metadata *zmd) +{ +return zmd->zone_nr_blocks_shift; +} + +unsigned int dmz_zone_nr_sectors (struct dmz_metadata *zmd) +{ +return zmd->zone_nr_sectors; +} + +unsigned int dmz_zone_nr_sectors_shift (struct dmz_metadata *zmd) +{ +return zmd->zone_nr_sectors_shift; +} +unsigned int dmz_nr_zones (struct dmz_metadata *zmd) { -return zmd->dev->nr_zones; +return zmd->nr_zones; }unsigned int dmz_nr_chunks (struct dmz_metadata *zmd)
@@ -887,8 +914,8 @@ static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set)return -ENXIO ; } - nr_meta_zones = (le32_to_cpu (sb->nr_meta_blocks) + dev->zone_nr_blocks -1 ) - >> dev->zone_nr_blocks_shift; + nr_meta_zones = (le32_to_cpu (sb->nr_meta_blocks) + zmd->zone_nr_blocks -1 ) + >> zmd->zone_nr_blocks_shift;if (!nr_meta_zones || nr_meta_zones >= zmd->nr_rnd_zones) {dmz_dev_err (dev,"Invalid number of metadata blocks" );
@@ -937,7 +964,7 @@ static int dmz_read_sb(struct dmz_metadata *zmd, unsigned int set)*/ static int dmz_lookup_secondary_sb (struct dmz_metadata *zmd) { -unsigned int zone_nr_blocks = zmd->dev->zone_nr_blocks; +unsigned int zone_nr_blocks = zmd->zone_nr_blocks;struct dmz_mblock *mblk;int i;
@@ -1148,7 +1175,7 @@ static int dmz_init_zone(struct blk_zone *blkz, unsigned int idx, void *data)struct dmz_dev *dev = zmd->dev;/* Ignore the eventual last runt (smaller) zone */ -if (blkz->len != dev->zone_nr_sectors) { +if (blkz->len != zmd->zone_nr_sectors) {if (blkz->start + blkz->len == dev->capacity)return 0 ;return -ENXIO ;
@@ -1213,19 +1240,24 @@ static int dmz_init_zones(struct dmz_metadata *zmd)int ret;/* Init */ - zmd->zone_bitmap_size = dev->zone_nr_blocks >>3 ; + zmd->zone_nr_sectors = dev->zone_nr_sectors; + zmd->zone_nr_sectors_shift =ilog2 (zmd->zone_nr_sectors); + zmd->zone_nr_blocks =dmz_sect2blk (zmd->zone_nr_sectors); + zmd->zone_nr_blocks_shift =ilog2 (zmd->zone_nr_blocks); + zmd->zone_bitmap_size = zmd->zone_nr_blocks >>3 ; zmd->zone_nr_bitmap_blocks =max_t (sector_t,1 , zmd->zone_bitmap_size >>DMZ_BLOCK_SHIFT ); - zmd->zone_bits_per_mblk =min_t (sector_t, dev->zone_nr_blocks, + zmd->zone_bits_per_mblk =min_t (sector_t, zmd->zone_nr_blocks,DMZ_BLOCK_SIZE_BITS );/* Allocate zone array */ - zmd->zones =kcalloc (dev->nr_zones,sizeof (struct dm_zone ),GFP_KERNEL ); + zmd->nr_zones = dev->nr_zones; + zmd->zones =kcalloc (zmd->nr_zones,sizeof (struct dm_zone ),GFP_KERNEL );if (!zmd->zones)return -ENOMEM ;dmz_dev_info (dev,"Using %zu B for zone information" , -sizeof (struct dm_zone ) * dev->nr_zones); +sizeof (struct dm_zone ) * zmd->nr_zones);/* * Get zone information and initialize zone descriptors. At the same
@@ -1344,7 +1376,7 @@ static int dmz_reset_zone(struct dmz_metadata *zmd, struct dm_zone *zone) ret =blkdev_zone_mgmt (dev->bdev,REQ_OP_ZONE_RESET ,dmz_start_sect (zmd, zone), - dev->zone_nr_sectors,GFP_NOIO ); + zmd->zone_nr_sectors,GFP_NOIO );if (ret) {dmz_dev_err (dev,"Reset zone %u failed %d" ,dmz_id (zmd, zone), ret);
@@ -1398,7 +1430,7 @@ static int dmz_load_mapping(struct dmz_metadata *zmd)if (dzone_id ==DMZ_MAP_UNMAPPED ) goto next; -if (dzone_id >= dev->nr_zones) { +if (dzone_id >= zmd->nr_zones) {dmz_dev_err (dev,"Chunk %u mapping: invalid data zone ID %u" , chunk, dzone_id);return -EIO ;
@@ -1419,7 +1451,7 @@ static int dmz_load_mapping(struct dmz_metadata *zmd)if (bzone_id ==DMZ_MAP_UNMAPPED ) goto next; -if (bzone_id >= dev->nr_zones) { +if (bzone_id >= zmd->nr_zones) {dmz_dev_err (dev,"Chunk %u mapping: invalid buffer zone ID %u" , chunk, bzone_id);return -EIO ;
@@ -1451,7 +1483,7 @@ static int dmz_load_mapping(struct dmz_metadata *zmd)* fully initialized. All remaining zones are unmapped data * zones. Finish initializing those here. */ -for (i =0 ; i < dev->nr_zones; i++) { +for (i =0 ; i < zmd->nr_zones; i++) { dzone =dmz_get (zmd, i);if (dmz_is_meta (dzone))continue ;
@@ -1996,7 +2028,7 @@ int dmz_copy_valid_blocks(struct dmz_metadata *zmd, struct dm_zone *from_zone,sector_t chunk_block =0 ;/* Get the zones bitmap blocks */ -while (chunk_block < zmd->dev->zone_nr_blocks) { +while (chunk_block < zmd->zone_nr_blocks) { from_mblk =dmz_get_bitmap (zmd, from_zone, chunk_block);if (IS_ERR (from_mblk))return PTR_ERR (from_mblk);
@@ -2031,7 +2063,7 @@ int dmz_merge_valid_blocks(struct dmz_metadata *zmd, struct dm_zone *from_zone,int ret;/* Get the zones bitmap blocks */ -while (chunk_block < zmd->dev->zone_nr_blocks) { +while (chunk_block < zmd->zone_nr_blocks) {/* Get a valid region from the source zone */ ret =dmz_first_valid_block (zmd, from_zone, &chunk_block);if (ret <=0 )
@@ -2055,7 +2087,7 @@ int dmz_validate_blocks(struct dmz_metadata *zmd, struct dm_zone *zone, sector_t chunk_block, unsigned int nr_blocks) { unsigned int count, bit, nr_bits; -unsigned int zone_nr_blocks = zmd->dev->zone_nr_blocks; +unsigned int zone_nr_blocks = zmd->zone_nr_blocks;struct dmz_mblock *mblk;unsigned int n =0 ;
@@ -2142,7 +2174,7 @@ int dmz_invalidate_blocks(struct dmz_metadata *zmd, struct dm_zone *zone,dmz_dev_debug (zmd->dev,"=> INVALIDATE zone %u, block %llu, %u blocks" ,dmz_id (zmd, zone), (u64 )chunk_block, nr_blocks); -WARN_ON (chunk_block + nr_blocks > zmd->dev->zone_nr_blocks); +WARN_ON (chunk_block + nr_blocks > zmd->zone_nr_blocks);while (nr_blocks) {/* Get bitmap block */
@@ -2186,7 +2218,7 @@ static int dmz_test_block(struct dmz_metadata *zmd, struct dm_zone *zone,struct dmz_mblock *mblk;int ret; -WARN_ON (chunk_block >= zmd->dev->zone_nr_blocks); +WARN_ON (chunk_block >= zmd->zone_nr_blocks);/* Get bitmap block */ mblk =dmz_get_bitmap (zmd, zone, chunk_block);
@@ -2216,7 +2248,7 @@ static int dmz_to_next_set_block(struct dmz_metadata *zmd, struct dm_zone *zone,unsigned long *bitmap;int n =0 ; -WARN_ON (chunk_block + nr_blocks > zmd->dev->zone_nr_blocks); +WARN_ON (chunk_block + nr_blocks > zmd->zone_nr_blocks);while (nr_blocks) {/* Get bitmap block */
@@ -2260,7 +2292,7 @@ int dmz_block_valid(struct dmz_metadata *zmd, struct dm_zone *zone,/* The block is valid: get the number of valid blocks from block */ return dmz_to_next_set_block (zmd, zone, chunk_block, - zmd->dev->zone_nr_blocks - chunk_block,0 ); + zmd->zone_nr_blocks - chunk_block,0 ); }/*
@@ -2276,7 +2308,7 @@ int dmz_first_valid_block(struct dmz_metadata *zmd, struct dm_zone *zone,int ret; ret =dmz_to_next_set_block (zmd, zone, start_block, - zmd->dev->zone_nr_blocks - start_block,1 ); + zmd->zone_nr_blocks - start_block,1 );if (ret <0 )return ret;
@@ -2284,7 +2316,7 @@ int dmz_first_valid_block(struct dmz_metadata *zmd, struct dm_zone *zone, *chunk_block = start_block;return dmz_to_next_set_block (zmd, zone, start_block, - zmd->dev->zone_nr_blocks - start_block,0 ); + zmd->zone_nr_blocks - start_block,0 ); }/*
@@ -2323,7 +2355,7 @@ static void dmz_get_zone_weight(struct dmz_metadata *zmd, struct dm_zone *zone)struct dmz_mblock *mblk;sector_t chunk_block =0 ;unsigned int bit, nr_bits; -unsigned int nr_blocks = zmd->dev->zone_nr_blocks; +unsigned int nr_blocks = zmd->zone_nr_blocks;void *bitmap;int n =0 ;
@@ -2495,7 +2527,7 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata)dmz_dev_info (dev," %llu 512-byte logical sectors" , (u64 )dev->capacity);dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , - dev->nr_zones, (u64 )dev->zone_nr_sectors); + zmd->nr_zones, (u64 )zmd->zone_nr_sectors);dmz_dev_info (dev," %u metadata zones" , zmd->nr_meta_zones *2 ); dmz_dev_info(dev, " %u data zones for %u chunks",
@@ -2548,7 +2580,7 @@ int dmz_resume_metadata(struct dmz_metadata *zmd)int ret;/* Check zones */ -for (i =0 ; i < dev->nr_zones; i++) { +for (i =0 ; i < zmd->nr_zones; i++) { zone =dmz_get (zmd, i);if (!zone) {dmz_dev_err (dev,"Unable to get zone %u" , i);
@@ -2576,7 +2608,7 @@ int dmz_resume_metadata(struct dmz_metadata *zmd) i, (u64)zone->wp_block, (u64)wp_block); zone->wp_block = wp_block;dmz_invalidate_blocks (zmd, zone, zone->wp_block, - dev->zone_nr_blocks - zone->wp_block); + zmd->zone_nr_blocks - zone->wp_block); } }
drivers/md/dm-zoned-reclaim.c +4 -4
@@ -128,7 +128,7 @@ static int dmz_reclaim_copy(struct dmz_reclaim *zrc,if (dmz_is_seq (src_zone)) end_block = src_zone->wp_block;else - end_block = dev->zone_nr_blocks; + end_block =dmz_zone_nr_blocks (zmd); src_zone_block =dmz_start_block (zmd, src_zone); dst_zone_block =dmz_start_block (zmd, dst_zone);
@@ -210,7 +210,7 @@ static int dmz_reclaim_buf(struct dmz_reclaim *zrc, struct dm_zone *dzone) ret =dmz_merge_valid_blocks (zmd, bzone, dzone, chunk_block);if (ret ==0 ) {/* Free the buffer zone */ -dmz_invalidate_blocks (zmd, bzone,0 , zrc->dev->zone_nr_blocks); +dmz_invalidate_blocks (zmd, bzone,0 ,dmz_zone_nr_blocks (zmd));dmz_lock_map (zmd);dmz_unmap_zone (zmd, bzone);dmz_unlock_zone_reclaim (dzone);
@@ -252,7 +252,7 @@ static int dmz_reclaim_seq_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)* Free the data zone and remap the chunk to * the buffer zone. */ -dmz_invalidate_blocks (zmd, dzone,0 , zrc->dev->zone_nr_blocks); +dmz_invalidate_blocks (zmd, dzone,0 ,dmz_zone_nr_blocks (zmd));dmz_lock_map (zmd);dmz_unmap_zone (zmd, bzone);dmz_unmap_zone (zmd, dzone);
@@ -306,7 +306,7 @@ static int dmz_reclaim_rnd_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)dmz_unlock_map (zmd); }else {/* Free the data zone and remap the chunk */ -dmz_invalidate_blocks (zmd, dzone,0 , zrc->dev->zone_nr_blocks); +dmz_invalidate_blocks (zmd, dzone,0 ,dmz_zone_nr_blocks (zmd));dmz_lock_map (zmd);dmz_unmap_zone (zmd, dzone);dmz_unlock_zone_reclaim (dzone);
drivers/md/dm-zoned-target.c +26 -26
168 lines not on this page · raw message
drivers/md/dm-zoned.h +7 -7
@@ -60,15 +60,11 @@ struct dmz_dev {unsigned int flags;sector_t zone_nr_sectors; -unsigned int zone_nr_sectors_shift; - -sector_t zone_nr_blocks; -sector_t zone_nr_blocks_shift; }; -#define dmz_bio_chunk (dev, bio) ((bio)->bi_iter.bi_sector >> \ - (dev)->zone_nr_sectors_shift) -#define dmz_chunk_block (dev, b) ((b) & ((dev)->zone_nr_blocks - 1)) +#define dmz_bio_chunk (zmd, bio) ((bio)->bi_iter.bi_sector >> \ + dmz_zone_nr_sectors_shift(zmd)) +#define dmz_chunk_block (zmd, b) ((b) & (dmz_zone_nr_blocks(zmd) - 1))/* Device flags. */ #define DMZ_BDEV_DYING (1 << 0)
@@ -198,6 +194,10 @@ unsigned int dmz_nr_rnd_zones(struct dmz_metadata *zmd);unsigned int dmz_nr_unmap_rnd_zones (struct dmz_metadata *zmd);unsigned int dmz_nr_seq_zones (struct dmz_metadata *zmd);unsigned int dmz_nr_unmap_seq_zones (struct dmz_metadata *zmd); +unsigned int dmz_zone_nr_blocks (struct dmz_metadata *zmd); +unsigned int dmz_zone_nr_blocks_shift (struct dmz_metadata *zmd); +unsigned int dmz_zone_nr_sectors (struct dmz_metadata *zmd); +unsigned int dmz_zone_nr_sectors_shift (struct dmz_metadata *zmd);/* * Activate a zone (increment its reference count).
Signature · 1 line
2.25.0
Re: [PATCH 04/11] dm-zoned: move fields from struct dmz_dev to dmz_metadata
Quoted 4 lines · Hannes Reinecke
Move fields from the device structure into the metadata structure and provide accessor functions.
Signed-off-by Hannes Reinecke <[email protected]>
Looks OK.
Quoted 549 lines
--- drivers/md/dm-zoned-metadata.c | 88 +++++++++++++++++++++++----------- drivers/md/dm-zoned-reclaim.c | 8 ++-- drivers/md/dm-zoned-target.c | 52 ++++++++++---------- drivers/md/dm-zoned.h | 14 +++--- 4 files changed, 97 insertions(+), 65 deletions(-)drivers/md/dm-zoned-metadata.c +60
-28@@ -138,9 +138,16 @@ struct dmz_metadata {unsigned int zone_nr_bitmap_blocks;unsigned int zone_bits_per_mblk; +sector_t zone_nr_blocks; +sector_t zone_nr_blocks_shift; + +sector_t zone_nr_sectors; +sector_t zone_nr_sectors_shift; +unsigned int nr_bitmap_blocks;unsigned int nr_map_blocks; +unsigned int nr_zones;unsigned int nr_useable_zones;unsigned int nr_meta_blocks;unsigned int nr_meta_zones;@@ -195,12 +202,12 @@ unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone)sector_t dmz_start_sect (struct dmz_metadata *zmd,struct dm_zone *zone) { -return (sector_t )dmz_id (zmd, zone) << zmd->dev->zone_nr_sectors_shift; +return (sector_t )dmz_id (zmd, zone) << zmd->zone_nr_sectors_shift; }sector_t dmz_start_block (struct dmz_metadata *zmd,struct dm_zone *zone) { -return (sector_t )dmz_id (zmd, zone) << zmd->dev->zone_nr_blocks_shift; +return (sector_t )dmz_id (zmd, zone) << zmd->zone_nr_blocks_shift; }struct dmz_dev *dmz_zone_to_dev (struct dmz_metadata *zmd,struct dm_zone *zone)@@ -208,9 +215,29 @@ struct dmz_dev *dmz_zone_to_dev(struct dmz_metadata *zmd, struct dm_zone *zone)return &zmd->dev[0 ]; } +unsigned int dmz_zone_nr_blocks (struct dmz_metadata *zmd) +{ +return zmd->zone_nr_blocks; +} + +unsigned int dmz_zone_nr_blocks_shift (struct dmz_metadata *zmd) +{ +return zmd->zone_nr_blocks_shift; +} + +unsigned int dmz_zone_nr_sectors (struct dmz_metadata *zmd) +{ +return zmd->zone_nr_sectors; +} + +unsigned int dmz_zone_nr_sectors_shift (struct dmz_metadata *zmd) +{ +return zmd->zone_nr_sectors_shift; +} +unsigned int dmz_nr_zones (struct dmz_metadata *zmd) { -return zmd->dev->nr_zones; +return zmd->nr_zones; }unsigned int dmz_nr_chunks (struct dmz_metadata *zmd)@@ -887,8 +914,8 @@ static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set)return -ENXIO ; } - nr_meta_zones = (le32_to_cpu (sb->nr_meta_blocks) + dev->zone_nr_blocks -1 ) - >> dev->zone_nr_blocks_shift; + nr_meta_zones = (le32_to_cpu (sb->nr_meta_blocks) + zmd->zone_nr_blocks -1 ) + >> zmd->zone_nr_blocks_shift;if (!nr_meta_zones || nr_meta_zones >= zmd->nr_rnd_zones) {dmz_dev_err (dev,"Invalid number of metadata blocks" );@@ -937,7 +964,7 @@ static int dmz_read_sb(struct dmz_metadata *zmd, unsigned int set)*/ static int dmz_lookup_secondary_sb (struct dmz_metadata *zmd) { -unsigned int zone_nr_blocks = zmd->dev->zone_nr_blocks; +unsigned int zone_nr_blocks = zmd->zone_nr_blocks;struct dmz_mblock *mblk;int i;@@ -1148,7 +1175,7 @@ static int dmz_init_zone(struct blk_zone *blkz, unsigned int idx, void *data)struct dmz_dev *dev = zmd->dev;/* Ignore the eventual last runt (smaller) zone */ -if (blkz->len != dev->zone_nr_sectors) { +if (blkz->len != zmd->zone_nr_sectors) {if (blkz->start + blkz->len == dev->capacity)return 0 ;return -ENXIO ;@@ -1213,19 +1240,24 @@ static int dmz_init_zones(struct dmz_metadata *zmd)int ret;/* Init */ - zmd->zone_bitmap_size = dev->zone_nr_blocks >>3 ; + zmd->zone_nr_sectors = dev->zone_nr_sectors; + zmd->zone_nr_sectors_shift =ilog2 (zmd->zone_nr_sectors); + zmd->zone_nr_blocks =dmz_sect2blk (zmd->zone_nr_sectors); + zmd->zone_nr_blocks_shift =ilog2 (zmd->zone_nr_blocks); + zmd->zone_bitmap_size = zmd->zone_nr_blocks >>3 ; zmd->zone_nr_bitmap_blocks =max_t (sector_t,1 , zmd->zone_bitmap_size >>DMZ_BLOCK_SHIFT ); - zmd->zone_bits_per_mblk =min_t (sector_t, dev->zone_nr_blocks, + zmd->zone_bits_per_mblk =min_t (sector_t, zmd->zone_nr_blocks,DMZ_BLOCK_SIZE_BITS );/* Allocate zone array */ - zmd->zones =kcalloc (dev->nr_zones,sizeof (struct dm_zone ),GFP_KERNEL ); + zmd->nr_zones = dev->nr_zones; + zmd->zones =kcalloc (zmd->nr_zones,sizeof (struct dm_zone ),GFP_KERNEL );if (!zmd->zones)return -ENOMEM ;dmz_dev_info (dev,"Using %zu B for zone information" , -sizeof (struct dm_zone ) * dev->nr_zones); +sizeof (struct dm_zone ) * zmd->nr_zones);/* * Get zone information and initialize zone descriptors. At the same @@ -1344,7 +1376,7 @@ static int dmz_reset_zone(struct dmz_metadata *zmd, struct dm_zone *zone) ret =blkdev_zone_mgmt (dev->bdev,REQ_OP_ZONE_RESET ,dmz_start_sect (zmd, zone), - dev->zone_nr_sectors,GFP_NOIO ); + zmd->zone_nr_sectors,GFP_NOIO );if (ret) {dmz_dev_err (dev,"Reset zone %u failed %d" ,dmz_id (zmd, zone), ret);@@ -1398,7 +1430,7 @@ static int dmz_load_mapping(struct dmz_metadata *zmd)if (dzone_id ==DMZ_MAP_UNMAPPED ) goto next; -if (dzone_id >= dev->nr_zones) { +if (dzone_id >= zmd->nr_zones) {dmz_dev_err (dev,"Chunk %u mapping: invalid data zone ID %u" , chunk, dzone_id);return -EIO ;@@ -1419,7 +1451,7 @@ static int dmz_load_mapping(struct dmz_metadata *zmd)if (bzone_id ==DMZ_MAP_UNMAPPED ) goto next; -if (bzone_id >= dev->nr_zones) { +if (bzone_id >= zmd->nr_zones) {dmz_dev_err (dev,"Chunk %u mapping: invalid buffer zone ID %u" , chunk, bzone_id);return -EIO ;@@ -1451,7 +1483,7 @@ static int dmz_load_mapping(struct dmz_metadata *zmd)* fully initialized. All remaining zones are unmapped data * zones. Finish initializing those here. */ -for (i =0 ; i < dev->nr_zones; i++) { +for (i =0 ; i < zmd->nr_zones; i++) { dzone =dmz_get (zmd, i);if (dmz_is_meta (dzone))continue ;@@ -1996,7 +2028,7 @@ int dmz_copy_valid_blocks(struct dmz_metadata *zmd, struct dm_zone *from_zone,sector_t chunk_block =0 ;/* Get the zones bitmap blocks */ -while (chunk_block < zmd->dev->zone_nr_blocks) { +while (chunk_block < zmd->zone_nr_blocks) { from_mblk =dmz_get_bitmap (zmd, from_zone, chunk_block);if (IS_ERR (from_mblk))return PTR_ERR (from_mblk);@@ -2031,7 +2063,7 @@ int dmz_merge_valid_blocks(struct dmz_metadata *zmd, struct dm_zone *from_zone,int ret;/* Get the zones bitmap blocks */ -while (chunk_block < zmd->dev->zone_nr_blocks) { +while (chunk_block < zmd->zone_nr_blocks) {/* Get a valid region from the source zone */ ret =dmz_first_valid_block (zmd, from_zone, &chunk_block);if (ret <=0 )@@ -2055,7 +2087,7 @@ int dmz_validate_blocks(struct dmz_metadata *zmd, struct dm_zone *zone, sector_t chunk_block, unsigned int nr_blocks) { unsigned int count, bit, nr_bits; -unsigned int zone_nr_blocks = zmd->dev->zone_nr_blocks; +unsigned int zone_nr_blocks = zmd->zone_nr_blocks;struct dmz_mblock *mblk;unsigned int n =0 ;@@ -2142,7 +2174,7 @@ int dmz_invalidate_blocks(struct dmz_metadata *zmd, struct dm_zone *zone,dmz_dev_debug (zmd->dev,"=> INVALIDATE zone %u, block %llu, %u blocks" ,dmz_id (zmd, zone), (u64 )chunk_block, nr_blocks); -WARN_ON (chunk_block + nr_blocks > zmd->dev->zone_nr_blocks); +WARN_ON (chunk_block + nr_blocks > zmd->zone_nr_blocks);while (nr_blocks) {/* Get bitmap block */ @@ -2186,7 +2218,7 @@ static int dmz_test_block(struct dmz_metadata *zmd, struct dm_zone *zone,struct dmz_mblock *mblk;int ret; -WARN_ON (chunk_block >= zmd->dev->zone_nr_blocks); +WARN_ON (chunk_block >= zmd->zone_nr_blocks);/* Get bitmap block */ mblk =dmz_get_bitmap (zmd, zone, chunk_block);@@ -2216,7 +2248,7 @@ static int dmz_to_next_set_block(struct dmz_metadata *zmd, struct dm_zone *zone,unsigned long *bitmap;int n =0 ; -WARN_ON (chunk_block + nr_blocks > zmd->dev->zone_nr_blocks); +WARN_ON (chunk_block + nr_blocks > zmd->zone_nr_blocks);while (nr_blocks) {/* Get bitmap block */ @@ -2260,7 +2292,7 @@ int dmz_block_valid(struct dmz_metadata *zmd, struct dm_zone *zone,/* The block is valid: get the number of valid blocks from block */ return dmz_to_next_set_block (zmd, zone, chunk_block, - zmd->dev->zone_nr_blocks - chunk_block,0 ); + zmd->zone_nr_blocks - chunk_block,0 ); }/* @@ -2276,7 +2308,7 @@ int dmz_first_valid_block(struct dmz_metadata *zmd, struct dm_zone *zone,int ret; ret =dmz_to_next_set_block (zmd, zone, start_block, - zmd->dev->zone_nr_blocks - start_block,1 ); + zmd->zone_nr_blocks - start_block,1 );if (ret <0 )return ret;@@ -2284,7 +2316,7 @@ int dmz_first_valid_block(struct dmz_metadata *zmd, struct dm_zone *zone, *chunk_block = start_block;return dmz_to_next_set_block (zmd, zone, start_block, - zmd->dev->zone_nr_blocks - start_block,0 ); + zmd->zone_nr_blocks - start_block,0 ); }/* @@ -2323,7 +2355,7 @@ static void dmz_get_zone_weight(struct dmz_metadata *zmd, struct dm_zone *zone)struct dmz_mblock *mblk;sector_t chunk_block =0 ;unsigned int bit, nr_bits; -unsigned int nr_blocks = zmd->dev->zone_nr_blocks; +unsigned int nr_blocks = zmd->zone_nr_blocks;void *bitmap;int n =0 ;@@ -2495,7 +2527,7 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata)dmz_dev_info (dev," %llu 512-byte logical sectors" , (u64 )dev->capacity);dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , - dev->nr_zones, (u64 )dev->zone_nr_sectors); + zmd->nr_zones, (u64 )zmd->zone_nr_sectors);dmz_dev_info (dev," %u metadata zones" , zmd->nr_meta_zones *2 ); dmz_dev_info(dev, " %u data zones for %u chunks",@@ -2548,7 +2580,7 @@ int dmz_resume_metadata(struct dmz_metadata *zmd)int ret;/* Check zones */ -for (i =0 ; i < dev->nr_zones; i++) { +for (i =0 ; i < zmd->nr_zones; i++) { zone =dmz_get (zmd, i);if (!zone) {dmz_dev_err (dev,"Unable to get zone %u" , i);@@ -2576,7 +2608,7 @@ int dmz_resume_metadata(struct dmz_metadata *zmd) i, (u64)zone->wp_block, (u64)wp_block); zone->wp_block = wp_block;dmz_invalidate_blocks (zmd, zone, zone->wp_block, - dev->zone_nr_blocks - zone->wp_block); + zmd->zone_nr_blocks - zone->wp_block); } }drivers/md/dm-zoned-reclaim.c +4
-4@@ -128,7 +128,7 @@ static int dmz_reclaim_copy(struct dmz_reclaim *zrc,if (dmz_is_seq (src_zone)) end_block = src_zone->wp_block;else - end_block = dev->zone_nr_blocks; + end_block =dmz_zone_nr_blocks (zmd); src_zone_block =dmz_start_block (zmd, src_zone); dst_zone_block =dmz_start_block (zmd, dst_zone);@@ -210,7 +210,7 @@ static int dmz_reclaim_buf(struct dmz_reclaim *zrc, struct dm_zone *dzone) ret =dmz_merge_valid_blocks (zmd, bzone, dzone, chunk_block);if (ret ==0 ) {/* Free the buffer zone */ -dmz_invalidate_blocks (zmd, bzone,0 , zrc->dev->zone_nr_blocks); +dmz_invalidate_blocks (zmd, bzone,0 ,dmz_zone_nr_blocks (zmd));dmz_lock_map (zmd);dmz_unmap_zone (zmd, bzone);dmz_unlock_zone_reclaim (dzone);@@ -252,7 +252,7 @@ static int dmz_reclaim_seq_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)* Free the data zone and remap the chunk to * the buffer zone. */ -dmz_invalidate_blocks (zmd, dzone,0 , zrc->dev->zone_nr_blocks); +dmz_invalidate_blocks (zmd, dzone,0 ,dmz_zone_nr_blocks (zmd));dmz_lock_map (zmd);dmz_unmap_zone (zmd, bzone);dmz_unmap_zone (zmd, dzone);@@ -306,7 +306,7 @@ static int dmz_reclaim_rnd_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)dmz_unlock_map (zmd); }else {/* Free the data zone and remap the chunk */ -dmz_invalidate_blocks (zmd, dzone,0 , zrc->dev->zone_nr_blocks); +dmz_invalidate_blocks (zmd, dzone,0 ,dmz_zone_nr_blocks (zmd));dmz_lock_map (zmd);dmz_unmap_zone (zmd, dzone);dmz_unlock_zone_reclaim (dzone);drivers/md/dm-zoned-target.c +26
-26@@ -165,7 +165,8 @@ static void dmz_handle_read_zero(struct dmz_target *dmz, struct bio *bio,static int dmz_handle_read (struct dmz_target *dmz,struct dm_zone *zone,struct bio *bio) { -sector_t chunk_block =dmz_chunk_block (dmz->dev,dmz_bio_block (bio)); +struct dmz_metadata *zmd = dmz->metadata; +sector_t chunk_block =dmz_chunk_block (zmd,dmz_bio_block (bio));unsigned int nr_blocks =dmz_bio_blocks (bio);sector_t end_block = chunk_block + nr_blocks;struct dm_zone *rzone, *bzone;@@ -178,9 +179,9 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone, }dmz_dev_debug (dmz->dev,"READ chunk %llu -> %s zone %u, block %llu, %u blocks" , - (unsigned long long )dmz_bio_chunk (dmz->dev, bio), + (unsigned long long )dmz_bio_chunk (zmd, bio), (dmz_is_rnd (zone) ?"RND" :"SEQ" ), -dmz_id (dmz->metadata, zone), +dmz_id (zmd, zone), (unsigned long long )chunk_block, nr_blocks);/* Check block validity to determine the read location */ @@ -189,7 +190,7 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone, nr_blocks =0 ;if (dmz_is_rnd (zone) || chunk_block < zone->wp_block) {/* Test block validity in the data zone */ - ret =dmz_block_valid (dmz->metadata, zone, chunk_block); + ret =dmz_block_valid (zmd, zone, chunk_block);if (ret <0 )return ret;if (ret >0 ) {@@ -204,7 +205,7 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone,* Check the buffer zone, if there is one. */ if (!nr_blocks && bzone) { - ret =dmz_block_valid (dmz->metadata, bzone, chunk_block); + ret =dmz_block_valid (zmd, bzone, chunk_block);if (ret <0 )return ret;if (ret >0 ) {@@ -308,16 +309,17 @@ static int dmz_handle_buffered_write(struct dmz_target *dmz,static int dmz_handle_write (struct dmz_target *dmz,struct dm_zone *zone,struct bio *bio) { -sector_t chunk_block =dmz_chunk_block (dmz->dev,dmz_bio_block (bio)); +struct dmz_metadata *zmd = dmz->metadata; +sector_t chunk_block =dmz_chunk_block (zmd,dmz_bio_block (bio));unsigned int nr_blocks =dmz_bio_blocks (bio);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 (dmz->dev, bio), + (unsigned long long )dmz_bio_chunk (zmd, bio), (dmz_is_rnd (zone) ?"RND" :"SEQ" ), -dmz_id (dmz->metadata, zone), +dmz_id (zmd, zone), (unsigned long long )chunk_block, nr_blocks);if (dmz_is_rnd (zone) || chunk_block == zone->wp_block) {@@ -345,7 +347,7 @@ static int dmz_handle_discard(struct dmz_target *dmz, struct dm_zone *zone,struct dmz_metadata *zmd = dmz->metadata;sector_t block =dmz_bio_block (bio);unsigned int nr_blocks =dmz_bio_blocks (bio); -sector_t chunk_block =dmz_chunk_block (dmz->dev, block); +sector_t chunk_block =dmz_chunk_block (zmd, block);int ret =0 ;/* For unmapped chunks, there is nothing to do */ @@ -356,7 +358,7 @@ static int dmz_handle_discard(struct dmz_target *dmz, struct dm_zone *zone,return -EROFS ;dmz_dev_debug (dmz->dev,"DISCARD chunk %llu -> zone %u, block %llu, %u blocks" , - (unsigned long long )dmz_bio_chunk (dmz->dev, bio), + (unsigned long long )dmz_bio_chunk (zmd, bio),dmz_id (zmd, zone), (unsigned long long )chunk_block, nr_blocks);@@ -402,7 +404,7 @@ static void dmz_handle_bio(struct dmz_target *dmz, struct dm_chunk_work *cw,* mapping for read and discard. If a mapping is obtained, + the zone returned will be set to active state. */ - zone =dmz_get_chunk_mapping (zmd,dmz_bio_chunk (dmz->dev, bio), + zone =dmz_get_chunk_mapping (zmd,dmz_bio_chunk (zmd, bio),bio_op (bio));if (IS_ERR (zone)) { ret =PTR_ERR (zone);@@ -525,7 +527,7 @@ static void dmz_flush_work(struct work_struct *work)*/ static int dmz_queue_chunk_work (struct dmz_target *dmz,struct bio *bio) { -unsigned int chunk =dmz_bio_chunk (dmz->dev, bio); +unsigned int chunk =dmz_bio_chunk (dmz->metadata, bio);struct dm_chunk_work *cw;int ret =0 ;@@ -618,6 +620,7 @@ bool dmz_check_bdev(struct dmz_dev *dmz_dev)static int dmz_map (struct dm_target *ti,struct bio *bio) {struct dmz_target *dmz = ti->private; +struct dmz_metadata *zmd = dmz->metadata;struct dmz_dev *dev = dmz->dev;struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx ));sector_t sector = bio->bi_iter.bi_sector;@@ -630,8 +633,8 @@ static int dmz_map(struct dm_target *ti, struct bio *bio)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 (dmz->dev, bio), - (unsigned long long )dmz_chunk_block (dmz->dev,dmz_bio_block (bio)), + (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);@@ -659,16 +662,16 @@ static int dmz_map(struct dm_target *ti, struct bio *bio) }/* Split zone BIOs to fit entirely into a zone */ - chunk_sector = sector & (dev->zone_nr_sectors -1 ); -if (chunk_sector + nr_sectors > dev->zone_nr_sectors) -dm_accept_partial_bio (bio, dev->zone_nr_sectors - chunk_sector); + chunk_sector = sector & (dmz_zone_nr_sectors (zmd) -1 ); +if (chunk_sector + nr_sectors >dmz_zone_nr_sectors (zmd)) +dm_accept_partial_bio (bio,dmz_zone_nr_sectors (zmd) - chunk_sector);/* 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 (dmz->dev, bio), +bio_op (bio), (u64 )dmz_bio_chunk (zmd, bio), ret);return DM_MAPIO_REQUEUE ; }@@ -722,10 +725,6 @@ static int dmz_get_zoned_device(struct dm_target *ti, char *path) } dev->zone_nr_sectors =blk_queue_zone_sectors (q); - dev->zone_nr_sectors_shift =ilog2 (dev->zone_nr_sectors); - - dev->zone_nr_blocks =dmz_sect2blk (dev->zone_nr_sectors); - dev->zone_nr_blocks_shift =ilog2 (dev->zone_nr_blocks); dev->nr_zones =blkdev_nr_zones (dev->bdev->bd_disk);@@ -790,7 +789,7 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv) }/* Set target (no write same support) */ - ti->max_io_len = dev->zone_nr_sectors <<9 ; + ti->max_io_len =dmz_zone_nr_sectors (dmz->metadata) <<9 ; ti->num_flush_bios =1 ; ti->num_discard_bios =1 ; ti->num_write_zeroes_bios =1 ;@@ -799,7 +798,8 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv) ti->discards_supported = true;/* The exposed capacity is the number of chunks that can be mapped */ - ti->len = (sector_t )dmz_nr_chunks (dmz->metadata) << dev->zone_nr_sectors_shift; + ti->len = (sector_t )dmz_nr_chunks (dmz->metadata) << +dmz_zone_nr_sectors_shift (dmz->metadata);/* Zone BIO */ ret =bioset_init (&dmz->bio_set,DMZ_MIN_BIOS ,0 ,0 );@@ -895,7 +895,7 @@ static void dmz_dtr(struct dm_target *ti)static void dmz_io_hints (struct dm_target *ti,struct queue_limits *limits) {struct dmz_target *dmz = ti->private; -unsigned int chunk_sectors = dmz->dev->zone_nr_sectors; +unsigned int chunk_sectors =dmz_zone_nr_sectors (dmz->metadata); limits->logical_block_size =DMZ_BLOCK_SIZE ; limits->physical_block_size =DMZ_BLOCK_SIZE ;@@ -960,7 +960,7 @@ static int dmz_iterate_devices(struct dm_target *ti, {struct dmz_target *dmz = ti->private;struct dmz_dev *dev = dmz->dev; -sector_t capacity = dev->capacity & ~(dev->zone_nr_sectors -1 ); +sector_t capacity = dev->capacity & ~(dmz_zone_nr_sectors (dmz->metadata) -1 );return fn (ti, dmz->ddev,0 , capacity, data); }drivers/md/dm-zoned.h +7
-7@@ -60,15 +60,11 @@ struct dmz_dev {unsigned int flags;sector_t zone_nr_sectors; -unsigned int zone_nr_sectors_shift; - -sector_t zone_nr_blocks; -sector_t zone_nr_blocks_shift; }; -#define dmz_bio_chunk (dev, bio) ((bio)->bi_iter.bi_sector >> \ - (dev)->zone_nr_sectors_shift) -#define dmz_chunk_block (dev, b) ((b) & ((dev)->zone_nr_blocks - 1)) +#define dmz_bio_chunk (zmd, bio) ((bio)->bi_iter.bi_sector >> \ + dmz_zone_nr_sectors_shift(zmd)) +#define dmz_chunk_block (zmd, b) ((b) & (dmz_zone_nr_blocks(zmd) - 1))/* Device flags. */ #define DMZ_BDEV_DYING (1 << 0)@@ -198,6 +194,10 @@ unsigned int dmz_nr_rnd_zones(struct dmz_metadata *zmd);unsigned int dmz_nr_unmap_rnd_zones (struct dmz_metadata *zmd);unsigned int dmz_nr_seq_zones (struct dmz_metadata *zmd);unsigned int dmz_nr_unmap_seq_zones (struct dmz_metadata *zmd); +unsigned int dmz_zone_nr_blocks (struct dmz_metadata *zmd); +unsigned int dmz_zone_nr_blocks_shift (struct dmz_metadata *zmd); +unsigned int dmz_zone_nr_sectors (struct dmz_metadata *zmd); +unsigned int dmz_zone_nr_sectors_shift (struct dmz_metadata *zmd);/* * Activate a zone (increment its reference count).
Signature · 2 lines
Damien Le Moal Western Digital Research
PATCH v2 5/11 dm-zoned: introduce dmz_metadata_label() to format device name
In reply to Hannes ReineckeIntroduce dmz_metadata_label() to format the device-mapper device name and use it instead of the device name of the underlying device.
--- drivers/md/dm-zoned-metadata.c | 11 ++++++++++- drivers/md/dm-zoned-reclaim.c | 15 ++++++++------- drivers/md/dm-zoned-target.c | 17 ++++++++++------- drivers/md/dm-zoned.h | 4 +++- 4 files changed, 31 insertions(+), 16 deletions(-)
drivers/md/dm-zoned-metadata.c +10 -1
@@ -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;
@@ -265,6 +267,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.
@@ -2445,7 +2452,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, zid;
@@ -2456,6 +2464,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);
drivers/md/dm-zoned-reclaim.c +8 -7
@@ -481,15 +481,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 ; }
@@ -525,7 +526,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;
drivers/md/dm-zoned-target.c +10 -7
@@ -782,7 +782,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 +812,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 +826,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 +841,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:
drivers/md/dm-zoned.h +3 -1
@@ -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);unsigned int dmz_id (struct dmz_metadata *zmd,struct dm_zone *zone);sector_t dmz_start_sect (struct dmz_metadata *zmd,struct dm_zone *zone);
Signature · 1 line
2.25.0
Re: [PATCH 05/11] dm-zoned: introduce dmz_metadata_label() to format device name
Quoted 4 lines · Hannes Reinecke
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 <[email protected]>
Quoted 158 lines
--- drivers/md/dm-zoned-metadata.c | 11 ++++++++++- drivers/md/dm-zoned-reclaim.c | 15 ++++++++------- drivers/md/dm-zoned-target.c | 17 ++++++++++------- drivers/md/dm-zoned.h | 4 +++- 4 files changed, 31 insertions(+), 16 deletions(-)drivers/md/dm-zoned-metadata.c +10
-1@@ -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;@@ -265,6 +267,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. @@ -2445,7 +2452,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, zid;@@ -2456,6 +2464,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);drivers/md/dm-zoned-reclaim.c +8
-7@@ -481,15 +481,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 ; }@@ -525,7 +526,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;drivers/md/dm-zoned-target.c +10
-7@@ -782,7 +782,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 +812,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 +826,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 +841,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:drivers/md/dm-zoned.h +3
-1@@ -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);unsigned int dmz_id (struct dmz_metadata *zmd,struct dm_zone *zone);sector_t dmz_start_sect (struct dmz_metadata *zmd,struct dm_zone *zone);
Signature · 2 lines
Damien Le Moal Western Digital Research
PATCH v2 6/11 dm-zoned: remove 'dev' argument from reclaim
In reply to Hannes ReineckeUse the dmz_zone_to_dev() mapping function to remove the 'dev' argument from reclaim.
--- drivers/md/dm-zoned-metadata.c | 5 ++++ drivers/md/dm-zoned-reclaim.c | 44 ++++++++++++++++++---------------- drivers/md/dm-zoned-target.c | 2 +- drivers/md/dm-zoned.h | 4 +++- 4 files changed, 33 insertions(+), 22 deletions(-)
drivers/md/dm-zoned-metadata.c +5 -0
@@ -272,6 +272,11 @@ const char *dmz_metadata_label(struct dmz_metadata *zmd)return (const char *)zmd->devname; } +bool dmz_check_dev (struct dmz_metadata *zmd) +{ +return dmz_check_bdev (&zmd->dev[0 ]); +} +/* * Lock/unlock mapping table. * The map lock also protects all the zone lists.
drivers/md/dm-zoned-reclaim.c +24 -20
170 lines not on this page · raw message
drivers/md/dm-zoned-target.c +1 -1
@@ -835,7 +835,7 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv)mod_delayed_work (dmz->flush_wq, &dmz->flush_work,DMZ_FLUSH_PERIOD );/* Initialize reclaim */ - ret =dmz_ctr_reclaim (dev, dmz->metadata, &dmz->reclaim); + ret =dmz_ctr_reclaim (dmz->metadata, &dmz->reclaim);if (ret) { ti->error ="Zone reclaim initialization failed" ; goto err_fwq;
drivers/md/dm-zoned.h +3 -1
@@ -176,11 +176,13 @@ 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); +bool dmz_check_dev (struct dmz_metadata *zmd);unsigned int dmz_id (struct dmz_metadata *zmd,struct dm_zone *zone);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);unsigned int dmz_nr_chunks (struct dmz_metadata *zmd); +struct dmz_dev *dmz_zone_to_dev (struct dmz_metadata *zmd,struct dm_zone *zone);#define DMZ_ALLOC_RND 0x01#define DMZ_ALLOC_RECLAIM 0x02
@@ -252,7 +254,7 @@ int dmz_merge_valid_blocks(struct dmz_metadata *zmd, struct dm_zone *from_zone,/* * Functions defined in dm-zoned-reclaim.c */ -int dmz_ctr_reclaim (struct dmz_dev *dev,struct dmz_metadata *zmd, +int dmz_ctr_reclaim (struct dmz_metadata *zmd,struct dmz_reclaim **zrc);void dmz_dtr_reclaim (struct dmz_reclaim *zrc);void dmz_suspend_reclaim (struct dmz_reclaim *zrc);
Signature · 1 line
2.25.0
Re: [PATCH 06/11] dm-zoned: remove 'dev' argument from reclaim
Quoted 170 lines · Hannes Reinecke
Use the
dmz_zone_to_dev()mapping function to remove the 'dev' argument from reclaim.Signed-off-by Hannes Reinecke <[email protected]>--- drivers/md/dm-zoned-metadata.c | 5 ++++ drivers/md/dm-zoned-reclaim.c | 44 ++++++++++++++++++---------------- drivers/md/dm-zoned-target.c | 2 +- drivers/md/dm-zoned.h | 4 +++- 4 files changed, 33 insertions(+), 22 deletions(-)drivers/md/dm-zoned-metadata.c +5
-0@@ -272,6 +272,11 @@ const char *dmz_metadata_label(struct dmz_metadata *zmd)return (const char *)zmd->devname; } +bool dmz_check_dev (struct dmz_metadata *zmd) +{ +return dmz_check_bdev (&zmd->dev[0 ]); +} +/* * Lock/unlock mapping table. * The map lock also protects all the zone lists. drivers/md/dm-zoned-reclaim.c +20
-12@@ -13,7 +13,6 @@struct dmz_reclaim {struct dmz_metadata *metadata; -struct dmz_dev *dev;struct delayed_work work;struct workqueue_struct *wq;@@ -59,6 +58,7 @@ static int dmz_reclaim_align_wp(struct dmz_reclaim *zrc, struct dm_zone *zone, sector_t block) {struct dmz_metadata *zmd = zrc->metadata; +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone);sector_t wp_block = zone->wp_block;unsigned int nr_blocks;int ret;@@ -74,15 +74,15 @@ static int dmz_reclaim_align_wp(struct dmz_reclaim *zrc, struct dm_zone *zone,* pointer and the requested position. */ nr_blocks = block - wp_block; - ret =blkdev_issue_zeroout (zrc->dev->bdev, + ret =blkdev_issue_zeroout (dev->bdev,dmz_start_sect (zmd, zone) +dmz_blk2sect (wp_block),dmz_blk2sect (nr_blocks),GFP_NOIO ,0 );if (ret) { -dmz_dev_err (zrc->dev, +dmz_dev_err (dev,"Align zone %u wp %llu to %llu (wp+%u) blocks failed %d" ,dmz_id (zmd, zone), (unsigned long long )wp_block, (unsigned long long )block, nr_blocks, ret); -dmz_check_bdev (zrc->dev); +dmz_check_bdev (dev);return ret; }@@ -116,7 +116,7 @@ static int dmz_reclaim_copy(struct dmz_reclaim *zrc, struct dm_zone *src_zone, struct dm_zone *dst_zone) { struct dmz_metadata *zmd = zrc->metadata; -struct dmz_dev *dev = zrc->dev; +struct dmz_dev *src_dev, *dst_dev;struct dm_io_region src, dst;sector_t block =0 , end_block;sector_t nr_blocks;@@ -130,13 +130,17 @@ static int dmz_reclaim_copy(struct dmz_reclaim *zrc,else end_block =dmz_zone_nr_blocks (zmd); src_zone_block =dmz_start_block (zmd, src_zone); + src_dev =dmz_zone_to_dev (zmd, src_zone); dst_zone_block =dmz_start_block (zmd, dst_zone); + dst_dev =dmz_zone_to_dev (zmd, dst_zone);if (dmz_is_seq (dst_zone))set_bit (DM_KCOPYD_WRITE_SEQ , &flags);while (block < end_block) { -if (dev->flags &DMZ_BDEV_DYING ) +if (src_dev->flags &DMZ_BDEV_DYING ) +return -EIO ; +if (dst_dev->flags &DMZ_BDEV_DYING )return -EIO ;/* Get a valid region from the source zone */ @@ -156,11 +160,11 @@ static int dmz_reclaim_copy(struct dmz_reclaim *zrc,return ret; } - src.bdev = dev->bdev; + src.bdev = src_dev->bdev; src.sector =dmz_blk2sect (src_zone_block + block); src.count =dmz_blk2sect (nr_blocks); - dst.bdev = dev->bdev; + dst.bdev = dst_dev->bdev; dst.sector =dmz_blk2sect (dst_zone_block + block); dst.count = src.count;@@ -192,9 +196,10 @@ static int dmz_reclaim_buf(struct dmz_reclaim *zrc, struct dm_zone *dzone)struct dm_zone *bzone = dzone->bzone;sector_t chunk_block = dzone->wp_block;struct dmz_metadata *zmd = zrc->metadata; +struct dmz_dev *dev =dmz_zone_to_dev (zmd, dzone);int ret; -dmz_dev_debug (zrc->dev, +dmz_dev_debug (dev,"Chunk %u, move buf zone %u (weight %u) to data zone %u (weight %u)" , dzone->chunk,dmz_id (zmd, bzone),dmz_weight (bzone),dmz_id (zmd, dzone),dmz_weight (dzone));@@ -231,9 +236,10 @@ static int dmz_reclaim_seq_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)unsigned int chunk = dzone->chunk;struct dm_zone *bzone = dzone->bzone;struct dmz_metadata *zmd = zrc->metadata; +struct dmz_dev *dev =dmz_zone_to_dev (zmd, dzone);int ret =0 ; -dmz_dev_debug (zrc->dev, +dmz_dev_debug (dev,"Chunk %u, move data zone %u (weight %u) to buf zone %u (weight %u)" , chunk,dmz_id (zmd, dzone),dmz_weight (dzone),dmz_id (zmd, bzone),dmz_weight (bzone));@@ -276,6 +282,7 @@ static int dmz_reclaim_rnd_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)unsigned int chunk = dzone->chunk;struct dm_zone *szone =NULL ;struct dmz_metadata *zmd = zrc->metadata; +struct dmz_dev *dev =dmz_zone_to_dev (zmd, dzone);int ret;/* Get a free sequential zone */ @@ -285,7 +292,7 @@ static int dmz_reclaim_rnd_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)if (!szone)return -ENOSPC ; -dmz_dev_debug (zrc->dev, +dmz_dev_debug (dev,"Chunk %u, move rnd zone %u (weight %u) to seq zone %u" , chunk,dmz_id (zmd, dzone),dmz_weight (dzone),dmz_id (zmd, szone));@@ -344,6 +351,7 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc)struct dmz_metadata *zmd = zrc->metadata;struct dm_zone *dzone;struct dm_zone *rzone; +struct dmz_dev *dev;unsigned long start;int ret;@@ -353,7 +361,7 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc)return PTR_ERR (dzone); start = jiffies; - + dev =dmz_zone_to_dev (zmd, dzone);if (dmz_is_rnd (dzone)) {if (!dmz_weight (dzone)) {/* Empty zone */ @@ -401,13 +409,13 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc) ret =dmz_flush_metadata (zrc->metadata);if (ret) {
drivers/md/dm-zoned-reclaim.c static int dmz_do_reclaim(struct dmz_reclaim *zrc) · line 419
Quoted 10 lines
drivers/md/dm-zoned-reclaim.c +2
-2-dmz_dev_debug (zrc->dev, +dmz_dev_debug (dev,"Metadata flush for zone %u failed, err %d\n" ,dmz_id (zmd, rzone), ret);return ret; } -dmz_dev_debug (zrc->dev,"Reclaimed zone %u in %u ms" , +dmz_dev_debug (dev,"Reclaimed zone %u in %u ms" ,dmz_id (zmd, rzone),jiffies_to_msecs (jiffies - start));
In patch 5, you changed dmz_dev_debug() to use DMDEBUG() to print the label. It may be good to do the same here to have the label, but also add the bdev name reclaim acted on ? Not super important though.
Quoted 71 lines
drivers/md/dm-zoned-reclaim.c +2
-6return 0 ; }@@ -456,9 +464,6 @@ static void dmz_reclaim_work(struct work_struct *work)unsigned int p_unmap_rnd;int ret; -if (dmz_bdev_is_dying (zrc->dev)) -return ; -if (!dmz_should_reclaim (zrc)) {mod_delayed_work (zrc->wq, &zrc->work,DMZ_IDLE_PERIOD );return ;@@ -491,7 +496,7 @@ static void dmz_reclaim_work(struct work_struct *work)if (ret) {DMDEBUG ("(%s): Reclaim error %d\n" ,dmz_metadata_label (zmd), ret); -if (!dmz_check_bdev (zrc->dev)) +if (!dmz_check_dev (zmd))return ; }@@ -501,7 +506,7 @@ static void dmz_reclaim_work(struct work_struct *work)/* * Initialize reclaim. */ -int dmz_ctr_reclaim (struct dmz_dev *dev,struct dmz_metadata *zmd, +int dmz_ctr_reclaim (struct dmz_metadata *zmd,struct dmz_reclaim **reclaim) {struct dmz_reclaim *zrc;@@ -511,7 +516,6 @@ int dmz_ctr_reclaim(struct dmz_dev *dev, struct dmz_metadata *zmd,if (!zrc)return -ENOMEM ; - zrc->dev = dev; zrc->metadata = zmd; zrc->atime = jiffies;drivers/md/dm-zoned-target.c +1
-1@@ -835,7 +835,7 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv)mod_delayed_work (dmz->flush_wq, &dmz->flush_work,DMZ_FLUSH_PERIOD );/* Initialize reclaim */ - ret =dmz_ctr_reclaim (dev, dmz->metadata, &dmz->reclaim); + ret =dmz_ctr_reclaim (dmz->metadata, &dmz->reclaim);if (ret) { ti->error ="Zone reclaim initialization failed" ; goto err_fwq;drivers/md/dm-zoned.h +2
-0@@ -176,11 +176,13 @@ 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); +bool dmz_check_dev (struct dmz_metadata *zmd);unsigned int dmz_id (struct dmz_metadata *zmd,struct dm_zone *zone);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);unsigned int dmz_nr_chunks (struct dmz_metadata *zmd); +struct dmz_dev *dmz_zone_to_dev (struct dmz_metadata *zmd,struct dm_zone *zone);#define DMZ_ALLOC_RND 0x01#define DMZ_ALLOC_RECLAIM 0x02
drivers/md/dm-zoned.h int dmz_merge_valid_blocks(struct dmz_metadata *zmd, struct dm_zone *from_zone, · line 260
Quoted 8 lines
drivers/md/dm-zoned.h +1
-1@@ -252,7 +254,7 @@ int dmz_merge_valid_blocks(struct dmz_metadata *zmd, struct dm_zone *from_zone,/* * Functions defined in dm-zoned-reclaim.c */ -int dmz_ctr_reclaim (struct dmz_dev *dev,struct dmz_metadata *zmd, +int dmz_ctr_reclaim (struct dmz_metadata *zmd,struct dmz_reclaim **zrc);void dmz_dtr_reclaim (struct dmz_reclaim *zrc);void dmz_suspend_reclaim (struct dmz_reclaim *zrc);
Apart from the nit above, looks good.
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 06/11] dm-zoned: remove 'dev' argument from reclaim
Quoted 178 lines · Damien Le Moal
Quoted 177 lines · Hannes Reinecke
Use the
dmz_zone_to_dev()mapping function to remove the 'dev' argument from reclaim.Signed-off-by Hannes Reinecke <[email protected]>--- drivers/md/dm-zoned-metadata.c | 5 ++++ drivers/md/dm-zoned-reclaim.c | 44 ++++++++++++++++++---------------- drivers/md/dm-zoned-target.c | 2 +- drivers/md/dm-zoned.h | 4 +++- 4 files changed, 33 insertions(+), 22 deletions(-)drivers/md/dm-zoned-metadata.c +5
-0@@ -272,6 +272,11 @@ const char *dmz_metadata_label(struct dmz_metadata *zmd)return (const char *)zmd->devname; } +bool dmz_check_dev (struct dmz_metadata *zmd) +{ +return dmz_check_bdev (&zmd->dev[0 ]); +} +/* * Lock/unlock mapping table. * The map lock also protects all the zone lists. drivers/md/dm-zoned-reclaim.c +21
-13@@ -13,7 +13,6 @@struct dmz_reclaim {struct dmz_metadata *metadata; -struct dmz_dev *dev;struct delayed_work work;struct workqueue_struct *wq;@@ -59,6 +58,7 @@ static int dmz_reclaim_align_wp(struct dmz_reclaim *zrc, struct dm_zone *zone, sector_t block) {struct dmz_metadata *zmd = zrc->metadata; +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone);sector_t wp_block = zone->wp_block;unsigned int nr_blocks;int ret;@@ -74,15 +74,15 @@ static int dmz_reclaim_align_wp(struct dmz_reclaim *zrc, struct dm_zone *zone,* pointer and the requested position. */ nr_blocks = block - wp_block; - ret =blkdev_issue_zeroout (zrc->dev->bdev, + ret =blkdev_issue_zeroout (dev->bdev,dmz_start_sect (zmd, zone) +dmz_blk2sect (wp_block),dmz_blk2sect (nr_blocks),GFP_NOIO ,0 );if (ret) { -dmz_dev_err (zrc->dev, +dmz_dev_err (dev,"Align zone %u wp %llu to %llu (wp+%u) blocks failed %d" ,dmz_id (zmd, zone), (unsigned long long )wp_block, (unsigned long long )block, nr_blocks, ret); -dmz_check_bdev (zrc->dev); +dmz_check_bdev (dev);return ret; }@@ -116,7 +116,7 @@ static int dmz_reclaim_copy(struct dmz_reclaim *zrc, struct dm_zone *src_zone, struct dm_zone *dst_zone) { struct dmz_metadata *zmd = zrc->metadata; -struct dmz_dev *dev = zrc->dev; +struct dmz_dev *src_dev, *dst_dev;struct dm_io_region src, dst;sector_t block =0 , end_block;sector_t nr_blocks;@@ -130,13 +130,17 @@ static int dmz_reclaim_copy(struct dmz_reclaim *zrc,else end_block =dmz_zone_nr_blocks (zmd); src_zone_block =dmz_start_block (zmd, src_zone); + src_dev =dmz_zone_to_dev (zmd, src_zone); dst_zone_block =dmz_start_block (zmd, dst_zone); + dst_dev =dmz_zone_to_dev (zmd, dst_zone);if (dmz_is_seq (dst_zone))set_bit (DM_KCOPYD_WRITE_SEQ , &flags);while (block < end_block) { -if (dev->flags &DMZ_BDEV_DYING ) +if (src_dev->flags &DMZ_BDEV_DYING ) +return -EIO ; +if (dst_dev->flags &DMZ_BDEV_DYING )return -EIO ;/* Get a valid region from the source zone */ @@ -156,11 +160,11 @@ static int dmz_reclaim_copy(struct dmz_reclaim *zrc,return ret; } - src.bdev = dev->bdev; + src.bdev = src_dev->bdev; src.sector =dmz_blk2sect (src_zone_block + block); src.count =dmz_blk2sect (nr_blocks); - dst.bdev = dev->bdev; + dst.bdev = dst_dev->bdev; dst.sector =dmz_blk2sect (dst_zone_block + block); dst.count = src.count;@@ -192,9 +196,10 @@ static int dmz_reclaim_buf(struct dmz_reclaim *zrc, struct dm_zone *dzone)struct dm_zone *bzone = dzone->bzone;sector_t chunk_block = dzone->wp_block;struct dmz_metadata *zmd = zrc->metadata; +struct dmz_dev *dev =dmz_zone_to_dev (zmd, dzone);int ret; -dmz_dev_debug (zrc->dev, +dmz_dev_debug (dev,"Chunk %u, move buf zone %u (weight %u) to data zone %u (weight %u)" , dzone->chunk,dmz_id (zmd, bzone),dmz_weight (bzone),dmz_id (zmd, dzone),dmz_weight (dzone));@@ -231,9 +236,10 @@ static int dmz_reclaim_seq_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)unsigned int chunk = dzone->chunk;struct dm_zone *bzone = dzone->bzone;struct dmz_metadata *zmd = zrc->metadata; +struct dmz_dev *dev =dmz_zone_to_dev (zmd, dzone);int ret =0 ; -dmz_dev_debug (zrc->dev, +dmz_dev_debug (dev,"Chunk %u, move data zone %u (weight %u) to buf zone %u (weight %u)" , chunk,dmz_id (zmd, dzone),dmz_weight (dzone),dmz_id (zmd, bzone),dmz_weight (bzone));@@ -276,6 +282,7 @@ static int dmz_reclaim_rnd_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)unsigned int chunk = dzone->chunk;struct dm_zone *szone =NULL ;struct dmz_metadata *zmd = zrc->metadata; +struct dmz_dev *dev =dmz_zone_to_dev (zmd, dzone);int ret;/* Get a free sequential zone */ @@ -285,7 +292,7 @@ static int dmz_reclaim_rnd_data(struct dmz_reclaim *zrc, struct dm_zone *dzone)if (!szone)return -ENOSPC ; -dmz_dev_debug (zrc->dev, +dmz_dev_debug (dev,"Chunk %u, move rnd zone %u (weight %u) to seq zone %u" , chunk,dmz_id (zmd, dzone),dmz_weight (dzone),dmz_id (zmd, szone));@@ -344,6 +351,7 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc)struct dmz_metadata *zmd = zrc->metadata;struct dm_zone *dzone;struct dm_zone *rzone; +struct dmz_dev *dev;unsigned long start;int ret;@@ -353,7 +361,7 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc)return PTR_ERR (dzone); start = jiffies; - + dev =dmz_zone_to_dev (zmd, dzone);if (dmz_is_rnd (dzone)) {if (!dmz_weight (dzone)) {/* Empty zone */ @@ -401,13 +409,13 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc) ret =dmz_flush_metadata (zrc->metadata);if (ret) { -dmz_dev_debug (zrc->dev, +dmz_dev_debug (dev,"Metadata flush for zone %u failed, err %d\n" ,dmz_id (zmd, rzone), ret);return ret; }
Quoted 8 lines
drivers/md/dm-zoned-reclaim.c static int dmz_do_reclaim(struct dmz_reclaim *zrc) · line 419
Quoted 3 lines
drivers/md/dm-zoned-reclaim.c +1
-1-dmz_dev_debug (zrc->dev,"Reclaimed zone %u in %u ms" , +dmz_dev_debug (dev,"Reclaimed zone %u in %u ms" ,dmz_id (zmd, rzone),jiffies_to_msecs (jiffies - start));In patch 5, you changed
dmz_dev_debug()to useDMDEBUG()to print the label. It may be good to do the same here to have the label, but also add the bdev name reclaim acted on ? Not super important though.
Well; I'm not particularly happy with DMDEBUG() in general. One really should convert it to dyndebug, and not a compile-time option. I'll probably send a patch for that to Mike.
But yeah, possibly we should be using DMDEBUG() here, as this relates to the overall zone set and not a single drive.
Cheers,
Hannes
Signature · 10 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
PATCH v2 7/11 dm-zoned: use device as argument for bio handler functions
In reply to Hannes ReineckeInstead of having each function to reference the device for themselves add it as an argument to the function. And replace the 'target' pointer in the bio context with the device pointer.
--- drivers/md/dm-zoned-target.c | 88 +++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 36 deletions(-)
drivers/md/dm-zoned-target.c +52 -36
@@ -17,7 +17,7 @@* Zone BIO context. */ struct dmz_bioctx { -struct dmz_target *target; +struct dmz_dev *dev;struct dm_zone *zone;struct bio *bio;refcount_t ref;
@@ -71,6 +71,11 @@ struct dmz_target {*/ #define DMZ_FLUSH_PERIOD (10 * HZ) +struct dmz_dev *dmz_sect_to_dev (struct dmz_target *dmz,sector_t sect) +{ +return &dmz->dev[0 ]; +} +/* * Target BIO completion. */
@@ -81,7 +86,7 @@ static inline void dmz_bio_endio(struct bio *bio, blk_status_t status)if (status !=BLK_STS_OK && bio->bi_status ==BLK_STS_OK ) bio->bi_status = status;if (bio->bi_status !=BLK_STS_OK ) - bioctx->target->dev->flags |=DMZ_CHECK_BDEV ; + bioctx->dev->flags |=DMZ_CHECK_BDEV ;if (refcount_dec_and_test (&bioctx->ref)) {struct dm_zone *zone = bioctx->zone;
@@ -114,18 +119,20 @@ static void dmz_clone_endio(struct bio *clone)* Issue a clone of a target BIO. The clone may only partially process the * original target BIO. */ -static int dmz_submit_bio (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio,sector_t chunk_block, -unsigned int nr_blocks) +static int dmz_submit_bio (struct dmz_target *dmz,struct dmz_dev *dev, +struct dm_zone *zone,struct bio *bio, +sector_t chunk_block,unsigned int nr_blocks) { -struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx )); +struct dmz_bioctx *bioctx = +dm_per_bio_data (bio,sizeof (struct dmz_bioctx ));struct bio *clone; clone =bio_clone_fast (bio,GFP_NOIO , &dmz->bio_set);if (!clone)return -ENOMEM ; -bio_set_dev (clone, dmz->dev->bdev); +bio_set_dev (clone, dev->bdev); + bioctx->dev = dev; clone->bi_iter.bi_sector =dmz_start_sect (dmz->metadata, zone) +dmz_blk2sect (chunk_block); clone->bi_iter.bi_size =dmz_blk2sect (nr_blocks) <<SECTOR_SHIFT ;
@@ -162,8 +169,8 @@ static void dmz_handle_read_zero(struct dmz_target *dmz, struct bio *bio,/* * Process a read BIO. */ -static int dmz_handle_read (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio) +static int dmz_handle_read (struct dmz_target *dmz,struct dmz_dev *dev, +struct dm_zone *zone,struct bio *bio) {struct dmz_metadata *zmd = dmz->metadata;sector_t chunk_block =dmz_chunk_block (zmd,dmz_bio_block (bio));
@@ -178,7 +185,7 @@ 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", + dmz_dev_debug(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"), dmz_id(zmd, zone),
@@ -218,7 +225,8 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone,if (nr_blocks) {/* Valid blocks found: read them */ nr_blocks = min_t(unsigned int, nr_blocks, end_block - chunk_block); - ret =dmz_submit_bio (dmz, rzone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, dev, rzone, bio, + chunk_block, nr_blocks);if (ret)return ret; chunk_block += nr_blocks;
@@ -238,6 +246,7 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone,* in place. */ static int dmz_handle_direct_write (struct dmz_target *dmz, +struct dmz_dev *dev,struct dm_zone *zone,struct bio *bio,sector_t chunk_block,unsigned int nr_blocks)
@@ -250,7 +259,7 @@ static int dmz_handle_direct_write(struct dmz_target *dmz,return -EROFS ;/* Submit write */ - ret =dmz_submit_bio (dmz, zone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, dev, zone, bio, chunk_block, nr_blocks);if (ret)return ret;
@@ -271,6 +280,7 @@ static int dmz_handle_direct_write(struct dmz_target *dmz,* Called with @zone write locked. */ static int dmz_handle_buffered_write (struct dmz_target *dmz, +struct dmz_dev *dev,struct dm_zone *zone,struct bio *bio,sector_t chunk_block,unsigned int nr_blocks)
@@ -288,7 +298,7 @@ static int dmz_handle_buffered_write(struct dmz_target *dmz,return -EROFS ;/* Submit write */ - ret =dmz_submit_bio (dmz, bzone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, dev, bzone, bio, chunk_block, nr_blocks);if (ret)return ret;
@@ -306,8 +316,8 @@ static int dmz_handle_buffered_write(struct dmz_target *dmz,/* * Process a write BIO. */ -static int dmz_handle_write (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio) +static int dmz_handle_write (struct dmz_target *dmz,struct dmz_dev *dev, +struct dm_zone *zone,struct bio *bio) {struct dmz_metadata *zmd = dmz->metadata;sector_t chunk_block =dmz_chunk_block (zmd,dmz_bio_block (bio));
@@ -316,7 +326,7 @@ 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", + dmz_dev_debug(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"), dmz_id(zmd, zone),
@@ -328,21 +338,23 @@ static int dmz_handle_write(struct dmz_target *dmz, struct dm_zone *zone,* and the BIO is aligned to the zone write pointer: * direct write the zone. */ -return dmz_handle_direct_write (dmz, zone, bio, chunk_block, nr_blocks); +return dmz_handle_direct_write (dmz, dev, zone, bio, + chunk_block, nr_blocks); }/* * This is an unaligned write in a sequential zone: * use buffered write. */ -return dmz_handle_buffered_write (dmz, zone, bio, chunk_block, nr_blocks); +return dmz_handle_buffered_write (dmz, dev, zone, bio, + chunk_block, nr_blocks); }/* * Process a discard BIO. */ -static int dmz_handle_discard (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio) +static int dmz_handle_discard (struct dmz_target *dmz,struct dmz_dev *dev, +struct dm_zone *zone,struct bio *bio) {struct dmz_metadata *zmd = dmz->metadata;sector_t block =dmz_bio_block (bio);
@@ -357,7 +369,7 @@ 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" , +dmz_dev_debug (dev,"DISCARD chunk %llu -> zone %u, block %llu, %u blocks" , (unsigned long long )dmz_bio_chunk (zmd, bio),dmz_id (zmd, zone), (unsigned long long )chunk_block, nr_blocks);
@@ -382,6 +394,7 @@ static void dmz_handle_bio(struct dmz_target *dmz, struct dm_chunk_work *cw, {struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx ));struct dmz_metadata *zmd = dmz->metadata; +struct dmz_dev *dev;struct dm_zone *zone;int ret;
@@ -394,11 +407,6 @@ static void dmz_handle_bio(struct dmz_target *dmz, struct dm_chunk_work *cw,dmz_lock_metadata (zmd); -if (dmz->dev->flags &DMZ_BDEV_DYING ) { - ret = -EIO ; - goto out; - } -/* * Get the data zone mapping the chunk. There may be no * mapping for read and discard. If a mapping is obtained,
@@ -413,23 +421,30 @@ static void dmz_handle_bio(struct dmz_target *dmz, struct dm_chunk_work *cw,/* Process the BIO */ if (zone) { + dev =dmz_zone_to_dev (zmd, zone);dmz_activate_zone (zone); bioctx->zone = zone; + }else + dev =dmz_sect_to_dev (dmz, bio->bi_iter.bi_sector); + +if (dev->flags &DMZ_BDEV_DYING ) { + ret = -EIO ; + goto out; }switch (bio_op (bio)) {case REQ_OP_READ : - ret =dmz_handle_read (dmz, zone, bio); + ret =dmz_handle_read (dmz, dev, zone, bio);break ;case REQ_OP_WRITE : - ret =dmz_handle_write (dmz, zone, bio); + ret =dmz_handle_write (dmz, dev, zone, bio);break ;case REQ_OP_DISCARD :case REQ_OP_WRITE_ZEROES : - ret =dmz_handle_discard (dmz, zone, bio); + ret =dmz_handle_discard (dmz, dev, zone, bio);break ;default : -dmz_dev_err (dmz->dev,"Unsupported BIO operation 0x%x" , +dmz_dev_err (dev,"Unsupported BIO operation 0x%x" ,bio_op (bio)); ret = -EIO ; }
@@ -621,14 +636,14 @@ static int dmz_map(struct dm_target *ti, struct bio *bio) {struct dmz_target *dmz = ti->private;struct dmz_metadata *zmd = dmz->metadata; -struct dmz_dev *dev = dmz->dev;struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx ));sector_t sector = bio->bi_iter.bi_sector;unsigned int nr_sectors =bio_sectors (bio); +struct dmz_dev *dev =dmz_sect_to_dev (dmz, sector);sector_t chunk_sector;int ret; -if (dmz_bdev_is_dying (dmz->dev)) +if (dmz_bdev_is_dying (dev))return DM_MAPIO_KILL ; dmz_dev_debug(dev, "BIO op %d sector %llu + %u => chunk %llu, block %llu, %u blocks",
@@ -647,7 +662,7 @@ static int dmz_map(struct dm_target *ti, struct bio *bio)return DM_MAPIO_KILL ;/* Initialize the BIO context */ - bioctx->target = dmz; + bioctx->dev =NULL ; bioctx->zone =NULL ; bioctx->bio = bio;refcount_set (&bioctx->ref,1 );
@@ -669,7 +684,7 @@ 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, +dmz_dev_debug (dev,"BIO op %d, can't process chunk %llu, err %i\n" ,bio_op (bio), (u64 )dmz_bio_chunk (zmd, bio), ret);
@@ -926,11 +941,12 @@ static void dmz_io_hints(struct dm_target *ti, struct queue_limits *limits)static int dmz_prepare_ioctl (struct dm_target *ti,struct block_device **bdev) {struct dmz_target *dmz = ti->private; +struct dmz_dev *dev =dmz_sect_to_dev (dmz,0 ); -if (!dmz_check_bdev (dmz->dev)) +if (!dmz_check_bdev (dev))return -EIO ; - *bdev = dmz->dev->bdev; + *bdev = dev->bdev;return 0 ; }
Signature · 1 line
2.25.0
Re: [PATCH 07/11] dm-zoned: use device as argument for bio handler functions
Quoted 24 lines · Hannes Reinecke
Instead of having each function to reference the device for themselves add it as an argument to the function. And replace the 'target' pointer in the bio context with the device pointer.
Signed-off-by Hannes Reinecke <[email protected]>--- drivers/md/dm-zoned-target.c | 88 +++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 36 deletions(-)drivers/md/dm-zoned-target.c +1
-1@@ -17,7 +17,7 @@* Zone BIO context. */ struct dmz_bioctx { -struct dmz_target *target; +struct dmz_dev *dev;struct dm_zone *zone;struct bio *bio;refcount_t ref;
drivers/md/dm-zoned-target.c struct dmz_target { · line 77
Quoted 7 lines
drivers/md/dm-zoned-target.c +4
-0@@ -71,6 +71,11 @@ struct dmz_target {*/ #define DMZ_FLUSH_PERIOD (10 * HZ) +struct dmz_dev *dmz_sect_to_dev (struct dmz_target *dmz,sector_t sect) +{ +return &dmz->dev[0 ]; +}
I do not get it. Regardless of the chunk sector specified, always returning the first device seems wrong. If the sector belongs to a chunk mapped to a zone on the second device, things will break, no ?
Quoted 14 lines
drivers/md/dm-zoned-target.c +2
-1+/* * Target BIO completion. */ @@ -81,7 +86,7 @@ static inline void dmz_bio_endio(struct bio *bio, blk_status_t status)if (status !=BLK_STS_OK && bio->bi_status ==BLK_STS_OK ) bio->bi_status = status;if (bio->bi_status !=BLK_STS_OK ) - bioctx->target->dev->flags |=DMZ_CHECK_BDEV ; + bioctx->dev->flags |=DMZ_CHECK_BDEV ;if (refcount_dec_and_test (&bioctx->ref)) {struct dm_zone *zone = bioctx->zone;
drivers/md/dm-zoned-target.c static void dmz_clone_endio(struct bio *clone) · line 124
Quoted 9 lines
drivers/md/dm-zoned-target.c +3
-3@@ -114,18 +119,20 @@ static void dmz_clone_endio(struct bio *clone)* Issue a clone of a target BIO. The clone may only partially process the * original target BIO. */ -static int dmz_submit_bio (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio,sector_t chunk_block, -unsigned int nr_blocks) +static int dmz_submit_bio (struct dmz_target *dmz,struct dmz_dev *dev, +struct dm_zone *zone,struct bio *bio, +sector_t chunk_block,unsigned int nr_blocks)
dev could be inferred from the zone with dmz_zone_to_dev(), no ?
Quoted 17 lines
drivers/md/dm-zoned-target.c +4
-2{ -struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx )); +struct dmz_bioctx *bioctx = +dm_per_bio_data (bio,sizeof (struct dmz_bioctx ));struct bio *clone; clone =bio_clone_fast (bio,GFP_NOIO , &dmz->bio_set);if (!clone)return -ENOMEM ; -bio_set_dev (clone, dmz->dev->bdev); +bio_set_dev (clone, dev->bdev); + bioctx->dev = dev; clone->bi_iter.bi_sector =dmz_start_sect (dmz->metadata, zone) +dmz_blk2sect (chunk_block); clone->bi_iter.bi_size =dmz_blk2sect (nr_blocks) <<SECTOR_SHIFT ;
drivers/md/dm-zoned-target.c static void dmz_handle_read_zero(struct dmz_target *dmz, struct bio *bio, · line 173
Quoted 7 lines
drivers/md/dm-zoned-target.c +2
-2@@ -162,8 +169,8 @@ static void dmz_handle_read_zero(struct dmz_target *dmz, struct bio *bio,/* * Process a read BIO. */ -static int dmz_handle_read (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio) +static int dmz_handle_read (struct dmz_target *dmz,struct dmz_dev *dev, +struct dm_zone *zone,struct bio *bio)
Same comment as above.
drivers/md/dm-zoned-target.c static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone, · line 191
Quoted 12 lines
drivers/md/dm-zoned-target.c +1
-1{struct dmz_metadata *zmd = dmz->metadata;sector_t chunk_block =dmz_chunk_block (zmd,dmz_bio_block (bio));@@ -178,7 +185,7 @@ 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", + dmz_dev_debug(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"), dmz_id(zmd, zone),
DMDEBUG to print the label ? or we could also have dmz_dev_debug() print format changed to something like: "%s (%s): ...", label_name, dev->bdev_name
Quoted 11 lines
drivers/md/dm-zoned-target.c +2
-1@@ -218,7 +225,8 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone,if (nr_blocks) {/* Valid blocks found: read them */ nr_blocks = min_t(unsigned int, nr_blocks, end_block - chunk_block); - ret =dmz_submit_bio (dmz, rzone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, dev, rzone, bio, + chunk_block, nr_blocks);if (ret)return ret; chunk_block += nr_blocks;
drivers/md/dm-zoned-target.c static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone, · line 249
Quoted 4 lines
drivers/md/dm-zoned-target.c +1
-0@@ -238,6 +246,7 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone,* in place. */ static int dmz_handle_direct_write(struct dmz_target *dmz, + struct dmz_dev *dev,
Use dmz_zone_to_dev() ?
Quoted 21 lines
drivers/md/dm-zoned-target.c +2
-1struct dm_zone *zone, struct bio *bio, sector_t chunk_block, unsigned int nr_blocks)@@ -250,7 +259,7 @@ static int dmz_handle_direct_write(struct dmz_target *dmz,return -EROFS ;/* Submit write */ - ret =dmz_submit_bio (dmz, zone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, dev, zone, bio, chunk_block, nr_blocks);if (ret)return ret;@@ -271,6 +280,7 @@ static int dmz_handle_direct_write(struct dmz_target *dmz,* Called with @zone write locked. */ static int dmz_handle_buffered_write (struct dmz_target *dmz, +struct dmz_dev *dev,struct dm_zone *zone,struct bio *bio,sector_t chunk_block,unsigned int nr_blocks)
drivers/md/dm-zoned-target.c static int dmz_handle_buffered_write(struct dmz_target *dmz, · line 301
Quoted 5 lines
drivers/md/dm-zoned-target.c +1
-1@@ -288,7 +298,7 @@ static int dmz_handle_buffered_write(struct dmz_target *dmz,return -EROFS ;/* Submit write */ - ret =dmz_submit_bio (dmz, bzone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, dev, bzone, bio, chunk_block, nr_blocks);
Yes, I think it would be far better to use dmz_zone_to_dev() instead of passing directly dev. That will avoid bugs like passing a wrong dev for a zone or wrong zone for a dev.
drivers/md/dm-zoned-target.c static int dmz_handle_buffered_write(struct dmz_target *dmz, · line 320
Quoted 11 lines
drivers/md/dm-zoned-target.c +2
-2if (ret)return ret;@@ -306,8 +316,8 @@ static int dmz_handle_buffered_write(struct dmz_target *dmz,/* * Process a write BIO. */ -static int dmz_handle_write (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio) +static int dmz_handle_write (struct dmz_target *dmz,struct dmz_dev *dev, +struct dm_zone *zone,struct bio *bio)
Same comment about using dmz_zone_to_dev().
Quoted 155 lines
drivers/md/dm-zoned-target.c +27
-21{struct dmz_metadata *zmd = dmz->metadata;sector_t chunk_block =dmz_chunk_block (zmd,dmz_bio_block (bio));@@ -316,7 +326,7 @@ 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", + dmz_dev_debug(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"), dmz_id(zmd, zone),@@ -328,21 +338,23 @@ static int dmz_handle_write(struct dmz_target *dmz, struct dm_zone *zone,* and the BIO is aligned to the zone write pointer: * direct write the zone. */ -return dmz_handle_direct_write (dmz, zone, bio, chunk_block, nr_blocks); +return dmz_handle_direct_write (dmz, dev, zone, bio, + chunk_block, nr_blocks); }/* * This is an unaligned write in a sequential zone: * use buffered write. */ -return dmz_handle_buffered_write (dmz, zone, bio, chunk_block, nr_blocks); +return dmz_handle_buffered_write (dmz, dev, zone, bio, + chunk_block, nr_blocks); }/* * Process a discard BIO. */ -static int dmz_handle_discard (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio) +static int dmz_handle_discard (struct dmz_target *dmz,struct dmz_dev *dev, +struct dm_zone *zone,struct bio *bio) {struct dmz_metadata *zmd = dmz->metadata;sector_t block =dmz_bio_block (bio);@@ -357,7 +369,7 @@ 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" , +dmz_dev_debug (dev,"DISCARD chunk %llu -> zone %u, block %llu, %u blocks" , (unsigned long long )dmz_bio_chunk (zmd, bio),dmz_id (zmd, zone), (unsigned long long )chunk_block, nr_blocks);@@ -382,6 +394,7 @@ static void dmz_handle_bio(struct dmz_target *dmz, struct dm_chunk_work *cw, {struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx ));struct dmz_metadata *zmd = dmz->metadata; +struct dmz_dev *dev;struct dm_zone *zone;int ret;@@ -394,11 +407,6 @@ static void dmz_handle_bio(struct dmz_target *dmz, struct dm_chunk_work *cw,dmz_lock_metadata (zmd); -if (dmz->dev->flags &DMZ_BDEV_DYING ) { - ret = -EIO ; - goto out; - } -/* * Get the data zone mapping the chunk. There may be no * mapping for read and discard. If a mapping is obtained, @@ -413,23 +421,30 @@ static void dmz_handle_bio(struct dmz_target *dmz, struct dm_chunk_work *cw,/* Process the BIO */ if (zone) { + dev =dmz_zone_to_dev (zmd, zone);dmz_activate_zone (zone); bioctx->zone = zone; + }else + dev =dmz_sect_to_dev (dmz, bio->bi_iter.bi_sector); + +if (dev->flags &DMZ_BDEV_DYING ) { + ret = -EIO ; + goto out; }switch (bio_op (bio)) {case REQ_OP_READ : - ret =dmz_handle_read (dmz, zone, bio); + ret =dmz_handle_read (dmz, dev, zone, bio);break ;case REQ_OP_WRITE : - ret =dmz_handle_write (dmz, zone, bio); + ret =dmz_handle_write (dmz, dev, zone, bio);break ;case REQ_OP_DISCARD :case REQ_OP_WRITE_ZEROES : - ret =dmz_handle_discard (dmz, zone, bio); + ret =dmz_handle_discard (dmz, dev, zone, bio);break ;default : -dmz_dev_err (dmz->dev,"Unsupported BIO operation 0x%x" , +dmz_dev_err (dev,"Unsupported BIO operation 0x%x" ,bio_op (bio)); ret = -EIO ; }@@ -621,14 +636,14 @@ static int dmz_map(struct dm_target *ti, struct bio *bio) {struct dmz_target *dmz = ti->private;struct dmz_metadata *zmd = dmz->metadata; -struct dmz_dev *dev = dmz->dev;struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx ));sector_t sector = bio->bi_iter.bi_sector;unsigned int nr_sectors =bio_sectors (bio); +struct dmz_dev *dev =dmz_sect_to_dev (dmz, sector);sector_t chunk_sector;int ret; -if (dmz_bdev_is_dying (dmz->dev)) +if (dmz_bdev_is_dying (dev))return DM_MAPIO_KILL ; dmz_dev_debug(dev, "BIO op %d sector %llu + %u => chunk %llu, block %llu, %u blocks",@@ -647,7 +662,7 @@ static int dmz_map(struct dm_target *ti, struct bio *bio)return DM_MAPIO_KILL ;/* Initialize the BIO context */ - bioctx->target = dmz; + bioctx->dev =NULL ; bioctx->zone =NULL ; bioctx->bio = bio;refcount_set (&bioctx->ref,1 );@@ -669,7 +684,7 @@ 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, +dmz_dev_debug (dev,"BIO op %d, can't process chunk %llu, err %i\n" ,bio_op (bio), (u64 )dmz_bio_chunk (zmd, bio), ret);@@ -926,11 +941,12 @@ static void dmz_io_hints(struct dm_target *ti, struct queue_limits *limits)static int dmz_prepare_ioctl (struct dm_target *ti,struct block_device **bdev) {struct dmz_target *dmz = ti->private; +struct dmz_dev *dev =dmz_sect_to_dev (dmz,0 ); -if (!dmz_check_bdev (dmz->dev)) +if (!dmz_check_bdev (dev))return -EIO ; - *bdev = dmz->dev->bdev; + *bdev = dev->bdev;return 0 ; }
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH 07/11] dm-zoned: use device as argument for bio handler functions
Quoted 28 lines · Damien Le Moal
Quoted 27 lines · Hannes Reinecke
Instead of having each function to reference the device for themselves add it as an argument to the function. And replace the 'target' pointer in the bio context with the device pointer.
Signed-off-by Hannes Reinecke <[email protected]>--- drivers/md/dm-zoned-target.c | 88 +++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 36 deletions(-)drivers/md/dm-zoned-target.c +1
-1@@ -17,7 +17,7 @@* Zone BIO context. */ struct dmz_bioctx { -struct dmz_target *target; +struct dmz_dev *dev;struct dm_zone *zone;struct bio *bio;refcount_t ref;@@ -71,6 +71,11 @@ struct dmz_target {*/ #define DMZ_FLUSH_PERIOD (10 * HZ)
Quoted 9 lines
drivers/md/dm-zoned-target.c struct dmz_target { · line 77
Quoted 4 lines
drivers/md/dm-zoned-target.c +4
-0+struct dmz_dev *dmz_sect_to_dev (struct dmz_target *dmz,sector_t sect) +{ +return &dmz->dev[0 ]; +}I do not get it. Regardless of the chunk sector specified, always returning the first device seems wrong. If the sector belongs to a chunk mapped to a zone on the second device, things will break, no ?
This is just a stub for now, so that the actual patch introducing several devices can fold into here and the code churn for the final patch is reduced.
Quoted 11 lines
Quoted 11 lines
drivers/md/dm-zoned-target.c +2
-1+/* * Target BIO completion. */ @@ -81,7 +86,7 @@ static inline void dmz_bio_endio(struct bio *bio, blk_status_t status)if (status !=BLK_STS_OK && bio->bi_status ==BLK_STS_OK ) bio->bi_status = status;if (bio->bi_status !=BLK_STS_OK ) - bioctx->target->dev->flags |=DMZ_CHECK_BDEV ; + bioctx->dev->flags |=DMZ_CHECK_BDEV ;
Quoted 15 lines
drivers/md/dm-zoned-target.c static void dmz_clone_endio(struct bio *clone) · line 124
Quoted 12 lines
drivers/md/dm-zoned-target.c +3
-3if (refcount_dec_and_test (&bioctx->ref)) {struct dm_zone *zone = bioctx->zone;@@ -114,18 +119,20 @@ static void dmz_clone_endio(struct bio *clone)* Issue a clone of a target BIO. The clone may only partially process the * original target BIO. */ -static int dmz_submit_bio (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio,sector_t chunk_block, -unsigned int nr_blocks) +static int dmz_submit_bio (struct dmz_target *dmz,struct dmz_dev *dev, +struct dm_zone *zone,struct bio *bio, +sector_t chunk_block,unsigned int nr_blocks)dev could be inferred from the zone with
dmz_zone_to_dev(), no ?
Yes, it could, but then I'll find myself calling dmz_zone_to_dev() on every function in the call chain. So I thought to pass in 'dev' directly to avoid that.
Quoted 10 lines
Quoted 10 lines
drivers/md/dm-zoned-target.c +2
-1{ -struct dmz_bioctx *bioctx =dm_per_bio_data (bio,sizeof (struct dmz_bioctx )); +struct dmz_bioctx *bioctx = +dm_per_bio_data (bio,sizeof (struct dmz_bioctx ));struct bio *clone; clone =bio_clone_fast (bio,GFP_NOIO , &dmz->bio_set);if (!clone)return -ENOMEM ;
Quoted 17 lines
Quoted 7 lines
drivers/md/dm-zoned-target.c +2
-1-bio_set_dev (clone, dmz->dev->bdev); +bio_set_dev (clone, dev->bdev); + bioctx->dev = dev; clone->bi_iter.bi_sector =dmz_start_sect (dmz->metadata, zone) +dmz_blk2sect (chunk_block); clone->bi_iter.bi_size =dmz_blk2sect (nr_blocks) <<SECTOR_SHIFT ;drivers/md/dm-zoned-target.c static void dmz_handle_read_zero(struct dmz_target *dmz, struct bio *bio, · line 173
Quoted 7 lines
drivers/md/dm-zoned-target.c +2
-2@@ -162,8 +169,8 @@ static void dmz_handle_read_zero(struct dmz_target *dmz, struct bio *bio,/* * Process a read BIO. */ -static int dmz_handle_read (struct dmz_target *dmz,struct dm_zone *zone, -struct bio *bio) +static int dmz_handle_read (struct dmz_target *dmz,struct dmz_dev *dev, +struct dm_zone *zone,struct bio *bio)Same comment as above.
... which is why I did it ...
Quoted 7 lines
Quoted 7 lines
drivers/md/dm-zoned-target.c +0
-0{struct dmz_metadata *zmd = dmz->metadata;sector_t chunk_block =dmz_chunk_block (zmd,dmz_bio_block (bio));@@ -178,7 +185,7 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone,return 0 ; }
Quoted 9 lines
drivers/md/dm-zoned-target.c static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone, · line 191
Quoted 5 lines
drivers/md/dm-zoned-target.c +1
-1- dmz_dev_debug(dmz->dev, "READ chunk %llu -> %s zone %u, block %llu, %u blocks", + dmz_dev_debug(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"), dmz_id(zmd, zone),DMDEBUG to print the label ? or we could also have
dmz_dev_debug()print format changed to something like: "%s (%s): ...",label_name,dev->bdev_name
As you've seen, I've not been very consistent when to use the device name or the label. But indeed, using both as you suggested is a good idea. I'll be modifying it for the next round.
Quoted 41 lines
Quoted 11 lines
drivers/md/dm-zoned-target.c +2
-1@@ -218,7 +225,8 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone,if (nr_blocks) {/* Valid blocks found: read them */ nr_blocks = min_t(unsigned int, nr_blocks, end_block - chunk_block); - ret =dmz_submit_bio (dmz, rzone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, dev, rzone, bio, + chunk_block, nr_blocks);if (ret)return ret; chunk_block += nr_blocks;drivers/md/dm-zoned-target.c static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone, · line 249
Quoted 4 lines
drivers/md/dm-zoned-target.c +1
-0@@ -238,6 +246,7 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dm_zone *zone,* in place. */ static int dmz_handle_direct_write(struct dmz_target *dmz, + struct dmz_dev *dev,Use
dmz_zone_to_dev()?Quoted 23 lines
drivers/md/dm-zoned-target.c +2
-1struct dm_zone *zone, struct bio *bio, sector_t chunk_block, unsigned int nr_blocks)@@ -250,7 +259,7 @@ static int dmz_handle_direct_write(struct dmz_target *dmz,return -EROFS ;/* Submit write */ - ret =dmz_submit_bio (dmz, zone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, dev, zone, bio, chunk_block, nr_blocks);if (ret)return ret;@@ -271,6 +280,7 @@ static int dmz_handle_direct_write(struct dmz_target *dmz,* Called with @zone write locked. */ static int dmz_handle_buffered_write (struct dmz_target *dmz, +struct dmz_dev *dev,struct dm_zone *zone,struct bio *bio,sector_t chunk_block,unsigned int nr_blocks)@@ -288,7 +298,7 @@ static int dmz_handle_buffered_write(struct dmz_target *dmz,return -EROFS ;
Quoted 8 lines
drivers/md/dm-zoned-target.c static int dmz_handle_buffered_write(struct dmz_target *dmz, · line 301
Quoted 3 lines
drivers/md/dm-zoned-target.c +1
-1/* Submit write */ - ret =dmz_submit_bio (dmz, bzone, bio, chunk_block, nr_blocks); + ret =dmz_submit_bio (dmz, dev, bzone, bio, chunk_block, nr_blocks);Yes, I think it would be far better to use
dmz_zone_to_dev()instead of passing directly dev. That will avoid bugs like passing a wrong dev for a zone or wrong zone for a dev.
As mentioned above, yes, we could.
In fact, that's what I did originally.
But then I thought it easier to pass the device precisely to avoid having to call dmz_zone_to_dev() in every function.
However, I'll see how things pan out and will be modifying it for the next round.
Cheers,
Hannes
Signature · 10 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
PATCH v2 8/11 dm-zoned: use dmz_zone_to_dev() when handling metadata I/O
In reply to Hannes ReineckeUse accessors to retrieve the device pointer in preparation for adding an additional block device.
--- drivers/md/dm-zoned-metadata.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/md/dm-zoned-metadata.c +13 -9
@@ -1310,6 +1310,7 @@ static int dmz_update_zone_cb(struct blk_zone *blkz, unsigned int idx,*/ static int dmz_update_zone (struct dmz_metadata *zmd,struct dm_zone *zone) { +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone);unsigned int noio_flag;int ret;
@@ -1320,16 +1321,16 @@ static int dmz_update_zone(struct dmz_metadata *zmd, struct dm_zone *zone)* GFP_NOIO was specified. */ noio_flag =memalloc_noio_save (); - ret =blkdev_report_zones (zmd->dev->bdev,dmz_start_sect (zmd, zone),1 , + ret =blkdev_report_zones (dev->bdev,dmz_start_sect (zmd, zone),1 , dmz_update_zone_cb, zone);memalloc_noio_restore (noio_flag);if (ret ==0 ) ret = -EIO ;if (ret <0 ) { -dmz_dev_err (zmd->dev,"Get zone %u report failed" , +dmz_dev_err (dev,"Get zone %u report failed" ,dmz_id (zmd, zone)); -dmz_check_bdev (zmd->dev); +dmz_check_bdev (dev);return ret; }
@@ -1343,6 +1344,7 @@ static int dmz_update_zone(struct dmz_metadata *zmd, struct dm_zone *zone)static int dmz_handle_seq_write_err (struct dmz_metadata *zmd,struct dm_zone *zone) { +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone);unsigned int wp =0 ;int ret;
@@ -1351,7 +1353,7 @@ static int dmz_handle_seq_write_err(struct dmz_metadata *zmd,if (ret)return ret; -dmz_dev_warn (zmd->dev,"Processing zone %u write error (zone wp %u/%u)" , +dmz_dev_warn (dev,"Processing zone %u write error (zone wp %u/%u)" ,dmz_id (zmd, zone), zone->wp_block, wp);if (zone->wp_block < wp) {
@@ -1384,7 +1386,7 @@ static int dmz_reset_zone(struct dmz_metadata *zmd, struct dm_zone *zone)return 0 ;if (!dmz_is_empty (zone) ||dmz_seq_write_err (zone)) { -struct dmz_dev *dev = zmd->dev; +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone); ret = blkdev_zone_mgmt(dev->bdev, REQ_OP_ZONE_RESET, dmz_start_sect(zmd, zone),
@@ -2098,12 +2100,13 @@ int dmz_merge_valid_blocks(struct dmz_metadata *zmd, struct dm_zone *from_zone,int dmz_validate_blocks (struct dmz_metadata *zmd,struct dm_zone *zone,sector_t chunk_block,unsigned int nr_blocks) { +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone);unsigned int count, bit, nr_bits;unsigned int zone_nr_blocks = zmd->zone_nr_blocks;struct dmz_mblock *mblk;unsigned int n =0 ; -dmz_dev_debug (zmd->dev,"=> VALIDATE zone %u, block %llu, %u blocks" , +dmz_dev_debug (dev,"=> VALIDATE zone %u, block %llu, %u blocks" ,dmz_id (zmd, zone), (unsigned long long )chunk_block, nr_blocks);
@@ -2133,7 +2136,7 @@ int dmz_validate_blocks(struct dmz_metadata *zmd, struct dm_zone *zone,if (likely (zone->weight + n <= zone_nr_blocks)) zone->weight += n;else { -dmz_dev_warn (zmd->dev,"Zone %u: weight %u should be <= %u" , +dmz_dev_warn (dev,"Zone %u: weight %u should be <= %u" ,dmz_id (zmd, zone), zone->weight, zone_nr_blocks - n); zone->weight = zone_nr_blocks;
@@ -2179,11 +2182,12 @@ static int dmz_clear_bits(unsigned long *bitmap, int bit, int nr_bits)int dmz_invalidate_blocks (struct dmz_metadata *zmd,struct dm_zone *zone,sector_t chunk_block,unsigned int nr_blocks) { +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone);unsigned int count, bit, nr_bits;struct dmz_mblock *mblk;unsigned int n =0 ; -dmz_dev_debug (zmd->dev,"=> INVALIDATE zone %u, block %llu, %u blocks" , +dmz_dev_debug (dev,"=> INVALIDATE zone %u, block %llu, %u blocks" ,dmz_id (zmd, zone), (u64 )chunk_block, nr_blocks);WARN_ON (chunk_block + nr_blocks > zmd->zone_nr_blocks);
@@ -2213,7 +2217,7 @@ int dmz_invalidate_blocks(struct dmz_metadata *zmd, struct dm_zone *zone,if (zone->weight >= n) zone->weight -= n;else { -dmz_dev_warn (zmd->dev,"Zone %u: weight %u should be >= %u" , +dmz_dev_warn (dev,"Zone %u: weight %u should be >= %u" ,dmz_id (zmd, zone), zone->weight, n); zone->weight =0 ; }
Signature · 1 line
2.25.0
Re: [PATCH 08/11] dm-zoned: use dmz_zone_to_dev() when handling metadata I/O
Quoted 4 lines · Hannes Reinecke
Use accessors to retrieve the device pointer in preparation for adding an additional block device.
Signed-off-by Hannes Reinecke <[email protected]>
Looks OK.
Quoted 110 lines
--- drivers/md/dm-zoned-metadata.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)drivers/md/dm-zoned-metadata.c +13
-9@@ -1310,6 +1310,7 @@ static int dmz_update_zone_cb(struct blk_zone *blkz, unsigned int idx,*/ static int dmz_update_zone (struct dmz_metadata *zmd,struct dm_zone *zone) { +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone);unsigned int noio_flag;int ret;@@ -1320,16 +1321,16 @@ static int dmz_update_zone(struct dmz_metadata *zmd, struct dm_zone *zone)* GFP_NOIO was specified. */ noio_flag =memalloc_noio_save (); - ret =blkdev_report_zones (zmd->dev->bdev,dmz_start_sect (zmd, zone),1 , + ret =blkdev_report_zones (dev->bdev,dmz_start_sect (zmd, zone),1 , dmz_update_zone_cb, zone);memalloc_noio_restore (noio_flag);if (ret ==0 ) ret = -EIO ;if (ret <0 ) { -dmz_dev_err (zmd->dev,"Get zone %u report failed" , +dmz_dev_err (dev,"Get zone %u report failed" ,dmz_id (zmd, zone)); -dmz_check_bdev (zmd->dev); +dmz_check_bdev (dev);return ret; }@@ -1343,6 +1344,7 @@ static int dmz_update_zone(struct dmz_metadata *zmd, struct dm_zone *zone)static int dmz_handle_seq_write_err (struct dmz_metadata *zmd,struct dm_zone *zone) { +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone);unsigned int wp =0 ;int ret;@@ -1351,7 +1353,7 @@ static int dmz_handle_seq_write_err(struct dmz_metadata *zmd,if (ret)return ret; -dmz_dev_warn (zmd->dev,"Processing zone %u write error (zone wp %u/%u)" , +dmz_dev_warn (dev,"Processing zone %u write error (zone wp %u/%u)" ,dmz_id (zmd, zone), zone->wp_block, wp);if (zone->wp_block < wp) {@@ -1384,7 +1386,7 @@ static int dmz_reset_zone(struct dmz_metadata *zmd, struct dm_zone *zone)return 0 ;if (!dmz_is_empty (zone) ||dmz_seq_write_err (zone)) { -struct dmz_dev *dev = zmd->dev; +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone); ret = blkdev_zone_mgmt(dev->bdev, REQ_OP_ZONE_RESET, dmz_start_sect(zmd, zone),@@ -2098,12 +2100,13 @@ int dmz_merge_valid_blocks(struct dmz_metadata *zmd, struct dm_zone *from_zone,int dmz_validate_blocks (struct dmz_metadata *zmd,struct dm_zone *zone,sector_t chunk_block,unsigned int nr_blocks) { +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone);unsigned int count, bit, nr_bits;unsigned int zone_nr_blocks = zmd->zone_nr_blocks;struct dmz_mblock *mblk;unsigned int n =0 ; -dmz_dev_debug (zmd->dev,"=> VALIDATE zone %u, block %llu, %u blocks" , +dmz_dev_debug (dev,"=> VALIDATE zone %u, block %llu, %u blocks" ,dmz_id (zmd, zone), (unsigned long long )chunk_block, nr_blocks);@@ -2133,7 +2136,7 @@ int dmz_validate_blocks(struct dmz_metadata *zmd, struct dm_zone *zone,if (likely (zone->weight + n <= zone_nr_blocks)) zone->weight += n;else { -dmz_dev_warn (zmd->dev,"Zone %u: weight %u should be <= %u" , +dmz_dev_warn (dev,"Zone %u: weight %u should be <= %u" ,dmz_id (zmd, zone), zone->weight, zone_nr_blocks - n); zone->weight = zone_nr_blocks;@@ -2179,11 +2182,12 @@ static int dmz_clear_bits(unsigned long *bitmap, int bit, int nr_bits)int dmz_invalidate_blocks (struct dmz_metadata *zmd,struct dm_zone *zone,sector_t chunk_block,unsigned int nr_blocks) { +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone);unsigned int count, bit, nr_bits;struct dmz_mblock *mblk;unsigned int n =0 ; -dmz_dev_debug (zmd->dev,"=> INVALIDATE zone %u, block %llu, %u blocks" , +dmz_dev_debug (dev,"=> INVALIDATE zone %u, block %llu, %u blocks" ,dmz_id (zmd, zone), (u64 )chunk_block, nr_blocks);WARN_ON (chunk_block + nr_blocks > zmd->zone_nr_blocks);@@ -2213,7 +2217,7 @@ int dmz_invalidate_blocks(struct dmz_metadata *zmd, struct dm_zone *zone,if (zone->weight >= n) zone->weight -= n;else { -dmz_dev_warn (zmd->dev,"Zone %u: weight %u should be >= %u" , +dmz_dev_warn (dev,"Zone %u: weight %u should be >= %u" ,dmz_id (zmd, zone), zone->weight, n); zone->weight =0 ; }
Signature · 2 lines
Damien Le Moal Western Digital Research
PATCH v2 9/11 dm-zoned: add metadata logging functions
In reply to Hannes ReineckeUse the metadata label for logging and not the underlying device.
--- drivers/md/dm-zoned-metadata.c | 89 +++++++++++++++++++++------------- drivers/md/dm-zoned-target.c | 3 +- 2 files changed, 56 insertions(+), 36 deletions(-)
drivers/md/dm-zoned-metadata.c +54 -35
@@ -194,6 +194,17 @@ struct dmz_metadata {wait_queue_head_t free_wq; }; +#define dmz_zmd_info(zmd, format, args...) \ + DMINFO("(%s): " format, (zmd)->devname, ## args) + +#define dmz_zmd_err(zmd, format, args...) \ + DMERR("(%s): " format, (zmd)->devname, ## args) + +#define dmz_zmd_warn(zmd, format, args...) \ + DMWARN("(%s): " format, (zmd)->devname, ## args) + +#define dmz_zmd_debug(zmd, format, args...) \ + DMDEBUG("(%s): " format, (zmd)->devname, ## args)/* * Various accessors */
@@ -1098,7 +1109,7 @@ static int dmz_load_sb(struct dmz_metadata *zmd)int ret;if (!zmd->sb[0 ].zone) { -dmz_dev_err (zmd->dev,"Primary super block zone not set" ); +dmz_zmd_err (zmd,"Primary super block zone not set" );return -ENXIO ; }
@@ -1135,7 +1146,7 @@ static int dmz_load_sb(struct dmz_metadata *zmd)/* Use highest generation sb first */ if (!sb_good[0 ] && !sb_good[1 ]) { -dmz_dev_err (zmd->dev,"No valid super block found" ); +dmz_zmd_err (zmd,"No valid super block found" );return -EIO ; }
@@ -1248,7 +1259,7 @@ static void dmz_drop_zones(struct dmz_metadata *zmd)*/ static int dmz_init_zones (struct dmz_metadata *zmd) { -struct dmz_dev *dev = zmd->dev; +struct dmz_dev *dev = &zmd->dev[0 ];int ret;/* Init */
@@ -1268,8 +1279,8 @@ static int dmz_init_zones(struct dmz_metadata *zmd)if (!zmd->zones)return -ENOMEM ; -dmz_dev_info (dev,"Using %zu B for zone information" , -sizeof (struct dm_zone ) * zmd->nr_zones); +DMINFO ("(%s): Using %zu B for zone information" , + zmd->devname,sizeof (struct dm_zone ) * zmd->nr_zones);/* * Get zone information and initialize zone descriptors. At the same
@@ -1412,7 +1423,6 @@ static void dmz_get_zone_weight(struct dmz_metadata *zmd, struct dm_zone *zone);*/ static int dmz_load_mapping (struct dmz_metadata *zmd) { -struct dmz_dev *dev = zmd->dev;struct dm_zone *dzone, *bzone;struct dmz_mblock *dmap_mblk =NULL ;struct dmz_map *dmap;
@@ -1445,7 +1455,7 @@ static int dmz_load_mapping(struct dmz_metadata *zmd) goto next;if (dzone_id >= zmd->nr_zones) { -dmz_dev_err (dev,"Chunk %u mapping: invalid data zone ID %u" , +dmz_zmd_err (zmd,"Chunk %u mapping: invalid data zone ID %u" , chunk, dzone_id);return -EIO ; }
@@ -1466,14 +1476,14 @@ static int dmz_load_mapping(struct dmz_metadata *zmd) goto next;if (bzone_id >= zmd->nr_zones) { -dmz_dev_err (dev,"Chunk %u mapping: invalid buffer zone ID %u" , +dmz_zmd_err (zmd,"Chunk %u mapping: invalid buffer zone ID %u" , chunk, bzone_id);return -EIO ; } bzone =dmz_get (zmd, bzone_id);if (!dmz_is_rnd (bzone)) { -dmz_dev_err (dev,"Chunk %u mapping: invalid buffer zone %u" , +dmz_zmd_err (zmd,"Chunk %u mapping: invalid buffer zone %u" , chunk, bzone_id);return -EIO ; }
@@ -1894,7 +1904,9 @@ struct dm_zone *dmz_alloc_zone(struct dmz_metadata *zmd, unsigned long flags)atomic_dec (&zmd->unmap_nr_seq);if (dmz_is_offline (zone)) { -dmz_dev_warn (zmd->dev,"Zone %u is offline" ,dmz_id (zmd, zone)); +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone); + +dmz_dev_warn (dev,"Zone %u is offline" ,dmz_id (zmd, zone)); zone =NULL ; goto again; }
@@ -2427,7 +2439,7 @@ static void dmz_cleanup_metadata(struct dmz_metadata *zmd)while (!list_empty (&zmd->mblk_dirty_list)) { mblk =list_first_entry (&zmd->mblk_dirty_list, struct dmz_mblock, link); -dmz_dev_warn (zmd->dev,"mblock %llu still in dirty list (ref %u)" , +dmz_zmd_warn (zmd,"mblock %llu still in dirty list (ref %u)" , (u64 )mblk->no, mblk->ref);list_del_init (&mblk->link);rb_erase (&mblk->node, &zmd->mblk_rbtree);
@@ -2445,7 +2457,7 @@ static void dmz_cleanup_metadata(struct dmz_metadata *zmd)/* Sanity checks: the mblock rbtree should now be empty */ root = &zmd->mblk_rbtree;rbtree_postorder_for_each_entry_safe (mblk, next, root, node) { -dmz_dev_warn (zmd->dev,"mblock %llu ref %u still in rbtree" , +dmz_zmd_warn (zmd,"mblock %llu ref %u still in rbtree" , (u64 )mblk->no, mblk->ref); mblk->ref =0 ;dmz_free_mblock (zmd, mblk);
@@ -2458,6 +2470,18 @@ static void dmz_cleanup_metadata(struct dmz_metadata *zmd)mutex_destroy (&zmd->map_lock); } +void dmz_print_dev (struct dmz_metadata *zmd,int num) +{ +struct dmz_dev *dev = &zmd->dev[num]; + +dmz_dev_info (dev,"Host-%s zoned block device" , +bdev_zoned_model (dev->bdev) ==BLK_ZONED_HA ? +"aware" :"managed" ); +dmz_dev_info (dev," %llu 512-byte logical sectors" , + (u64 )dev->capacity); +dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , + dev->nr_zones, (u64 )zmd->zone_nr_sectors); +}/* * Initialize the zoned metadata. */
@@ -2535,34 +2559,31 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata,/* Metadata cache shrinker */ ret =register_shrinker (&zmd->mblk_shrinker);if (ret) { -dmz_dev_err (dev,"Register metadata cache shrinker failed" ); +dmz_zmd_err (zmd,"Register metadata cache shrinker failed" ); goto err; } -dmz_dev_info (dev,"Host-%s zoned block device" , -bdev_zoned_model (dev->bdev) ==BLK_ZONED_HA ? -"aware" :"managed" ); -dmz_dev_info (dev," %llu 512-byte logical sectors" , - (u64 )dev->capacity); -dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , +dmz_zmd_info (zmd,"DM-Zoned metadata version %d" ,DMZ_META_VER ); +dmz_print_dev (zmd,0 ); + +dmz_zmd_info (zmd," %u zones of %llu 512-byte logical sectors" , zmd->nr_zones, (u64 )zmd->zone_nr_sectors); -dmz_dev_info (dev," %u metadata zones" , +dmz_zmd_info (zmd," %u metadata zones" , zmd->nr_meta_zones *2 ); -dmz_dev_info (dev," %u data zones for %u chunks" , +dmz_zmd_info (zmd," %u data zones for %u chunks" , zmd->nr_data_zones, zmd->nr_chunks); -dmz_dev_info (dev," %u random zones (%u unmapped)" , +dmz_zmd_info (zmd," %u random zones (%u unmapped)" , zmd->nr_rnd,atomic_read (&zmd->unmap_nr_rnd)); -dmz_dev_info (dev," %u sequential zones (%u unmapped)" , +dmz_zmd_info (zmd," %u sequential zones (%u unmapped)" , zmd->nr_seq,atomic_read (&zmd->unmap_nr_seq)); -dmz_dev_info (dev," %u reserved sequential data zones" , +dmz_zmd_info (zmd," %u reserved sequential data zones" , zmd->nr_reserved_seq); - -dmz_dev_debug (dev,"Format:" ); -dmz_dev_debug (dev,"%u metadata blocks per set (%u max cache)" , +dmz_zmd_debug (zmd,"Format:" ); +dmz_zmd_debug (zmd,"%u metadata blocks per set (%u max cache)" , zmd->nr_meta_blocks, zmd->max_nr_mblks); -dmz_dev_debug (dev," %u data zone mapping blocks" , +dmz_zmd_debug (zmd," %u data zone mapping blocks" , zmd->nr_map_blocks); -dmz_dev_debug (dev," %u bitmap blocks" , +dmz_zmd_debug (zmd," %u bitmap blocks" , zmd->nr_bitmap_blocks); *metadata = zmd;
@@ -2591,7 +2612,6 @@ void dmz_dtr_metadata(struct dmz_metadata *zmd)*/ int dmz_resume_metadata (struct dmz_metadata *zmd) { -struct dmz_dev *dev = zmd->dev;struct dm_zone *zone;sector_t wp_block;unsigned int i;
@@ -2601,20 +2621,19 @@ int dmz_resume_metadata(struct dmz_metadata *zmd)for (i =0 ; i < zmd->nr_zones; i++) { zone =dmz_get (zmd, i);if (!zone) { -dmz_dev_err (dev,"Unable to get zone %u" , i); +dmz_zmd_err (zmd,"Unable to get zone %u" , i);return -EIO ; } - wp_block = zone->wp_block; ret =dmz_update_zone (zmd, zone);if (ret) { -dmz_dev_err (dev,"Broken zone %u" , i); +dmz_zmd_err (zmd,"Broken zone %u" , i);return ret; }if (dmz_is_offline (zone)) { -dmz_dev_warn (dev,"Zone %u is offline" , i); +dmz_zmd_warn (zmd,"Zone %u is offline" , i);continue ; }
@@ -2622,7 +2641,7 @@ int dmz_resume_metadata(struct dmz_metadata *zmd)if (!dmz_is_seq (zone)) zone->wp_block =0 ;else if (zone->wp_block != wp_block) { -dmz_dev_err (dev,"Zone %u: Invalid wp (%llu / %llu)" , +dmz_zmd_err (zmd,"Zone %u: Invalid wp (%llu / %llu)" , i, (u64 )zone->wp_block, (u64 )wp_block); zone->wp_block = wp_block; dmz_invalidate_blocks(zmd, zone, zone->wp_block,
drivers/md/dm-zoned-target.c +2 -1
@@ -519,7 +519,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 ) {
Signature · 1 line
2.25.0
Re: [PATCH 09/11] dm-zoned: add metadata logging functions
Quoted 4 lines · Hannes Reinecke
Use the metadata label for logging and not the underlying device.
Signed-off-by Hannes Reinecke <[email protected]>
Looks good.
Quoted 252 lines
--- drivers/md/dm-zoned-metadata.c | 89 +++++++++++++++++++++------------- drivers/md/dm-zoned-target.c | 3 +- 2 files changed, 56 insertions(+), 36 deletions(-)drivers/md/dm-zoned-metadata.c +54
-35@@ -194,6 +194,17 @@ struct dmz_metadata {wait_queue_head_t free_wq; }; +#define dmz_zmd_info(zmd, format, args...) \ + DMINFO("(%s): " format, (zmd)->devname, ## args) + +#define dmz_zmd_err(zmd, format, args...) \ + DMERR("(%s): " format, (zmd)->devname, ## args) + +#define dmz_zmd_warn(zmd, format, args...) \ + DMWARN("(%s): " format, (zmd)->devname, ## args) + +#define dmz_zmd_debug(zmd, format, args...) \ + DMDEBUG("(%s): " format, (zmd)->devname, ## args)/* * Various accessors */ @@ -1098,7 +1109,7 @@ static int dmz_load_sb(struct dmz_metadata *zmd)int ret;if (!zmd->sb[0 ].zone) { -dmz_dev_err (zmd->dev,"Primary super block zone not set" ); +dmz_zmd_err (zmd,"Primary super block zone not set" );return -ENXIO ; }@@ -1135,7 +1146,7 @@ static int dmz_load_sb(struct dmz_metadata *zmd)/* Use highest generation sb first */ if (!sb_good[0 ] && !sb_good[1 ]) { -dmz_dev_err (zmd->dev,"No valid super block found" ); +dmz_zmd_err (zmd,"No valid super block found" );return -EIO ; }@@ -1248,7 +1259,7 @@ static void dmz_drop_zones(struct dmz_metadata *zmd)*/ static int dmz_init_zones (struct dmz_metadata *zmd) { -struct dmz_dev *dev = zmd->dev; +struct dmz_dev *dev = &zmd->dev[0 ];int ret;/* Init */ @@ -1268,8 +1279,8 @@ static int dmz_init_zones(struct dmz_metadata *zmd)if (!zmd->zones)return -ENOMEM ; -dmz_dev_info (dev,"Using %zu B for zone information" , -sizeof (struct dm_zone ) * zmd->nr_zones); +DMINFO ("(%s): Using %zu B for zone information" , + zmd->devname,sizeof (struct dm_zone ) * zmd->nr_zones);/* * Get zone information and initialize zone descriptors. At the same @@ -1412,7 +1423,6 @@ static void dmz_get_zone_weight(struct dmz_metadata *zmd, struct dm_zone *zone);*/ static int dmz_load_mapping (struct dmz_metadata *zmd) { -struct dmz_dev *dev = zmd->dev;struct dm_zone *dzone, *bzone;struct dmz_mblock *dmap_mblk =NULL ;struct dmz_map *dmap;@@ -1445,7 +1455,7 @@ static int dmz_load_mapping(struct dmz_metadata *zmd) goto next;if (dzone_id >= zmd->nr_zones) { -dmz_dev_err (dev,"Chunk %u mapping: invalid data zone ID %u" , +dmz_zmd_err (zmd,"Chunk %u mapping: invalid data zone ID %u" , chunk, dzone_id);return -EIO ; }@@ -1466,14 +1476,14 @@ static int dmz_load_mapping(struct dmz_metadata *zmd) goto next;if (bzone_id >= zmd->nr_zones) { -dmz_dev_err (dev,"Chunk %u mapping: invalid buffer zone ID %u" , +dmz_zmd_err (zmd,"Chunk %u mapping: invalid buffer zone ID %u" , chunk, bzone_id);return -EIO ; } bzone =dmz_get (zmd, bzone_id);if (!dmz_is_rnd (bzone)) { -dmz_dev_err (dev,"Chunk %u mapping: invalid buffer zone %u" , +dmz_zmd_err (zmd,"Chunk %u mapping: invalid buffer zone %u" , chunk, bzone_id);return -EIO ; }@@ -1894,7 +1904,9 @@ struct dm_zone *dmz_alloc_zone(struct dmz_metadata *zmd, unsigned long flags)atomic_dec (&zmd->unmap_nr_seq);if (dmz_is_offline (zone)) { -dmz_dev_warn (zmd->dev,"Zone %u is offline" ,dmz_id (zmd, zone)); +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone); + +dmz_dev_warn (dev,"Zone %u is offline" ,dmz_id (zmd, zone)); zone =NULL ; goto again; }@@ -2427,7 +2439,7 @@ static void dmz_cleanup_metadata(struct dmz_metadata *zmd)while (!list_empty (&zmd->mblk_dirty_list)) { mblk =list_first_entry (&zmd->mblk_dirty_list, struct dmz_mblock, link); -dmz_dev_warn (zmd->dev,"mblock %llu still in dirty list (ref %u)" , +dmz_zmd_warn (zmd,"mblock %llu still in dirty list (ref %u)" , (u64 )mblk->no, mblk->ref);list_del_init (&mblk->link);rb_erase (&mblk->node, &zmd->mblk_rbtree);@@ -2445,7 +2457,7 @@ static void dmz_cleanup_metadata(struct dmz_metadata *zmd)/* Sanity checks: the mblock rbtree should now be empty */ root = &zmd->mblk_rbtree;rbtree_postorder_for_each_entry_safe (mblk, next, root, node) { -dmz_dev_warn (zmd->dev,"mblock %llu ref %u still in rbtree" , +dmz_zmd_warn (zmd,"mblock %llu ref %u still in rbtree" , (u64 )mblk->no, mblk->ref); mblk->ref =0 ;dmz_free_mblock (zmd, mblk);@@ -2458,6 +2470,18 @@ static void dmz_cleanup_metadata(struct dmz_metadata *zmd)mutex_destroy (&zmd->map_lock); } +void dmz_print_dev (struct dmz_metadata *zmd,int num) +{ +struct dmz_dev *dev = &zmd->dev[num]; + +dmz_dev_info (dev,"Host-%s zoned block device" , +bdev_zoned_model (dev->bdev) ==BLK_ZONED_HA ? +"aware" :"managed" ); +dmz_dev_info (dev," %llu 512-byte logical sectors" , + (u64 )dev->capacity); +dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , + dev->nr_zones, (u64 )zmd->zone_nr_sectors); +}/* * Initialize the zoned metadata. */ @@ -2535,34 +2559,31 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata,/* Metadata cache shrinker */ ret =register_shrinker (&zmd->mblk_shrinker);if (ret) { -dmz_dev_err (dev,"Register metadata cache shrinker failed" ); +dmz_zmd_err (zmd,"Register metadata cache shrinker failed" ); goto err; } -dmz_dev_info (dev,"Host-%s zoned block device" , -bdev_zoned_model (dev->bdev) ==BLK_ZONED_HA ? -"aware" :"managed" ); -dmz_dev_info (dev," %llu 512-byte logical sectors" , - (u64 )dev->capacity); -dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , +dmz_zmd_info (zmd,"DM-Zoned metadata version %d" ,DMZ_META_VER ); +dmz_print_dev (zmd,0 ); + +dmz_zmd_info (zmd," %u zones of %llu 512-byte logical sectors" , zmd->nr_zones, (u64 )zmd->zone_nr_sectors); -dmz_dev_info (dev," %u metadata zones" , +dmz_zmd_info (zmd," %u metadata zones" , zmd->nr_meta_zones *2 ); -dmz_dev_info (dev," %u data zones for %u chunks" , +dmz_zmd_info (zmd," %u data zones for %u chunks" , zmd->nr_data_zones, zmd->nr_chunks); -dmz_dev_info (dev," %u random zones (%u unmapped)" , +dmz_zmd_info (zmd," %u random zones (%u unmapped)" , zmd->nr_rnd,atomic_read (&zmd->unmap_nr_rnd)); -dmz_dev_info (dev," %u sequential zones (%u unmapped)" , +dmz_zmd_info (zmd," %u sequential zones (%u unmapped)" , zmd->nr_seq,atomic_read (&zmd->unmap_nr_seq)); -dmz_dev_info (dev," %u reserved sequential data zones" , +dmz_zmd_info (zmd," %u reserved sequential data zones" , zmd->nr_reserved_seq); - -dmz_dev_debug (dev,"Format:" ); -dmz_dev_debug (dev,"%u metadata blocks per set (%u max cache)" , +dmz_zmd_debug (zmd,"Format:" ); +dmz_zmd_debug (zmd,"%u metadata blocks per set (%u max cache)" , zmd->nr_meta_blocks, zmd->max_nr_mblks); -dmz_dev_debug (dev," %u data zone mapping blocks" , +dmz_zmd_debug (zmd," %u data zone mapping blocks" , zmd->nr_map_blocks); -dmz_dev_debug (dev," %u bitmap blocks" , +dmz_zmd_debug (zmd," %u bitmap blocks" , zmd->nr_bitmap_blocks); *metadata = zmd;@@ -2591,7 +2612,6 @@ void dmz_dtr_metadata(struct dmz_metadata *zmd)*/ int dmz_resume_metadata (struct dmz_metadata *zmd) { -struct dmz_dev *dev = zmd->dev;struct dm_zone *zone;sector_t wp_block;unsigned int i;@@ -2601,20 +2621,19 @@ int dmz_resume_metadata(struct dmz_metadata *zmd)for (i =0 ; i < zmd->nr_zones; i++) { zone =dmz_get (zmd, i);if (!zone) { -dmz_dev_err (dev,"Unable to get zone %u" , i); +dmz_zmd_err (zmd,"Unable to get zone %u" , i);return -EIO ; } - wp_block = zone->wp_block; ret =dmz_update_zone (zmd, zone);if (ret) { -dmz_dev_err (dev,"Broken zone %u" , i); +dmz_zmd_err (zmd,"Broken zone %u" , i);return ret; }if (dmz_is_offline (zone)) { -dmz_dev_warn (dev,"Zone %u is offline" , i); +dmz_zmd_warn (zmd,"Zone %u is offline" , i);continue ; }@@ -2622,7 +2641,7 @@ int dmz_resume_metadata(struct dmz_metadata *zmd)if (!dmz_is_seq (zone)) zone->wp_block =0 ;else if (zone->wp_block != wp_block) { -dmz_dev_err (dev,"Zone %u: Invalid wp (%llu / %llu)" , +dmz_zmd_err (zmd,"Zone %u: Invalid wp (%llu / %llu)" , i, (u64 )zone->wp_block, (u64 )wp_block); zone->wp_block = wp_block; dmz_invalidate_blocks(zmd, zone, zone->wp_block,drivers/md/dm-zoned-target.c +2
-1@@ -519,7 +519,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 ) {
Signature · 2 lines
Damien Le Moal Western Digital Research
PATCH v2 10/11 dm-zoned: ignore metadata zone in dmz_alloc_zone()
In reply to Hannes ReineckeWhen looking up zones in dmz_alloc_zone() we need to ignore metadata zones so as not to accidentally overwrite metadata.
--- drivers/md/dm-zoned-metadata.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/md/dm-zoned-metadata.c +6 -0
@@ -1910,7 +1910,13 @@ struct dm_zone *dmz_alloc_zone(struct dmz_metadata *zmd, unsigned long flags) zone =NULL ; goto again; } +if (dmz_is_meta (zone)) { +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone); +dmz_dev_warn (dev,"Zone %u has metadata" ,dmz_id (zmd, zone)); + zone =NULL ; + goto again; + }return zone; }
Signature · 1 line
2.25.0
Re: [PATCH 10/11] dm-zoned: ignore metadata zone in dmz_alloc_zone()
Quoted 4 lines · Hannes Reinecke
When looking up zones in
dmz_alloc_zone()we need to ignore metadata zones so as not to accidentally overwrite metadata.Signed-off-by Hannes Reinecke <[email protected]>
Quoted 23 lines
--- drivers/md/dm-zoned-metadata.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/md/dm-zoned-metadata.c +6
-0@@ -1910,7 +1910,13 @@ struct dm_zone *dmz_alloc_zone(struct dmz_metadata *zmd, unsigned long flags) zone =NULL ; goto again; } +if (dmz_is_meta (zone)) { +struct dmz_dev *dev =dmz_zone_to_dev (zmd, zone); +dmz_dev_warn (dev,"Zone %u has metadata" ,dmz_id (zmd, zone)); + zone =NULL ; + goto again; + }return zone; }
Signature · 2 lines
Damien Le Moal Western Digital Research
PATCH v2 11/11 dm-zoned: metadata version 2
In reply to Hannes ReineckeImplement handling for metadata version 2. The new metadata adds a label and UUID for the device mapper device, and additional UUID for the underlying block devices.
It also allows for an additional regular drive to be used for emulating random access zones. The emulated zones will be placed logically in front of the zones from the zoned block device, causing the superblocks and metadata to be stored on that device. The first zone of the original zoned device will be used to hold another, tertiary copy of the metadata. This copy carries a generation number of 0 and is never updated; it's just used for identification.
The zones are spaced equidistant, which means that any eventual runt zones will be counted, too. They are marked as 'offline' and ignored when selecting zones.
--- drivers/md/dm-zoned-metadata.c | 269 +++++++++++++++++++++++++++------ drivers/md/dm-zoned-target.c | 128 +++++++++------- drivers/md/dm-zoned.h | 7 +- 3 files changed, 304 insertions(+), 100 deletions(-)
drivers/md/dm-zoned-metadata.c +223 -46
@@ -16,7 +16,7 @@/* * Metadata version. */ -#define DMZ_META_VER 1 +#define DMZ_META_VER 2/* * On-disk super block magic.
@@ -69,8 +69,17 @@ struct dmz_super {/* Checksum */ __le32 crc;/* 48 */ +/* DM-Zoned label */ +u8 dmz_label[32 ];/* 80 */ + +/* DM-Zoned UUID */ +u8 dmz_uuid[16 ];/* 96 */ + +/* Device UUID */ +u8 dev_uuid[16 ];/* 112 */ +/* Padding to full 512B sector */ -u8 reserved[464 ];/* 512 */ +u8 reserved[400 ];/* 512 */ };/*
@@ -135,6 +144,8 @@ struct dmz_metadata {struct dmz_dev *dev;char devname[BDEVNAME_SIZE ]; +char label[BDEVNAME_SIZE ]; +uuid_t uuid;sector_t zone_bitmap_size;unsigned int zone_nr_bitmap_blocks;
@@ -161,8 +172,9 @@ struct dmz_metadata {/* Zone information array */ struct dm_zone *zones; -struct dmz_sb sb[2 ]; +struct dmz_sb sb[3 ];unsigned int mblk_primary; +unsigned int sb_version;u64 sb_gen;unsigned int min_nr_mblks;unsigned int max_nr_mblks;
@@ -195,16 +207,16 @@ struct dmz_metadata { }; #define dmz_zmd_info(zmd, format, args...) \ - DMINFO("(%s): " format, (zmd)->devname, ## args) + DMINFO("(%s): " format, (zmd)->label, ## args) #define dmz_zmd_err(zmd, format, args...) \ - DMERR("(%s): " format, (zmd)->devname, ## args) + DMERR("(%s): " format, (zmd)->label, ## args) #define dmz_zmd_warn(zmd, format, args...) \ - DMWARN("(%s): " format, (zmd)->devname, ## args) + DMWARN("(%s): " format, (zmd)->label, ## args) #define dmz_zmd_debug(zmd, format, args...) \ - DMDEBUG("(%s): " format, (zmd)->devname, ## args) + DMDEBUG("(%s): " format, (zmd)->label, ## args)/* * Various accessors */
@@ -215,16 +227,41 @@ unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone)sector_t dmz_start_sect (struct dmz_metadata *zmd,struct dm_zone *zone) { -return (sector_t )dmz_id (zmd, zone) << zmd->zone_nr_sectors_shift; +unsigned int zone_id; + +if (WARN_ON (!zone)) +return 0 ; + + zone_id = zone->id; +if (zmd->dev[0 ].zone_offset && + (zone_id >= zmd->dev[0 ].zone_offset)) + zone_id -= zmd->dev[0 ].zone_offset; +return (sector_t )zone_id << zmd->zone_nr_sectors_shift; }sector_t dmz_start_block (struct dmz_metadata *zmd,struct dm_zone *zone) { -return (sector_t )dmz_id (zmd, zone) << zmd->zone_nr_blocks_shift; +unsigned int zone_id; + +if (WARN_ON (!zone)) +return 0 ; + + zone_id = zone->id; +if (zmd->dev[0 ].zone_offset && + (zone_id >= zmd->dev[0 ].zone_offset)) + zone_id -= zmd->dev[0 ].zone_offset; +return (sector_t )zone_id << zmd->zone_nr_blocks_shift; }struct dmz_dev *dmz_zone_to_dev (struct dmz_metadata *zmd,struct dm_zone *zone) { +if (WARN_ON (!zone)) +return &zmd->dev[0 ]; + +if (zmd->dev[0 ].zone_offset && + zone->id < zmd->dev[0 ].zone_offset) +return &zmd->dev[1 ]; +return &zmd->dev[0 ]; }
@@ -280,7 +317,7 @@ unsigned int dmz_nr_unmap_seq_zones(struct dmz_metadata *zmd)const char *dmz_metadata_label (struct dmz_metadata *zmd) { -return (const char *)zmd->devname; +return (const char *)zmd->label; }bool dmz_check_dev (struct dmz_metadata *zmd)
@@ -687,6 +724,9 @@ static int dmz_rdwr_block(struct dmz_dev *dev, int op,struct bio *bio;int ret; +if (WARN_ON (!dev)) +return -EIO ; +if (dmz_bdev_is_dying (dev))return -EIO ;
@@ -711,7 +751,8 @@ static int dmz_rdwr_block(struct dmz_dev *dev, int op,*/ static int dmz_write_sb (struct dmz_metadata *zmd,unsigned int set) { -sector_t block = zmd->sb[set].block; +unsigned int sb_zid =dmz_id (zmd, zmd->sb[set].zone); +sector_t sb_block = sb_zid << zmd->zone_nr_blocks_shift;struct dmz_mblock *mblk = zmd->sb[set].mblk;struct dmz_super *sb = zmd->sb[set].sb;struct dmz_dev *dev = zmd->sb[set].dev;
@@ -719,11 +760,17 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set)int ret; sb->magic =cpu_to_le32 (DMZ_MAGIC ); - sb->version =cpu_to_le32 (DMZ_META_VER ); + + sb->version =cpu_to_le32 (zmd->sb_version); +if (zmd->sb_version >1 ) { +uuid_copy ((uuid_t *)sb->dmz_uuid, &zmd->uuid); +memcpy (sb->dmz_label, zmd->label,BDEVNAME_SIZE ); +uuid_copy ((uuid_t *)sb->dev_uuid, &dev->uuid); + } sb->gen =cpu_to_le64 (sb_gen); - sb->sb_block =cpu_to_le64 (block); + sb->sb_block =cpu_to_le64 (sb_block); sb->nr_meta_blocks =cpu_to_le32 (zmd->nr_meta_blocks); sb->nr_reserved_seq =cpu_to_le32 (zmd->nr_reserved_seq); sb->nr_chunks =cpu_to_le32 (zmd->nr_chunks);
@@ -734,7 +781,8 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set) sb->crc =0 ; sb->crc =cpu_to_le32 (crc32_le (sb_gen, (unsigned char *)sb,DMZ_BLOCK_SIZE )); - ret =dmz_rdwr_block (dev,REQ_OP_WRITE , block, mblk->page); + ret =dmz_rdwr_block (dev,REQ_OP_WRITE , zmd->sb[set].block, + mblk->page);if (ret ==0 ) ret =blkdev_issue_flush (dev->bdev,GFP_NOIO ,NULL );
@@ -915,6 +963,23 @@ static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set)u32 crc, stored_crc;u64 gen; +if (le32_to_cpu (sb->magic) !=DMZ_MAGIC ) { +dmz_dev_err (dev,"Invalid meta magic (needed 0x%08x, got 0x%08x)" , +DMZ_MAGIC ,le32_to_cpu (sb->magic)); +return -ENXIO ; + } + + zmd->sb_version =le32_to_cpu (sb->version); +if (zmd->sb_version >DMZ_META_VER ) { +dmz_dev_err (dev,"Invalid meta version (needed %d, got %d)" , +DMZ_META_VER , zmd->sb_version); +return -EINVAL ; + } +if ((zmd->sb_version <1 ) && (set ==2 )) { +dmz_dev_err (dev,"Tertiary superblocks are not supported" ); +return -EINVAL ; + } + gen =le64_to_cpu (sb->gen); stored_crc =le32_to_cpu (sb->crc); sb->crc =0 ;
@@ -925,18 +990,41 @@ static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set)return -ENXIO ; } -if (le32_to_cpu (sb->magic) !=DMZ_MAGIC ) { -dmz_dev_err (dev,"Invalid meta magic (needed 0x%08x, got 0x%08x)" , -DMZ_MAGIC ,le32_to_cpu (sb->magic)); -return -ENXIO ; - } +if (zmd->sb_version >1 ) { +if (uuid_is_null ((uuid_t *)sb->dmz_uuid)) { +dmz_dev_err (dev,"sb%d: NULL DM-Zoned uuid" , set); +return -ENXIO ; + }else if (uuid_is_null (&zmd->uuid)) { +uuid_copy (&zmd->uuid, (uuid_t *)sb->dmz_uuid); + }else if (!uuid_equal (&zmd->uuid, (uuid_t *)sb->dmz_uuid)) { +dmz_dev_err (dev,"sb%d: mismatching DM-Zoned uuid, " +"is %pUl expected %pUl" , set, + (uuid_t *)sb->dmz_uuid, &zmd->uuid); +return -ENXIO ; + } +if (!strlen (zmd->label)) +memcpy (zmd->label, sb->dmz_label,BDEVNAME_SIZE ); +else if (memcmp (zmd->label, sb->dmz_label,BDEVNAME_SIZE )) { +dmz_dev_err (dev,"sb%d: mismatching DM-Zoned label, " +"is %s expected %s" , + set, sb->dmz_label, zmd->label); +return -ENXIO ; + } +if (uuid_is_null ((uuid_t *)sb->dev_uuid)) { +dmz_dev_err (dev,"sb%d: NULL device uuid" , set); +return -ENXIO ; + } +uuid_copy (&dev->uuid, (uuid_t *)sb->dev_uuid); -if (le32_to_cpu (sb->version) !=DMZ_META_VER ) { -dmz_dev_err (dev,"Invalid meta version (needed %d, got %d)" , -DMZ_META_VER ,le32_to_cpu (sb->version)); -return -ENXIO ; +if (set ==2 ) { +if (gen !=0 ) { +dmz_dev_err (dev,"sb%d: Invalid generation %llu" , + set, gen); +return -ENXIO ; + } +return 0 ; + } } - nr_meta_zones = (le32_to_cpu (sb->nr_meta_blocks) + zmd->zone_nr_blocks -1 ) >> zmd->zone_nr_blocks_shift; if (!nr_meta_zones ||
@@ -1185,21 +1273,37 @@ static int dmz_load_sb(struct dmz_metadata *zmd)"Using super block %u (gen %llu)" , zmd->mblk_primary, zmd->sb_gen); +if ((zmd->sb_version >1 ) && zmd->sb[2 ].zone) { + zmd->sb[2 ].block =dmz_start_block (zmd, zmd->sb[2 ].zone); + zmd->sb[2 ].dev =dmz_zone_to_dev (zmd, zmd->sb[2 ].zone); + ret =dmz_get_sb (zmd,2 ); +if (ret) { +dmz_dev_err (zmd->sb[2 ].dev, +"Read tertiary super block failed" ); +return ret; + } + ret =dmz_check_sb (zmd,2 ); +if (ret == -EINVAL ) +return ret; + }return 0 ; }/* * Initialize a zone descriptor. */ -static int dmz_init_zone (struct blk_zone *blkz,unsigned int idx,void *data) +static int dmz_init_zone (struct blk_zone *blkz,unsigned int num,void *data) {struct dmz_metadata *zmd = data; +int idx = num + zmd->dev[0 ].zone_offset;struct dm_zone *zone = &zmd->zones[idx]; -struct dmz_dev *dev = zmd->dev; -/* Ignore the eventual last runt (smaller) zone */ if (blkz->len != zmd->zone_nr_sectors) { -if (blkz->start + blkz->len == dev->capacity) +if (zmd->sb_version >1 ) { +/* Ignore the eventual runt (smaller) zone */ +set_bit (DMZ_OFFLINE , &zone->flags); +return 0 ; + }else if (blkz->start + blkz->len == dev->capacity)return 0 ;return -ENXIO ; }
@@ -1235,10 +1339,14 @@ static int dmz_init_zone(struct blk_zone *blkz, unsigned int idx, void *data)if (dmz_is_rnd (zone)) { zmd->nr_rnd_zones++;if (!zmd->sb[0 ].zone) { -/* Super block zone */ +/* Primary super block zone */ zmd->sb[0 ].zone = zone; } } +if (zmd->dev[1 ].bdev && !zmd->sb[2 ].zone) { +/* Tertiary superblock zone */ + zmd->sb[2 ].zone = zone; + } }return 0 ;
@@ -1259,11 +1367,10 @@ static void dmz_drop_zones(struct dmz_metadata *zmd)*/ static int dmz_init_zones (struct dmz_metadata *zmd) { -struct dmz_dev *dev = &zmd->dev[0 ];int ret;/* Init */ - zmd->zone_nr_sectors = dev->zone_nr_sectors; + zmd->zone_nr_sectors = zmd->dev[0 ].zone_nr_sectors; zmd->zone_nr_sectors_shift =ilog2 (zmd->zone_nr_sectors); zmd->zone_nr_blocks =dmz_sect2blk (zmd->zone_nr_sectors); zmd->zone_nr_blocks_shift =ilog2 (zmd->zone_nr_blocks);
@@ -1274,7 +1381,14 @@ static int dmz_init_zones(struct dmz_metadata *zmd) DMZ_BLOCK_SIZE_BITS);/* Allocate zone array */ - zmd->nr_zones = dev->nr_zones; + zmd->nr_zones = zmd->dev[0 ].nr_zones; +if (zmd->dev[1 ].bdev) + zmd->nr_zones += zmd->dev[1 ].nr_zones; + +if (!zmd->nr_zones) { +DMERR ("(%s): No zones found" , zmd->devname); +return -ENXIO ; + } zmd->zones =kcalloc (zmd->nr_zones,sizeof (struct dm_zone ),GFP_KERNEL );if (!zmd->zones)return -ENOMEM ;
@@ -1282,13 +1396,43 @@ static int dmz_init_zones(struct dmz_metadata *zmd)DMINFO ("(%s): Using %zu B for zone information" , zmd->devname,sizeof (struct dm_zone ) * zmd->nr_zones); +if (zmd->dev[1 ].bdev) { +int idx; +sector_t zone_offset =0 ; + +for (idx =0 ; idx < zmd->dev[1 ].nr_zones; idx++) { +struct dm_zone *zone = &zmd->zones[idx]; + +INIT_LIST_HEAD (&zone->link); +atomic_set (&zone->refcount,0 ); + zone->id = idx; + zone->chunk =DMZ_MAP_UNMAPPED ; +set_bit (DMZ_RND , &zone->flags); + zone->wp_block =0 ; + zmd->nr_rnd_zones++; + zmd->nr_useable_zones++; +if (zmd->dev[1 ].capacity - zone_offset < + zmd->zone_nr_sectors) { +/* Disable runt zone */ +set_bit (DMZ_OFFLINE , &zone->flags); +break ; + } + zone_offset += zmd->zone_nr_sectors; +if (!zmd->sb[0 ].zone) { +/* Primary superblock zone */ + zmd->sb[0 ].zone = zone; + } + } + zmd->dev[0 ].zone_offset = zmd->dev[1 ].nr_zones; + } +/* * Get zone information and initialize zone descriptors. At the same * time, determine where the super block should be: first block of the * first randomly writable zone. */ - ret =blkdev_report_zones (dev->bdev,0 ,BLK_ALL_ZONES , dmz_init_zone, - zmd); + ret =blkdev_report_zones (zmd->dev[0 ].bdev,0 ,BLK_ALL_ZONES , + dmz_init_zone, zmd);if (ret <0 ) {dmz_drop_zones (zmd);return ret;
@@ -1325,6 +1469,9 @@ static int dmz_update_zone(struct dmz_metadata *zmd, struct dm_zone *zone)unsigned int noio_flag;int ret; +if (dev->flags &DMZ_BDEV_REGULAR ) +return 0 ; +/* * Get zone information from disk. Since blkdev_report_zones() uses * GFP_KERNEL by default for memory allocations, set the per-task
@@ -1741,7 +1888,8 @@ struct dm_zone *dmz_get_chunk_mapping(struct dmz_metadata *zmd, unsigned int chu/* Allocate a random zone */ dzone =dmz_alloc_zone (zmd,DMZ_ALLOC_RND );if (!dzone) { -if (dmz_bdev_is_dying (zmd->dev)) { +if (dmz_bdev_is_dying (&zmd->dev[0 ]) || +dmz_bdev_is_dying (&zmd->dev[1 ])) { dzone =ERR_PTR (-EIO ); goto out; }
@@ -1842,7 +1990,8 @@ struct dm_zone *dmz_get_chunk_buffer(struct dmz_metadata *zmd,/* Allocate a random zone */ bzone =dmz_alloc_zone (zmd,DMZ_ALLOC_RND );if (!bzone) { -if (dmz_bdev_is_dying (zmd->dev)) { +if (dmz_bdev_is_dying (&zmd->dev[0 ]) || +dmz_bdev_is_dying (&zmd->dev[1 ])) { bzone =ERR_PTR (-EIO ); goto out; }
@@ -2480,18 +2629,34 @@ void dmz_print_dev(struct dmz_metadata *zmd, int num) {struct dmz_dev *dev = &zmd->dev[num]; -dmz_dev_info (dev,"Host-%s zoned block device" , -bdev_zoned_model (dev->bdev) ==BLK_ZONED_HA ? -"aware" :"managed" ); -dmz_dev_info (dev," %llu 512-byte logical sectors" , - (u64 )dev->capacity); -dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , - dev->nr_zones, (u64 )zmd->zone_nr_sectors); +if (bdev_zoned_model (dev->bdev) ==BLK_ZONED_NONE ) +dmz_dev_info (dev,"Regular block device" ); +else +dmz_dev_info (dev,"Host-%s zoned block device" , +bdev_zoned_model (dev->bdev) ==BLK_ZONED_HA ? +"aware" :"managed" ); +if (zmd->sb_version >1 ) { +sector_t sector_offset = + dev->zone_offset << zmd->zone_nr_sectors_shift; + +dmz_dev_info (dev," uuid %pUl" , &dev->uuid); +dmz_dev_info (dev," %llu 512-byte logical sectors (offset %llu)" , + (u64 )dev->capacity, (u64 )sector_offset); +dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors (offset %llu)" , + dev->nr_zones, (u64 )zmd->zone_nr_sectors, + (u64 )dev->zone_offset); + }else { +dmz_dev_info (dev," %llu 512-byte logical sectors" , + (u64 )dev->capacity); +dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , + dev->nr_zones, (u64 )zmd->zone_nr_sectors); + } }/* * Initialize the zoned metadata. */ -int dmz_ctr_metadata (struct dmz_dev *dev,struct dmz_metadata **metadata, +int dmz_ctr_metadata (struct dmz_dev *dev,int num_dev, +struct dmz_metadata **metadata,const char *devname) {struct dmz_metadata *zmd;
@@ -2544,7 +2709,13 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata, goto err;set_bit (DMZ_META , &zone->flags); } - +if (zmd->sb[2 ].zone) { + zid =dmz_id (zmd, zmd->sb[2 ].zone); + zone =dmz_get (zmd, zid); +if (!zone) + goto err; +set_bit (DMZ_META , &zone->flags); + }/* Load mapping table */ ret =dmz_load_mapping (zmd);if (ret)
@@ -2569,8 +2740,14 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata, goto err; } -dmz_zmd_info (zmd,"DM-Zoned metadata version %d" ,DMZ_META_VER ); +dmz_zmd_info (zmd,"DM-Zoned metadata version %d" , zmd->sb_version); +if (zmd->sb_version >1 ) { +dmz_zmd_info (zmd,"DM UUID %pUl" , &zmd->uuid); +dmz_zmd_info (zmd,"DM Label %s" , zmd->label); + }dmz_print_dev (zmd,0 ); +if (zmd->dev[1 ].bdev) +dmz_print_dev (zmd,1 );dmz_zmd_info (zmd," %u zones of %llu 512-byte logical sectors" , zmd->nr_zones, (u64 )zmd->zone_nr_sectors);
drivers/md/dm-zoned-target.c +76 -52
242 lines not on this page · raw message
drivers/md/dm-zoned.h +5 -2
@@ -52,10 +52,12 @@ struct dmz_dev {struct block_device *bdev;char name[BDEVNAME_SIZE ]; +uuid_t uuid;sector_t capacity;unsigned int nr_zones; +unsigned int zone_offset;unsigned int flags;
@@ -69,6 +71,7 @@ struct dmz_dev {/* Device flags. */ #define DMZ_BDEV_DYING (1 << 0)#define DMZ_CHECK_BDEV (2 << 0) +#define DMZ_BDEV_REGULAR (4 << 0)/* * Zone descriptor.
@@ -163,8 +166,8 @@ struct dmz_reclaim;/* * Functions defined in dm-zoned-metadata.c */ -int dmz_ctr_metadata (struct dmz_dev *dev,struct dmz_metadata **zmd, -const char *devname); +int dmz_ctr_metadata (struct dmz_dev *dev,int num_dev, +struct dmz_metadata **zmd,const char *devname);void dmz_dtr_metadata (struct dmz_metadata *zmd);int dmz_resume_metadata (struct dmz_metadata *zmd);
Signature · 1 line
2.25.0
Quoted 115 lines · Hannes Reinecke
Implement handling for metadata version 2. The new metadata adds a label and UUID for the device mapper device, and additional UUID for the underlying block devices.
It also allows for an additional regular drive to be used for emulating random access zones. The emulated zones will be placed logically in front of the zones from the zoned block device, causing the superblocks and metadata to be stored on that device. The first zone of the original zoned device will be used to hold another, tertiary copy of the metadata. This copy carries a generation number of 0 and is never updated; it's just used for identification.
The zones are spaced equidistant, which means that any eventual runt zones will be counted, too. They are marked as 'offline' and ignored when selecting zones.Signed-off-by Hannes Reinecke <[email protected]>--- drivers/md/dm-zoned-metadata.c | 269 +++++++++++++++++++++++++++------ drivers/md/dm-zoned-target.c | 128 +++++++++------- drivers/md/dm-zoned.h | 7 +- 3 files changed, 304 insertions(+), 100 deletions(-)drivers/md/dm-zoned-metadata.c +29
-9@@ -16,7 +16,7 @@/* * Metadata version. */ -#define DMZ_META_VER 1 +#define DMZ_META_VER 2/* * On-disk super block magic. @@ -69,8 +69,17 @@ struct dmz_super {/* Checksum */ __le32 crc;/* 48 */ +/* DM-Zoned label */ +u8 dmz_label[32 ];/* 80 */ + +/* DM-Zoned UUID */ +u8 dmz_uuid[16 ];/* 96 */ + +/* Device UUID */ +u8 dev_uuid[16 ];/* 112 */ +/* Padding to full 512B sector */ -u8 reserved[464 ];/* 512 */ +u8 reserved[400 ];/* 512 */ };/* @@ -135,6 +144,8 @@ struct dmz_metadata {struct dmz_dev *dev;char devname[BDEVNAME_SIZE ]; +char label[BDEVNAME_SIZE ]; +uuid_t uuid;sector_t zone_bitmap_size;unsigned int zone_nr_bitmap_blocks;@@ -161,8 +172,9 @@ struct dmz_metadata {/* Zone information array */ struct dm_zone *zones; -struct dmz_sb sb[2 ]; +struct dmz_sb sb[3 ];unsigned int mblk_primary; +unsigned int sb_version;u64 sb_gen;unsigned int min_nr_mblks;unsigned int max_nr_mblks;@@ -195,16 +207,16 @@ struct dmz_metadata { }; #define dmz_zmd_info(zmd, format, args...) \ - DMINFO("(%s): " format, (zmd)->devname, ## args) + DMINFO("(%s): " format, (zmd)->label, ## args) #define dmz_zmd_err(zmd, format, args...) \ - DMERR("(%s): " format, (zmd)->devname, ## args) + DMERR("(%s): " format, (zmd)->label, ## args) #define dmz_zmd_warn(zmd, format, args...) \ - DMWARN("(%s): " format, (zmd)->devname, ## args) + DMWARN("(%s): " format, (zmd)->label, ## args) #define dmz_zmd_debug(zmd, format, args...) \ - DMDEBUG("(%s): " format, (zmd)->devname, ## args) + DMDEBUG("(%s): " format, (zmd)->label, ## args)/* * Various accessors */ @@ -215,16 +227,41 @@ unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone)sector_t dmz_start_sect (struct dmz_metadata *zmd,struct dm_zone *zone) { -return (sector_t )dmz_id (zmd, zone) << zmd->zone_nr_sectors_shift; +unsigned int zone_id; + +if (WARN_ON (!zone)) +return 0 ; + + zone_id = zone->id; +if (zmd->dev[0 ].zone_offset && + (zone_id >= zmd->dev[0 ].zone_offset)) + zone_id -= zmd->dev[0 ].zone_offset; +return (sector_t )zone_id << zmd->zone_nr_sectors_shift; }sector_t dmz_start_block (struct dmz_metadata *zmd,struct dm_zone *zone) { -return (sector_t )dmz_id (zmd, zone) << zmd->zone_nr_blocks_shift;
drivers/md/dm-zoned-metadata.c unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone) · line 253
Quoted 10 lines
drivers/md/dm-zoned-metadata.c +10
-0+unsigned int zone_id; + +if (WARN_ON (!zone)) +return 0 ; + + zone_id = zone->id; +if (zmd->dev[0 ].zone_offset && + (zone_id >= zmd->dev[0 ].zone_offset)) + zone_id -= zmd->dev[0 ].zone_offset; +return (sector_t )zone_id << zmd->zone_nr_blocks_shift;
The zone_id calculation is repeated. May be add a simple helper dmz_dev_zone_id() for it ?
drivers/md/dm-zoned-metadata.c unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone) · line 263
Quoted 10 lines
drivers/md/dm-zoned-metadata.c +6
-0}struct dmz_dev *dmz_zone_to_dev (struct dmz_metadata *zmd,struct dm_zone *zone) { +if (WARN_ON (!zone)) +return &zmd->dev[0 ]; + +if (zmd->dev[0 ].zone_offset && + zone->id < zmd->dev[0 ].zone_offset) +return &zmd->dev[1 ];
Isn't that return &zmd->dev[0]; ? if zone->id < zmd->dev[0].zone_offset then you are within the first dev, no ?
drivers/md/dm-zoned-metadata.c unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone) · line 265
Quoted 2 lines
drivers/md/dm-zoned-metadata.c +1
-0+return &zmd->dev[0 ];
And this would be return &zmd->dev[1];
Quoted 98 lines
drivers/md/dm-zoned-metadata.c +37
-10}@@ -280,7 +317,7 @@ unsigned int dmz_nr_unmap_seq_zones(struct dmz_metadata *zmd)const char *dmz_metadata_label (struct dmz_metadata *zmd) { -return (const char *)zmd->devname; +return (const char *)zmd->label; }bool dmz_check_dev (struct dmz_metadata *zmd)@@ -687,6 +724,9 @@ static int dmz_rdwr_block(struct dmz_dev *dev, int op,struct bio *bio;int ret; +if (WARN_ON (!dev)) +return -EIO ; +if (dmz_bdev_is_dying (dev))return -EIO ;@@ -711,7 +751,8 @@ static int dmz_rdwr_block(struct dmz_dev *dev, int op,*/ static int dmz_write_sb (struct dmz_metadata *zmd,unsigned int set) { -sector_t block = zmd->sb[set].block; +unsigned int sb_zid =dmz_id (zmd, zmd->sb[set].zone); +sector_t sb_block = sb_zid << zmd->zone_nr_blocks_shift;struct dmz_mblock *mblk = zmd->sb[set].mblk;struct dmz_super *sb = zmd->sb[set].sb;struct dmz_dev *dev = zmd->sb[set].dev;@@ -719,11 +760,17 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set)int ret; sb->magic =cpu_to_le32 (DMZ_MAGIC ); - sb->version =cpu_to_le32 (DMZ_META_VER ); + + sb->version =cpu_to_le32 (zmd->sb_version); +if (zmd->sb_version >1 ) { +uuid_copy ((uuid_t *)sb->dmz_uuid, &zmd->uuid); +memcpy (sb->dmz_label, zmd->label,BDEVNAME_SIZE ); +uuid_copy ((uuid_t *)sb->dev_uuid, &dev->uuid); + } sb->gen =cpu_to_le64 (sb_gen); - sb->sb_block =cpu_to_le64 (block); + sb->sb_block =cpu_to_le64 (sb_block); sb->nr_meta_blocks =cpu_to_le32 (zmd->nr_meta_blocks); sb->nr_reserved_seq =cpu_to_le32 (zmd->nr_reserved_seq); sb->nr_chunks =cpu_to_le32 (zmd->nr_chunks);@@ -734,7 +781,8 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set) sb->crc =0 ; sb->crc =cpu_to_le32 (crc32_le (sb_gen, (unsigned char *)sb,DMZ_BLOCK_SIZE )); - ret =dmz_rdwr_block (dev,REQ_OP_WRITE , block, mblk->page); + ret =dmz_rdwr_block (dev,REQ_OP_WRITE , zmd->sb[set].block, + mblk->page);if (ret ==0 ) ret =blkdev_issue_flush (dev->bdev,GFP_NOIO ,NULL );@@ -915,6 +963,23 @@ static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set)u32 crc, stored_crc;u64 gen; +if (le32_to_cpu (sb->magic) !=DMZ_MAGIC ) { +dmz_dev_err (dev,"Invalid meta magic (needed 0x%08x, got 0x%08x)" , +DMZ_MAGIC ,le32_to_cpu (sb->magic)); +return -ENXIO ; + } + + zmd->sb_version =le32_to_cpu (sb->version); +if (zmd->sb_version >DMZ_META_VER ) { +dmz_dev_err (dev,"Invalid meta version (needed %d, got %d)" , +DMZ_META_VER , zmd->sb_version); +return -EINVAL ; + } +if ((zmd->sb_version <1 ) && (set ==2 )) { +dmz_dev_err (dev,"Tertiary superblocks are not supported" ); +return -EINVAL ; + } + gen =le64_to_cpu (sb->gen); stored_crc =le32_to_cpu (sb->crc); sb->crc =0 ;@@ -925,18 +990,41 @@ static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set)return -ENXIO ; } -if (le32_to_cpu (sb->magic) !=DMZ_MAGIC ) { -dmz_dev_err (dev,"Invalid meta magic (needed 0x%08x, got 0x%08x)" , -DMZ_MAGIC ,le32_to_cpu (sb->magic)); -return -ENXIO ; - } +if (zmd->sb_version >1 ) { +if (uuid_is_null ((uuid_t *)sb->dmz_uuid)) { +dmz_dev_err (dev,"sb%d: NULL DM-Zoned uuid" , set); +return -ENXIO ;
drivers/md/dm-zoned-metadata.c static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set) · line 1006
Quoted 10 lines
drivers/md/dm-zoned-metadata.c +10
-0+ }else if (uuid_is_null (&zmd->uuid)) { +uuid_copy (&zmd->uuid, (uuid_t *)sb->dmz_uuid); + }else if (!uuid_equal (&zmd->uuid, (uuid_t *)sb->dmz_uuid)) { +dmz_dev_err (dev,"sb%d: mismatching DM-Zoned uuid, " +"is %pUl expected %pUl" , set, + (uuid_t *)sb->dmz_uuid, &zmd->uuid); +return -ENXIO ; + } +if (!strlen (zmd->label)) +memcpy (zmd->label, sb->dmz_label,BDEVNAME_SIZE );
We should probably ensure that label is always 0 terminated here. If the metadata label uses all BDEVNAME_SIZE characters, zmd->label will too since it is a BDEVNAME_SIZE long string. Make it BDEVNAME_SIZE + 1 long ?
Quoted 138 lines
drivers/md/dm-zoned-metadata.c +71
-13+else if (memcmp (zmd->label, sb->dmz_label,BDEVNAME_SIZE )) { +dmz_dev_err (dev,"sb%d: mismatching DM-Zoned label, " +"is %s expected %s" , + set, sb->dmz_label, zmd->label); +return -ENXIO ; + } +if (uuid_is_null ((uuid_t *)sb->dev_uuid)) { +dmz_dev_err (dev,"sb%d: NULL device uuid" , set); +return -ENXIO ; + } +uuid_copy (&dev->uuid, (uuid_t *)sb->dev_uuid); -if (le32_to_cpu (sb->version) !=DMZ_META_VER ) { -dmz_dev_err (dev,"Invalid meta version (needed %d, got %d)" , -DMZ_META_VER ,le32_to_cpu (sb->version)); -return -ENXIO ; +if (set ==2 ) { +if (gen !=0 ) { +dmz_dev_err (dev,"sb%d: Invalid generation %llu" , + set, gen); +return -ENXIO ; + } +return 0 ; + } } - nr_meta_zones = (le32_to_cpu (sb->nr_meta_blocks) + zmd->zone_nr_blocks -1 ) >> zmd->zone_nr_blocks_shift; if (!nr_meta_zones ||@@ -1185,21 +1273,37 @@ static int dmz_load_sb(struct dmz_metadata *zmd)"Using super block %u (gen %llu)" , zmd->mblk_primary, zmd->sb_gen); +if ((zmd->sb_version >1 ) && zmd->sb[2 ].zone) { + zmd->sb[2 ].block =dmz_start_block (zmd, zmd->sb[2 ].zone); + zmd->sb[2 ].dev =dmz_zone_to_dev (zmd, zmd->sb[2 ].zone); + ret =dmz_get_sb (zmd,2 ); +if (ret) { +dmz_dev_err (zmd->sb[2 ].dev, +"Read tertiary super block failed" ); +return ret; + } + ret =dmz_check_sb (zmd,2 ); +if (ret == -EINVAL ) +return ret; + }return 0 ; }/* * Initialize a zone descriptor. */ -static int dmz_init_zone (struct blk_zone *blkz,unsigned int idx,void *data) +static int dmz_init_zone (struct blk_zone *blkz,unsigned int num,void *data) {struct dmz_metadata *zmd = data; +int idx = num + zmd->dev[0 ].zone_offset;struct dm_zone *zone = &zmd->zones[idx]; -struct dmz_dev *dev = zmd->dev; -/* Ignore the eventual last runt (smaller) zone */ if (blkz->len != zmd->zone_nr_sectors) { -if (blkz->start + blkz->len == dev->capacity) +if (zmd->sb_version >1 ) { +/* Ignore the eventual runt (smaller) zone */ +set_bit (DMZ_OFFLINE , &zone->flags); +return 0 ; + }else if (blkz->start + blkz->len == dev->capacity)return 0 ;return -ENXIO ; }@@ -1235,10 +1339,14 @@ static int dmz_init_zone(struct blk_zone *blkz, unsigned int idx, void *data)if (dmz_is_rnd (zone)) { zmd->nr_rnd_zones++;if (!zmd->sb[0 ].zone) { -/* Super block zone */ +/* Primary super block zone */ zmd->sb[0 ].zone = zone; } } +if (zmd->dev[1 ].bdev && !zmd->sb[2 ].zone) { +/* Tertiary superblock zone */ + zmd->sb[2 ].zone = zone; + } }return 0 ;@@ -1259,11 +1367,10 @@ static void dmz_drop_zones(struct dmz_metadata *zmd)*/ static int dmz_init_zones (struct dmz_metadata *zmd) { -struct dmz_dev *dev = &zmd->dev[0 ];int ret;/* Init */ - zmd->zone_nr_sectors = dev->zone_nr_sectors; + zmd->zone_nr_sectors = zmd->dev[0 ].zone_nr_sectors; zmd->zone_nr_sectors_shift =ilog2 (zmd->zone_nr_sectors); zmd->zone_nr_blocks =dmz_sect2blk (zmd->zone_nr_sectors); zmd->zone_nr_blocks_shift =ilog2 (zmd->zone_nr_blocks);@@ -1274,7 +1381,14 @@ static int dmz_init_zones(struct dmz_metadata *zmd) DMZ_BLOCK_SIZE_BITS);/* Allocate zone array */ - zmd->nr_zones = dev->nr_zones; + zmd->nr_zones = zmd->dev[0 ].nr_zones; +if (zmd->dev[1 ].bdev) + zmd->nr_zones += zmd->dev[1 ].nr_zones; + +if (!zmd->nr_zones) { +DMERR ("(%s): No zones found" , zmd->devname); +return -ENXIO ; + } zmd->zones =kcalloc (zmd->nr_zones,sizeof (struct dm_zone ),GFP_KERNEL );if (!zmd->zones)return -ENOMEM ;@@ -1282,13 +1396,43 @@ static int dmz_init_zones(struct dmz_metadata *zmd)DMINFO ("(%s): Using %zu B for zone information" , zmd->devname,sizeof (struct dm_zone ) * zmd->nr_zones); +if (zmd->dev[1 ].bdev) { +int idx; +sector_t zone_offset =0 ; + +for (idx =0 ; idx < zmd->dev[1 ].nr_zones; idx++) { +struct dm_zone *zone = &zmd->zones[idx]; + +INIT_LIST_HEAD (&zone->link); +atomic_set (&zone->refcount,0 ); + zone->id = idx; + zone->chunk =DMZ_MAP_UNMAPPED ; +set_bit (DMZ_RND , &zone->flags); + zone->wp_block =0 ; + zmd->nr_rnd_zones++; + zmd->nr_useable_zones++; +if (zmd->dev[1 ].capacity - zone_offset < + zmd->zone_nr_sectors) { +/* Disable runt zone */
drivers/md/dm-zoned-metadata.c static int dmz_init_zones(struct dmz_metadata *zmd) · line 1426
Quoted 10 lines
drivers/md/dm-zoned-metadata.c +10
-0+set_bit (DMZ_OFFLINE , &zone->flags); +break ; + } + zone_offset += zmd->zone_nr_sectors; +if (!zmd->sb[0 ].zone) { +/* Primary superblock zone */ + zmd->sb[0 ].zone = zone; + } + } + zmd->dev[0 ].zone_offset = zmd->dev[1 ].nr_zones;
This is assuming that dev[1] always is a regular device. What if this is a zoned device ? E.g. do we want to prevent the case: zoned device with rnd zoned + zoned device with no rnd zones ? I do not think it is an interesting use case, but I do not see any reason for preventing it either as I do not think this will change anything to the code beside the init zones. Thoughts ?
Quoted 123 lines
drivers/md/dm-zoned-metadata.c +49
-14+ } +/* * Get zone information and initialize zone descriptors. At the same * time, determine where the super block should be: first block of the * first randomly writable zone. */ - ret =blkdev_report_zones (dev->bdev,0 ,BLK_ALL_ZONES , dmz_init_zone, - zmd); + ret =blkdev_report_zones (zmd->dev[0 ].bdev,0 ,BLK_ALL_ZONES , + dmz_init_zone, zmd);if (ret <0 ) {dmz_drop_zones (zmd);return ret;@@ -1325,6 +1469,9 @@ static int dmz_update_zone(struct dmz_metadata *zmd, struct dm_zone *zone)unsigned int noio_flag;int ret; +if (dev->flags &DMZ_BDEV_REGULAR ) +return 0 ; +/* * Get zone information from disk. Since blkdev_report_zones() uses * GFP_KERNEL by default for memory allocations, set the per-task @@ -1741,7 +1888,8 @@ struct dm_zone *dmz_get_chunk_mapping(struct dmz_metadata *zmd, unsigned int chu/* Allocate a random zone */ dzone =dmz_alloc_zone (zmd,DMZ_ALLOC_RND );if (!dzone) { -if (dmz_bdev_is_dying (zmd->dev)) { +if (dmz_bdev_is_dying (&zmd->dev[0 ]) || +dmz_bdev_is_dying (&zmd->dev[1 ])) { dzone =ERR_PTR (-EIO ); goto out; }@@ -1842,7 +1990,8 @@ struct dm_zone *dmz_get_chunk_buffer(struct dmz_metadata *zmd,/* Allocate a random zone */ bzone =dmz_alloc_zone (zmd,DMZ_ALLOC_RND );if (!bzone) { -if (dmz_bdev_is_dying (zmd->dev)) { +if (dmz_bdev_is_dying (&zmd->dev[0 ]) || +dmz_bdev_is_dying (&zmd->dev[1 ])) { bzone =ERR_PTR (-EIO ); goto out; }@@ -2480,18 +2629,34 @@ void dmz_print_dev(struct dmz_metadata *zmd, int num) {struct dmz_dev *dev = &zmd->dev[num]; -dmz_dev_info (dev,"Host-%s zoned block device" , -bdev_zoned_model (dev->bdev) ==BLK_ZONED_HA ? -"aware" :"managed" ); -dmz_dev_info (dev," %llu 512-byte logical sectors" , - (u64 )dev->capacity); -dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , - dev->nr_zones, (u64 )zmd->zone_nr_sectors); +if (bdev_zoned_model (dev->bdev) ==BLK_ZONED_NONE ) +dmz_dev_info (dev,"Regular block device" ); +else +dmz_dev_info (dev,"Host-%s zoned block device" , +bdev_zoned_model (dev->bdev) ==BLK_ZONED_HA ? +"aware" :"managed" ); +if (zmd->sb_version >1 ) { +sector_t sector_offset = + dev->zone_offset << zmd->zone_nr_sectors_shift; + +dmz_dev_info (dev," uuid %pUl" , &dev->uuid); +dmz_dev_info (dev," %llu 512-byte logical sectors (offset %llu)" , + (u64 )dev->capacity, (u64 )sector_offset); +dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors (offset %llu)" , + dev->nr_zones, (u64 )zmd->zone_nr_sectors, + (u64 )dev->zone_offset); + }else { +dmz_dev_info (dev," %llu 512-byte logical sectors" , + (u64 )dev->capacity); +dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , + dev->nr_zones, (u64 )zmd->zone_nr_sectors); + } }/* * Initialize the zoned metadata. */ -int dmz_ctr_metadata (struct dmz_dev *dev,struct dmz_metadata **metadata, +int dmz_ctr_metadata (struct dmz_dev *dev,int num_dev, +struct dmz_metadata **metadata,const char *devname) {struct dmz_metadata *zmd;@@ -2544,7 +2709,13 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata, goto err;set_bit (DMZ_META , &zone->flags); } - +if (zmd->sb[2 ].zone) { + zid =dmz_id (zmd, zmd->sb[2 ].zone); + zone =dmz_get (zmd, zid); +if (!zone) + goto err; +set_bit (DMZ_META , &zone->flags); + }/* Load mapping table */ ret =dmz_load_mapping (zmd);if (ret)@@ -2569,8 +2740,14 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata, goto err; } -dmz_zmd_info (zmd,"DM-Zoned metadata version %d" ,DMZ_META_VER ); +dmz_zmd_info (zmd,"DM-Zoned metadata version %d" , zmd->sb_version); +if (zmd->sb_version >1 ) { +dmz_zmd_info (zmd,"DM UUID %pUl" , &zmd->uuid); +dmz_zmd_info (zmd,"DM Label %s" , zmd->label); + }dmz_print_dev (zmd,0 ); +if (zmd->dev[1 ].bdev) +dmz_print_dev (zmd,1 );dmz_zmd_info (zmd," %u zones of %llu 512-byte logical sectors" , zmd->nr_zones, (u64 )zmd->zone_nr_sectors);drivers/md/dm-zoned-target.c +0
-0
drivers/md/dm-zoned-target.c struct dm_chunk_work { · line 41
Quoted 5 lines
drivers/md/dm-zoned-target.c +1
-1@@ -38,7 +38,7 @@ struct dm_chunk_work {* Target descriptor. */ struct dmz_target { -struct dm_dev *ddev; +struct dm_dev *ddev[2 ];
Form the code above, ddev[1] is the regular device and ddev[0] the zoned device. I would really prefer to have that reversed as the ddev array index would increase together with target sector/zone id instead of being reversed. That would be far less confusing I think.
Quoted 64 lines
drivers/md/dm-zoned-target.c +13
-12unsigned long flags;@@ -223,6 +223,9 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dmz_dev *dev, }if (nr_blocks) { +if (rzone != zone) + dev =dmz_zone_to_dev (zmd, rzone); +/* Valid blocks found: read them */ nr_blocks = min_t(unsigned int, nr_blocks, end_block - chunk_block); ret = dmz_submit_bio(dmz, dev, rzone, bio,@@ -298,6 +301,7 @@ static int dmz_handle_buffered_write(struct dmz_target *dmz,return -EROFS ;/* Submit write */ + dev =dmz_zone_to_dev (zmd, bzone); ret =dmz_submit_bio (dmz, dev, bzone, bio, chunk_block, nr_blocks);if (ret)return ret;@@ -591,6 +595,10 @@ static int dmz_queue_chunk_work(struct dmz_target *dmz, struct bio *bio)*/ bool dmz_bdev_is_dying (struct dmz_dev *dmz_dev) { +/* Device not configured, no error */ +if (!dmz_dev->bdev) +return false; +if (dmz_dev->flags &DMZ_BDEV_DYING )return true;@@ -698,60 +706,47 @@ static int dmz_map(struct dm_target *ti, struct bio *bio)/* * Get zoned device information. */ -static int dmz_get_zoned_device (struct dm_target *ti,char *path) +static int dmz_get_zoned_device (struct dm_target *ti,char *path, +struct dmz_dev *dev,int num) {struct dmz_target *dmz = ti->private;struct request_queue *q; -struct dmz_dev *dev; -sector_t aligned_capacity;int ret;/* Get the target device */ - ret =dm_get_device (ti, path,dm_table_get_mode (ti->table), &dmz->ddev); + ret =dm_get_device (ti, path,dm_table_get_mode (ti->table), + &dmz->ddev[num]);if (ret) { ti->error ="Get target device failed" ; - dmz->ddev =NULL ; + dmz->ddev[num] =NULL ;return ret; } - dev =kzalloc (sizeof (struct dmz_dev ),GFP_KERNEL ); -if (!dev) { - ret = -ENOMEM ; - goto err; - } - - dev->bdev = dmz->ddev->bdev;
drivers/md/dm-zoned-target.c static int dmz_map(struct dm_target *ti, struct bio *bio) · line 729
Quoted 10 lines
drivers/md/dm-zoned-target.c +3
-5+ dev->bdev = dmz->ddev[num]->bdev; (void )bdevname (dev->bdev, dev->name); -if (bdev_zoned_model (dev->bdev) ==BLK_ZONED_NONE ) { - ti->error ="Not a zoned block device" ; - ret = -EINVAL ; - goto err; - } +if (bdev_zoned_model (dev->bdev) ==BLK_ZONED_NONE ) + dev->flags =DMZ_BDEV_REGULAR ;
Do we want to disallow regular block dev for num == 1 (second device) ? Or we actually do not care about the order in which devices are obtained from the ctr arguments ?
Quoted 213 lines
drivers/md/dm-zoned-target.c +59
-34q =bdev_get_queue (dev->bdev); dev->capacity =i_size_read (dev->bdev->bd_inode) >>SECTOR_SHIFT ; - aligned_capacity = dev->capacity & - ~((sector_t )blk_queue_zone_sectors (q) -1 ); -if (ti->begin || - ((ti->len != dev->capacity) && (ti->len != aligned_capacity))) { - ti->error ="Partial mapping not supported" ; - ret = -EINVAL ; - goto err; +if (ti->begin) { + ti->error ="Partial mapping is not supported" ; +dm_put_device (ti, dmz->ddev[num]); + dmz->ddev[num] =NULL ; +return -EINVAL ; } - dev->zone_nr_sectors =blk_queue_zone_sectors (q); - - dev->nr_zones =blkdev_nr_zones (dev->bdev->bd_disk); - - dmz->dev = dev; - +if (num ==1 ) { + dev->zone_nr_sectors = dmz->dev[0 ].zone_nr_sectors; + dev->nr_zones = dev->capacity / dev->zone_nr_sectors; +if (dev->capacity % dev->nr_zones) + dev->nr_zones++; + }else { + dev->zone_nr_sectors =blk_queue_zone_sectors (q); + dev->nr_zones =blkdev_nr_zones (dev->bdev->bd_disk); + }return 0 ; -err: -dm_put_device (ti, dmz->ddev); -kfree (dev); - -return ret; }/* @@ -761,9 +756,12 @@ static void dmz_put_zoned_device(struct dm_target *ti) {struct dmz_target *dmz = ti->private; -dm_put_device (ti, dmz->ddev); -kfree (dmz->dev); - dmz->dev =NULL ; +if (dmz->ddev[1 ]) { +dm_put_device (ti, dmz->ddev[1 ]); + dmz->ddev[1 ] =NULL ; + } +dm_put_device (ti, dmz->ddev[0 ]); + dmz->ddev[0 ] =NULL ; }/* @@ -772,11 +770,10 @@ static void dmz_put_zoned_device(struct dm_target *ti)static int dmz_ctr (struct dm_target *ti,unsigned int argc,char **argv) {struct dmz_target *dmz; -struct dmz_dev *dev;int ret;/* Check arguments */ -if (argc !=1 ) { +if (argc <1 || argc >2 ) { ti->error ="Invalid argument count" ;return -EINVAL ; }@@ -787,18 +784,29 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv) ti->error ="Unable to allocate the zoned target descriptor" ;return -ENOMEM ; } + dmz->dev =kcalloc (2 ,sizeof (struct dmz_dev ),GFP_KERNEL ); +if (!dmz->dev) { + ti->error ="Unable to allocate the zoned device descriptors" ; +kfree (dmz); +return -ENOMEM ; + } ti->private = dmz;/* Get the target zoned block device */ - ret =dmz_get_zoned_device (ti, argv[0 ]); -if (ret) { - dmz->ddev =NULL ; + ret =dmz_get_zoned_device (ti, argv[0 ], &dmz->dev[0 ],0 ); +if (ret) goto err; + +if (argc ==2 ) { + ret =dmz_get_zoned_device (ti, argv[1 ], &dmz->dev[1 ],1 ); +if (ret) { +dmz_put_zoned_device (ti); + goto err; + } }/* Initialize metadata */ - dev = dmz->dev; - ret =dmz_ctr_metadata (dev, &dmz->metadata, + ret =dmz_ctr_metadata (dmz->dev, argc, &dmz->metadata,dm_table_device_name (ti->table));if (ret) { ti->error ="Metadata initialization failed" ;@@ -875,6 +883,7 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv) err_dev:dmz_put_zoned_device (ti); err: +kfree (dmz->dev);kfree (dmz);return ret;@@ -905,6 +914,7 @@ static void dmz_dtr(struct dm_target *ti)mutex_destroy (&dmz->chunk_lock); +kfree (dmz->dev);kfree (dmz); }@@ -979,10 +989,17 @@ static int dmz_iterate_devices(struct dm_target *ti, iterate_devices_callout_fn fn, void *data) { struct dmz_target *dmz = ti->private; -struct dmz_dev *dev = dmz->dev; -sector_t capacity = dev->capacity & ~(dmz_zone_nr_sectors (dmz->metadata) -1 ); - -return fn (ti, dmz->ddev,0 , capacity, data); +unsigned int zone_nr_sectors =dmz_zone_nr_sectors (dmz->metadata); +sector_t capacity; +int r; + + capacity = dmz->dev[0 ].capacity & ~(zone_nr_sectors -1 ); + r =fn (ti, dmz->ddev[0 ],0 , capacity, data); +if (!r && dmz->ddev[1 ]) { + capacity = dmz->dev[1 ].capacity & ~(zone_nr_sectors -1 ); + r =fn (ti, dmz->ddev[1 ],0 , capacity, data); + } +return r; } static void dmz_status(struct dm_target *ti, status_type_t type,@@ -992,6 +1009,7 @@ static void dmz_status(struct dm_target *ti, status_type_t type,struct dmz_target *dmz = ti->private;ssize_t sz =0 ;char buf[BDEVNAME_SIZE ]; +struct dmz_dev *dev;switch (type) {case STATUSTYPE_INFO :@@ -1005,8 +1023,14 @@ static void dmz_status(struct dm_target *ti, status_type_t type, dmz_nr_seq_zones(dmz->metadata));break ;case STATUSTYPE_TABLE : -format_dev_t (buf, dmz->dev->bdev->bd_dev); + dev = &dmz->dev[0 ]; +format_dev_t (buf, dev->bdev->bd_dev);DMEMIT ("%s " , buf); +if (dmz->dev[1 ].bdev) { + dev = &dmz->dev[1 ]; +format_dev_t (buf, dev->bdev->bd_dev); +DMEMIT ("%s " , buf); + }break ; }return ;@@ -1028,7 +1052,7 @@ static int dmz_message(struct dm_target *ti, unsigned int argc, char **argv,static struct target_type dmz_type = { .name ="zoned" , - .version = {1 ,1 ,0 }, + .version = {1 ,2 ,0 }, .features =DM_TARGET_SINGLETON |DM_TARGET_ZONED_HM , .module =THIS_MODULE , .ctr = dmz_ctr,drivers/md/dm-zoned.h +5
-2@@ -52,10 +52,12 @@ struct dmz_dev {struct block_device *bdev;char name[BDEVNAME_SIZE ]; +uuid_t uuid;sector_t capacity;unsigned int nr_zones; +unsigned int zone_offset;unsigned int flags;@@ -69,6 +71,7 @@ struct dmz_dev {/* Device flags. */ #define DMZ_BDEV_DYING (1 << 0)#define DMZ_CHECK_BDEV (2 << 0) +#define DMZ_BDEV_REGULAR (4 << 0)/* * Zone descriptor. @@ -163,8 +166,8 @@ struct dmz_reclaim;/* * Functions defined in dm-zoned-metadata.c */ -int dmz_ctr_metadata (struct dmz_dev *dev,struct dmz_metadata **zmd, -const char *devname); +int dmz_ctr_metadata (struct dmz_dev *dev,int num_dev, +struct dmz_metadata **zmd,const char *devname);void dmz_dtr_metadata (struct dmz_metadata *zmd);int dmz_resume_metadata (struct dmz_metadata *zmd);
Signature · 2 lines
Damien Le Moal Western Digital Research
Quoted 113 lines · Damien Le Moal
Quoted 112 lines · Hannes Reinecke
Implement handling for metadata version 2. The new metadata adds a label and UUID for the device mapper device, and additional UUID for the underlying block devices.
It also allows for an additional regular drive to be used for emulating random access zones. The emulated zones will be placed logically in front of the zones from the zoned block device, causing the superblocks and metadata to be stored on that device. The first zone of the original zoned device will be used to hold another, tertiary copy of the metadata. This copy carries a generation number of 0 and is never updated; it's just used for identification.
The zones are spaced equidistant, which means that any eventual runt zones will be counted, too. They are marked as 'offline' and ignored when selecting zones.Signed-off-by Hannes Reinecke <[email protected]>--- drivers/md/dm-zoned-metadata.c | 269 +++++++++++++++++++++++++++------ drivers/md/dm-zoned-target.c | 128 +++++++++------- drivers/md/dm-zoned.h | 7 +- 3 files changed, 304 insertions(+), 100 deletions(-)drivers/md/dm-zoned-metadata.c +29
-8@@ -16,7 +16,7 @@/* * Metadata version. */ -#define DMZ_META_VER 1 +#define DMZ_META_VER 2/* * On-disk super block magic. @@ -69,8 +69,17 @@ struct dmz_super {/* Checksum */ __le32 crc;/* 48 */ +/* DM-Zoned label */ +u8 dmz_label[32 ];/* 80 */ + +/* DM-Zoned UUID */ +u8 dmz_uuid[16 ];/* 96 */ + +/* Device UUID */ +u8 dev_uuid[16 ];/* 112 */ +/* Padding to full 512B sector */ -u8 reserved[464 ];/* 512 */ +u8 reserved[400 ];/* 512 */ };/* @@ -135,6 +144,8 @@ struct dmz_metadata {struct dmz_dev *dev;char devname[BDEVNAME_SIZE ]; +char label[BDEVNAME_SIZE ]; +uuid_t uuid;sector_t zone_bitmap_size;unsigned int zone_nr_bitmap_blocks;@@ -161,8 +172,9 @@ struct dmz_metadata {/* Zone information array */ struct dm_zone *zones; -struct dmz_sb sb[2 ]; +struct dmz_sb sb[3 ];unsigned int mblk_primary; +unsigned int sb_version;u64 sb_gen;unsigned int min_nr_mblks;unsigned int max_nr_mblks;@@ -195,16 +207,16 @@ struct dmz_metadata { }; #define dmz_zmd_info(zmd, format, args...) \ - DMINFO("(%s): " format, (zmd)->devname, ## args) + DMINFO("(%s): " format, (zmd)->label, ## args) #define dmz_zmd_err(zmd, format, args...) \ - DMERR("(%s): " format, (zmd)->devname, ## args) + DMERR("(%s): " format, (zmd)->label, ## args) #define dmz_zmd_warn(zmd, format, args...) \ - DMWARN("(%s): " format, (zmd)->devname, ## args) + DMWARN("(%s): " format, (zmd)->label, ## args) #define dmz_zmd_debug(zmd, format, args...) \ - DMDEBUG("(%s): " format, (zmd)->devname, ## args) + DMDEBUG("(%s): " format, (zmd)->label, ## args)/* * Various accessors */ @@ -215,16 +227,41 @@ unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone)sector_t dmz_start_sect (struct dmz_metadata *zmd,struct dm_zone *zone) { -return (sector_t )dmz_id (zmd, zone) << zmd->zone_nr_sectors_shift; +unsigned int zone_id; + +if (WARN_ON (!zone)) +return 0 ; + + zone_id = zone->id; +if (zmd->dev[0 ].zone_offset && + (zone_id >= zmd->dev[0 ].zone_offset)) + zone_id -= zmd->dev[0 ].zone_offset; +return (sector_t )zone_id << zmd->zone_nr_sectors_shift; }
Quoted 17 lines
drivers/md/dm-zoned-metadata.c unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone) · line 253
Quoted 13 lines
drivers/md/dm-zoned-metadata.c +10
-1sector_t dmz_start_block (struct dmz_metadata *zmd,struct dm_zone *zone) { -return (sector_t )dmz_id (zmd, zone) << zmd->zone_nr_blocks_shift; +unsigned int zone_id; + +if (WARN_ON (!zone)) +return 0 ; + + zone_id = zone->id; +if (zmd->dev[0 ].zone_offset && + (zone_id >= zmd->dev[0 ].zone_offset)) + zone_id -= zmd->dev[0 ].zone_offset; +return (sector_t )zone_id << zmd->zone_nr_blocks_shift;The
zone_idcalculation is repeated. May be add a simple helperdmz_dev_zone_id()for it ?
Ok.
Quoted 14 lines
drivers/md/dm-zoned-metadata.c unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone) · line 263
Quoted 10 lines
drivers/md/dm-zoned-metadata.c +6
-0}struct dmz_dev *dmz_zone_to_dev (struct dmz_metadata *zmd,struct dm_zone *zone) { +if (WARN_ON (!zone)) +return &zmd->dev[0 ]; + +if (zmd->dev[0 ].zone_offset && + zone->id < zmd->dev[0 ].zone_offset) +return &zmd->dev[1 ];Isn't that return &zmd->dev[0]; ? if
zone->id< zmd->dev[0].zone_offset then you are within the first dev, no ?
Yes, but the first device is the second :-)
Remember, dev[0] is the zoned device, and dev[1] is the regular device. But dev[1] is arranged in front of dev[0] :-)
Quoted 5 lines
drivers/md/dm-zoned-metadata.c unsigned int dmz_id(struct dmz_metadata *zmd, struct dm_zone *zone) · line 265
Quoted 2 lines
drivers/md/dm-zoned-metadata.c +1
-0+return &zmd->dev[0 ];And this would be return &zmd->dev[1];
No. See above.
We could possibly make it position independent (ie that the order of devices wouldn't matter), but it took me long enough on decide on remotely sane layout (and get it to work ...) so that I didn't attempt it. Hence, for now, dev[0] is the zoned device, dev[1] is the regular device, dev[0] has an offset to the zones making the zones from dev[0] to be arranged after the emulated zones from dev[1].
Quoted 104 lines
Quoted 104 lines
drivers/md/dm-zoned-metadata.c +43
-10}@@ -280,7 +317,7 @@ unsigned int dmz_nr_unmap_seq_zones(struct dmz_metadata *zmd)const char *dmz_metadata_label (struct dmz_metadata *zmd) { -return (const char *)zmd->devname; +return (const char *)zmd->label; }bool dmz_check_dev (struct dmz_metadata *zmd)@@ -687,6 +724,9 @@ static int dmz_rdwr_block(struct dmz_dev *dev, int op,struct bio *bio;int ret; +if (WARN_ON (!dev)) +return -EIO ; +if (dmz_bdev_is_dying (dev))return -EIO ;@@ -711,7 +751,8 @@ static int dmz_rdwr_block(struct dmz_dev *dev, int op,*/ static int dmz_write_sb (struct dmz_metadata *zmd,unsigned int set) { -sector_t block = zmd->sb[set].block; +unsigned int sb_zid =dmz_id (zmd, zmd->sb[set].zone); +sector_t sb_block = sb_zid << zmd->zone_nr_blocks_shift;struct dmz_mblock *mblk = zmd->sb[set].mblk;struct dmz_super *sb = zmd->sb[set].sb;struct dmz_dev *dev = zmd->sb[set].dev;@@ -719,11 +760,17 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set)int ret; sb->magic =cpu_to_le32 (DMZ_MAGIC ); - sb->version =cpu_to_le32 (DMZ_META_VER ); + + sb->version =cpu_to_le32 (zmd->sb_version); +if (zmd->sb_version >1 ) { +uuid_copy ((uuid_t *)sb->dmz_uuid, &zmd->uuid); +memcpy (sb->dmz_label, zmd->label,BDEVNAME_SIZE ); +uuid_copy ((uuid_t *)sb->dev_uuid, &dev->uuid); + } sb->gen =cpu_to_le64 (sb_gen); - sb->sb_block =cpu_to_le64 (block); + sb->sb_block =cpu_to_le64 (sb_block); sb->nr_meta_blocks =cpu_to_le32 (zmd->nr_meta_blocks); sb->nr_reserved_seq =cpu_to_le32 (zmd->nr_reserved_seq); sb->nr_chunks =cpu_to_le32 (zmd->nr_chunks);@@ -734,7 +781,8 @@ static int dmz_write_sb(struct dmz_metadata *zmd, unsigned int set) sb->crc =0 ; sb->crc =cpu_to_le32 (crc32_le (sb_gen, (unsigned char *)sb,DMZ_BLOCK_SIZE )); - ret =dmz_rdwr_block (dev,REQ_OP_WRITE , block, mblk->page); + ret =dmz_rdwr_block (dev,REQ_OP_WRITE , zmd->sb[set].block, + mblk->page);if (ret ==0 ) ret =blkdev_issue_flush (dev->bdev,GFP_NOIO ,NULL );@@ -915,6 +963,23 @@ static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set)u32 crc, stored_crc;u64 gen; +if (le32_to_cpu (sb->magic) !=DMZ_MAGIC ) { +dmz_dev_err (dev,"Invalid meta magic (needed 0x%08x, got 0x%08x)" , +DMZ_MAGIC ,le32_to_cpu (sb->magic)); +return -ENXIO ; + } + + zmd->sb_version =le32_to_cpu (sb->version); +if (zmd->sb_version >DMZ_META_VER ) { +dmz_dev_err (dev,"Invalid meta version (needed %d, got %d)" , +DMZ_META_VER , zmd->sb_version); +return -EINVAL ; + } +if ((zmd->sb_version <1 ) && (set ==2 )) { +dmz_dev_err (dev,"Tertiary superblocks are not supported" ); +return -EINVAL ; + } + gen =le64_to_cpu (sb->gen); stored_crc =le32_to_cpu (sb->crc); sb->crc =0 ;@@ -925,18 +990,41 @@ static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set)return -ENXIO ; } -if (le32_to_cpu (sb->magic) !=DMZ_MAGIC ) { -dmz_dev_err (dev,"Invalid meta magic (needed 0x%08x, got 0x%08x)" , -DMZ_MAGIC ,le32_to_cpu (sb->magic)); -return -ENXIO ; - } +if (zmd->sb_version >1 ) { +if (uuid_is_null ((uuid_t *)sb->dmz_uuid)) { +dmz_dev_err (dev,"sb%d: NULL DM-Zoned uuid" , set); +return -ENXIO ; + }else if (uuid_is_null (&zmd->uuid)) { +uuid_copy (&zmd->uuid, (uuid_t *)sb->dmz_uuid); + }else if (!uuid_equal (&zmd->uuid, (uuid_t *)sb->dmz_uuid)) { +dmz_dev_err (dev,"sb%d: mismatching DM-Zoned uuid, " +"is %pUl expected %pUl" , set, + (uuid_t *)sb->dmz_uuid, &zmd->uuid);
Quoted 9 lines
drivers/md/dm-zoned-metadata.c static int dmz_check_sb(struct dmz_metadata *zmd, unsigned int set) · line 1006
Quoted 4 lines
drivers/md/dm-zoned-metadata.c +4
-0+return -ENXIO ; + } +if (!strlen (zmd->label)) +memcpy (zmd->label, sb->dmz_label,BDEVNAME_SIZE );We should probably ensure that label is always 0 terminated here. If the metadata label uses all
BDEVNAME_SIZEcharacters,zmd->labelwill too since it is aBDEVNAME_SIZElong string. Make itBDEVNAME_SIZE+ 1 long ?
I would rely on the the general usage here. BDEVNAME is a global variable, used in several places. So I guess everyone will have the same issue. But I'll check what the general use pattern here is.
Quoted 146 lines
Quoted 146 lines
drivers/md/dm-zoned-metadata.c +79
-13+else if (memcmp (zmd->label, sb->dmz_label,BDEVNAME_SIZE )) { +dmz_dev_err (dev,"sb%d: mismatching DM-Zoned label, " +"is %s expected %s" , + set, sb->dmz_label, zmd->label); +return -ENXIO ; + } +if (uuid_is_null ((uuid_t *)sb->dev_uuid)) { +dmz_dev_err (dev,"sb%d: NULL device uuid" , set); +return -ENXIO ; + } +uuid_copy (&dev->uuid, (uuid_t *)sb->dev_uuid); -if (le32_to_cpu (sb->version) !=DMZ_META_VER ) { -dmz_dev_err (dev,"Invalid meta version (needed %d, got %d)" , -DMZ_META_VER ,le32_to_cpu (sb->version)); -return -ENXIO ; +if (set ==2 ) { +if (gen !=0 ) { +dmz_dev_err (dev,"sb%d: Invalid generation %llu" , + set, gen); +return -ENXIO ; + } +return 0 ; + } } - nr_meta_zones = (le32_to_cpu (sb->nr_meta_blocks) + zmd->zone_nr_blocks -1 ) >> zmd->zone_nr_blocks_shift; if (!nr_meta_zones ||@@ -1185,21 +1273,37 @@ static int dmz_load_sb(struct dmz_metadata *zmd)"Using super block %u (gen %llu)" , zmd->mblk_primary, zmd->sb_gen); +if ((zmd->sb_version >1 ) && zmd->sb[2 ].zone) { + zmd->sb[2 ].block =dmz_start_block (zmd, zmd->sb[2 ].zone); + zmd->sb[2 ].dev =dmz_zone_to_dev (zmd, zmd->sb[2 ].zone); + ret =dmz_get_sb (zmd,2 ); +if (ret) { +dmz_dev_err (zmd->sb[2 ].dev, +"Read tertiary super block failed" ); +return ret; + } + ret =dmz_check_sb (zmd,2 ); +if (ret == -EINVAL ) +return ret; + }return 0 ; }/* * Initialize a zone descriptor. */ -static int dmz_init_zone (struct blk_zone *blkz,unsigned int idx,void *data) +static int dmz_init_zone (struct blk_zone *blkz,unsigned int num,void *data) {struct dmz_metadata *zmd = data; +int idx = num + zmd->dev[0 ].zone_offset;struct dm_zone *zone = &zmd->zones[idx]; -struct dmz_dev *dev = zmd->dev; -/* Ignore the eventual last runt (smaller) zone */ if (blkz->len != zmd->zone_nr_sectors) { -if (blkz->start + blkz->len == dev->capacity) +if (zmd->sb_version >1 ) { +/* Ignore the eventual runt (smaller) zone */ +set_bit (DMZ_OFFLINE , &zone->flags); +return 0 ; + }else if (blkz->start + blkz->len == dev->capacity)return 0 ;return -ENXIO ; }@@ -1235,10 +1339,14 @@ static int dmz_init_zone(struct blk_zone *blkz, unsigned int idx, void *data)if (dmz_is_rnd (zone)) { zmd->nr_rnd_zones++;if (!zmd->sb[0 ].zone) { -/* Super block zone */ +/* Primary super block zone */ zmd->sb[0 ].zone = zone; } } +if (zmd->dev[1 ].bdev && !zmd->sb[2 ].zone) { +/* Tertiary superblock zone */ + zmd->sb[2 ].zone = zone; + } }return 0 ;@@ -1259,11 +1367,10 @@ static void dmz_drop_zones(struct dmz_metadata *zmd)*/ static int dmz_init_zones (struct dmz_metadata *zmd) { -struct dmz_dev *dev = &zmd->dev[0 ];int ret;/* Init */ - zmd->zone_nr_sectors = dev->zone_nr_sectors; + zmd->zone_nr_sectors = zmd->dev[0 ].zone_nr_sectors; zmd->zone_nr_sectors_shift =ilog2 (zmd->zone_nr_sectors); zmd->zone_nr_blocks =dmz_sect2blk (zmd->zone_nr_sectors); zmd->zone_nr_blocks_shift =ilog2 (zmd->zone_nr_blocks);@@ -1274,7 +1381,14 @@ static int dmz_init_zones(struct dmz_metadata *zmd) DMZ_BLOCK_SIZE_BITS);/* Allocate zone array */ - zmd->nr_zones = dev->nr_zones; + zmd->nr_zones = zmd->dev[0 ].nr_zones; +if (zmd->dev[1 ].bdev) + zmd->nr_zones += zmd->dev[1 ].nr_zones; + +if (!zmd->nr_zones) { +DMERR ("(%s): No zones found" , zmd->devname); +return -ENXIO ; + } zmd->zones =kcalloc (zmd->nr_zones,sizeof (struct dm_zone ),GFP_KERNEL );if (!zmd->zones)return -ENOMEM ;@@ -1282,13 +1396,43 @@ static int dmz_init_zones(struct dmz_metadata *zmd)DMINFO ("(%s): Using %zu B for zone information" , zmd->devname,sizeof (struct dm_zone ) * zmd->nr_zones); +if (zmd->dev[1 ].bdev) { +int idx; +sector_t zone_offset =0 ; + +for (idx =0 ; idx < zmd->dev[1 ].nr_zones; idx++) { +struct dm_zone *zone = &zmd->zones[idx]; + +INIT_LIST_HEAD (&zone->link); +atomic_set (&zone->refcount,0 ); + zone->id = idx; + zone->chunk =DMZ_MAP_UNMAPPED ; +set_bit (DMZ_RND , &zone->flags); + zone->wp_block =0 ; + zmd->nr_rnd_zones++; + zmd->nr_useable_zones++; +if (zmd->dev[1 ].capacity - zone_offset < + zmd->zone_nr_sectors) { +/* Disable runt zone */ +set_bit (DMZ_OFFLINE , &zone->flags); +break ; + } + zone_offset += zmd->zone_nr_sectors; +if (!zmd->sb[0 ].zone) { +/* Primary superblock zone */ + zmd->sb[0 ].zone = zone; + }
Quoted 9 lines
drivers/md/dm-zoned-metadata.c static int dmz_init_zones(struct dmz_metadata *zmd) · line 1426
Quoted 2 lines
drivers/md/dm-zoned-metadata.c +2
-0+ } + zmd->dev[0 ].zone_offset = zmd->dev[1 ].nr_zones;This is assuming that dev[1] always is a regular device. What if this is a zoned device ? E.g. do we want to prevent the case: zoned device with rnd zoned + zoned device with no rnd zones ? I do not think it is an interesting use case, but I do not see any reason for preventing it either as I do not think this will change anything to the code beside the init zones. Thoughts ?
It might work if the zoned device doesn't contain any random write zones. The current model assumes that the metadata zones are located at the (logical) start of the zones, and the bitmap covers all zones after the metadata. For V2 I had to make some sleigh of hand here for runt zones and the tertiary metadata zone; they are marked specifically (as offline or metadata zone, respectively) so that dmz_alloc_zone() will ignore them when selecting a new zone from the bitmap. But the important bit is that the random and sequential write zones are assumed to be consecutive; any device compound which can be arranged like that should work.
Which is why I checked for !zoned here; all zoned devices I've seen so far _do_ have random write zones at the start, so the chunk allocator wouldn't readily work with them and I didn't want to go into details figuring out which zoned devices match and which don't.
Plus this really would be more like a RAID0 compound, which raises the question if it shouldn't better be handled by RAID0 directly ...
Quoted 125 lines
Quoted 125 lines
drivers/md/dm-zoned-metadata.c +49
-14+ } +/* * Get zone information and initialize zone descriptors. At the same * time, determine where the super block should be: first block of the * first randomly writable zone. */ - ret =blkdev_report_zones (dev->bdev,0 ,BLK_ALL_ZONES , dmz_init_zone, - zmd); + ret =blkdev_report_zones (zmd->dev[0 ].bdev,0 ,BLK_ALL_ZONES , + dmz_init_zone, zmd);if (ret <0 ) {dmz_drop_zones (zmd);return ret;@@ -1325,6 +1469,9 @@ static int dmz_update_zone(struct dmz_metadata *zmd, struct dm_zone *zone)unsigned int noio_flag;int ret; +if (dev->flags &DMZ_BDEV_REGULAR ) +return 0 ; +/* * Get zone information from disk. Since blkdev_report_zones() uses * GFP_KERNEL by default for memory allocations, set the per-task @@ -1741,7 +1888,8 @@ struct dm_zone *dmz_get_chunk_mapping(struct dmz_metadata *zmd, unsigned int chu/* Allocate a random zone */ dzone =dmz_alloc_zone (zmd,DMZ_ALLOC_RND );if (!dzone) { -if (dmz_bdev_is_dying (zmd->dev)) { +if (dmz_bdev_is_dying (&zmd->dev[0 ]) || +dmz_bdev_is_dying (&zmd->dev[1 ])) { dzone =ERR_PTR (-EIO ); goto out; }@@ -1842,7 +1990,8 @@ struct dm_zone *dmz_get_chunk_buffer(struct dmz_metadata *zmd,/* Allocate a random zone */ bzone =dmz_alloc_zone (zmd,DMZ_ALLOC_RND );if (!bzone) { -if (dmz_bdev_is_dying (zmd->dev)) { +if (dmz_bdev_is_dying (&zmd->dev[0 ]) || +dmz_bdev_is_dying (&zmd->dev[1 ])) { bzone =ERR_PTR (-EIO ); goto out; }@@ -2480,18 +2629,34 @@ void dmz_print_dev(struct dmz_metadata *zmd, int num) {struct dmz_dev *dev = &zmd->dev[num]; -dmz_dev_info (dev,"Host-%s zoned block device" , -bdev_zoned_model (dev->bdev) ==BLK_ZONED_HA ? -"aware" :"managed" ); -dmz_dev_info (dev," %llu 512-byte logical sectors" , - (u64 )dev->capacity); -dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , - dev->nr_zones, (u64 )zmd->zone_nr_sectors); +if (bdev_zoned_model (dev->bdev) ==BLK_ZONED_NONE ) +dmz_dev_info (dev,"Regular block device" ); +else +dmz_dev_info (dev,"Host-%s zoned block device" , +bdev_zoned_model (dev->bdev) ==BLK_ZONED_HA ? +"aware" :"managed" ); +if (zmd->sb_version >1 ) { +sector_t sector_offset = + dev->zone_offset << zmd->zone_nr_sectors_shift; + +dmz_dev_info (dev," uuid %pUl" , &dev->uuid); +dmz_dev_info (dev," %llu 512-byte logical sectors (offset %llu)" , + (u64 )dev->capacity, (u64 )sector_offset); +dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors (offset %llu)" , + dev->nr_zones, (u64 )zmd->zone_nr_sectors, + (u64 )dev->zone_offset); + }else { +dmz_dev_info (dev," %llu 512-byte logical sectors" , + (u64 )dev->capacity); +dmz_dev_info (dev," %u zones of %llu 512-byte logical sectors" , + dev->nr_zones, (u64 )zmd->zone_nr_sectors); + } }/* * Initialize the zoned metadata. */ -int dmz_ctr_metadata (struct dmz_dev *dev,struct dmz_metadata **metadata, +int dmz_ctr_metadata (struct dmz_dev *dev,int num_dev, +struct dmz_metadata **metadata,const char *devname) {struct dmz_metadata *zmd;@@ -2544,7 +2709,13 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata, goto err;set_bit (DMZ_META , &zone->flags); } - +if (zmd->sb[2 ].zone) { + zid =dmz_id (zmd, zmd->sb[2 ].zone); + zone =dmz_get (zmd, zid); +if (!zone) + goto err; +set_bit (DMZ_META , &zone->flags); + }/* Load mapping table */ ret =dmz_load_mapping (zmd);if (ret)@@ -2569,8 +2740,14 @@ int dmz_ctr_metadata(struct dmz_dev *dev, struct dmz_metadata **metadata, goto err; } -dmz_zmd_info (zmd,"DM-Zoned metadata version %d" ,DMZ_META_VER ); +dmz_zmd_info (zmd,"DM-Zoned metadata version %d" , zmd->sb_version); +if (zmd->sb_version >1 ) { +dmz_zmd_info (zmd,"DM UUID %pUl" , &zmd->uuid); +dmz_zmd_info (zmd,"DM Label %s" , zmd->label); + }dmz_print_dev (zmd,0 ); +if (zmd->dev[1 ].bdev) +dmz_print_dev (zmd,1 );dmz_zmd_info (zmd," %u zones of %llu 512-byte logical sectors" , zmd->nr_zones, (u64 )zmd->zone_nr_sectors);drivers/md/dm-zoned-target.c +0
-0@@ -38,7 +38,7 @@ struct dm_chunk_work {* Target descriptor. */
Quoted 9 lines
drivers/md/dm-zoned-target.c struct dm_chunk_work { · line 41
Quoted 3 lines
drivers/md/dm-zoned-target.c +1
-1struct dmz_target { -struct dm_dev *ddev; +struct dm_dev *ddev[2 ];Form the code above, ddev[1] is the regular device and ddev[0] the zoned device. I would really prefer to have that reversed as the ddev array index would increase together with target sector/zone id instead of being reversed. That would be far less confusing I think.
This was done so to keep compability with the original version, which had the zoned device as the first argument.
But I'll see how large the code churn would be when re-arranging the devices.
Quoted 67 lines
Quoted 67 lines
drivers/md/dm-zoned-target.c +14
-12unsigned long flags;@@ -223,6 +223,9 @@ static int dmz_handle_read(struct dmz_target *dmz, struct dmz_dev *dev, }if (nr_blocks) { +if (rzone != zone) + dev =dmz_zone_to_dev (zmd, rzone); +/* Valid blocks found: read them */ nr_blocks = min_t(unsigned int, nr_blocks, end_block - chunk_block); ret = dmz_submit_bio(dmz, dev, rzone, bio,@@ -298,6 +301,7 @@ static int dmz_handle_buffered_write(struct dmz_target *dmz,return -EROFS ;/* Submit write */ + dev =dmz_zone_to_dev (zmd, bzone); ret =dmz_submit_bio (dmz, dev, bzone, bio, chunk_block, nr_blocks);if (ret)return ret;@@ -591,6 +595,10 @@ static int dmz_queue_chunk_work(struct dmz_target *dmz, struct bio *bio)*/ bool dmz_bdev_is_dying (struct dmz_dev *dmz_dev) { +/* Device not configured, no error */ +if (!dmz_dev->bdev) +return false; +if (dmz_dev->flags &DMZ_BDEV_DYING )return true;@@ -698,60 +706,47 @@ static int dmz_map(struct dm_target *ti, struct bio *bio)/* * Get zoned device information. */ -static int dmz_get_zoned_device (struct dm_target *ti,char *path) +static int dmz_get_zoned_device (struct dm_target *ti,char *path, +struct dmz_dev *dev,int num) {struct dmz_target *dmz = ti->private;struct request_queue *q; -struct dmz_dev *dev; -sector_t aligned_capacity;int ret;/* Get the target device */ - ret =dm_get_device (ti, path,dm_table_get_mode (ti->table), &dmz->ddev); + ret =dm_get_device (ti, path,dm_table_get_mode (ti->table), + &dmz->ddev[num]);if (ret) { ti->error ="Get target device failed" ; - dmz->ddev =NULL ; + dmz->ddev[num] =NULL ;return ret; } - dev =kzalloc (sizeof (struct dmz_dev ),GFP_KERNEL ); -if (!dev) { - ret = -ENOMEM ; - goto err; - } - - dev->bdev = dmz->ddev->bdev; + dev->bdev = dmz->ddev[num]->bdev; (void )bdevname (dev->bdev, dev->name);
Quoted 12 lines
drivers/md/dm-zoned-target.c static int dmz_map(struct dm_target *ti, struct bio *bio) · line 729
Quoted 7 lines
drivers/md/dm-zoned-target.c +2
-5-if (bdev_zoned_model (dev->bdev) ==BLK_ZONED_NONE ) { - ti->error ="Not a zoned block device" ; - ret = -EINVAL ; - goto err; - } +if (bdev_zoned_model (dev->bdev) ==BLK_ZONED_NONE ) + dev->flags =DMZ_BDEV_REGULAR ;Do we want to disallow regular block dev for num == 1 (second device) ? Or we actually do not care about the order in which devices are obtained from the ctr arguments ?
For now, we do.
I'll need to do a code audit to ensure we can handle an arbitrary order of devices.
But possibly with a next patchset; took me long enough to get this one figured out :-(
Thanks for your review!
Cheers,
Hannes
Signature · 10 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel