From: "Javier González" <javier@javigon.com>
To: linux-nvme@lists.infradead.org
Cc: axboe@kernel.dk, Damien.LeMoal@wdc.com,
"SelvaKumar S" <selvakuma.s1@samsung.com>,
sagi@grimberg.me, "Kanchan Joshi" <joshi.k@samsung.com>,
Johannes.Thumshirn@wdc.com,
"Nitesh Shetty" <nj.shetty@samsung.com>,
linux-block@vger.kernel.org, kbusch@kernel.org,
"Javier González" <javier.gonz@samsung.com>,
mb@lightnvm.io, hch@lst.de
Subject: [PATCH v3 1/4] block: Add zone flags to queue zone prop.
Date: Thu, 2 Jul 2020 11:24:35 +0200 [thread overview]
Message-ID: <20200702092438.63717-2-javier@javigon.com> (raw)
In-Reply-To: <20200702092438.63717-1-javier@javigon.com>
From: Javier González <javier.gonz@samsung.com>
As the zoned block device will have to deal with features that are
optional for the backend device, add a flag field to inform the block
layer about supported features. This builds on top of
blk_zone_report_flags and extendes to the zone report code.
Signed-off-by: Javier González <javier.gonz@samsung.com>
Signed-off-by: SelvaKumar S <selvakuma.s1@samsung.com>
Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
Signed-off-by: Nitesh Shetty <nj.shetty@samsung.com>
---
block/blk-zoned.c | 3 ++-
drivers/block/null_blk_zoned.c | 2 ++
drivers/nvme/host/zns.c | 1 +
drivers/scsi/sd.c | 2 ++
include/linux/blkdev.h | 3 +++
5 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 81152a260354..0f156e96e48f 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -312,7 +312,8 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode,
return ret;
rep.nr_zones = ret;
- rep.flags = BLK_ZONE_REP_CAPACITY;
+ rep.flags = q->zone_flags;
+
if (copy_to_user(argp, &rep, sizeof(struct blk_zone_report)))
return -EFAULT;
return 0;
diff --git a/drivers/block/null_blk_zoned.c b/drivers/block/null_blk_zoned.c
index b05832eb21b2..957c2103f240 100644
--- a/drivers/block/null_blk_zoned.c
+++ b/drivers/block/null_blk_zoned.c
@@ -78,6 +78,8 @@ int null_init_zoned_dev(struct nullb_device *dev, struct request_queue *q)
}
q->limits.zoned = BLK_ZONED_HM;
+ q->zone_flags = BLK_ZONE_REP_CAPACITY;
+
blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q);
blk_queue_required_elevator_features(q, ELEVATOR_F_ZBD_SEQ_WRITE);
diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c
index c08f6281b614..afe62dc27ff7 100644
--- a/drivers/nvme/host/zns.c
+++ b/drivers/nvme/host/zns.c
@@ -81,6 +81,7 @@ int nvme_update_zone_info(struct gendisk *disk, struct nvme_ns *ns,
}
q->limits.zoned = BLK_ZONED_HM;
+ q->zone_flags = BLK_ZONE_REP_CAPACITY;
blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q);
free_data:
kfree(id);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index d90fefffe31b..b9c920bace28 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2967,6 +2967,7 @@ static void sd_read_block_characteristics(struct scsi_disk *sdkp)
if (sdkp->device->type == TYPE_ZBC) {
/* Host-managed */
q->limits.zoned = BLK_ZONED_HM;
+ q->zone_flags = BLK_ZONE_REP_CAPACITY;
} else {
sdkp->zoned = (buffer[8] >> 4) & 3;
if (sdkp->zoned == 1 && !disk_has_partitions(sdkp->disk)) {
@@ -2983,6 +2984,7 @@ static void sd_read_block_characteristics(struct scsi_disk *sdkp)
"Drive-managed SMR disk\n");
}
}
+
if (blk_queue_is_zoned(q) && sdkp->first_scan)
sd_printk(KERN_NOTICE, sdkp, "Host-%s zoned block device\n",
q->limits.zoned == BLK_ZONED_HM ? "managed" : "aware");
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 8fd900998b4e..3f2e3425fa53 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -512,12 +512,15 @@ struct request_queue {
* Stacking drivers (device mappers) may or may not initialize
* these fields.
*
+ * Flags represent features as described by blk_zone_report_flags in blkzoned.h
+ *
* Reads of this information must be protected with blk_queue_enter() /
* blk_queue_exit(). Modifying this information is only allowed while
* no requests are being processed. See also blk_mq_freeze_queue() and
* blk_mq_unfreeze_queue().
*/
unsigned int nr_zones;
+ unsigned int zone_flags;
unsigned long *conv_zones_bitmap;
unsigned long *seq_zones_wlock;
#endif /* CONFIG_BLK_DEV_ZONED */
--
2.17.1
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-07-02 9:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-02 9:24 [PATCH v3 0/4] ZNS: Extra features for current patches Javier González
2020-07-02 9:24 ` Javier González [this message]
2020-07-02 9:46 ` [PATCH v3 1/4] block: Add zone flags to queue zone prop Damien Le Moal
2020-07-02 10:18 ` Javier González
2020-07-02 9:24 ` [PATCH v3 2/4] block: add support for zone offline transition Javier González
2020-07-02 9:47 ` Damien Le Moal
2020-07-02 9:24 ` [PATCH v3 3/4] nvme: Add consistency check for zone count Javier González
2020-07-02 9:24 ` [PATCH v3 4/4] block: add attributes to zone report Javier González
2020-07-02 9:54 ` Damien Le Moal
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=20200702092438.63717-2-javier@javigon.com \
--to=javier@javigon.com \
--cc=Damien.LeMoal@wdc.com \
--cc=Johannes.Thumshirn@wdc.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=javier.gonz@samsung.com \
--cc=joshi.k@samsung.com \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=mb@lightnvm.io \
--cc=nj.shetty@samsung.com \
--cc=sagi@grimberg.me \
--cc=selvakuma.s1@samsung.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).