From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk>, Damien Le Moal <damien.lemoal@opensource.wdc.com> Cc: dm-devel@redhat.com, linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org, Chaitanya Kulkarni <kch@nvidia.com>, Johannes Thumshirn <johannes.thumshirn@wdc.com> Subject: [PATCH 10/16] block: pass a gendisk to blk_queue_max_open_zones and blk_queue_max_active_zones Date: Wed, 6 Jul 2022 09:03:44 +0200 [thread overview] Message-ID: <20220706070350.1703384-11-hch@lst.de> (raw) In-Reply-To: <20220706070350.1703384-1-hch@lst.de> Switch to a gendisk based API in preparation for moving all zone related fields from the request_queue to the gendisk. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> --- drivers/block/null_blk/zoned.c | 4 ++-- drivers/nvme/host/zns.c | 4 ++-- drivers/scsi/sd_zbc.c | 6 +++--- include/linux/blkdev.h | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/block/null_blk/zoned.c b/drivers/block/null_blk/zoned.c index b47bbd114058d..576ab3ed082a5 100644 --- a/drivers/block/null_blk/zoned.c +++ b/drivers/block/null_blk/zoned.c @@ -174,8 +174,8 @@ int null_register_zoned_dev(struct nullb *nullb) } blk_queue_max_zone_append_sectors(q, dev->zone_size_sects); - blk_queue_max_open_zones(q, dev->zone_max_open); - blk_queue_max_active_zones(q, dev->zone_max_active); + disk_set_max_open_zones(nullb->disk, dev->zone_max_open); + disk_set_max_active_zones(nullb->disk, dev->zone_max_active); return 0; } diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c index 0ed15c2fd56de..12316ab51bda6 100644 --- a/drivers/nvme/host/zns.c +++ b/drivers/nvme/host/zns.c @@ -111,8 +111,8 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) disk_set_zoned(ns->disk, BLK_ZONED_HM); blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); - blk_queue_max_open_zones(q, le32_to_cpu(id->mor) + 1); - blk_queue_max_active_zones(q, le32_to_cpu(id->mar) + 1); + disk_set_max_open_zones(ns->disk, le32_to_cpu(id->mor) + 1); + disk_set_max_active_zones(ns->disk, le32_to_cpu(id->mar) + 1); free_data: kfree(id); return status; diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c index 0f5823b674685..b4106f8997342 100644 --- a/drivers/scsi/sd_zbc.c +++ b/drivers/scsi/sd_zbc.c @@ -950,10 +950,10 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, u8 buf[SD_BUF_SIZE]) blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); blk_queue_required_elevator_features(q, ELEVATOR_F_ZBD_SEQ_WRITE); if (sdkp->zones_max_open == U32_MAX) - blk_queue_max_open_zones(q, 0); + disk_set_max_open_zones(disk, 0); else - blk_queue_max_open_zones(q, sdkp->zones_max_open); - blk_queue_max_active_zones(q, 0); + disk_set_max_open_zones(disk, sdkp->zones_max_open); + disk_set_max_active_zones(disk, 0); nr_zones = round_up(sdkp->capacity, zone_blocks) >> ilog2(zone_blocks); /* diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 7d4105d23b0a4..c05e1cc05c265 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -696,16 +696,16 @@ static inline bool blk_queue_zone_is_seq(struct request_queue *q, return !test_bit(blk_queue_zone_no(q, sector), q->conv_zones_bitmap); } -static inline void blk_queue_max_open_zones(struct request_queue *q, +static inline void disk_set_max_open_zones(struct gendisk *disk, unsigned int max_open_zones) { - q->max_open_zones = max_open_zones; + disk->queue->max_open_zones = max_open_zones; } -static inline void blk_queue_max_active_zones(struct request_queue *q, +static inline void disk_set_max_active_zones(struct gendisk *disk, unsigned int max_active_zones) { - q->max_active_zones = max_active_zones; + disk->queue->max_active_zones = max_active_zones; } static inline unsigned int bdev_max_open_zones(struct block_device *bdev) -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk>, Damien Le Moal <damien.lemoal@opensource.wdc.com> Cc: Chaitanya Kulkarni <kch@nvidia.com>, linux-scsi@vger.kernel.org, Johannes Thumshirn <johannes.thumshirn@wdc.com>, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, dm-devel@redhat.com Subject: [dm-devel] [PATCH 10/16] block: pass a gendisk to blk_queue_max_open_zones and blk_queue_max_active_zones Date: Wed, 6 Jul 2022 09:03:44 +0200 [thread overview] Message-ID: <20220706070350.1703384-11-hch@lst.de> (raw) In-Reply-To: <20220706070350.1703384-1-hch@lst.de> Switch to a gendisk based API in preparation for moving all zone related fields from the request_queue to the gendisk. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> --- drivers/block/null_blk/zoned.c | 4 ++-- drivers/nvme/host/zns.c | 4 ++-- drivers/scsi/sd_zbc.c | 6 +++--- include/linux/blkdev.h | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/block/null_blk/zoned.c b/drivers/block/null_blk/zoned.c index b47bbd114058d..576ab3ed082a5 100644 --- a/drivers/block/null_blk/zoned.c +++ b/drivers/block/null_blk/zoned.c @@ -174,8 +174,8 @@ int null_register_zoned_dev(struct nullb *nullb) } blk_queue_max_zone_append_sectors(q, dev->zone_size_sects); - blk_queue_max_open_zones(q, dev->zone_max_open); - blk_queue_max_active_zones(q, dev->zone_max_active); + disk_set_max_open_zones(nullb->disk, dev->zone_max_open); + disk_set_max_active_zones(nullb->disk, dev->zone_max_active); return 0; } diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c index 0ed15c2fd56de..12316ab51bda6 100644 --- a/drivers/nvme/host/zns.c +++ b/drivers/nvme/host/zns.c @@ -111,8 +111,8 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) disk_set_zoned(ns->disk, BLK_ZONED_HM); blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); - blk_queue_max_open_zones(q, le32_to_cpu(id->mor) + 1); - blk_queue_max_active_zones(q, le32_to_cpu(id->mar) + 1); + disk_set_max_open_zones(ns->disk, le32_to_cpu(id->mor) + 1); + disk_set_max_active_zones(ns->disk, le32_to_cpu(id->mar) + 1); free_data: kfree(id); return status; diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c index 0f5823b674685..b4106f8997342 100644 --- a/drivers/scsi/sd_zbc.c +++ b/drivers/scsi/sd_zbc.c @@ -950,10 +950,10 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, u8 buf[SD_BUF_SIZE]) blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); blk_queue_required_elevator_features(q, ELEVATOR_F_ZBD_SEQ_WRITE); if (sdkp->zones_max_open == U32_MAX) - blk_queue_max_open_zones(q, 0); + disk_set_max_open_zones(disk, 0); else - blk_queue_max_open_zones(q, sdkp->zones_max_open); - blk_queue_max_active_zones(q, 0); + disk_set_max_open_zones(disk, sdkp->zones_max_open); + disk_set_max_active_zones(disk, 0); nr_zones = round_up(sdkp->capacity, zone_blocks) >> ilog2(zone_blocks); /* diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 7d4105d23b0a4..c05e1cc05c265 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -696,16 +696,16 @@ static inline bool blk_queue_zone_is_seq(struct request_queue *q, return !test_bit(blk_queue_zone_no(q, sector), q->conv_zones_bitmap); } -static inline void blk_queue_max_open_zones(struct request_queue *q, +static inline void disk_set_max_open_zones(struct gendisk *disk, unsigned int max_open_zones) { - q->max_open_zones = max_open_zones; + disk->queue->max_open_zones = max_open_zones; } -static inline void blk_queue_max_active_zones(struct request_queue *q, +static inline void disk_set_max_active_zones(struct gendisk *disk, unsigned int max_active_zones) { - q->max_active_zones = max_active_zones; + disk->queue->max_active_zones = max_active_zones; } static inline unsigned int bdev_max_open_zones(struct block_device *bdev) -- 2.30.2 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2022-07-06 7:04 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-06 7:03 clean up zoned device information v2 Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` [PATCH 01/16] block: remove a superflous ifdef in blkdev.h Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` [PATCH 02/16] block: call blk_queue_free_zone_bitmaps from disk_release Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` [PATCH 03/16] block: use bdev_is_zoned instead of open coding it Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` [PATCH 04/16] block: simplify blk_mq_plug Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` [PATCH 05/16] block: simplify blk_check_zone_append Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` [PATCH 06/16] block: pass a gendisk to blk_queue_set_zoned Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` [PATCH 07/16] block: pass a gendisk to blk_queue_clear_zone_settings Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` [PATCH 08/16] block: pass a gendisk to blk_queue_free_zone_bitmaps Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` [PATCH 09/16] block: remove queue_max_open_zones and queue_max_active_zones Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` Christoph Hellwig [this message] 2022-07-06 7:03 ` [dm-devel] [PATCH 10/16] block: pass a gendisk to blk_queue_max_open_zones and blk_queue_max_active_zones Christoph Hellwig 2022-07-06 7:03 ` [PATCH 11/16] block: replace blkdev_nr_zones with bdev_nr_zones Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 11:59 ` Damien Le Moal 2022-07-06 11:59 ` [dm-devel] " Damien Le Moal 2022-07-06 7:03 ` [PATCH 12/16] block: use bdev based helpers in blkdev_zone_mgmt{,all} Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] [PATCH 12/16] block: use bdev based helpers in blkdev_zone_mgmt{, all} Christoph Hellwig 2022-07-06 7:03 ` [PATCH 13/16] nvmet:: use bdev based helpers in nvmet_bdev_zone_mgmt_emulate_all Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 11:59 ` Damien Le Moal 2022-07-06 11:59 ` [dm-devel] " Damien Le Moal 2022-07-06 7:03 ` [PATCH 14/16] dm-zoned: cleanup dmz_fixup_devices Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` [PATCH 15/16] block: remove blk_queue_zone_sectors Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 7:03 ` [PATCH 16/16] block: move zone related fields to struct gendisk Christoph Hellwig 2022-07-06 7:03 ` [dm-devel] " Christoph Hellwig 2022-07-06 12:46 ` clean up zoned device information v2 Jens Axboe 2022-07-06 12:46 ` [dm-devel] " Jens Axboe 2022-07-08 4:16 ` Shinichiro Kawasaki 2022-07-08 4:16 ` [dm-devel] " Shinichiro Kawasaki
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=20220706070350.1703384-11-hch@lst.de \ --to=hch@lst.de \ --cc=axboe@kernel.dk \ --cc=damien.lemoal@opensource.wdc.com \ --cc=dm-devel@redhat.com \ --cc=johannes.thumshirn@wdc.com \ --cc=kch@nvidia.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-scsi@vger.kernel.org \ /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.