convert nvme to atomic queue limits updates v2
Christoph Hellwig
maintainerHi all,
this series converts nvme to the new atomic queue limit updates, and as part of that refactors a lot of the setup code. The first two patches are block layer patches already sent out as part of the md queue limits conversion and will hopefully get merged into Jens' tree soon.
Changes since v1:
- also set GENHD_FL_HIDDEN on the multipath gendisk for unknown command sets
- use the queue_limits_* API for multipath device stacking
- update the admin queue limits after reading in the MDTS value
Diffstat:
core.c | 393 ++++++++++++++++++++++++++++++------------------------------ multipath.c | 13 + nvme.h | 11 - zns.c | 24 +-- 4 files changed, 218 insertions(+), 223 deletions(-)
Christoph Hellwig
maintainerPATCH 1/16 nvme: set max_hw_sectors unconditionally
All transports set a max_hw_sectors value in the nvme_ctrl, so make the code using it unconditional and clean it up using a little helper.
--- drivers/nvme/host/core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/nvme/host/core.c +8 -8
@@ -1944,19 +1944,19 @@ static int nvme_configure_metadata(struct nvme_ctrl *ctrl,return 0 ; } +static u32 nvme_max_drv_segments (struct nvme_ctrl *ctrl) +{ +return ctrl->max_hw_sectors / (NVME_CTRL_PAGE_SIZE >>SECTOR_SHIFT ) +1 ; +} +static void nvme_set_queue_limits (struct nvme_ctrl *ctrl,struct request_queue *q) {bool vwc = ctrl->vwc &NVME_CTRL_VWC_PRESENT ; -if (ctrl->max_hw_sectors) { -u32 max_segments = - (ctrl->max_hw_sectors / (NVME_CTRL_PAGE_SIZE >>9 )) +1 ; - - max_segments =min_not_zero (max_segments, ctrl->max_segments); -blk_queue_max_hw_sectors (q, ctrl->max_hw_sectors); -blk_queue_max_segments (q,min_t (u32, max_segments,USHRT_MAX )); - } +blk_queue_max_hw_sectors (q, ctrl->max_hw_sectors); +blk_queue_max_segments (q,min_t (u32,USHRT_MAX , +min_not_zero (nvme_max_drv_segments (ctrl), ctrl->max_segments)));blk_queue_virt_boundary (q,NVME_CTRL_PAGE_SIZE -1 );blk_queue_dma_alignment (q,3 );blk_queue_write_cache (q, vwc, vwc);
Signature · 1 line
2.39.2
Re: [PATCH 01/16] nvme: set max_hw_sectors unconditionally
return ctrl->max_hw_sectors / (NVME_CTRL_PAGE_SIZE >> SECTOR_SHIFT) + 1;
Quoted 5 lines · Christoph Hellwig
All transports set a
max_hw_sectorsvalue in thenvme_ctrl, so make the code using it unconditional and clean it up using a little helper.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Max Gurtovoy <[email protected]>
FWIW, but I do have a small comment, below:
Quoted 9 lines
--- drivers/nvme/host/core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)drivers/nvme/host/core.c +0
-0
drivers/nvme/host/core.c static int nvme_configure_metadata(struct nvme_ctrl *ctrl, · line 1949
Quoted 6 lines
drivers/nvme/host/core.c +3
-0@@ -1944,19 +1944,19 @@ static int nvme_configure_metadata(struct nvme_ctrl *ctrl,return 0 ; } +static u32 nvme_max_drv_segments (struct nvme_ctrl *ctrl) +{ +return ctrl->max_hw_sectors / (NVME_CTRL_PAGE_SIZE >>SECTOR_SHIFT ) +1 ;
I think that it would be nicer to keep the parenthesis, like:
return (ctrl->max_hw_sectors / (NVME_CTRL_PAGE_SIZE >> SECTOR_SHIFT)) + 1;
Quoted 21 lines
drivers/nvme/host/core.c +5
-8+} +static void nvme_set_queue_limits (struct nvme_ctrl *ctrl,struct request_queue *q) {bool vwc = ctrl->vwc &NVME_CTRL_VWC_PRESENT ; -if (ctrl->max_hw_sectors) { -u32 max_segments = - (ctrl->max_hw_sectors / (NVME_CTRL_PAGE_SIZE >>9 )) +1 ; - - max_segments =min_not_zero (max_segments, ctrl->max_segments); -blk_queue_max_hw_sectors (q, ctrl->max_hw_sectors); -blk_queue_max_segments (q,min_t (u32, max_segments,USHRT_MAX )); - } +blk_queue_max_hw_sectors (q, ctrl->max_hw_sectors); +blk_queue_max_segments (q,min_t (u32,USHRT_MAX , +min_not_zero (nvme_max_drv_segments (ctrl), ctrl->max_segments)));blk_queue_virt_boundary (q,NVME_CTRL_PAGE_SIZE -1 );blk_queue_dma_alignment (q,3 );blk_queue_write_cache (q, vwc, vwc);
Christoph Hellwig
maintainerPATCH 2/16 nvme: move NVME_QUIRK_DEALLOCATE_ZEROES out of nvme_config_discard
In reply to Christoph HellwigMove the handling of the NVME_QUIRK_DEALLOCATE_ZEROES quirk out of nvme_config_discard so that it is combined with the normal write_zeroes limit handling.
--- drivers/nvme/host/core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/nvme/host/core.c +6 -5
@@ -1816,9 +1816,6 @@ static void nvme_config_discard(struct nvme_ctrl *ctrl, struct gendisk *disk,else blk_queue_max_discard_segments (queue,NVME_DSM_MAX_RANGES ); queue->limits.discard_granularity =queue_logical_block_size (queue); - -if (ctrl->quirks &NVME_QUIRK_DEALLOCATE_ZEROES ) -blk_queue_max_write_zeroes_sectors (queue,UINT_MAX ); }static bool nvme_ns_ids_equal (struct nvme_ns_ids *a,struct nvme_ns_ids *b)
@@ -2029,8 +2026,12 @@ static void nvme_update_disk_info(struct nvme_ctrl *ctrl, struct gendisk *disk,set_capacity_and_notify (disk, capacity);nvme_config_discard (ctrl, disk, head); -blk_queue_max_write_zeroes_sectors (disk->queue, - ctrl->max_zeroes_sectors); + +if (ctrl->quirks &NVME_QUIRK_DEALLOCATE_ZEROES ) +blk_queue_max_write_zeroes_sectors (disk->queue,UINT_MAX ); +else +blk_queue_max_write_zeroes_sectors (disk->queue, + ctrl->max_zeroes_sectors); }static bool nvme_ns_is_readonly (struct nvme_ns *ns,struct nvme_ns_info *info)
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 3/16 nvme: remove nvme_revalidate_zones
In reply to Christoph HellwigHandle setting the zone size / chunk_sectors and max_append_sectors limits together with the other ZNS limits, and just open code the call to blk_revalidate_zones in the current place.
--- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/nvme.h | 1 - drivers/nvme/host/zns.c | 12 ++---------- 3 files changed, 3 insertions(+), 12 deletions(-)
drivers/nvme/host/core.c +1 -1
@@ -2154,7 +2154,7 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns,blk_mq_unfreeze_queue (ns->disk->queue);if (blk_queue_is_zoned (ns->queue)) { - ret =nvme_revalidate_zones (ns); + ret =blk_revalidate_disk_zones (ns->disk,NULL );if (ret && !nvme_first_scan (ns->disk)) goto out; }
drivers/nvme/host/nvme.h +0 -1
@@ -1036,7 +1036,6 @@ static inline bool nvme_disk_is_ns_head(struct gendisk *disk) }#endif /* CONFIG_NVME_MULTIPATH */ -int nvme_revalidate_zones (struct nvme_ns *ns);int nvme_ns_report_zones (struct nvme_ns *ns,sector_t sector,unsigned int nr_zones,report_zones_cb cb,void *data);#ifdef CONFIG_BLK_DEV_ZONED
drivers/nvme/host/zns.c +2 -10
@@ -7,16 +7,6 @@#include <linux/vmalloc.h> #include "nvme.h" -int nvme_revalidate_zones (struct nvme_ns *ns) -{ -struct request_queue *q = ns->queue; - -blk_queue_chunk_sectors (q, ns->head->zsze); -blk_queue_max_zone_append_sectors (q, ns->ctrl->max_zone_append); - -return blk_revalidate_disk_zones (ns->disk,NULL ); -} -static int nvme_set_max_append (struct nvme_ctrl *ctrl) {struct nvme_command c = { };
@@ -113,6 +103,8 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf)blk_queue_flag_set (QUEUE_FLAG_ZONE_RESETALL , q);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 ); +blk_queue_chunk_sectors (ns->queue, ns->head->zsze); +blk_queue_max_zone_append_sectors (ns->queue, ns->ctrl->max_zone_append); free_data:kfree (id);return status;
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 4/16 nvme: move max_integrity_segments handling out of nvme_init_integrity
In reply to Christoph Hellwigmax_integrity_segments is just a hardware limit and doesn't need to be in nvme_init_integrity with the PI setup.
--- drivers/nvme/host/core.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/nvme/host/core.c +4 -7
@@ -1724,8 +1724,7 @@ int nvme_getgeo(struct block_device *bdev, struct hd_geometry *geo) }#ifdef CONFIG_BLK_DEV_INTEGRITY -static void nvme_init_integrity (struct gendisk *disk, -struct nvme_ns_head *head,u32 max_integrity_segments) +static void nvme_init_integrity (struct gendisk *disk,struct nvme_ns_head *head) {struct blk_integrity integrity = { };
@@ -1773,11 +1772,9 @@ static void nvme_init_integrity(struct gendisk *disk, integrity.tuple_size = head->ms; integrity.pi_offset = head->pi_offset; blk_integrity_register(disk, &integrity); - blk_queue_max_integrity_segments(disk->queue, max_integrity_segments); }#else -static void nvme_init_integrity (struct gendisk *disk, -struct nvme_ns_head *head,u32 max_integrity_segments) +static void nvme_init_integrity (struct gendisk *disk,struct nvme_ns_head *head) { }#endif /* CONFIG_BLK_DEV_INTEGRITY */
@@ -1954,6 +1951,7 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl,blk_queue_max_hw_sectors (q, ctrl->max_hw_sectors);blk_queue_max_segments (q,min_t (u32,USHRT_MAX ,min_not_zero (nvme_max_drv_segments (ctrl), ctrl->max_segments))); +blk_queue_max_integrity_segments (q, ctrl->max_integrity_segments);blk_queue_virt_boundary (q,NVME_CTRL_PAGE_SIZE -1 );blk_queue_dma_alignment (q,3 );blk_queue_write_cache (q, vwc, vwc);
@@ -2017,8 +2015,7 @@ static void nvme_update_disk_info(struct nvme_ctrl *ctrl, struct gendisk *disk,if (head->ms) {if (IS_ENABLED (CONFIG_BLK_DEV_INTEGRITY ) && (head->features &NVME_NS_METADATA_SUPPORTED )) -nvme_init_integrity (disk, head, - ctrl->max_integrity_segments); +nvme_init_integrity (disk, head);else if (!nvme_ns_has_pi (head)) capacity =0 ; }
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 5/16 nvme: cleanup the nvme_init_integrity calling conventions
In reply to Christoph HellwigHandle the no metadata support case in nvme_init_integrity as well to simplify the calling convention and prepare for future changes in the area.
--- drivers/nvme/host/core.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
drivers/nvme/host/core.c +15 -14
@@ -1723,11 +1723,21 @@ int nvme_getgeo(struct block_device *bdev, struct hd_geometry *geo)return 0 ; } -#ifdef CONFIG_BLK_DEV_INTEGRITY -static void nvme_init_integrity (struct gendisk *disk,struct nvme_ns_head *head) +static bool nvme_init_integrity (struct gendisk *disk,struct nvme_ns_head *head) {struct blk_integrity integrity = { }; +if (!head->ms) +return true; + +/* +* PI can always be supported as we can ask the controller to simply +* insert/strip it, which is not possible for other kinds of metadata. +*/ +if (!IS_ENABLED (CONFIG_BLK_DEV_INTEGRITY ) || + !(head->features &NVME_NS_METADATA_SUPPORTED )) +return nvme_ns_has_pi (head); +switch (head->pi_type) {case NVME_NS_DPS_PI_TYPE3 :switch (head->guard_type) {
@@ -1772,12 +1782,8 @@ static void nvme_init_integrity(struct gendisk *disk, struct nvme_ns_head *head) integrity.tuple_size = head->ms; integrity.pi_offset = head->pi_offset;blk_integrity_register (disk, &integrity); +return true; } -#else -static void nvme_init_integrity (struct gendisk *disk,struct nvme_ns_head *head) -{ -} -#endif /* CONFIG_BLK_DEV_INTEGRITY */ static void nvme_config_discard (struct nvme_ctrl *ctrl,struct gendisk *disk,struct nvme_ns_head *head)
@@ -2012,13 +2018,8 @@ static void nvme_update_disk_info(struct nvme_ctrl *ctrl, struct gendisk *disk,* I/O to namespaces with metadata except when the namespace supports * PI, as it can strip/insert in that case. */ -if (head->ms) { -if (IS_ENABLED (CONFIG_BLK_DEV_INTEGRITY ) && - (head->features &NVME_NS_METADATA_SUPPORTED )) -nvme_init_integrity (disk, head); -else if (!nvme_ns_has_pi (head)) - capacity =0 ; - } +if (!nvme_init_integrity (disk, head)) + capacity =0 ;set_capacity_and_notify (disk, capacity);
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 6/16 nvme: move blk_integrity_unregister into nvme_init_integrity
In reply to Christoph HellwigMove uneregistering the existing integrity profile into the helper dealing with all the other integrity / metadata setup.
--- drivers/nvme/host/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +2 -2
@@ -1727,6 +1727,8 @@ static bool nvme_init_integrity(struct gendisk *disk, struct nvme_ns_head *head) {struct blk_integrity integrity = { }; +blk_integrity_unregister (disk); +if (!head->ms)return true;
@@ -1980,8 +1982,6 @@ static void nvme_update_disk_info(struct nvme_ctrl *ctrl, struct gendisk *disk, bs = (1 <<9 ); } -blk_integrity_unregister (disk); - atomic_bs = phys_bs = bs;if (id->nabo ==0 ) {/*
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 7/16 nvme: don't use nvme_update_disk_info for the multipath disk
In reply to Christoph HellwigCurrently nvme_update_ns_info_block calls nvme_update_disk_info both for the namespace attached disk, and the multipath one (if it exists). This is very different from how other stacking drivers work, and leads to a lot of complexity.
Switch to setting the disk capacity and initializing the integrity profile, and let blk_stack_limits which already is called just below deal with updating the other limits.
--- drivers/nvme/host/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/core.c +2 -1
@@ -2159,7 +2159,8 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns,if (nvme_ns_head_multipath (ns->head)) {blk_mq_freeze_queue (ns->head->disk->queue); -nvme_update_disk_info (ns->ctrl, ns->head->disk, ns->head, id); +nvme_init_integrity (ns->head->disk, ns->head); +set_capacity_and_notify (ns->head->disk,get_capacity (ns->disk));set_disk_ro (ns->head->disk,nvme_ns_is_readonly (ns, info));nvme_mpath_revalidate_paths (ns); blk_stack_limits(&ns->head->disk->queue->limits,
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 8/16 nvme: move a few things out of nvme_update_disk_info
In reply to Christoph HellwigMove setting up the integrity profile and setting the disk capacity out of nvme_update_disk_info to get nvme_update_disk_info into a shape where it just sets queue_limits eventually.
--- drivers/nvme/host/core.c | 46 +++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 20 deletions(-)
drivers/nvme/host/core.c +26 -20
@@ -1965,12 +1965,13 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl,blk_queue_write_cache (q, vwc, vwc); } -static void nvme_update_disk_info (struct nvme_ctrl *ctrl,struct gendisk *disk, -struct nvme_ns_head *head,struct nvme_id_ns *id) +static bool nvme_update_disk_info (struct nvme_ns *ns,struct nvme_id_ns *id) { -sector_t capacity =nvme_lba_to_sect (head,le64_to_cpu (id->nsze)); +struct gendisk *disk = ns->disk; +struct nvme_ns_head *head = ns->head;u32 bs =1U << head->lba_shift;u32 atomic_bs, phys_bs, io_opt =0 ; +bool valid = true;/* * The block layer can't support LBA sizes larger than the page size
@@ -1978,8 +1979,8 @@ static void nvme_update_disk_info(struct nvme_ctrl *ctrl, struct gendisk *disk,* allow block I/O. */ if (head->lba_shift >PAGE_SHIFT || head->lba_shift <SECTOR_SHIFT ) { - capacity =0 ; bs = (1 <<9 ); + valid = false; } atomic_bs = phys_bs = bs;
@@ -1992,7 +1993,7 @@ static void nvme_update_disk_info(struct nvme_ctrl *ctrl, struct gendisk *disk,if (id->nsfeat &NVME_NS_FEAT_ATOMICS && id->nawupf) atomic_bs = (1 +le16_to_cpu (id->nawupf)) * bs;else - atomic_bs = (1 + ctrl->subsys->awupf) * bs; + atomic_bs = (1 + ns->ctrl->subsys->awupf) * bs; }if (id->nsfeat &NVME_NS_FEAT_IO_OPT ) {
@@ -2012,24 +2013,14 @@ static void nvme_update_disk_info(struct nvme_ctrl *ctrl, struct gendisk *disk,blk_queue_io_min (disk->queue, phys_bs);blk_queue_io_opt (disk->queue, io_opt); -/* -* Register a metadata profile for PI, or the plain non-integrity NVMe -* metadata masquerading as Type 0 if supported, otherwise reject block -* I/O to namespaces with metadata except when the namespace supports -* PI, as it can strip/insert in that case. -*/ -if (!nvme_init_integrity (disk, head)) - capacity =0 ; - -set_capacity_and_notify (disk, capacity); - -nvme_config_discard (ctrl, disk, head); +nvme_config_discard (ns->ctrl, disk, head); -if (ctrl->quirks &NVME_QUIRK_DEALLOCATE_ZEROES ) +if (ns->ctrl->quirks &NVME_QUIRK_DEALLOCATE_ZEROES )blk_queue_max_write_zeroes_sectors (disk->queue,UINT_MAX );else blk_queue_max_write_zeroes_sectors (disk->queue, - ctrl->max_zeroes_sectors); + ns->ctrl->max_zeroes_sectors); +return valid; }static bool nvme_ns_is_readonly (struct nvme_ns *ns,struct nvme_ns_info *info)
@@ -2103,6 +2094,7 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, struct nvme_ns_info *info) {struct nvme_id_ns *id; +sector_t capacity;unsigned lbaf;int ret;
@@ -2121,6 +2113,8 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, lbaf =nvme_lbaf_index (id->flbas); ns->head->lba_shift = id->lbaf[lbaf].ds; ns->head->nuse =le64_to_cpu (id->nuse); + capacity =nvme_lba_to_sect (ns->head,le64_to_cpu (id->nsze)); +nvme_set_queue_limits (ns->ctrl, ns->queue); ret =nvme_configure_metadata (ns->ctrl, ns->head, id);
@@ -2129,7 +2123,19 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, goto out; }nvme_set_chunk_sectors (ns, id); -nvme_update_disk_info (ns->ctrl, ns->disk, ns->head, id); +if (!nvme_update_disk_info (ns, id)) + capacity =0 ; + +/* +* Register a metadata profile for PI, or the plain non-integrity NVMe +* metadata masquerading as Type 0 if supported, otherwise reject block +* I/O to namespaces with metadata except when the namespace supports +* PI, as it can strip/insert in that case. +*/ +if (!nvme_init_integrity (ns->disk, ns->head)) + capacity =0 ; + +set_capacity_and_notify (ns->disk, capacity);if (ns->head->ids.csi ==NVME_CSI_ZNS ) { ret =nvme_update_zone_info (ns, lbaf);
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 9/16 nvme: move setting the write cache flags out of nvme_set_queue_limits
In reply to Christoph Hellwignvme_set_queue_limits is used on the admin queue and all gendisks including hidden ones that don't support block I/O. The write cache setting on the other hand only makes sense for block I/O. Move the blk_queue_write_cache call to nvme_update_ns_info_block instead.
--- drivers/nvme/host/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/nvme/host/core.c +2 -3
@@ -1954,15 +1954,12 @@ static u32 nvme_max_drv_segments(struct nvme_ctrl *ctrl)static void nvme_set_queue_limits (struct nvme_ctrl *ctrl,struct request_queue *q) { -bool vwc = ctrl->vwc &NVME_CTRL_VWC_PRESENT ; -blk_queue_max_hw_sectors (q, ctrl->max_hw_sectors);blk_queue_max_segments (q,min_t (u32,USHRT_MAX ,min_not_zero (nvme_max_drv_segments (ctrl), ctrl->max_segments)));blk_queue_max_integrity_segments (q, ctrl->max_integrity_segments);blk_queue_virt_boundary (q,NVME_CTRL_PAGE_SIZE -1 );blk_queue_dma_alignment (q,3 ); -blk_queue_write_cache (q, vwc, vwc); }static bool nvme_update_disk_info (struct nvme_ns *ns,struct nvme_id_ns *id)
@@ -2093,6 +2090,7 @@ static int nvme_update_ns_info_generic(struct nvme_ns *ns,static int nvme_update_ns_info_block (struct nvme_ns *ns,struct nvme_ns_info *info) { +bool vwc = ns->ctrl->vwc &NVME_CTRL_VWC_PRESENT ;struct nvme_id_ns *id;sector_t capacity;unsigned lbaf;
@@ -2154,6 +2152,7 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns,if ((id->dlfeat &0x7 ) ==0x1 && (id->dlfeat & (1 <<3 ))) ns->head->features |=NVME_NS_DEAC ;set_disk_ro (ns->disk,nvme_ns_is_readonly (ns, info)); +blk_queue_write_cache (ns->disk->queue, vwc, vwc);set_bit (NVME_NS_READY , &ns->flags);blk_mq_unfreeze_queue (ns->disk->queue);
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 10/16 nvme: move common logic into nvme_update_ns_info
In reply to Christoph Hellwignvme_update_ns_info_generic and nvme_update_ns_info_block share a fair amount of logic related to not fully supported namespace formats and updating the multipath information. Move this logic into the common caller.
--- drivers/nvme/host/core.c | 84 ++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-)
drivers/nvme/host/core.c +42 -42
@@ -2070,21 +2070,8 @@ static int nvme_update_ns_info_generic(struct nvme_ns *ns,set_disk_ro (ns->disk,nvme_ns_is_readonly (ns, info));blk_mq_unfreeze_queue (ns->disk->queue); -if (nvme_ns_head_multipath (ns->head)) { -blk_mq_freeze_queue (ns->head->disk->queue); -set_disk_ro (ns->head->disk,nvme_ns_is_readonly (ns, info)); -nvme_mpath_revalidate_paths (ns); -blk_stack_limits (&ns->head->disk->queue->limits, - &ns->queue->limits,0 ); - ns->head->disk->flags |=GENHD_FL_HIDDEN ; -blk_mq_unfreeze_queue (ns->head->disk->queue); - } -/* Hide the block-interface for these devices */ - ns->disk->flags |=GENHD_FL_HIDDEN ; -set_bit (NVME_NS_READY , &ns->flags); - -return 0 ; +return -ENODEV ; } static int nvme_update_ns_info_block(struct nvme_ns *ns,
@@ -2104,7 +2091,7 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns,/* namespace not allocated or attached */ info->is_removed = true; ret = -ENODEV ; - goto error; + goto out; }blk_mq_freeze_queue (ns->disk->queue);
@@ -2162,54 +2149,67 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, goto out; } -if (nvme_ns_head_multipath (ns->head)) { -blk_mq_freeze_queue (ns->head->disk->queue); -nvme_init_integrity (ns->head->disk, ns->head); -set_capacity_and_notify (ns->head->disk,get_capacity (ns->disk)); -set_disk_ro (ns->head->disk,nvme_ns_is_readonly (ns, info)); -nvme_mpath_revalidate_paths (ns); -blk_stack_limits (&ns->head->disk->queue->limits, - &ns->queue->limits,0 ); -disk_update_readahead (ns->head->disk); -blk_mq_unfreeze_queue (ns->head->disk->queue); - } - ret =0 ; out: -/* -* If probing fails due an unsupported feature, hide the block device, -* but still allow other access. -*/ -if (ret == -ENODEV ) { - ns->disk->flags |=GENHD_FL_HIDDEN ; -set_bit (NVME_NS_READY , &ns->flags); - ret =0 ; - } - -error:kfree (id);return ret; }static int nvme_update_ns_info (struct nvme_ns *ns,struct nvme_ns_info *info) { +bool unsupported = false; +int ret; +switch (info->ids.csi) {case NVME_CSI_ZNS :if (!IS_ENABLED (CONFIG_BLK_DEV_ZONED )) {dev_info (ns->ctrl->device,"block device for nsid %u not supported without CONFIG_BLK_DEV_ZONED\n" , info->nsid); -return nvme_update_ns_info_generic (ns, info); + ret =nvme_update_ns_info_generic (ns, info); +break ; } -return nvme_update_ns_info_block (ns, info); + ret =nvme_update_ns_info_block (ns, info); +break ;case NVME_CSI_NVM : -return nvme_update_ns_info_block (ns, info); + ret =nvme_update_ns_info_block (ns, info); +break ;default :dev_info (ns->ctrl->device,"block device for nsid %u not supported (csi %u)\n" , info->nsid, info->ids.csi); -return nvme_update_ns_info_generic (ns, info); + ret =nvme_update_ns_info_generic (ns, info); +break ; } + +/* +* If probing fails due an unsupported feature, hide the block device, +* but still allow other access. +*/ +if (ret == -ENODEV ) { + ns->disk->flags |=GENHD_FL_HIDDEN ; +set_bit (NVME_NS_READY , &ns->flags); + unsupported = true; + ret =0 ; + } + +if (!ret &&nvme_ns_head_multipath (ns->head)) { +blk_mq_freeze_queue (ns->head->disk->queue); +if (unsupported) + ns->head->disk->flags |=GENHD_FL_HIDDEN ; +else +nvme_init_integrity (ns->head->disk, ns->head); +set_capacity_and_notify (ns->head->disk,get_capacity (ns->disk)); +set_disk_ro (ns->head->disk,nvme_ns_is_readonly (ns, info)); +nvme_mpath_revalidate_paths (ns); +blk_stack_limits (&ns->head->disk->queue->limits, + &ns->queue->limits,0 ); + +disk_update_readahead (ns->head->disk); +blk_mq_unfreeze_queue (ns->head->disk->queue); + } + +return ret; }#ifdef CONFIG_BLK_SED_OPAL
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 11/16 nvme: split out a nvme_identify_ns_nvm helper
In reply to Christoph HellwigSplit the logic to query the Identify Namespace Data Structure, NVM Command Set into a separate helper.
--- drivers/nvme/host/core.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-)
drivers/nvme/host/core.c +26 -12
@@ -1831,12 +1831,35 @@ static bool nvme_ns_ids_equal(struct nvme_ns_ids *a, struct nvme_ns_ids *b) a->csi == b->csi; } +static int nvme_identify_ns_nvm (struct nvme_ctrl *ctrl,unsigned int nsid, +struct nvme_id_ns_nvm **nvmp) +{ +struct nvme_command c = { + .identify.opcode = nvme_admin_identify, + .identify.nsid =cpu_to_le32 (nsid), + .identify.cns =NVME_ID_CNS_CS_NS , + .identify.csi =NVME_CSI_NVM , + }; +struct nvme_id_ns_nvm *nvm; +int ret; + + nvm =kzalloc (sizeof (*nvm),GFP_KERNEL ); +if (!nvm) +return -ENOMEM ; + + ret =nvme_submit_sync_cmd (ctrl->admin_q, &c, nvm,sizeof (*nvm)); +if (ret) +kfree (nvm); +else + *nvmp = nvm; +return ret; +} +static int nvme_init_ms (struct nvme_ctrl *ctrl,struct nvme_ns_head *head,struct nvme_id_ns *id) {bool first = id->dps &NVME_NS_DPS_PI_FIRST ;unsigned lbaf =nvme_lbaf_index (id->flbas); -struct nvme_command c = { };struct nvme_id_ns_nvm *nvm;int ret =0 ;u32 elbaf;
@@ -1849,18 +1872,9 @@ static int nvme_init_ms(struct nvme_ctrl *ctrl, struct nvme_ns_head *head, goto set_pi; } - nvm =kzalloc (sizeof (*nvm),GFP_KERNEL ); -if (!nvm) -return -ENOMEM ; - - c.identify.opcode = nvme_admin_identify; - c.identify.nsid =cpu_to_le32 (head->ns_id); - c.identify.cns =NVME_ID_CNS_CS_NS ; - c.identify.csi =NVME_CSI_NVM ; - - ret =nvme_submit_sync_cmd (ctrl->admin_q, &c, nvm,sizeof (*nvm)); + ret =nvme_identify_ns_nvm (ctrl, head->ns_id, &nvm);if (ret) - goto free_data; + goto set_pi; elbaf =le32_to_cpu (nvm->elbaf[lbaf]);
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 12/16 nvme: don't query identify data in configure_metadata
In reply to Christoph HellwigMove reading the Identify Namespace Data Structure, NVM Command Set out of configure_metadata into the caller. This allows doing the identify call outside the frozen I/O queues, and prepares for using data from the Identify data structure for other purposes.
--- drivers/nvme/host/core.c | 49 ++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 30 deletions(-)
drivers/nvme/host/core.c +19 -30
@@ -1855,32 +1855,26 @@ static int nvme_identify_ns_nvm(struct nvme_ctrl *ctrl, unsigned int nsid,return ret; } -static int nvme_init_ms (struct nvme_ctrl *ctrl,struct nvme_ns_head *head, -struct nvme_id_ns *id) +static void nvme_init_ms (struct nvme_ctrl *ctrl,struct nvme_ns_head *head, +struct nvme_id_ns *id,struct nvme_id_ns_nvm *nvm) {bool first = id->dps &NVME_NS_DPS_PI_FIRST ;unsigned lbaf =nvme_lbaf_index (id->flbas); -struct nvme_id_ns_nvm *nvm; -int ret =0 ;u32 elbaf; head->pi_size =0 ; head->ms =le16_to_cpu (id->lbaf[lbaf].ms); -if (!(ctrl->ctratt &NVME_CTRL_ATTR_ELBAS )) { +if (!nvm || !(ctrl->ctratt &NVME_CTRL_ATTR_ELBAS )) { head->pi_size =sizeof (struct t10_pi_tuple ); head->guard_type =NVME_NVM_NS_16B_GUARD ; goto set_pi; } - ret =nvme_identify_ns_nvm (ctrl, head->ns_id, &nvm); -if (ret) - goto set_pi; - elbaf =le32_to_cpu (nvm->elbaf[lbaf]);/* no support for storage tag formats right now */ if (nvme_elbaf_sts (elbaf)) - goto free_data; + goto set_pi; head->guard_type =nvme_elbaf_guard_type (elbaf);switch (head->guard_type) {
@@ -1894,8 +1888,6 @@ static int nvme_init_ms(struct nvme_ctrl *ctrl, struct nvme_ns_head *head,break ; } -free_data: -kfree (nvm); set_pi:if (head->pi_size && head->ms >= head->pi_size) head->pi_type = id->dps &NVME_NS_DPS_PI_MASK ;
@@ -1906,22 +1898,17 @@ static int nvme_init_ms(struct nvme_ctrl *ctrl, struct nvme_ns_head *head, head->pi_offset =0 ; else head->pi_offset = head->ms - head->pi_size; - -return ret; } -static int nvme_configure_metadata (struct nvme_ctrl *ctrl, -struct nvme_ns_head *head,struct nvme_id_ns *id) +static void nvme_configure_metadata (struct nvme_ctrl *ctrl, +struct nvme_ns_head *head,struct nvme_id_ns *id, +struct nvme_id_ns_nvm *nvm) { -int ret; - - ret =nvme_init_ms (ctrl, head, id); -if (ret) -return ret; +nvme_init_ms (ctrl, head, id, nvm); head->features &= ~(NVME_NS_METADATA_SUPPORTED |NVME_NS_EXT_LBAS );if (!head->ms || !(ctrl->ops->flags &NVME_F_METADATA_SUPPORTED )) -return 0 ; +return ;if (ctrl->ops->flags &NVME_F_FABRICS ) {/*
@@ -1930,7 +1917,7 @@ static int nvme_configure_metadata(struct nvme_ctrl *ctrl,* remap the separate metadata buffer from the block layer. */ if (WARN_ON_ONCE (!(id->flbas &NVME_NS_FLBAS_META_EXT ))) -return 0 ; +return ; head->features |=NVME_NS_EXT_LBAS ;
@@ -1957,7 +1944,6 @@ static int nvme_configure_metadata(struct nvme_ctrl *ctrl,else head->features |=NVME_NS_METADATA_SUPPORTED ; } -return 0 ; }static u32 nvme_max_drv_segments (struct nvme_ctrl *ctrl)
@@ -2092,6 +2078,7 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, struct nvme_ns_info *info) {bool vwc = ns->ctrl->vwc &NVME_CTRL_VWC_PRESENT ; +struct nvme_id_ns_nvm *nvm =NULL ;struct nvme_id_ns *id;sector_t capacity;unsigned lbaf;
@@ -2108,6 +2095,12 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, goto out; } +if (ns->ctrl->ctratt &NVME_CTRL_ATTR_ELBAS ) { + ret =nvme_identify_ns_nvm (ns->ctrl, info->nsid, &nvm); +if (ret <0 ) + goto out; + } +blk_mq_freeze_queue (ns->disk->queue); lbaf =nvme_lbaf_index (id->flbas); ns->head->lba_shift = id->lbaf[lbaf].ds;
@@ -2115,12 +2108,7 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, capacity =nvme_lba_to_sect (ns->head,le64_to_cpu (id->nsze));nvme_set_queue_limits (ns->ctrl, ns->queue); - - ret =nvme_configure_metadata (ns->ctrl, ns->head, id); -if (ret <0 ) { -blk_mq_unfreeze_queue (ns->disk->queue); - goto out; - } +nvme_configure_metadata (ns->ctrl, ns->head, id, nvm);nvme_set_chunk_sectors (ns, id);if (!nvme_update_disk_info (ns, id)) capacity =0 ;
@@ -2165,6 +2153,7 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, ret =0 ; out: +kfree (nvm);kfree (id);return ret; }
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 13/16 nvme: cleanup nvme_configure_metadata
In reply to Christoph HellwigFold nvme_init_ms into nvme_configure_metadata after splitting up a little helper to deal with the extended LBA formats.
--- drivers/nvme/host/core.c | 47 ++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 28 deletions(-)
drivers/nvme/host/core.c +19 -28
@@ -1855,26 +1855,14 @@ static int nvme_identify_ns_nvm(struct nvme_ctrl *ctrl, unsigned int nsid,return ret; } -static void nvme_init_ms (struct nvme_ctrl *ctrl,struct nvme_ns_head *head, +static void nvme_configure_pi_elbas (struct nvme_ns_head *head,struct nvme_id_ns *id,struct nvme_id_ns_nvm *nvm) { -bool first = id->dps &NVME_NS_DPS_PI_FIRST ; -unsigned lbaf =nvme_lbaf_index (id->flbas); -u32 elbaf; - - head->pi_size =0 ; - head->ms =le16_to_cpu (id->lbaf[lbaf].ms); -if (!nvm || !(ctrl->ctratt &NVME_CTRL_ATTR_ELBAS )) { - head->pi_size =sizeof (struct t10_pi_tuple ); - head->guard_type =NVME_NVM_NS_16B_GUARD ; - goto set_pi; - } - - elbaf =le32_to_cpu (nvm->elbaf[lbaf]); +u32 elbaf =le32_to_cpu (nvm->elbaf[nvme_lbaf_index (id->flbas)]);/* no support for storage tag formats right now */ if (nvme_elbaf_sts (elbaf)) - goto set_pi; +return ; head->guard_type =nvme_elbaf_guard_type (elbaf);switch (head->guard_type) {
@@ -1887,29 +1875,32 @@ static void nvme_init_ms(struct nvme_ctrl *ctrl, struct nvme_ns_head *head,default :break ; } - -set_pi: -if (head->pi_size && head->ms >= head->pi_size) - head->pi_type = id->dps &NVME_NS_DPS_PI_MASK ; -else - head->pi_type =0 ; - -if (first) - head->pi_offset =0 ; -else - head->pi_offset = head->ms - head->pi_size; }static void nvme_configure_metadata (struct nvme_ctrl *ctrl,struct nvme_ns_head *head,struct nvme_id_ns *id,struct nvme_id_ns_nvm *nvm) { -nvme_init_ms (ctrl, head, id, nvm); - head->features &= ~(NVME_NS_METADATA_SUPPORTED |NVME_NS_EXT_LBAS ); + head->pi_type =0 ; + head->pi_size =0 ; + head->pi_offset =0 ; + head->ms =le16_to_cpu (id->lbaf[nvme_lbaf_index (id->flbas)].ms);if (!head->ms || !(ctrl->ops->flags &NVME_F_METADATA_SUPPORTED ))return ; +if (nvm && (ctrl->ctratt &NVME_CTRL_ATTR_ELBAS )) { +nvme_configure_pi_elbas (head, id, nvm); + }else { + head->pi_size =sizeof (struct t10_pi_tuple ); + head->guard_type =NVME_NVM_NS_16B_GUARD ; + } + +if (head->pi_size && head->ms >= head->pi_size) + head->pi_type = id->dps &NVME_NS_DPS_PI_MASK ; +if (!(id->dps &NVME_NS_DPS_PI_FIRST )) + head->pi_offset = head->ms - head->pi_size; +if (ctrl->ops->flags &NVME_F_FABRICS ) {/* * The NVMe over Fabrics specification only supports metadata as
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 14/16 nvme: use the atomic queue limits update API
In reply to Christoph HellwigChanges the callchains that update queue_limits to build an on-stack queue_limits and update it atomically. Note that for now only the admin queue actually passes it to the queue allocation function. Doing the same for the gendisks used for the namespaces will require a little more work.
--- drivers/nvme/host/core.c | 133 ++++++++++++++++++++------------------- drivers/nvme/host/nvme.h | 10 +-- drivers/nvme/host/zns.c | 16 ++--- 3 files changed, 80 insertions(+), 79 deletions(-)
drivers/nvme/host/core.c +70 -63
@@ -1787,40 +1787,27 @@ static bool nvme_init_integrity(struct gendisk *disk, struct nvme_ns_head *head)return true; } -static void nvme_config_discard (struct nvme_ctrl *ctrl,struct gendisk *disk, -struct nvme_ns_head *head) +static void nvme_config_discard (struct nvme_ns *ns,struct queue_limits *lim) { -struct request_queue *queue = disk->queue; -u32 max_discard_sectors; - -if (ctrl->dmrsl && ctrl->dmrsl <=nvme_sect_to_lba (head,UINT_MAX )) { - max_discard_sectors =nvme_lba_to_sect (head, ctrl->dmrsl); - }else if (ctrl->oncs &NVME_CTRL_ONCS_DSM ) { - max_discard_sectors =UINT_MAX ; - }else { -blk_queue_max_discard_sectors (queue,0 ); -return ; - } +struct nvme_ctrl *ctrl = ns->ctrl;BUILD_BUG_ON (PAGE_SIZE /sizeof (struct nvme_dsm_range ) <NVME_DSM_MAX_RANGES ); -/* -* If discard is already enabled, don't reset queue limits. -* -* This works around the fact that the block layer can't cope well with -* updating the hardware limits when overridden through sysfs. This is -* harmless because discard limits in NVMe are purely advisory. -*/ -if (queue->limits.max_discard_sectors) -return ; +if (ctrl->dmrsl && ctrl->dmrsl <=nvme_sect_to_lba (ns->head,UINT_MAX )) + lim->max_hw_discard_sectors = +nvme_lba_to_sect (ns->head, ctrl->dmrsl); +else if (ctrl->oncs &NVME_CTRL_ONCS_DSM ) + lim->max_hw_discard_sectors =UINT_MAX ; +else + lim->max_hw_discard_sectors =0 ; + + lim->discard_granularity = lim->logical_block_size; -blk_queue_max_discard_sectors (queue, max_discard_sectors);if (ctrl->dmrl) -blk_queue_max_discard_segments (queue, ctrl->dmrl); + lim->max_discard_segments = ctrl->dmrl;else -blk_queue_max_discard_segments (queue,NVME_DSM_MAX_RANGES ); - queue->limits.discard_granularity =queue_logical_block_size (queue); + lim->max_discard_segments =NVME_DSM_MAX_RANGES ; }static bool nvme_ns_ids_equal (struct nvme_ns_ids *a,struct nvme_ns_ids *b)
@@ -1942,20 +1929,21 @@ static u32 nvme_max_drv_segments(struct nvme_ctrl *ctrl)return ctrl->max_hw_sectors / (NVME_CTRL_PAGE_SIZE >>SECTOR_SHIFT ) +1 ; } -static void nvme_set_queue_limits (struct nvme_ctrl *ctrl, -struct request_queue *q) +static void nvme_set_ctrl_limits (struct nvme_ctrl *ctrl, +struct queue_limits *lim) { -blk_queue_max_hw_sectors (q, ctrl->max_hw_sectors); -blk_queue_max_segments (q,min_t (u32,USHRT_MAX , -min_not_zero (nvme_max_drv_segments (ctrl), ctrl->max_segments))); -blk_queue_max_integrity_segments (q, ctrl->max_integrity_segments); -blk_queue_virt_boundary (q,NVME_CTRL_PAGE_SIZE -1 ); -blk_queue_dma_alignment (q,3 ); + lim->max_hw_sectors = ctrl->max_hw_sectors; + lim->max_segments =min_t (u32,USHRT_MAX , +min_not_zero (nvme_max_drv_segments (ctrl), ctrl->max_segments)); + lim->max_integrity_segments = ctrl->max_integrity_segments; + lim->virt_boundary_mask =NVME_CTRL_PAGE_SIZE -1 ; + lim->max_segment_size =UINT_MAX ; + lim->dma_alignment =3 ; } -static bool nvme_update_disk_info (struct nvme_ns *ns,struct nvme_id_ns *id) +static bool nvme_update_disk_info (struct nvme_ns *ns,struct nvme_id_ns *id, +struct queue_limits *lim) { -struct gendisk *disk = ns->disk;struct nvme_ns_head *head = ns->head;u32 bs =1U << head->lba_shift;u32 atomic_bs, phys_bs, io_opt =0 ;
@@ -1991,23 +1979,19 @@ static bool nvme_update_disk_info(struct nvme_ns *ns, struct nvme_id_ns *id) io_opt = bs * (1 +le16_to_cpu (id->nows)); } -blk_queue_logical_block_size (disk->queue, bs);/* * Linux filesystems assume writing a single physical block is * an atomic operation. Hence limit the physical block size to the * value of the Atomic Write Unit Power Fail parameter. */ -blk_queue_physical_block_size (disk->queue,min (phys_bs, atomic_bs)); -blk_queue_io_min (disk->queue, phys_bs); -blk_queue_io_opt (disk->queue, io_opt); - -nvme_config_discard (ns->ctrl, disk, head); - + lim->logical_block_size = bs; + lim->physical_block_size =min (phys_bs, atomic_bs); + lim->io_min = phys_bs; + lim->io_opt = io_opt;if (ns->ctrl->quirks &NVME_QUIRK_DEALLOCATE_ZEROES ) -blk_queue_max_write_zeroes_sectors (disk->queue,UINT_MAX ); + lim->max_write_zeroes_sectors =UINT_MAX ;else -blk_queue_max_write_zeroes_sectors (disk->queue, - ns->ctrl->max_zeroes_sectors); + lim->max_write_zeroes_sectors = ns->ctrl->max_zeroes_sectors;return valid; }
@@ -2022,7 +2006,8 @@ static inline bool nvme_first_scan(struct gendisk *disk)return !disk_live (disk); } -static void nvme_set_chunk_sectors (struct nvme_ns *ns,struct nvme_id_ns *id) +static void nvme_set_chunk_sectors (struct nvme_ns *ns,struct nvme_id_ns *id, +struct queue_limits *lim) {struct nvme_ctrl *ctrl = ns->ctrl;u32 iob;
@@ -2050,25 +2035,33 @@ static void nvme_set_chunk_sectors(struct nvme_ns *ns, struct nvme_id_ns *id)return ; } -blk_queue_chunk_sectors (ns->queue, iob); + lim->chunk_sectors = iob; }static int nvme_update_ns_info_generic (struct nvme_ns *ns,struct nvme_ns_info *info) { +struct queue_limits lim; +int ret; +blk_mq_freeze_queue (ns->disk->queue); -nvme_set_queue_limits (ns->ctrl, ns->queue); + lim =queue_limits_start_update (ns->disk->queue); +nvme_set_ctrl_limits (ns->ctrl, &lim); + ret =queue_limits_commit_update (ns->disk->queue, &lim);set_disk_ro (ns->disk,nvme_ns_is_readonly (ns, info));blk_mq_unfreeze_queue (ns->disk->queue);/* Hide the block-interface for these devices */ -return -ENODEV ; +if (!ret) + ret = -ENODEV ; +return ret; }static int nvme_update_ns_info_block (struct nvme_ns *ns,struct nvme_ns_info *info) {bool vwc = ns->ctrl->vwc &NVME_CTRL_VWC_PRESENT ; +struct queue_limits lim;struct nvme_id_ns_nvm *nvm =NULL ;struct nvme_id_ns *id;sector_t capacity;
@@ -2098,11 +2091,26 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, ns->head->nuse =le64_to_cpu (id->nuse); capacity =nvme_lba_to_sect (ns->head,le64_to_cpu (id->nsze)); -nvme_set_queue_limits (ns->ctrl, ns->queue); + lim =queue_limits_start_update (ns->disk->queue); +nvme_set_ctrl_limits (ns->ctrl, &lim);nvme_configure_metadata (ns->ctrl, ns->head, id, nvm); -nvme_set_chunk_sectors (ns, id); -if (!nvme_update_disk_info (ns, id)) +nvme_set_chunk_sectors (ns, id, &lim); +if (!nvme_update_disk_info (ns, id, &lim)) capacity =0 ; +nvme_config_discard (ns, &lim); +if (IS_ENABLED (CONFIG_BLK_DEV_ZONED ) && + ns->head->ids.csi ==NVME_CSI_ZNS ) { + ret =nvme_update_zone_info (ns, lbaf, &lim); +if (ret) { +blk_mq_unfreeze_queue (ns->disk->queue); + goto out; + } + } + ret =queue_limits_commit_update (ns->disk->queue, &lim); +if (ret) { +blk_mq_unfreeze_queue (ns->disk->queue); + goto out; + }/* * Register a metadata profile for PI, or the plain non-integrity NVMe
@@ -2115,14 +2123,6 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns,set_capacity_and_notify (ns->disk, capacity); -if (ns->head->ids.csi ==NVME_CSI_ZNS ) { - ret =nvme_update_zone_info (ns, lbaf); -if (ret) { -blk_mq_unfreeze_queue (ns->disk->queue); - goto out; - } - } -/* * Only set the DEAC bit if the device guarantees that reads from * deallocated data return zeroes. While the DEAC bit does not
@@ -3128,6 +3128,7 @@ static int nvme_check_ctrl_fabric_info(struct nvme_ctrl *ctrl, struct nvme_id_ctstatic int nvme_init_identify (struct nvme_ctrl *ctrl) { +struct queue_limits lim;struct nvme_id_ctrl *id;u32 max_hw_sectors;bool prev_apst_enabled;
@@ -3194,7 +3195,12 @@ static int nvme_init_identify(struct nvme_ctrl *ctrl) ctrl->max_hw_sectors =min_not_zero (ctrl->max_hw_sectors, max_hw_sectors); -nvme_set_queue_limits (ctrl, ctrl->admin_q); + lim =queue_limits_start_update (ctrl->admin_q); +nvme_set_ctrl_limits (ctrl, &lim); + ret =queue_limits_commit_update (ctrl->admin_q, &lim); +if (ret) + goto out_free; + ctrl->sgls =le32_to_cpu (id->sgls); ctrl->kas =le16_to_cpu (id->kas); ctrl->max_namespaces =le32_to_cpu (id->mnan);
@@ -4357,6 +4363,7 @@ EXPORT_SYMBOL_GPL(nvme_complete_async_event);int nvme_alloc_admin_tag_set (struct nvme_ctrl *ctrl,struct blk_mq_tag_set *set,const struct blk_mq_ops *ops,unsigned int cmd_size) { +struct queue_limits lim = {};int ret;memset (set,0 ,sizeof (*set));
@@ -4376,7 +4383,7 @@ int nvme_alloc_admin_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set,if (ret)return ret; - ctrl->admin_q =blk_mq_alloc_queue (set,NULL ,NULL ); + ctrl->admin_q =blk_mq_alloc_queue (set, &lim,NULL );if (IS_ERR (ctrl->admin_q)) { ret =PTR_ERR (ctrl->admin_q); goto out_free_tagset;
drivers/nvme/host/nvme.h +2 -8
@@ -1038,8 +1038,9 @@ static inline bool nvme_disk_is_ns_head(struct gendisk *disk)int nvme_ns_report_zones (struct nvme_ns *ns,sector_t sector,unsigned int nr_zones,report_zones_cb cb,void *data); +int nvme_update_zone_info (struct nvme_ns *ns,unsigned lbaf, +struct queue_limits *lim);#ifdef CONFIG_BLK_DEV_ZONED -int nvme_update_zone_info (struct nvme_ns *ns,unsigned lbaf);blk_status_t nvme_setup_zone_mgmt_send (struct nvme_ns *ns,struct request *req,struct nvme_command *cmnd,enum nvme_zone_mgmt_action action);
@@ -1050,13 +1051,6 @@ static inline blk_status_t nvme_setup_zone_mgmt_send(struct nvme_ns *ns, {return BLK_STS_NOTSUPP ; } - -static inline int nvme_update_zone_info (struct nvme_ns *ns,unsigned lbaf) -{ -dev_warn (ns->ctrl->device, -"Please enable CONFIG_BLK_DEV_ZONED to support ZNS devices\n" ); -return -EPROTONOSUPPORT ; -}#endif static inline struct nvme_ns *nvme_get_ns_from_dev (struct device *dev)
drivers/nvme/host/zns.c +8 -8
@@ -35,10 +35,10 @@ static int nvme_set_max_append(struct nvme_ctrl *ctrl)return 0 ; } -int nvme_update_zone_info (struct nvme_ns *ns,unsigned lbaf) +int nvme_update_zone_info (struct nvme_ns *ns,unsigned lbaf, +struct queue_limits *lim) {struct nvme_effects_log *log = ns->head->effects; -struct request_queue *q = ns->queue;struct nvme_command c = { };struct nvme_id_ns_zns *id;int status;
@@ -99,12 +99,12 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) goto free_data; } -disk_set_zoned (ns->disk); -blk_queue_flag_set (QUEUE_FLAG_ZONE_RESETALL , q); -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 ); -blk_queue_chunk_sectors (ns->queue, ns->head->zsze); -blk_queue_max_zone_append_sectors (ns->queue, ns->ctrl->max_zone_append); +blk_queue_flag_set (QUEUE_FLAG_ZONE_RESETALL , ns->queue); + lim->zoned =1 ; + lim->max_open_zones =le32_to_cpu (id->mor) +1 ; + lim->max_active_zones =le32_to_cpu (id->mar) +1 ; + lim->chunk_sectors = ns->head->zsze; + lim->max_zone_append_sectors = ns->ctrl->max_zone_append; free_data:kfree (id);return status;
Signature · 1 line
2.39.2
Re: [PATCH 14/16] nvme: use the atomic queue limits update API
Quoted 17 lines · Christoph Hellwig
drivers/nvme/host/core.c +8
-3@@ -2098,11 +2091,26 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, ns->head->nuse =le64_to_cpu (id->nuse); capacity =nvme_lba_to_sect (ns->head,le64_to_cpu (id->nsze)); -nvme_set_queue_limits (ns->ctrl, ns->queue); + lim =queue_limits_start_update (ns->disk->queue); +nvme_set_ctrl_limits (ns->ctrl, &lim);nvme_configure_metadata (ns->ctrl, ns->head, id, nvm); -nvme_set_chunk_sectors (ns, id); -if (!nvme_update_disk_info (ns, id)) +nvme_set_chunk_sectors (ns, id, &lim); +if (!nvme_update_disk_info (ns, id, &lim)) capacity =0 ; +nvme_config_discard (ns, &lim); +if (IS_ENABLED (CONFIG_BLK_DEV_ZONED ) && + ns->head->ids.csi ==NVME_CSI_ZNS ) { + ret =nvme_update_zone_info (ns, lbaf, &lim);
drivers/nvme/host/core.c static int nvme_update_ns_info_block(struct nvme_ns *ns, · line 2113
Quoted 10 lines
drivers/nvme/host/core.c +10
-0+if (ret) { +blk_mq_unfreeze_queue (ns->disk->queue); + goto out; + } + } + ret =queue_limits_commit_update (ns->disk->queue, &lim); +if (ret) { +blk_mq_unfreeze_queue (ns->disk->queue); + goto out; + }
Not sure if this has been discussed already.
But do we need something that does not update the limit but still releases the mutex (q->limits_lock)?
If nvme_update_zone_info() returns error, the mutex will not be released.
Christoph Hellwig
maintainerRe: [PATCH 14/16] nvme: use the atomic queue limits update API
Quoted 10 lines · Kanchan Joshi
drivers/nvme/host/core.c static int nvme_update_ns_info_block(struct nvme_ns *ns, · line 2113
Quoted 5 lines
drivers/nvme/host/core.c +5
-0+ ret =queue_limits_commit_update (ns->disk->queue, &lim); +if (ret) { +blk_mq_unfreeze_queue (ns->disk->queue); + goto out; + }Not sure if this has been discussed already.
But do we need something that does not update the limit but still releases the mutex (q->limits_lock)?
Ifnvme_update_zone_info()returns error, the mutex will not be released.
It just came up in the scsi series..
Maybe we'll want a cancel_update version after all. I thought I'd get away without it.
Christoph Hellwig
maintainerPATCH 15/16 nvme-multipath: pass queue_limits to blk_alloc_disk
In reply to Christoph HellwigThe multipath disk starts out with the stacking default limits. The one interesting part here is that blk_set_stacking_limits sets the max_zone_append_sectorts to UINT_MAX, which fails the validation for non-zoned devices. With the old one call per limit scheme this was fine because no one verified this weird mismatch and it was fixed by blk_stack_limits a little later before I/O could be issued.
--- drivers/nvme/host/multipath.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/nvme/host/multipath.c +7 -6
@@ -516,6 +516,7 @@ static void nvme_requeue_work(struct work_struct *work)int nvme_mpath_alloc_disk (struct nvme_ctrl *ctrl,struct nvme_ns_head *head) { +struct queue_limits lim;bool vwc = false;mutex_init (&head->lock);
@@ -532,7 +533,12 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head) !nvme_is_unique_nsid(ctrl, head) || !multipath)return 0 ; - head->disk =blk_alloc_disk (NULL , ctrl->numa_node); +blk_set_stacking_limits (&lim); + lim.dma_alignment =3 ; +if (head->ids.csi !=NVME_CSI_ZNS ) + lim.max_zone_append_sectors =0 ; + + head->disk =blk_alloc_disk (&lim, ctrl->numa_node);if (IS_ERR (head->disk))return PTR_ERR (head->disk); head->disk->fops = &nvme_ns_head_ops;
@@ -553,11 +559,6 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head) ctrl->tagset->map[HCTX_TYPE_POLL].nr_queues)blk_queue_flag_set (QUEUE_FLAG_POLL , head->disk->queue); -/* set to a default value of 512 until the disk is validated */ -blk_queue_logical_block_size (head->disk->queue,512 ); -blk_set_stacking_limits (&head->disk->queue->limits); -blk_queue_dma_alignment (head->disk->queue,3 ); -/* we need to propagate up the VMC settings */ if (ctrl->vwc &NVME_CTRL_VWC_PRESENT ) vwc = true;
Signature · 1 line
2.39.2
Christoph Hellwig
maintainerPATCH 16/16 nvme-multipath: use atomic queue limits API for stacking limits
In reply to Christoph HellwigSwitch to the queue_limits_* helpers to stack the bdev limits, which also includes updating the readahead settings.
--- drivers/nvme/host/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/nvme/host/core.c +6 -3
@@ -2188,6 +2188,8 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_ns_info *info) }if (!ret &&nvme_ns_head_multipath (ns->head)) { +struct queue_limits lim; +blk_mq_freeze_queue (ns->head->disk->queue);if (unsupported) ns->head->disk->flags |=GENHD_FL_HIDDEN ;
@@ -2196,10 +2198,11 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_ns_info *info)set_capacity_and_notify (ns->head->disk,get_capacity (ns->disk));set_disk_ro (ns->head->disk,nvme_ns_is_readonly (ns, info));nvme_mpath_revalidate_paths (ns); -blk_stack_limits (&ns->head->disk->queue->limits, - &ns->queue->limits,0 ); -disk_update_readahead (ns->head->disk); + lim =queue_limits_start_update (ns->head->disk->queue); +queue_limits_stack_bdev (&lim, ns->disk->part0,0 , + ns->head->disk->disk_name); + ret =queue_limits_commit_update (ns->head->disk->queue, &lim);blk_mq_unfreeze_queue (ns->head->disk->queue); }
Signature · 1 line
2.39.2
Thanks, applied to nvme-6.9.
Quoted 1 line · Keith Busch
Thanks, applied to nvme-6.9.
FWIW,