From 049b0f1519d84c1855cb70fa734e470ba6b52ff2 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 30 Dec 2016 12:51:50 -0800 Subject: [PATCH] nvme: fix max_segments integer truncation The block layer uses an unsigned short for max_segments. The way we calculate the value for NVMe tends to generate very large 32-bit values, which after integer truncation may lead to a zero value instead of the desired outcome. Signed-off-by: Christoph Hellwig Reported-by: Jeff Lien Tested-by: Jeff Lien Reviewed-by: Keith Busch Signed-off-by: Jens Axboe (cherry picked from commit 45686b6198bd824f083ff5293f191d78db9d708a) Orabug: 25130845 Signed-off-by: Ashok Vairavan Reviewed-by: Martin K. Petersen --- drivers/nvme/host/core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index f022efff03d6..c8c921e83a53 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -843,15 +843,16 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl, struct request_queue *q) { if (ctrl->max_hw_sectors) { + u32 max_segments = + (ctrl->max_hw_sectors / (ctrl->page_size >> 9)) + 1; + blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors); - blk_queue_max_segments(q, - (ctrl->max_hw_sectors / (ctrl->page_size >> 9)) + 1); + blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX)); } if (ctrl->stripe_size) blk_queue_chunk_sectors(q, ctrl->stripe_size >> 9); if (ctrl->vwc & NVME_CTRL_VWC_PRESENT) blk_queue_flush(q, REQ_FLUSH | REQ_FUA); - blk_queue_virt_boundary(q, ctrl->page_size - 1); } /* -- 2.50.1