From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 2D1FE356760 for ; Wed, 7 Oct 2026 01:32:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791336744; cv=none; b=akxYJjdXlsiDfmAkyV6fmBsCoVYmXk/4bcpTUMLBuqYzgWpNSFStjzhmZ/RkKPyUGydIrLGSkN03AFXTh9MToNBWiS1zAQE5qGjjr16Ia8aOZ2eFoO4D7VdoyDv6+XFmtDoVFBvVal4wF11BVvs5m42rUYsWzohQ1TNpO6DOujo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791336744; c=relaxed/simple; bh=7Z/erRFoSbAYsY3vPemKHS/6TkHaTkzo0xYMYD251zE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G/lBRHDT98J+zuWnRPPgjlbduQcEVB8XQO3nojjZQ0URDWw0oR2XPaPULkNEuvgRRxtp0G/D5ERCz/BWvTGwogXPBA+gXThbtDPXW4BV6iFKJlv3D6uAh1tqUbcObKCrLd1ITSMu6e9tRWyK2Ci6tmPPBXH7+FiUqxrOZk9fgTY= 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=QO9/81D4; arc=none smtp.client-ip=209.85.128.42 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="QO9/81D4" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4a16aaf2067so39539305e9.0 for ; Tue, 06 Oct 2026 18:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791336740; x=1791941540; 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=VM4YauOJNuTZG75PQ0MDVsJf+tErKDy2SLufXh7QXpM=; b=QO9/81D4MMOjpmwR/SbRjFElm83mp5DYfvEhjBr+mU6m/C9cKuc63u5ZJTrXgheQ49 WSFN51LoVWb2nrUnewxpfzyH1SBB70ZbGWrVV8hryZNmx6G50oLiZON7yOyzR/+en7Su qrzlrEFt6aV/pxGT4wtxV4NAjta5rkP2B2TggqAGBPGIrdfz8TUAfv9bqWq96777EmNv snU1irE+iroeqkzn02vToq5AG+ucUBhCrBFhEzK5muBZiNfD539J8gr33oNJj0EDMV8s XGmBnIQiHW+mulE3fYkAh7wxB13chDgMKPgILy16K8v/UVv3e06WAGvn0x9dMr716Y4R haxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791336740; x=1791941540; 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=VM4YauOJNuTZG75PQ0MDVsJf+tErKDy2SLufXh7QXpM=; b=ps2YeQJfHonu+CITRlOZhzunyk6fdiacxOL9UGY2nrGB7yMru7zQpWNkoBg3r6noGh egkTVuqCavleldMsK44cHIlOTOytjRHX/UR4b9ZODb1IwOUzRlTR4WyVpCuQRIHKAIKR 3IH/Zo/DlmiTdqptB21dqDUVQ6uXUkyYpfHb3zJMwlfEmJQU9cUYE3zEsn6SZc3nsOVX Zja5nTeAZdmd7ooDdw2nmDsVt0+SwFsw99nTcD0+bL6wIrrunOA0IXFhPDtwBjVHLWYC I7qixGzTmnWfnutn2PAZZqTY7j/Y95lxJNlA8U0T4SorakaoG4OILeqRf8yoBQsM1aWJ /bHw== X-Forwarded-Encrypted: i=1; AKwUvBy3yPDcYJ1dB/N9rOaMYHViqL0+CqhUSrJY+i6PSxrCa3hrmpMRzzW1EmXxVu7yrx4SEy9MYnRVhWkWaO8=@vger.kernel.org X-Gm-Message-State: AFuF++m9/xaD33J7583mKGTnkGj26jltH5Lr7IJSp4E2yCIukWh9TcT4 VRzJYzYu/Zq/6sNvGjp4TqBYJIaGW1x7BNffTh+LvridYb3+h2AWTgyY X-Gm-Gg: AYBFou38Ub7ZAre7+ZUe1NyScTucrsq0JBF0dsvN1bKjXyYXEmwqQXTJcvdm9eX37NY BlVxmyDVdl6oiEYpc3DqTD7GDfRVxdYmOtM3TqmDeCPmQdIwpA6eHfNsCq22Rrxd34eiGQuP3wM xnQBVodH2RPFka9XdHOEwwXSXAGeAkKwGw9Cysi+UosDDHw0qk9mjdmTBnMHCs2ixPjFy8JMHZV EaD47SGsM1T1cwon5tseN27Jh9Wd8KJ5cFRYvgMw1+II9dC+BDlOL2Ethhxy0rFyCYfyyIzEpr2 lzk/CD2hVCX7OdBYs3TdCxSdz+70Fgas2KTI4BMVe5sTUB4W+J4yiKo/Xb45AOytgEHE70Fc+Ze iSv8/G86dtpu5hKvuYZSBA2vICKDq139ebQHYtMAtFC5Pf9Zy2H4jKGnPwoGSRyRQ3b6VarahLx AyI2wE8ALHnMUbZjCbhCeGB0pJHrfEeT8LAzNmgKjoHXSnG3qZ7QAKnBNWA+9WcKIjPVC5K3WS8 KHoDG1o3QG7emY1eOCoSmNhX64mpyfWGFnfQpicRrdJzHyqTiBbruNSqaxt7XV214BbBIVFrYCk X-Received: by 2002:a05:600c:8b64:b0:4a1:6dc3:f5e2 with SMTP id 5b1f17b1804b1-4a180650499mr7604605e9.33.1791336740292; Tue, 06 Oct 2026 18:32:20 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a17f6538b7sm21183615e9.13.2026.10.06.18.32.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2026 18:32:19 -0700 (PDT) From: Pavel Begunkov To: linux-block@vger.kernel.org Cc: asml.silence@gmail.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-nvme@lists.infradead.org, linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org, Christoph Hellwig , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , Keith Busch , Sagi Grimberg , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , Jens Axboe , Nitesh Shetty , Kanchan Joshi , Anuj Gupta , Tushar Gohad , William Power , Matthew Brost , Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Benjamin Marzinski , dm-devel@lists.linux.dev Subject: [PATCH v8 05/13] nvme-pci: implement dma-buf backed requests Date: Wed, 7 Oct 2026 02:31:48 +0100 Message-ID: <8b348c071c53ef88cb278522e7526870f4932690.1791336002.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 Enable BIO_DMABUF_MAP backed requests. On registration we map the dma-buf and store it as a prp list, which is then used to initialise requests. All attached contexts are stored in a new list dmabuf_ctxs, and additions/removals are synchronised with dmabuf_lock. Suggested-by: Keith Busch Signed-off-by: Pavel Begunkov --- drivers/nvme/host/core.c | 12 ++ drivers/nvme/host/nvme.h | 2 + drivers/nvme/host/pci.c | 305 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 319 insertions(+) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 7eb0f9fe6b18..2f9b2262f77c 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2708,6 +2708,17 @@ static int nvme_report_zones(struct gendisk *disk, sector_t sector, #define nvme_report_zones NULL #endif /* CONFIG_BLK_DEV_ZONED */ +static int nvme_init_dma_buf_io_ctx(struct block_device *bdev, + struct dma_buf_io_ctx *ctx) +{ + struct nvme_ns *ns = bdev->bd_disk->private_data; + struct nvme_ctrl *ctrl = ns->ctrl; + + if (!ctrl->ops->init_dma_buf_io_ctx) + return -EINVAL; + return ctrl->ops->init_dma_buf_io_ctx(ctrl, ctx); +} + const struct block_device_operations nvme_bdev_ops = { .owner = THIS_MODULE, .ioctl = nvme_ioctl, @@ -2718,6 +2729,7 @@ const struct block_device_operations nvme_bdev_ops = { .get_unique_id = nvme_get_unique_id, .report_zones = nvme_report_zones, .pr_ops = &nvme_pr_ops, + .init_dma_buf_io_ctx = nvme_init_dma_buf_io_ctx, }; static int nvme_wait_ready(struct nvme_ctrl *ctrl, u32 mask, u32 val, diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index a643c4723a69..be32e9a5ca5a 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -668,6 +668,8 @@ struct nvme_ctrl_ops { int (*get_address)(struct nvme_ctrl *ctrl, char *buf, int size); void (*print_device_info)(struct nvme_ctrl *ctrl); bool (*supports_pci_p2pdma)(struct nvme_ctrl *ctrl); + int (*init_dma_buf_io_ctx)(struct nvme_ctrl *ctrl, + struct dma_buf_io_ctx *ctx); unsigned long (*get_virt_boundary)(struct nvme_ctrl *ctrl, bool is_admin); }; diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index a65b77726e4b..68e0d4dcade4 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include "trace.h" #include "nvme.h" @@ -318,6 +320,8 @@ struct nvme_dev { bool hmb; struct sg_table *hmb_sgt; mempool_t *dmavec_mempool; + struct list_head dmabuf_ctxs; + struct mutex dmabuf_lock; /* shadow doorbell buffer support: */ __le32 *dbbuf_dbs; @@ -397,6 +401,13 @@ struct nvme_queue { struct completion delete_done; }; +struct nvme_dmabuf_map { + struct dma_buf_io_map base; + struct sg_table *sgt; + unsigned nr_entries; + dma_addr_t dma_list[] __counted_by(nr_entries); +}; + /* bits for iod->flags */ enum nvme_iod_flags { /* this command has been aborted by the timeout handler */ @@ -865,6 +876,114 @@ static void nvme_free_descriptors(struct request *req) } } +static inline struct nvme_dmabuf_map * +to_nvme_dmabuf_map(struct dma_buf_io_map *map) +{ + return container_of(map, struct nvme_dmabuf_map, base); +} + +static void nvme_dmabuf_map_sync_for_cpu(struct nvme_dev *nvme_dev, + struct request *req) +{ + struct bio *bio = req->bio; + struct nvme_dmabuf_map *map = to_nvme_dmabuf_map(bio->bi_dmabuf_map); + + dma_sync_sgtable_for_cpu(nvme_dev->dev, map->sgt, rq_dma_dir(req)); +} + +static void nvme_dmabuf_map_sync_for_device(struct nvme_dev *nvme_dev, + struct request *req) +{ + struct bio *bio = req->bio; + struct nvme_dmabuf_map *map = to_nvme_dmabuf_map(bio->bi_dmabuf_map); + + dma_sync_sgtable_for_device(nvme_dev->dev, map->sgt, rq_dma_dir(req)); +} + +static void nvme_rq_clean_dmabuf_map(struct nvme_dev *dev, + struct request *req) +{ + struct nvme_iod *iod = blk_mq_rq_to_pdu(req); + + nvme_dmabuf_map_sync_for_cpu(dev, req); + + if (iod->nr_descriptors) + nvme_free_descriptors(req); +} + +static blk_status_t nvme_rq_setup_dmabuf_map(struct request *req, + struct nvme_queue *nvmeq) +{ + 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); + unsigned bvec_done = bio->bi_iter.bi_offset; + unsigned map_idx = bvec_done / NVME_CTRL_PAGE_SIZE; + unsigned offset = bvec_done & (NVME_CTRL_PAGE_SIZE - 1); + int length = blk_rq_payload_bytes(req) - (NVME_CTRL_PAGE_SIZE - offset); + dma_addr_t *dma_list = map->dma_list; + u64 prp1_dma = dma_list[map_idx++] + offset; + u64 dma_addr, prp2_dma; + dma_addr_t prp_dma; + __le64 *prp_list; + unsigned i; + + nvme_dmabuf_map_sync_for_device(nvmeq->dev, req); + + if (length <= 0) { + prp2_dma = 0; + goto done; + } + + if (length <= NVME_CTRL_PAGE_SIZE) { + prp2_dma = dma_list[map_idx]; + goto done; + } + + if (DIV_ROUND_UP(length, NVME_CTRL_PAGE_SIZE) <= + NVME_SMALL_POOL_SIZE / sizeof(__le64)) + iod->flags |= IOD_SMALL_DESCRIPTOR; + + prp_list = dma_pool_alloc(nvme_dma_pool(nvmeq, iod), GFP_ATOMIC, + &prp_dma); + if (!prp_list) + return BLK_STS_RESOURCE; + + iod->descriptors[iod->nr_descriptors++] = prp_list; + prp2_dma = prp_dma; + i = 0; + for (;;) { + if (i == NVME_CTRL_PAGE_SIZE >> 3) { + __le64 *old_prp_list = prp_list; + + prp_list = dma_pool_alloc(nvmeq->descriptor_pools.large, + GFP_ATOMIC, &prp_dma); + if (!prp_list) + goto free_prps; + iod->descriptors[iod->nr_descriptors++] = prp_list; + prp_list[0] = old_prp_list[i - 1]; + old_prp_list[i - 1] = cpu_to_le64(prp_dma); + i = 1; + } + + dma_addr = dma_list[map_idx++]; + prp_list[i++] = cpu_to_le64(dma_addr); + + length -= NVME_CTRL_PAGE_SIZE; + if (length <= 0) + break; + } +done: + iod->cmd.common.dptr.prp1 = cpu_to_le64(prp1_dma); + iod->cmd.common.dptr.prp2 = cpu_to_le64(prp2_dma); + return BLK_STS_OK; +free_prps: + iod->cmd.common.dptr.prp1 = cpu_to_le64(prp1_dma); + iod->cmd.common.dptr.prp2 = cpu_to_le64(prp2_dma); + nvme_free_descriptors(req); + return BLK_STS_RESOURCE; +} + static void nvme_free_prps(struct request *req, unsigned int attrs) { struct nvme_iod *iod = blk_mq_rq_to_pdu(req); @@ -943,6 +1062,11 @@ static void nvme_unmap_data(struct request *req) struct device *dma_dev = nvmeq->dev->dev; unsigned int attrs = 0; + if (blk_mq_rq_is_dmabuf(req)) { + nvme_rq_clean_dmabuf_map(nvmeq->dev, req); + return; + } + if (iod->flags & IOD_SINGLE_SEGMENT) { static_assert(offsetof(union nvme_data_ptr, prp1) == offsetof(union nvme_data_ptr, sgl.addr)); @@ -1257,6 +1381,9 @@ 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)) + return nvme_rq_setup_dmabuf_map(req, nvmeq); + /* * Try to skip the DMA iterator for single segment requests, as that * significantly improves performances for small I/O sizes. @@ -2284,6 +2411,175 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled) return result; } +#ifdef CONFIG_DMA_SHARED_BUFFER + +struct nvme_dma_buf_io_ctx { + struct dma_buf_attachment *attach; + struct dma_buf_io_ctx *ctx; + struct nvme_dev *dev; + struct list_head list; +}; + +static void nvme_dmabuf_invalidate_mappings(struct dma_buf_attachment *attach) +{ + struct dma_buf_io_ctx *ctx = attach->importer_priv; + + dma_buf_io_invalidate_mappings(ctx); +} + +static const struct dma_buf_attach_ops nvme_dmabuf_importer_ops = { + .invalidate_mappings = nvme_dmabuf_invalidate_mappings, + .allow_peer2peer = true, +}; + +static struct dma_buf_io_map *nvme_dma_buf_io_map(struct dma_buf_io_ctx *ctx) +{ + unsigned nr_entries = ctx->dmabuf->size / NVME_CTRL_PAGE_SIZE; + struct nvme_dma_buf_io_ctx *nvme_ctx = ctx->dev_priv; + struct dma_buf_attachment *attach = nvme_ctx->attach; + unsigned long tmp, i = 0; + struct nvme_dmabuf_map *map; + struct scatterlist *sg; + struct sg_table *sgt; + int ret; + + dma_resv_assert_held(ctx->dmabuf->resv); + + if (ctx->dmabuf->size % NVME_CTRL_PAGE_SIZE) + return ERR_PTR(-EINVAL); + + map = kvmalloc_flex(*map, dma_list, nr_entries); + if (!map) + return ERR_PTR(-ENOMEM); + map->nr_entries = nr_entries; + + sgt = dma_buf_map_attachment(attach, ctx->dir); + if (IS_ERR(sgt)) { + ret = PTR_ERR(sgt); + sgt = NULL; + goto err; + } + + for_each_sgtable_dma_sg(sgt, sg, tmp) { + dma_addr_t dma_addr = sg_dma_address(sg); + unsigned long sg_len = sg_dma_len(sg); + + if ((sg_len % NVME_CTRL_PAGE_SIZE) || + (dma_addr % NVME_CTRL_PAGE_SIZE)) { + ret = -EINVAL; + goto err; + } + while (sg_len) { + map->dma_list[i++] = dma_addr; + dma_addr += NVME_CTRL_PAGE_SIZE; + sg_len -= NVME_CTRL_PAGE_SIZE; + } + } + + ret = dma_buf_io_init_map(ctx, &map->base, sgt); + if (ret) + goto err; + map->sgt = sgt; + return &map->base; +err: + if (sgt) + dma_buf_unmap_attachment(attach, sgt, ctx->dir); + kvfree(map); + return ERR_PTR(ret); +} + +static void nvme_dma_buf_io_unmap(struct dma_buf_io_ctx *ctx, + struct dma_buf_io_map *map_base) +{ + struct nvme_dma_buf_io_ctx *nvme_ctx = ctx->dev_priv; + struct nvme_dmabuf_map *map = to_nvme_dmabuf_map(map_base); + + dma_resv_assert_held(ctx->dmabuf->resv); + + dma_buf_unmap_attachment(nvme_ctx->attach, map->sgt, ctx->dir); + kvfree(map); +} + +static void nvme_dma_buf_io_release(struct dma_buf_io_ctx *ctx) +{ + struct nvme_dma_buf_io_ctx *nvme_ctx = ctx->dev_priv; + struct nvme_dev *dev = nvme_ctx->dev; + + mutex_lock(&dev->dmabuf_lock); + if (!list_empty(&nvme_ctx->list)) { + dma_buf_detach(ctx->dmabuf, nvme_ctx->attach); + list_del_init(&nvme_ctx->list); + } + mutex_unlock(&dev->dmabuf_lock); + + nvme_put_ctrl(&dev->ctrl); + kfree(nvme_ctx); +} + +const struct dma_buf_io_ops nvme_dma_buf_io_ops = { + .map = nvme_dma_buf_io_map, + .unmap = nvme_dma_buf_io_unmap, + .release = nvme_dma_buf_io_release, +}; + +static int __nvme_pci_init_dma_buf_io_ctx(struct nvme_ctrl *ctrl, + struct dma_buf_io_ctx *ctx) +{ + struct nvme_dev *dev = to_nvme_dev(ctrl); + struct nvme_dma_buf_io_ctx *nvme_ctx; + struct dma_buf_attachment *attach; + + nvme_ctx = kzalloc_obj(*nvme_ctx); + if (!nvme_ctx) + return -ENOMEM; + + attach = dma_buf_dynamic_attach(ctx->dmabuf, dev->dev, + &nvme_dmabuf_importer_ops, ctx); + if (IS_ERR(attach)) { + kfree(nvme_ctx); + return PTR_ERR(attach); + } + + nvme_get_ctrl(ctrl); + list_add(&nvme_ctx->list, &dev->dmabuf_ctxs); + nvme_ctx->attach = attach; + nvme_ctx->ctx = ctx; + nvme_ctx->dev = dev; + ctx->dev_priv = nvme_ctx; + ctx->dev_ops = &nvme_dma_buf_io_ops; + return 0; +} + +static int nvme_pci_init_dma_buf_io_ctx(struct nvme_ctrl *ctrl, + struct dma_buf_io_ctx *ctx) +{ + struct nvme_dev *dev = to_nvme_dev(ctrl); + int ret; + + mutex_lock(&dev->dmabuf_lock); + ret = __nvme_pci_init_dma_buf_io_ctx(ctrl, ctx); + mutex_unlock(&dev->dmabuf_lock); + return ret; +} + +static void nvme_pci_remove_dmabuf(struct nvme_dev *dev) +{ + struct nvme_dma_buf_io_ctx *ctx, *tmp; + + mutex_lock(&dev->dmabuf_lock); + list_for_each_entry_safe(ctx, tmp, &dev->dmabuf_ctxs, list) { + dma_buf_io_detach(ctx->ctx); + dma_buf_detach(ctx->ctx->dmabuf, ctx->attach); + list_del_init(&ctx->list); + } + mutex_unlock(&dev->dmabuf_lock); +} +#else +static void nvme_pci_remove_dmabuf(struct nvme_dev *dev) +{ +} +#endif + static const struct blk_mq_ops nvme_mq_admin_ops = { .queue_rq = nvme_queue_rq, .complete = nvme_pci_complete_rq, @@ -3357,6 +3653,9 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) nvme_unquiesce_admin_queue(&dev->ctrl); } mutex_unlock(&dev->shutdown_lock); + + if (shutdown) + nvme_pci_remove_dmabuf(dev); } static int nvme_disable_prepare_reset(struct nvme_dev *dev, bool shutdown) @@ -3579,6 +3878,9 @@ static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = { .print_device_info = nvme_pci_print_device_info, .supports_pci_p2pdma = nvme_pci_supports_pci_p2pdma, .get_virt_boundary = nvme_pci_get_virt_boundary, +#ifdef CONFIG_DMA_SHARED_BUFFER + .init_dma_buf_io_ctx = nvme_pci_init_dma_buf_io_ctx, +#endif }; static int nvme_dev_map(struct nvme_dev *dev) @@ -3701,6 +4003,8 @@ static struct nvme_dev *nvme_pci_alloc_dev(struct pci_dev *pdev, return ERR_PTR(-ENOMEM); INIT_WORK(&dev->ctrl.reset_work, nvme_reset_work); mutex_init(&dev->shutdown_lock); + INIT_LIST_HEAD(&dev->dmabuf_ctxs); + mutex_init(&dev->dmabuf_lock); dev->nr_write_queues = write_queues; dev->nr_poll_queues = poll_queues; @@ -4346,5 +4650,6 @@ MODULE_AUTHOR("Matthew Wilcox "); MODULE_LICENSE("GPL"); MODULE_VERSION("1.0"); MODULE_DESCRIPTION("NVMe host PCIe transport driver"); +MODULE_IMPORT_NS("DMA_BUF"); module_init(nvme_init); module_exit(nvme_exit); -- 2.54.0