From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 02496C369AB for ; Fri, 18 Apr 2025 16:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=58X7drC/7y3+nIM+KuDwoMupmKxw6e2kM6B18XE2K2Y=; b=T9Fyj8O8b4r7L+xOlkiFmv+8Wq MeXAaCTSxVyJnkDVMi4kI94kn27YXaT+lvRMX2DeY2p+JZR+OR4wTdL8KKNXkU58xC5tjoeLMtzJK ce/A0AExMNp7Ur1P1pEqCro8+8OaJlleJviX/QTjSpYJmhzf35TSTRgZEdrgE8hOxvsICGbH3Cw0E 9kO6xPFhtPnf6Xl12JgDmRQ6nXfkZscJxFCBgOyYV9RatyQp+DvhPW5A5wyr18xCXiMlpp2ctDRAy IiKePSuRcVLbcbThHoPbhuosItUEVkA5BSJ3Kve5gB0ua0Z1e1iPRE6BrgJjoGU9AdMn546sYga1O JvnSA7Pg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5ooE-0000000H0wl-2ulh; Fri, 18 Apr 2025 16:43:22 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5fXU-0000000FK2a-1oV3 for linux-nvme@lists.infradead.org; Fri, 18 Apr 2025 06:49:30 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id EB884436AD; Fri, 18 Apr 2025 06:49:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60DBFC4CEE2; Fri, 18 Apr 2025 06:49:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744958968; bh=294NxRUIohhQBJNMY7N2MX6lkvZ3TDh+LJnGbG4ssHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NyRjrrJCYDcV4Q6X5lDPSqfKb5XXiaedFINEKeEaKj5c2isWltJhfsALSM3VgwvZl lS53PtklWfaycHbYjw4cvysee218GZYrOc7qZGi7BYsVIazNbU66R9j5fFmm2Ltt4n j8BjJ7+Ln/k8ahdAGCb7OnK13g4GjmTZLqhl9ArxHySQocsDC80u3s611uawF8YuFQ gy+bzOE2yHfYfcXxHSWpHrWT2xPfE0wadBFYg/6L2E0vNcNLVPrgL4DIN8o9MMHN1F 7PwwigxiizqoPXaEoeYzngVz1ND13xNGyXE0zjw8hkyHjlOvk92XVBi5cwbqAu6RPZ OlpBHekA1a6zA== From: Leon Romanovsky To: Marek Szyprowski , Jens Axboe , Christoph Hellwig , Keith Busch Cc: Kanchan Joshi , Jake Edge , Jonathan Corbet , Jason Gunthorpe , Zhu Yanjun , Robin Murphy , Joerg Roedel , Will Deacon , Sagi Grimberg , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Andrew Morton , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, iommu@lists.linux.dev, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, Niklas Schnelle , Chuck Lever , Luis Chamberlain , Matthew Wilcox , Dan Williams , Chaitanya Kulkarni , Nitesh Shetty , Leon Romanovsky Subject: [PATCH v8 24/24] nvme-pci: optimize single-segment handling Date: Fri, 18 Apr 2025 09:47:54 +0300 Message-ID: <670389227a033bd5b7c5aa55191aac9943244028.1744825142.git.leon@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250417_234928_539800_4B854C05 X-CRM114-Status: GOOD ( 20.41 ) X-Mailman-Approved-At: Fri, 18 Apr 2025 09:39:28 -0700 X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org From: Kanchan Joshi blk_rq_dma_map API is costly for single-segment requests. Avoid using it and map the bio_vec directly. Signed-off-by: Kanchan Joshi Signed-off-by: Nitesh Shetty Signed-off-by: Leon Romanovsky --- drivers/nvme/host/pci.c | 65 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 8d99a8f871ea..cf020de82962 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -216,6 +216,11 @@ struct nvme_queue { struct completion delete_done; }; +enum { + IOD_LARGE_DESCRIPTORS = 1, /* uses the full page sized descriptor pool */ + IOD_SINGLE_SEGMENT = 2, /* single segment dma mapping */ +}; + /* * The nvme_iod describes the data in an I/O. */ @@ -224,7 +229,7 @@ struct nvme_iod { struct nvme_command cmd; bool aborted; u8 nr_descriptors; /* # of PRP/SGL descriptors */ - bool large_descriptors; /* uses the full page sized descriptor pool */ + unsigned int flags; unsigned int total_len; /* length of the entire transfer */ unsigned int total_meta_len; /* length of the entire metadata transfer */ dma_addr_t meta_dma; @@ -529,7 +534,7 @@ static inline bool nvme_pci_use_sgls(struct nvme_dev *dev, struct request *req, static inline struct dma_pool *nvme_dma_pool(struct nvme_dev *dev, struct nvme_iod *iod) { - if (iod->large_descriptors) + if (iod->flags & IOD_LARGE_DESCRIPTORS) return dev->prp_page_pool; return dev->prp_small_pool; } @@ -630,6 +635,15 @@ static void nvme_free_sgls(struct nvme_dev *dev, struct request *req) static void nvme_unmap_data(struct nvme_dev *dev, struct request *req) { struct nvme_iod *iod = blk_mq_rq_to_pdu(req); + unsigned int nr_segments = blk_rq_nr_phys_segments(req); + dma_addr_t dma_addr; + + if (nr_segments == 1 && (iod->flags & IOD_SINGLE_SEGMENT)) { + dma_addr = le64_to_cpu(iod->cmd.common.dptr.prp1); + dma_unmap_page(dev->dev, dma_addr, iod->total_len, + rq_dma_dir(req)); + return; + } if (!blk_rq_dma_unmap(req, dev->dev, &iod->dma_state, iod->total_len)) { if (iod->cmd.common.flags & NVME_CMD_SGL_METABUF) @@ -642,6 +656,41 @@ static void nvme_unmap_data(struct nvme_dev *dev, struct request *req) nvme_free_descriptors(dev, req); } +static bool nvme_try_setup_prp_simple(struct nvme_dev *dev, struct request *req, + struct nvme_rw_command *cmnd, + struct blk_dma_iter *iter) +{ + struct nvme_iod *iod = blk_mq_rq_to_pdu(req); + struct bio_vec bv = req_bvec(req); + unsigned int first_prp_len; + + if (is_pci_p2pdma_page(bv.bv_page)) + return false; + if ((bv.bv_offset & (NVME_CTRL_PAGE_SIZE - 1)) + bv.bv_len > + NVME_CTRL_PAGE_SIZE * 2) + return false; + + iter->addr = dma_map_bvec(dev->dev, &bv, rq_dma_dir(req), 0); + if (dma_mapping_error(dev->dev, iter->addr)) { + iter->status = BLK_STS_RESOURCE; + goto out; + } + iod->total_len = bv.bv_len; + cmnd->dptr.prp1 = cpu_to_le64(iter->addr); + + first_prp_len = NVME_CTRL_PAGE_SIZE - + (bv.bv_offset & (NVME_CTRL_PAGE_SIZE - 1)); + if (bv.bv_len > first_prp_len) + cmnd->dptr.prp2 = cpu_to_le64(iter->addr + first_prp_len); + else + cmnd->dptr.prp2 = 0; + + iter->status = BLK_STS_OK; + iod->flags |= IOD_SINGLE_SEGMENT; +out: + return true; +} + static blk_status_t nvme_pci_setup_prps(struct nvme_dev *dev, struct request *req) { @@ -652,6 +701,12 @@ static blk_status_t nvme_pci_setup_prps(struct nvme_dev *dev, dma_addr_t prp1_dma, prp2_dma = 0; unsigned int prp_len, i; __le64 *prp_list; + unsigned int nr_segments = blk_rq_nr_phys_segments(req); + + if (nr_segments == 1) { + if (nvme_try_setup_prp_simple(dev, req, cmnd, &iter)) + return iter.status; + } if (!blk_rq_dma_map_iter_start(req, dev->dev, &iod->dma_state, &iter)) return iter.status; @@ -693,7 +748,7 @@ static blk_status_t nvme_pci_setup_prps(struct nvme_dev *dev, if (DIV_ROUND_UP(length, NVME_CTRL_PAGE_SIZE) > NVME_SMALL_DESCRIPTOR_SIZE / sizeof(__le64)) - iod->large_descriptors = true; + iod->flags |= IOD_LARGE_DESCRIPTORS; prp_list = dma_pool_alloc(nvme_dma_pool(dev, iod), GFP_ATOMIC, &prp2_dma); @@ -808,7 +863,7 @@ static blk_status_t nvme_pci_setup_sgls(struct nvme_dev *dev, } if (entries > NVME_SMALL_DESCRIPTOR_SIZE / sizeof(*sg_list)) - iod->large_descriptors = true; + iod->flags |= IOD_LARGE_DESCRIPTORS; sg_list = dma_pool_alloc(nvme_dma_pool(dev, iod), GFP_ATOMIC, &sgl_dma); if (!sg_list) @@ -932,7 +987,7 @@ static blk_status_t nvme_prep_rq(struct nvme_dev *dev, struct request *req) iod->aborted = false; iod->nr_descriptors = 0; - iod->large_descriptors = false; + iod->flags = 0; iod->total_len = 0; iod->total_meta_len = 0; -- 2.49.0