From: Jon Derrick Date: Tue, 25 Apr 2017 00:02:43 +0000 (-0600) Subject: nvme-scsi: Consider LBA format in IO splitting calculation X-Git-Tag: MMI-PSA29.97-13-9~5760^2^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7fad1fd46ccf3ee283052e948cf91edd0cd9b1c7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git nvme-scsi: Consider LBA format in IO splitting calculation The current command submission code uses a sector-based value when considering the maximum number of blocks per command. With a 4k-formatted namespace and a command exceeding max hardware limits, this calculation doesn't split IOs which should be split and fails in the nvme layer. This patch fixes that calculation and enables IO splitting in these circumstances. Signed-off-by: Jon Derrick Reviewed-by: Jens Axboe Signed-off-by: Christoph Hellwig --- diff --git a/drivers/nvme/host/scsi.c b/drivers/nvme/host/scsi.c index f49ae2758bb7..988da610d6aa 100644 --- a/drivers/nvme/host/scsi.c +++ b/drivers/nvme/host/scsi.c @@ -1609,7 +1609,7 @@ static int nvme_trans_do_nvme_io(struct nvme_ns *ns, struct sg_io_hdr *hdr, struct nvme_command c; u8 opcode = (is_write ? nvme_cmd_write : nvme_cmd_read); u16 control; - u32 max_blocks = queue_max_hw_sectors(ns->queue); + u32 max_blocks = queue_max_hw_sectors(ns->queue) >> (ns->lba_shift - 9); num_cmds = nvme_trans_io_get_num_cmds(hdr, cdb_info, max_blocks);