Skip to contentSkip to conversation

nvme-pci: fix single segment optimization

PATCH New Ming Lei 2 participants 3 messages May 17, 2019 – May 21, 2019 NVMe

lore
Share & tools
lore

Ming Lei

author
#0 lore raw

PATCH 1/1 nvme-pci: fix single segment optimization

Commit dff824b2aadb ("nvme-pci: optimize mapping of small single segment requests") supposes that single request request only includes single bvec.

However, this assumption is wrong, since the single segment may cross multiple bios, then there may be multiple bvecs involved in the segment.

Fixes this issue by checking if it is single bio request, if yes, the request includes only one bvec, given we don't merge bvecs to one segment if they belong to same bio.

Cc Sagi Grimberg <sagi at grimberg.me>
Fixes dff824b2aadb ("nvme-pci: optimize mapping of small single segment requests")
Signed-off-by Ming Lei <ming.lei at redhat.com>

---

Hi Christoph,

This patch is candidate on your patch of 'block: don't decrement nr_phys_segments for physically contigous segments', and I suggest to take this one because this patch is simpler, and more suitable to serve as v5.2 fix.

And your patchset can aim at 5.3 as cleanup after careful test/evaluation on performance effect.

 drivers/nvme/host/pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +2 -1
index 2a8708c9ac18..6a38a760a295 100644
@@ -824,7 +824,8 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,
 	blk_status_t ret = BLK_STS_RESOURCE;
 	int nr_mapped;
 
-	if (blk_rq_nr_phys_segments(req) == 1) {
+	/* Avoid the optimization if the single segment crosses two bios */
+	if (blk_rq_nr_phys_segments(req) == 1 && req->bio == req->biotail) {
 		struct bio_vec bv = req_bvec(req);
 
 		if (!is_pci_p2pdma_page(bv.bv_page)) {
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 nvme-pci: fix single segment optimization

Given that the code only showed up in 5.2 I'd rather try to fix the block layer issue, lets see what Jens says. But if not I defintively want the comment from my earlier patch, and to me the !req->bio->bi_next && req->bio->bi_vcnt == 1 check also seems slighly easier to parse.

author
#2 lore raw

PATCH 1/1 nvme-pci: fix single segment optimization

Quoted 4 lines · Christoph Hellwig

Given that the code only showed up in 5.2 I'd rather try to fix the block layer issue, lets see what Jens says. But if not I defintively want the comment from my earlier patch, and to me the !req->bio->bi_next && req->bio->bi_vcnt == 1 check also seems slighly

The check on 'req->bio->bi_vcnt == 1' should really be avoided, and it isn't needed too.

thanks,
Ming