From: Damien Le Moal <damien.lemoal@wdc.com> To: linux-block@vger.kernel.org, Jens Axboe <axboe@kernel.dk> Cc: linux-scsi@vger.kernel.org, "Martin K . Petersen" <martin.petersen@oracle.com>, linux-nvme@lists.infradead.org, Christoph Hellwig <hch@lst.de>, Keith Busch <keith.busch@wdc.com>, Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> Subject: [PATCH v4 7/8] block: introduce blk_queue_clear_zone_settings() Date: Thu, 28 Jan 2021 13:47:32 +0900 [thread overview] Message-ID: <20210128044733.503606-8-damien.lemoal@wdc.com> (raw) In-Reply-To: <20210128044733.503606-1-damien.lemoal@wdc.com> Introduce the internal function blk_queue_clear_zone_settings() to cleanup all limits and resources related to zoned block devices. This new function is called from blk_queue_set_zoned() when a disk zoned model is set to BLK_ZONED_NONE. This particular case can happens when a partition is created on a host-aware scsi disk. Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com> --- block/blk-settings.c | 2 ++ block/blk-zoned.c | 17 +++++++++++++++++ block/blk.h | 2 ++ 3 files changed, 21 insertions(+) diff --git a/block/blk-settings.c b/block/blk-settings.c index a1e66165adcf..7dd8be314ac6 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -910,6 +910,8 @@ void blk_queue_set_zoned(struct gendisk *disk, enum blk_zoned_model model) */ blk_queue_zone_write_granularity(q, queue_logical_block_size(q)); + } else { + blk_queue_clear_zone_settings(q); } } EXPORT_SYMBOL_GPL(blk_queue_set_zoned); diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 7a68b6e4300c..833978c02e60 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -549,3 +549,20 @@ int blk_revalidate_disk_zones(struct gendisk *disk, return ret; } EXPORT_SYMBOL_GPL(blk_revalidate_disk_zones); + +void blk_queue_clear_zone_settings(struct request_queue *q) +{ + blk_mq_freeze_queue(q); + + blk_queue_free_zone_bitmaps(q); + blk_queue_flag_clear(QUEUE_FLAG_ZONE_RESETALL, q); + q->required_elevator_features &= ~ELEVATOR_F_ZBD_SEQ_WRITE; + q->nr_zones = 0; + q->max_open_zones = 0; + q->max_active_zones = 0; + q->limits.chunk_sectors = 0; + q->limits.zone_write_granularity = 0; + q->limits.max_zone_append_sectors = 0; + + blk_mq_unfreeze_queue(q); +} diff --git a/block/blk.h b/block/blk.h index 0198335c5838..977d79a0d99a 100644 --- a/block/blk.h +++ b/block/blk.h @@ -333,8 +333,10 @@ struct bio *blk_next_bio(struct bio *bio, unsigned int nr_pages, gfp_t gfp); #ifdef CONFIG_BLK_DEV_ZONED void blk_queue_free_zone_bitmaps(struct request_queue *q); +void blk_queue_clear_zone_settings(struct request_queue *q); #else static inline void blk_queue_free_zone_bitmaps(struct request_queue *q) {} +static inline void blk_queue_clear_zone_settings(struct request_queue *q) {} #endif int blk_alloc_devt(struct block_device *part, dev_t *devt); -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Damien Le Moal <damien.lemoal@wdc.com> To: linux-block@vger.kernel.org, Jens Axboe <axboe@kernel.dk> Cc: Keith Busch <keith.busch@wdc.com>, Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org, "Martin K . Petersen" <martin.petersen@oracle.com>, Christoph Hellwig <hch@lst.de> Subject: [PATCH v4 7/8] block: introduce blk_queue_clear_zone_settings() Date: Thu, 28 Jan 2021 13:47:32 +0900 [thread overview] Message-ID: <20210128044733.503606-8-damien.lemoal@wdc.com> (raw) In-Reply-To: <20210128044733.503606-1-damien.lemoal@wdc.com> Introduce the internal function blk_queue_clear_zone_settings() to cleanup all limits and resources related to zoned block devices. This new function is called from blk_queue_set_zoned() when a disk zoned model is set to BLK_ZONED_NONE. This particular case can happens when a partition is created on a host-aware scsi disk. Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com> --- block/blk-settings.c | 2 ++ block/blk-zoned.c | 17 +++++++++++++++++ block/blk.h | 2 ++ 3 files changed, 21 insertions(+) diff --git a/block/blk-settings.c b/block/blk-settings.c index a1e66165adcf..7dd8be314ac6 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -910,6 +910,8 @@ void blk_queue_set_zoned(struct gendisk *disk, enum blk_zoned_model model) */ blk_queue_zone_write_granularity(q, queue_logical_block_size(q)); + } else { + blk_queue_clear_zone_settings(q); } } EXPORT_SYMBOL_GPL(blk_queue_set_zoned); diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 7a68b6e4300c..833978c02e60 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -549,3 +549,20 @@ int blk_revalidate_disk_zones(struct gendisk *disk, return ret; } EXPORT_SYMBOL_GPL(blk_revalidate_disk_zones); + +void blk_queue_clear_zone_settings(struct request_queue *q) +{ + blk_mq_freeze_queue(q); + + blk_queue_free_zone_bitmaps(q); + blk_queue_flag_clear(QUEUE_FLAG_ZONE_RESETALL, q); + q->required_elevator_features &= ~ELEVATOR_F_ZBD_SEQ_WRITE; + q->nr_zones = 0; + q->max_open_zones = 0; + q->max_active_zones = 0; + q->limits.chunk_sectors = 0; + q->limits.zone_write_granularity = 0; + q->limits.max_zone_append_sectors = 0; + + blk_mq_unfreeze_queue(q); +} diff --git a/block/blk.h b/block/blk.h index 0198335c5838..977d79a0d99a 100644 --- a/block/blk.h +++ b/block/blk.h @@ -333,8 +333,10 @@ struct bio *blk_next_bio(struct bio *bio, unsigned int nr_pages, gfp_t gfp); #ifdef CONFIG_BLK_DEV_ZONED void blk_queue_free_zone_bitmaps(struct request_queue *q); +void blk_queue_clear_zone_settings(struct request_queue *q); #else static inline void blk_queue_free_zone_bitmaps(struct request_queue *q) {} +static inline void blk_queue_clear_zone_settings(struct request_queue *q) {} #endif int blk_alloc_devt(struct block_device *part, dev_t *devt); -- 2.29.2 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-01-28 4:51 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-28 4:47 [PATCH v4 0/8] block: add zone write granularity limit Damien Le Moal 2021-01-28 4:47 ` Damien Le Moal 2021-01-28 4:47 ` [PATCH v4 1/8] block: document zone_append_max_bytes attribute Damien Le Moal 2021-01-28 4:47 ` Damien Le Moal 2021-01-28 10:20 ` Johannes Thumshirn 2021-01-28 10:20 ` Johannes Thumshirn 2021-01-28 4:47 ` [PATCH v4 2/8] nvme: cleanup zone information initialization Damien Le Moal 2021-01-28 4:47 ` Damien Le Moal 2021-01-28 9:17 ` Christoph Hellwig 2021-01-28 9:17 ` Christoph Hellwig 2021-01-28 9:27 ` Damien Le Moal 2021-01-28 9:27 ` Damien Le Moal 2021-01-28 9:32 ` Christoph Hellwig 2021-01-28 9:32 ` Christoph Hellwig 2021-01-28 4:47 ` [PATCH v4 3/8] nullb: use blk_queue_set_zoned() to setup zoned devices Damien Le Moal 2021-01-28 4:47 ` Damien Le Moal 2021-01-28 5:12 ` Chaitanya Kulkarni 2021-01-28 5:12 ` Chaitanya Kulkarni 2021-01-28 9:17 ` Christoph Hellwig 2021-01-28 9:17 ` Christoph Hellwig 2021-01-28 11:17 ` Johannes Thumshirn 2021-01-28 11:17 ` Johannes Thumshirn 2021-01-28 4:47 ` [PATCH v4 4/8] block: use blk_queue_set_zoned in add_partition() Damien Le Moal 2021-01-28 4:47 ` Damien Le Moal 2021-01-28 5:16 ` Chaitanya Kulkarni 2021-01-28 5:16 ` Chaitanya Kulkarni 2021-01-28 9:17 ` Christoph Hellwig 2021-01-28 9:17 ` Christoph Hellwig 2021-01-28 11:28 ` Johannes Thumshirn 2021-01-28 11:28 ` Johannes Thumshirn 2021-01-28 4:47 ` [PATCH v4 5/8] block: introduce zone_write_granularity limit Damien Le Moal 2021-01-28 4:47 ` Damien Le Moal 2021-01-28 9:19 ` Christoph Hellwig 2021-01-28 9:19 ` Christoph Hellwig 2021-01-28 11:32 ` Johannes Thumshirn 2021-01-28 11:32 ` Johannes Thumshirn 2021-02-05 2:54 ` Martin K. Petersen 2021-02-05 2:54 ` Martin K. Petersen 2021-01-28 4:47 ` [PATCH v4 6/8] zonefs: use zone write granularity as block size Damien Le Moal 2021-01-28 4:47 ` Damien Le Moal 2021-01-28 5:17 ` Chaitanya Kulkarni 2021-01-28 5:17 ` Chaitanya Kulkarni 2021-01-28 11:33 ` Johannes Thumshirn 2021-01-28 11:33 ` Johannes Thumshirn 2021-01-28 4:47 ` Damien Le Moal [this message] 2021-01-28 4:47 ` [PATCH v4 7/8] block: introduce blk_queue_clear_zone_settings() Damien Le Moal 2021-01-28 5:26 ` Chaitanya Kulkarni 2021-01-28 5:26 ` Chaitanya Kulkarni 2021-01-28 9:21 ` Christoph Hellwig 2021-01-28 9:21 ` Christoph Hellwig 2021-01-28 9:32 ` Damien Le Moal 2021-01-28 9:32 ` Damien Le Moal 2021-01-28 9:33 ` Christoph Hellwig 2021-01-28 9:33 ` Christoph Hellwig 2021-01-28 11:43 ` Johannes Thumshirn 2021-01-28 11:43 ` Johannes Thumshirn 2021-01-28 4:47 ` [PATCH v4 8/8] sd_zbc: clear zone resources for non-zoned case Damien Le Moal 2021-01-28 4:47 ` Damien Le Moal 2021-01-28 5:38 ` Chaitanya Kulkarni 2021-01-28 5:38 ` Chaitanya Kulkarni 2021-01-28 5:40 ` Damien Le Moal 2021-01-28 5:40 ` Damien Le Moal 2021-01-28 9:24 ` Christoph Hellwig 2021-01-28 9:24 ` Christoph Hellwig 2021-01-28 9:36 ` Damien Le Moal 2021-01-28 9:36 ` Damien Le Moal 2021-01-28 11:48 ` Johannes Thumshirn 2021-01-28 11:48 ` Johannes Thumshirn 2021-02-05 2:56 ` Martin K. Petersen 2021-02-05 2:56 ` Martin K. Petersen 2021-02-04 8:47 ` [PATCH v4 0/8] block: add zone write granularity limit Damien Le Moal 2021-02-04 8:47 ` Damien Le Moal 2021-02-08 17:17 ` Christoph Hellwig 2021-02-08 17:17 ` Christoph Hellwig 2021-02-10 14:45 ` Jens Axboe 2021-02-10 14:45 ` Jens Axboe
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210128044733.503606-8-damien.lemoal@wdc.com \ --to=damien.lemoal@wdc.com \ --cc=axboe@kernel.dk \ --cc=chaitanya.kulkarni@wdc.com \ --cc=hch@lst.de \ --cc=keith.busch@wdc.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.