From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A236F47CA71 for ; Tue, 28 Jul 2026 21:30:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785274205; cv=none; b=J9E2TzXmh/FhYuoljgYg9n6m66u6m+aXpObv3QYVUKnjHETqU8iCWYLm0vnTltzu0/cd4V04Iq0jjVnNtLyOumYDoQ3P2b5gVEarIvHakbj036Y5PCrPzDuhuZGzvh10RQzq1wqDO+m+7qPvz44ciDh++xNfb82xfkTPg/9VKRg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785274205; c=relaxed/simple; bh=0mLJmqr4j0NL7x17ECejeQJMzYg/MikUX7RC+P6Slf4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MODBYOGDiRq7ZL9cRcbuoR7X8Iu01f6uwFjDLBbux/kltUiKGaSN1V7MEqHIg7mbq4o1i4CcO0ujiFcBIKee0r7qS/uecLzAP9bv0UoZRIwr9t6qAEhlaTuinHF3mTceND0pj7JkXn34n2MxeV4NPcsxAgj5oa97rFdtLBQ+VI0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P/vKddKx; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P/vKddKx" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-47f81a3ccf9so227997f8f.0 for ; Tue, 28 Jul 2026 14:30:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785274200; x=1785879000; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kIFE0vMpUJ1dmAiCPJaILFb8BXNtIaKcrv79dEKWPKA=; b=P/vKddKxUsiva+EXeYvQ7gWGM0nrqxBf4ccKZjnkEYJh7mJVM3TBXqfVJc52cJw/SF xOD1q0CQiWf8ILqgbr4jb2T6Zxh+L0j5J1fsngdAlsHHdQwJUPMOSAZJTmB3PgWdQOLn cdWoJSvzgu4ZNBoBo/v7M8QmQNLncY+oYHzwP6CD2+gno2dGBwkVk+N6xOc+XQuLPNAO xLGkEDv0uRAgLyJBcDfD7SZMaFbeyxh5tuYGeHiY7K4TgpvI7E1nS2yQwJqLJoYpWZbI dBVAsIIbzNbYR9Do5N6pdhxxJkB8jq/iV/oE05FB8vZUjmasSIQxog2DDusTdwbhAYw4 WpSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785274200; x=1785879000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=kIFE0vMpUJ1dmAiCPJaILFb8BXNtIaKcrv79dEKWPKA=; b=UAsaxGfVmIkyH5qk7rLVIwW0WASFjY0Aogkdly6Ge7xdHamZzHF/puB33aBgi1t/I8 GFVeIag/to4jOKzDScHL8DfiZDOrr5DTzp3cVgGdEFtiHzNPeLR2qutxnIJjFPA+Ckkq DEjUzArieyW5znHo1bh3W5iKIGV56RXuh33s3Bfz9fpI4fDK+8Q0KFPibYMr7UAksndp 0M+LniwGe07mU3aV2cXb7Ms4Bd7ruwWzrS6WPCiPrw2RJ6g28NMI8aweKMHePqwVkinP yYJND7bCgnRAKzIa0lbNZpTrY6WkeMTykXMW9Ps4/at6DiDLr0wfSIxpTSU8pAHLdtd6 E4Lg== X-Forwarded-Encrypted: i=1; AHgh+RqOVkvm7gxdBwLVoWVXMTe4XpUu9GOVMDiV0uaUQ6nPGUQ7FYqnfYCPk7yblFaVaPo2zIeO6N/2I1gD7tg=@vger.kernel.org X-Gm-Message-State: AOJu0Yyw+UhkBUWqP9zR0ylXWERzp8WHw2nsZmz6tkRdH5hdNZDk8jvA r54Iqvm6tWpiOkBdsdzcnY64n1MU35tNHKGpLhELVBTXAejtUF45AeLf X-Gm-Gg: AR+sD12+NbaFs7tiHKd0Fq6GXP3X4zqnFqWgS7zygzM2LPHfN5SLllxBwzPT3wFKtxg CnOeCSZOrSvhqGTpvyGVt6lCim3AfVPjj0dVXcjWOLHy3BKth89L4Xr7DrDMOeSX3SKRaocqxgM 9iPadbAA4Bvb9utITnneNXP+hSy2CSicT+R2xOcQhyu1JPGIMfqUVBiMDjSwl8Fwjqys4DSt40p jheZQvyIh4+NK1OMtjJX3dpmTl5AtuaOjkoUdWx4f2AAdWFdEMiAAgL/AeJMFp38OZNUVD31NSH jPvvlIN1P3ea8+6+e+/1HeZU5gAJSWmB52EPBLd8FTIPHE143j/wqNEfFasv36u5Xpo+be/P8wo kvGKkfZKaR2+/fi5lyK+2yQqzubmzVZtpxuyty+t4VGR4R8L0z8xxuSx50iMLxbWkJxh+kfcRPS X0RcgIBhtGpbttdWWBYUXTxm+CONrgG5RnvDmAyuky3DVeDZBzWiyZ2JKAI5FXJ4gydUvgsj//9 4ySVpJE X-Received: by 2002:a05:6000:430c:b0:47f:9254:d453 with SMTP id ffacd0b85a97d-47fb1ec8030mr4347905f8f.8.1785274200459; Tue, 28 Jul 2026 14:30:00 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fb6ac44bcsm2245329f8f.11.2026.07.28.14.29.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 14:29:59 -0700 (PDT) From: Pavel Begunkov To: Jens Axboe , Keith Busch , Christoph Hellwig , Sagi Grimberg , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Cc: asml.silence@gmail.com, Alexander Viro , Christian Brauner , Andrew Morton , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , Nitesh Shetty , Kanchan Joshi , Anuj Gupta , Tushar Gohad , William Power , Phil Cayton , Jason Gunthorpe , Damien Le Moal , Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Benjamin Marzinski , Vishal Verma , David Sterba , Ilya Dryomov , dm-devel@lists.linux.dev, nvdimm@lists.linux.dev, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org Subject: [PATCH v4 09/14] nvme-pci: add SGL support for the dmabuf path Date: Tue, 28 Jul 2026 22:29:21 +0100 Message-ID: <5c2e9c3bdd3e87c0c9a6e4395ea199002b83fd36.1785274111.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Anuj Gupta Add SGL support in addition to PRP for dmabuf-backed requests, coalescing the mapping's sg_table into NVMe SGL data descriptors. Signed-off-by: Anuj Gupta [pavel: rebased] Signed-off-by: Pavel Begunkov --- drivers/nvme/host/pci.c | 191 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 187 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index f1b67c191892..cbb321fb7c50 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1287,12 +1287,18 @@ static blk_status_t nvme_pci_setup_data_prp(struct request *req, return BLK_STS_IOERR; } +static void nvme_pci_sgl_set_data_addr(struct nvme_sgl_desc *sge, + dma_addr_t addr, u32 len) +{ + sge->addr = cpu_to_le64(addr); + sge->length = cpu_to_le32(len); + sge->type = NVME_SGL_FMT_DATA_DESC << 4; +} + static void nvme_pci_sgl_set_data(struct nvme_sgl_desc *sge, struct blk_dma_iter *iter) { - sge->addr = cpu_to_le64(iter->addr); - sge->length = cpu_to_le32(iter->len); - sge->type = NVME_SGL_FMT_DATA_DESC << 4; + nvme_pci_sgl_set_data_addr(sge, iter->addr, iter->len); } static void nvme_pci_sgl_set_seg(struct nvme_sgl_desc *sge, @@ -1303,6 +1309,158 @@ static void nvme_pci_sgl_set_seg(struct nvme_sgl_desc *sge, sge->type = NVME_SGL_FMT_LAST_SEG_DESC << 4; } +static unsigned int nvme_pci_dmabuf_sgl_nents(struct request *req, + dma_addr_t *first_dma, + u32 *first_len) +{ + struct bio *bio = req->bio; + struct nvme_dmabuf_map *map = to_nvme_dmabuf_map(bio->bi_dmabuf_map); + struct scatterlist *sg; + unsigned long tmp; + size_t offset = bio->bi_iter.bi_offset; + size_t remaining = blk_rq_payload_bytes(req); + dma_addr_t last_end = 0; + unsigned int nents = 0; + dma_addr_t dma = 0; + u32 len = 0; + bool have = false; + + for_each_sgtable_dma_sg(map->sgt, sg, tmp) { + size_t sg_len = sg_dma_len(sg); + dma_addr_t addr = sg_dma_address(sg); + + if (!remaining) + break; + if (offset >= sg_len) { + offset -= sg_len; + continue; + } + + addr += offset; + sg_len -= offset; + offset = 0; + + while (sg_len && remaining) { + u32 chunk = min_t(size_t, remaining, sg_len); + + if (!have || last_end != addr) { + nents++; + if (nents == 1) { + dma = addr; + len = chunk; + } + } else if (nents == 1) { + len += chunk; + } + + have = true; + last_end = addr + chunk; + addr += chunk; + sg_len -= chunk; + remaining -= chunk; + } + } + + if (unlikely(remaining)) + return 0; + + *first_dma = dma; + *first_len = len; + return nents; +} + +static blk_status_t nvme_rq_setup_dmabuf_sgl(struct request *req, + struct nvme_queue *nvmeq, + unsigned int entries, + dma_addr_t first_dma, u32 first_len) +{ + struct nvme_iod *iod = blk_mq_rq_to_pdu(req); + struct bio *bio = req->bio; + struct nvme_dmabuf_map *map = to_nvme_dmabuf_map(bio->bi_dmabuf_map); + size_t length = blk_rq_payload_bytes(req); + struct nvme_sgl_desc *sg_list = NULL; + dma_addr_t sgl_dma = 0, last_end = 0; + unsigned int mapped = 0; + unsigned long tmp; + struct scatterlist *sg; + size_t offset, remaining; + bool have = false; + + if (!entries) + return BLK_STS_IOERR; + if (entries > NVME_MAX_SEGS) + return BLK_STS_AGAIN; + + iod->cmd.common.flags = NVME_CMD_SGL_METABUF; + iod->total_len = length; + + nvme_dmabuf_map_sync_for_device(nvmeq->dev, req); + + if (entries == 1) { + nvme_pci_sgl_set_data_addr(&iod->cmd.common.dptr.sgl, first_dma, + first_len); + return BLK_STS_OK; + } + + if (entries <= NVME_SMALL_POOL_SIZE / sizeof(*sg_list)) + iod->flags |= IOD_SMALL_DESCRIPTOR; + + sg_list = dma_pool_alloc(nvme_dma_pool(nvmeq, iod), GFP_ATOMIC, + &sgl_dma); + if (!sg_list) + return BLK_STS_RESOURCE; + iod->descriptors[iod->nr_descriptors++] = sg_list; + + offset = bio->bi_iter.bi_offset; + remaining = length; + + for_each_sgtable_dma_sg(map->sgt, sg, tmp) { + size_t sg_len = sg_dma_len(sg); + dma_addr_t addr = sg_dma_address(sg); + + if (!remaining) + break; + if (offset >= sg_len) { + offset -= sg_len; + continue; + } + + addr += offset; + sg_len -= offset; + offset = 0; + + while (sg_len && remaining) { + u32 chunk = min_t(size_t, remaining, sg_len); + + if (have && last_end == addr) { + u32 old = le32_to_cpu(sg_list[mapped - 1].length); + + sg_list[mapped - 1].length = cpu_to_le32(old + chunk); + } else { + if (WARN_ON_ONCE(mapped == entries)) + goto err_free; + nvme_pci_sgl_set_data_addr(&sg_list[mapped++], + addr, chunk); + } + have = true; + last_end = addr + chunk; + addr += chunk; + sg_len -= chunk; + remaining -= chunk; + } + } + + if (unlikely(remaining)) + goto err_free; + + nvme_pci_sgl_set_seg(&iod->cmd.common.dptr.sgl, sgl_dma, mapped); + return BLK_STS_OK; +err_free: + iod->nr_descriptors--; + dma_pool_free(nvme_dma_pool(nvmeq, iod), sg_list, sgl_dma); + return BLK_STS_IOERR; +} + static blk_status_t nvme_pci_setup_data_sgl(struct request *req, struct blk_dma_iter *iter) { @@ -1397,8 +1555,33 @@ static blk_status_t nvme_map_data(struct request *req) struct blk_dma_iter iter; blk_status_t ret; - if (blk_mq_rq_is_dmabuf(req)) + if (blk_mq_rq_is_dmabuf(req)) { + if (use_sgl != SGL_UNSUPPORTED) { + dma_addr_t first_dma; + u32 first_len; + unsigned int entries; + + entries = nvme_pci_dmabuf_sgl_nents(req, &first_dma, + &first_len); + + if (use_sgl == SGL_FORCED) { + ret = nvme_rq_setup_dmabuf_sgl(req, nvmeq, + entries, first_dma, first_len); + return ret == BLK_STS_AGAIN ? BLK_STS_IOERR : ret; + } + + if (sgl_threshold && entries && + DIV_ROUND_UP(blk_rq_payload_bytes(req), entries) >= + sgl_threshold) { + ret = nvme_rq_setup_dmabuf_sgl(req, nvmeq, + entries, first_dma, first_len); + if (ret != BLK_STS_AGAIN) + return ret; + } + } + return nvme_rq_setup_dmabuf_map(req, nvmeq); + } /* * Try to skip the DMA iterator for single segment requests, as that -- 2.54.0