nvme: implement non-mdts command limits
Keith Busch
maintainerPATCH v3 1/1 nvme: implement non-mdts command limits
Commands that access LBA contents without a data transfer between the host historically have not had a spec defined upper limit. The driver set the queue constraints for such commands to the max data transfer size just to be safe, but this artificial constraint frequently limits devices below their capabilities.
The NVMe Workgroup ratified TP4040 defines how a controller may advertise their non-MDTS limits. Use these if provided and default to the current constraints if not. Since the Dataset Management command limits are defined in logical blocks, but without a namespace to tell us the logical block size, the code defaults to the safe 512b size.
---v2->v3:
Remove the nvm_config_write_zeroes helper (hch)
For clarity, don't use inverted oncs logic (hch)
Replace nvme revision check with nvme_ctrl_limited_cns (hch)
Rebased patch for nvme-5.13: the previous version was based on a local conflict-resolved 5.12+5.13 branch, so that version wouldn't have successfully applied to either upstream branch.
drivers/nvme/host/core.c | 107 ++++++++++++++++++++++++++------------- drivers/nvme/host/nvme.h | 3 ++ include/linux/nvme.h | 10 ++++ 3 files changed, 86 insertions(+), 34 deletions(-)
drivers/nvme/host/core.c +73 -34
@@ -1936,7 +1936,7 @@ static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns)struct request_queue *queue = disk->queue;u32 size =queue_logical_block_size (queue); -if (!(ctrl->oncs &NVME_CTRL_ONCS_DSM )) { +if (ctrl->max_discard_sectors ==0 ) {blk_queue_flag_clear (QUEUE_FLAG_DISCARD , queue);return ; }
@@ -1954,39 +1954,13 @@ static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns)if (blk_queue_flag_test_and_set (QUEUE_FLAG_DISCARD , queue))return ; -blk_queue_max_discard_sectors (queue,UINT_MAX ); -blk_queue_max_discard_segments (queue,NVME_DSM_MAX_RANGES ); +blk_queue_max_discard_sectors (queue, ctrl->max_discard_sectors); +blk_queue_max_discard_segments (queue, ctrl->max_discard_segments);if (ctrl->quirks &NVME_QUIRK_DEALLOCATE_ZEROES )blk_queue_max_write_zeroes_sectors (queue,UINT_MAX ); } -static void nvme_config_write_zeroes (struct gendisk *disk,struct nvme_ns *ns) -{ -u64 max_blocks; - -if (!(ns->ctrl->oncs &NVME_CTRL_ONCS_WRITE_ZEROES ) || - (ns->ctrl->quirks &NVME_QUIRK_DISABLE_WRITE_ZEROES )) -return ; -/* -* Even though NVMe spec explicitly states that MDTS is not -* applicable to the write-zeroes:- "The restriction does not apply to -* commands that do not transfer data between the host and the -* controller (e.g., Write Uncorrectable ro Write Zeroes command).". -* In order to be more cautious use controller's max_hw_sectors value -* to configure the maximum sectors for the write-zeroes which is -* configured based on the controller's MDTS field in the -* nvme_init_ctrl_finish() if available. -*/ -if (ns->ctrl->max_hw_sectors ==UINT_MAX ) - max_blocks = (u64 )USHRT_MAX +1 ; -else - max_blocks = ns->ctrl->max_hw_sectors +1 ; - -blk_queue_max_write_zeroes_sectors (disk->queue, -nvme_lba_to_sect (ns, max_blocks)); -} -static bool nvme_ns_ids_valid (struct nvme_ns_ids *ids) { return !uuid_is_null(&ids->uuid) ||
@@ -2156,7 +2130,8 @@ static void nvme_update_disk_info(struct gendisk *disk,set_capacity_and_notify (disk, capacity);nvme_config_discard (disk, ns); -nvme_config_write_zeroes (disk, ns); +blk_queue_max_write_zeroes_sectors (disk->queue, + ns->ctrl->max_zeroes_sectors);set_disk_ro (disk, (id->nsattr &NVME_NS_ATTR_RO ) ||test_bit (NVME_NS_FORCE_RO , &ns->flags));
@@ -3060,14 +3035,73 @@ static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi,return 0 ; } +static inline u32 nvme_mps_size_to_sectors (struct nvme_ctrl *ctrl,u8 size) +{ +int page_shift =NVME_CAP_MPSMIN (ctrl->cap) +12 ; + +return 1 << (size + page_shift -9 ); +} + +static int nvme_init_non_mdts_limits (struct nvme_ctrl *ctrl) +{ +struct nvme_command c = { }; +struct nvme_id_ctrl_nvm *id; +int ret; + +if (ctrl->oncs &NVME_CTRL_ONCS_DSM ) { + ctrl->max_discard_sectors =UINT_MAX ; + ctrl->max_discard_segments =NVME_DSM_MAX_RANGES ; + }else { + ctrl->max_discard_sectors =0 ; + ctrl->max_discard_segments =0 ; + } + +/* +* Even though NVMe spec explicitly states that MDTS is not applicable +* to the write-zeroes, we are cautious and limit the size to the +* controllers max_hw_sectors value, which is based on the MDTS field +* and possibly other limiting factors. +*/ +if (!(ctrl->quirks &NVME_QUIRK_DISABLE_WRITE_ZEROES ) && + (ctrl->oncs &NVME_CTRL_ONCS_WRITE_ZEROES )) + ctrl->max_zeroes_sectors = ctrl->max_hw_sectors; +else + ctrl->max_zeroes_sectors =0 ; + +if (nvme_ctrl_limited_cns (ctrl)) +return 0 ; + + id =kzalloc (sizeof (*id),GFP_KERNEL ); +if (!id) +return 0 ; + + c.identify.opcode = nvme_admin_identify; + c.identify.cns =NVME_ID_CNS_CS_CTRL ; + c.identify.csi =NVME_CSI_NVM ; + + ret =nvme_submit_sync_cmd (ctrl->admin_q, &c, id,sizeof (*id)); +if (ret) + goto free_data; + +if (id->dmrl) + ctrl->max_discard_segments = id->dmrl; +if (id->dmrsl) + ctrl->max_discard_sectors =le32_to_cpu (id->dmrsl); +if (id->wzsl) + ctrl->max_zeroes_sectors =nvme_mps_size_to_sectors (ctrl, + id->wzsl); + +free_data: +kfree (id); +return ret; +} +static int nvme_init_identify (struct nvme_ctrl *ctrl) {struct nvme_id_ctrl *id; -int ret, page_shift;u32 max_hw_sectors;bool prev_apst_enabled; - - page_shift =NVME_CAP_MPSMIN (ctrl->cap) +12 ; +int ret; ret =nvme_identify_ctrl (ctrl, &id);if (ret) {
@@ -3124,7 +3158,7 @@ static int nvme_init_identify(struct nvme_ctrl *ctrl)atomic_set (&ctrl->abort_limit, id->acl +1 ); ctrl->vwc = id->vwc;if (id->mdts) - max_hw_sectors =1 << (id->mdts + page_shift -9 ); + max_hw_sectors =nvme_mps_size_to_sectors (ctrl, id->mdts);else max_hw_sectors =UINT_MAX ; ctrl->max_hw_sectors =
@@ -3235,6 +3269,10 @@ int nvme_init_ctrl_finish(struct nvme_ctrl *ctrl)if (ret)return ret; + ret =nvme_init_non_mdts_limits (ctrl); +if (ret <0 ) +return ret; + ret =nvme_configure_apst (ctrl);if (ret <0 )return ret;
@@ -4765,6 +4803,7 @@ static inline void _nvme_check_size(void)BUILD_BUG_ON (sizeof (struct nvme_id_ns ) !=NVME_IDENTIFY_DATA_SIZE );BUILD_BUG_ON (sizeof (struct nvme_id_ns_zns ) !=NVME_IDENTIFY_DATA_SIZE );BUILD_BUG_ON (sizeof (struct nvme_id_ctrl_zns ) !=NVME_IDENTIFY_DATA_SIZE ); +BUILD_BUG_ON (sizeof (struct nvme_id_ctrl_nvm ) !=NVME_IDENTIFY_DATA_SIZE );BUILD_BUG_ON (sizeof (struct nvme_lba_range_type ) !=64 );BUILD_BUG_ON (sizeof (struct nvme_smart_log ) !=512 );BUILD_BUG_ON (sizeof (struct nvme_dbbuf ) !=64 );
drivers/nvme/host/nvme.h +3 -0
@@ -276,6 +276,9 @@ struct nvme_ctrl {u32 max_hw_sectors;u32 max_segments;u32 max_integrity_segments; +u32 max_discard_sectors; +u32 max_discard_segments; +u32 max_zeroes_sectors;#ifdef CONFIG_BLK_DEV_ZONED u32 max_zone_append;#endif
include/linux/nvme.h +10 -0
@@ -405,6 +405,16 @@ struct nvme_id_ctrl_zns {__u8 rsvd1[4095 ]; }; +struct nvme_id_ctrl_nvm { +__u8 vsl; +__u8 wzsl; +__u8 wusl; +__u8 dmrl; +__le32 dmrsl; +__le64 dmsl; +__u8 rsvd16[4080 ]; +}; +enum {NVME_ID_CNS_NS =0x00 ,NVME_ID_CNS_CTRL =0x01 ,
Signature · 7 lines
2.25.4 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerQuoted 97 lines · Keith Busch
Commands that access LBA contents without a data transfer between the host historically have not had a spec defined upper limit. The driver set the queue constraints for such commands to the max data transfer size just to be safe, but this artificial constraint frequently limits devices below their capabilities.
The NVMe Workgroup ratified TP4040 defines how a controller may advertise their non-MDTS limits. Use these if provided and default to the current constraints if not. Since the Dataset Management command limits are defined in logical blocks, but without a namespace to tell us the logical block size, the code defaults to the safe 512b size.
Signed-off-by Keith Busch <[email protected]>---
v2->v3:Remove the
nvm_config_write_zeroeshelper (hch)For clarity, don't use inverted oncs logic (hch)
Replace nvme revision check with
nvme_ctrl_limited_cns(hch)Rebased patch for nvme-5.13: the previous version was based on a local conflict-resolved 5.12+5.13 branch, so that version wouldn't have successfully applied to either upstream branch.
drivers/nvme/host/core.c | 107 ++++++++++++++++++++++++++------------- drivers/nvme/host/nvme.h | 3 ++ include/linux/nvme.h | 10 ++++ 3 files changed, 86 insertions(+), 34 deletions(-)drivers/nvme/host/core.c +5
-30@@ -1936,7 +1936,7 @@ static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns)struct request_queue *queue = disk->queue;u32 size =queue_logical_block_size (queue); -if (!(ctrl->oncs &NVME_CTRL_ONCS_DSM )) { +if (ctrl->max_discard_sectors ==0 ) {blk_queue_flag_clear (QUEUE_FLAG_DISCARD , queue);return ; }@@ -1954,39 +1954,13 @@ static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns)if (blk_queue_flag_test_and_set (QUEUE_FLAG_DISCARD , queue))return ; -blk_queue_max_discard_sectors (queue,UINT_MAX ); -blk_queue_max_discard_segments (queue,NVME_DSM_MAX_RANGES ); +blk_queue_max_discard_sectors (queue, ctrl->max_discard_sectors); +blk_queue_max_discard_segments (queue, ctrl->max_discard_segments);if (ctrl->quirks &NVME_QUIRK_DEALLOCATE_ZEROES )blk_queue_max_write_zeroes_sectors (queue,UINT_MAX ); } -static void nvme_config_write_zeroes (struct gendisk *disk,struct nvme_ns *ns) -{ -u64 max_blocks; - -if (!(ns->ctrl->oncs &NVME_CTRL_ONCS_WRITE_ZEROES ) || - (ns->ctrl->quirks &NVME_QUIRK_DISABLE_WRITE_ZEROES )) -return ; -/* -* Even though NVMe spec explicitly states that MDTS is not -* applicable to the write-zeroes:- "The restriction does not apply to -* commands that do not transfer data between the host and the -* controller (e.g., Write Uncorrectable ro Write Zeroes command).". -* In order to be more cautious use controller's max_hw_sectors value -* to configure the maximum sectors for the write-zeroes which is -* configured based on the controller's MDTS field in the -* nvme_init_ctrl_finish() if available. -*/ -if (ns->ctrl->max_hw_sectors ==UINT_MAX ) - max_blocks = (u64 )USHRT_MAX +1 ; -else - max_blocks = ns->ctrl->max_hw_sectors +1 ; - -blk_queue_max_write_zeroes_sectors (disk->queue, -nvme_lba_to_sect (ns, max_blocks)); -} -static bool nvme_ns_ids_valid (struct nvme_ns_ids *ids) { return !uuid_is_null(&ids->uuid) ||@@ -2156,7 +2130,8 @@ static void nvme_update_disk_info(struct gendisk *disk,set_capacity_and_notify (disk, capacity);nvme_config_discard (disk, ns); -nvme_config_write_zeroes (disk, ns); +blk_queue_max_write_zeroes_sectors (disk->queue, + ns->ctrl->max_zeroes_sectors);set_disk_ro (disk, (id->nsattr &NVME_NS_ATTR_RO ) ||test_bit (NVME_NS_FORCE_RO , &ns->flags));
drivers/nvme/host/core.c static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi, · line 3042
Quoted 8 lines
drivers/nvme/host/core.c +5
-0@@ -3060,14 +3035,73 @@ static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi,return 0 ; } +static inline u32 nvme_mps_size_to_sectors (struct nvme_ctrl *ctrl,u8 size) +{ +int page_shift =NVME_CAP_MPSMIN (ctrl->cap) +12 ; + +return 1 << (size + page_shift -9 );
A little nitpick we can fix when applying if needed: MPS already is the memory page size, so the size here seems redundant.
drivers/nvme/host/core.c static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi, · line 3066
Quoted 8 lines
drivers/nvme/host/core.c +8
-0+/* +* Even though NVMe spec explicitly states that MDTS is not applicable +* to the write-zeroes, we are cautious and limit the size to the +* controllers max_hw_sectors value, which is based on the MDTS field +* and possibly other limiting factors. +*/ +if (!(ctrl->quirks &NVME_QUIRK_DISABLE_WRITE_ZEROES ) && + (ctrl->oncs &NVME_CTRL_ONCS_WRITE_ZEROES ))
I would place the oncs check befoe the quirks check as it flows a lot more logical.
But all the actual logic looks fine to me.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Keith Busch
maintainerQuoted 10 lines · Christoph Hellwig
drivers/nvme/host/core.c static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi, · line 3042
Quoted 6 lines · Keith Busch
drivers/nvme/host/core.c +5
-0+static inline u32 nvme_mps_size_to_sectors (struct nvme_ctrl *ctrl,u8 size) +{ +int page_shift =NVME_CAP_MPSMIN (ctrl->cap) +12 ; + +return 1 << (size + page_shift -9 );A little nitpick we can fix when applying if needed: MPS already is the memory page size, so the size here seems redundant.
Sure, nvme_mps_to_sectors() is fine. And perhaps renaming the 'size' parameter to something like 'units' might be more clear and aligns to the spec terms.
Quoted 12 lines
drivers/nvme/host/core.c static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi, · line 3066
Quoted 8 lines
drivers/nvme/host/core.c +8
-0+/* +* Even though NVMe spec explicitly states that MDTS is not applicable +* to the write-zeroes, we are cautious and limit the size to the +* controllers max_hw_sectors value, which is based on the MDTS field +* and possibly other limiting factors. +*/ +if (!(ctrl->quirks &NVME_QUIRK_DISABLE_WRITE_ZEROES ) && + (ctrl->oncs &NVME_CTRL_ONCS_WRITE_ZEROES ))I would place the oncs check befoe the quirks check as it flows a lot more logical.
Quoted 1 line
But all the actual logic looks fine to me.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Thanks,
applied to nvme-5.13.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme