summaryrefslogtreecommitdiffstats
path: root/drivers/nvme
diff options
context:
space:
mode:
authorNiklas Cassel <niklas.cassel@wdc.com>2021-04-09 20:12:55 +0200
committerChristoph Hellwig <hch@lst.de>2021-04-15 08:12:53 +0200
commite51183be1fa96dc6d3cd11b3c25a0f595807315e (patch)
tree12971bc915aaf593ccd5c8bd84d8fc4e18786f06 /drivers/nvme
parentccc1003b5b2ba9404b390f3183979f81136a3f1f (diff)
downloadlinux-e51183be1fa96dc6d3cd11b3c25a0f595807315e.tar.bz2
nvme-pci: don't simple map sgl when sgls are disabled
According to the module parameter description for sgl_threshold, a value of 0 means that SGLs are disabled. If SGLs are disabled, we should respect that, even for the case where the request is made up of a single physical segment. Fixes: 297910571f08 ("nvme-pci: optimize mapping single segment requests using SGLs") Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
-rw-r--r--drivers/nvme/host/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index d47bb18b976a..b06e685d1250 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -854,7 +854,7 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,
return nvme_setup_prp_simple(dev, req,
&cmnd->rw, &bv);
- if (iod->nvmeq->qid &&
+ if (iod->nvmeq->qid && sgl_threshold &&
dev->ctrl.sgls & ((1 << 0) | (1 << 1)))
return nvme_setup_sgl_simple(dev, req,
&cmnd->rw, &bv);