From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 7910B55292C for ; Tue, 13 Oct 2026 20:55:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924918; cv=none; b=SMIL0K4qGMMgSCMAFEvsJNxd2p89BsXsUs71eKNe+LAVhLN3Iwp7ve09Vi6oMG7fJ1g0MuXW1M8UwVPd//NCI2pyDuwR4UVJ6WIT1AoXOzC6rE1Vff4/X/mKmy7MrP2H05N4oVBxzGrIJDnbXHa8uathUrGSi0sZpNtqocj7frc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924918; c=relaxed/simple; bh=1esOn1vyb198P+o1JsVpC/oNvtW9U3rsj4/Uy7gyZUA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FF4D/L5lodg/kk3Ihv7VNSX8/YNkD1+xs7cH6KXkrfnQ1i5z/YHMz/F35nBKBW9QaxeHNfG/aT1FSV8rnEpzp0zQAY+BvW/tz7ln5Jl0slMuwm9sS0mUq/fKakac0IzA8tk/KlIzqQsTjYiIOTlcBx7ByfA6klL5b3lw5C6CiuY= 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=Oey1K3Cm; arc=none smtp.client-ip=209.85.221.53 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="Oey1K3Cm" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-48b060ec084so2208097f8f.0 for ; Tue, 13 Oct 2026 13:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924913; x=1792529713; 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=XiFKLTnTKwy5b9069TX0uLlXDgkgGZV94GstLdAPJNY=; b=Oey1K3CmTIQEgh1Z8pGllR12toOlNg0rm6ueqByiwH6tK7GAArzaV9V3U3NxXNjtHJ BG29wOOczS7/je9t4sqJVV+FR1hYV5N+hfJrUQ1T11wFgyFSHPKgtcyoaCQqBxl/SWw0 BSvMm6j3PNCMnnKszmKGSOrobvh5q7605rHXs4BkOtBfhrSX5AreT3MqC6MfSPl9sFZ1 12laK4Bml860DSmpyEWFoGfdnE8g5VCG2mKmxRIGDRMLoyttqPx89phqNBku7ZDETxdd lxh3dMxWG8SrpP0z3DzV3m4ojgNekpBheIwmrWlnSlKba06PGMVvPFB1LIGeGqVYn+d5 YQfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924913; x=1792529713; 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=XiFKLTnTKwy5b9069TX0uLlXDgkgGZV94GstLdAPJNY=; b=T2b5evWRa7GHEhh3wmhiYHhhQh/qpXCpZt4jZQIjtB6Ujued+Z46VL9nsuxYqalnqm wcVeVHbhHQanRu3XAG9Vio+lE/1U9s1alXNAamzgefTN6IF7wz/HwOvtWr/vj3WZbFwl AveU2yMkPODi/Ao8Kijh52+bd1aqNyG1y0HsJOWWjJ4tRQgUB+M+2v4Eyn1nj4azabJK ikHawg75cl6aig22Bc1iPPd8btQEJUlbS3VTKtWP5nUIw/Ya3SRtLBxrDUZDuevcBwgc +PTHcLp4V6jAGzrGl1CZarNwQXYjlSzHd13lVjBC2Dzr5JTFAi8uLkzRUx8yNHVjNTJb XNLA== X-Forwarded-Encrypted: i=1; AKwUvBw+RQ7l6DJc0KR+bsFRmB60MNP+g4+gdd4wmp9BgVJ77Zo1vVWk3d8r8xR7QeP38o6IswIcyW/l84FQ8Zo=@vger.kernel.org X-Gm-Message-State: AFq9FYJJTlTpI652GggENE3WYjDkG69L35UjEzX8Pz4bQqmiT3YUyDFW M/98uU6oYuNSSTlxPfFGwj0NhfNNodRAZ6FUb+q+6zUda1bXQPj+0Jst X-Gm-Gg: AYBFou0084ipJC3wKcAHm2lKgpdOV4dDw+WIdDFPp0eldxYPweofVgu8/sz+EWVq2w1 YlqITyxgPLr+4KCNuHK4JLOoc25lM4ihzAO4lB14hb85dMJwmKt8siVCQCm8LrWm81XxlHFNUDU sm5epxZlD01Kf5Dgl0RBWom4uew627ioWWg9z/9sel3GQAHTKH7SfPhqt7RQqP9E30KiejZ5Iqa 3DZ9elhq2EQtZCdkYUfgGIQ45AhUpDBkbbW/MeBm3Q2/qClv0XCjuKYAHaz65hmq1LiRZrh1mYG V1R5REa8utQtEv/N6P+5HSS8C1g8+oN0MoF9puRnj1d0QmMjCO1UgiHUaf7BzmQeoT7exDiUfPU gjTFYLkhiKA+t8y9ATHRIcq8JMsKjxm7xWTY/l6nmGzyMWYUIi8pxJiM0L+iBPlGiN4Ymmmh2Ue ulftniQEUBmcrLwTh8bxH8cu7j/QLq8UGx5jQm3CD+u4b+w6v1Kup/8APZaPx6FG8ovTpqLHW1u ROVi5Vd/vAnG7t8lx0AXPDaN0oZAPWMr136+QIl1iMywtABccBLNymGAGUCTM3WIL24EyQFQAyA 8tiY6Lw/ZqQ= X-Received: by 2002:a05:6000:4308:b0:488:823d:5060 with SMTP id ffacd0b85a97d-48dbacf1667mr24882320f8f.48.1791924912617; Tue, 13 Oct 2026 13:55:12 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:11 -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 v10 01/13] dma-buf: introduce initial file I/O infrastructure Date: Tue, 13 Oct 2026 21:54:45 +0100 Message-ID: <1caebf340d205f6d4c5137e7a8a548ea3cf3b87d.1791924581.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: quoted-printable Content-Type: text/plain; charset="utf-8" The goal is to be able to natively use dma-buf in the read-write / IO path. This patch adds basic building blocks serving as a glue and API between drivers and upper layer subsystems providing the uAPI. Later patches implement it for NVMe raw block devices and expose it to the user space via io_uring. There are two main objects. struct dma_buf_io_ctx and struct dma_buf_io_map. The ctx is used during initial registration and serves as an interface between the upper layer user like io_uring and to the importer subsystem / driver. The map represents the actual dma map established for the target device[s] with dma_buf_map_attachment() and stored in a device specific format. The context is created via a new file operation ->init_dma_buf_io_ctx. The ctx-map separation exists to facilitate map invalidation (see dma_buf_io_invalidate_mappings()). A ctx can create multiple maps during its lifetime, but there can only be no more than one (active) map attached to it. Invalidation drops the active map if present, and any new I/O request will try to create a new one. The primary task of dma_buf_io_map is to count requests using it and wait for their completion when we want to destroy the DMA map. [un]mapping and any work with dma addresses is delegated to the importer driver via an ops table stored in the ctx, see struct dma_buf_io_ops. Only the target driver / subsystem knows about devices it wants to use the dma-buf with, especially in case of multi-device filesystems or stacking in the future. Acked-by: Matthew Brost Tested-by: Matthew Brost Signed-off-by: Pavel Begunkov --- drivers/dma-buf/Makefile | 2 +- drivers/dma-buf/dma-buf-io.c | 183 +++++++++++++++++++++++++++++++++++ include/linux/dma-buf-io.h | 105 ++++++++++++++++++++ include/linux/fs.h | 2 + 4 files changed, 291 insertions(+), 1 deletion(-) create mode 100644 drivers/dma-buf/dma-buf-io.c create mode 100644 include/linux/dma-buf-io.h diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile index b25d7550bacf..523731b0f83e 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y :=3D dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \ - dma-fence-unwrap.o dma-resv.o dma-buf-mapping.o + dma-fence-unwrap.o dma-resv.o dma-buf-mapping.o dma-buf-io.o obj-$(CONFIG_DMABUF_HEAPS) +=3D dma-heap.o obj-$(CONFIG_DMABUF_HEAPS) +=3D heaps/ obj-$(CONFIG_SYNC_FILE) +=3D sync_file.o diff --git a/drivers/dma-buf/dma-buf-io.c b/drivers/dma-buf/dma-buf-io.c new file mode 100644 index 000000000000..9ba9c17f900a --- /dev/null +++ b/drivers/dma-buf/dma-buf-io.c @@ -0,0 +1,183 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Common infrastructure for supporing dma-buf in the I/O path. + * + * Copyright (C) 2026 Pavel Begunkov + */ +#include +#include + +static void dma_buf_io_map_release(struct dma_buf_io_map *map) +{ + struct dma_buf_io_ctx *ctx =3D map->ctx; + + dma_resv_assert_held(ctx->dmabuf->resv); + + percpu_ref_exit(&map->refs); + ctx->dev_ops->unmap(ctx, map); +} + +static void dma_buf_io_map_refs_cb(struct percpu_ref *ref) +{ + struct dma_buf_io_map *map =3D container_of(ref, struct dma_buf_io_map, r= efs); + + complete(&map->drained); +} + +static void dma_buf_io_kill_map(struct dma_buf_io_ctx *ctx) +{ + struct dma_buf_io_map *map; + + dma_resv_assert_held(ctx->dmabuf->resv); + + map =3D rcu_dereference_protected(ctx->map, + dma_resv_held(ctx->dmabuf->resv)); + if (!map) + return; + + rcu_assign_pointer(ctx->map, NULL); + percpu_ref_kill(&map->refs); + /* make sure the map is not visible via ctx->map */ + synchronize_rcu_expedited(); + wait_for_completion(&map->drained); + dma_buf_io_map_release(map); +} + +int dma_buf_io_init_map(struct dma_buf_io_ctx *ctx, struct dma_buf_io_map = *map, + struct sg_table *sgt) +{ + unsigned seg_shift =3D ~0U; + struct scatterlist *sg; + unsigned long tmp; + int ret; + + for_each_sgtable_dma_sg(sgt, sg, tmp) + seg_shift =3D min(seg_shift, __ffs(sg_dma_len(sg))); + + ret =3D percpu_ref_init(&map->refs, dma_buf_io_map_refs_cb, 0, GFP_KERNEL= ); + if (ret) + return ret; + init_completion(&map->drained); + map->min_seg_shift =3D seg_shift; + map->ctx =3D ctx; + return 0; +} +EXPORT_SYMBOL_NS_GPL(dma_buf_io_init_map, "DMA_BUF"); + +static struct dma_buf_io_map *__dma_buf_io_create_map(struct dma_buf_io_ct= x *ctx) +{ + struct dma_buf *dmabuf =3D ctx->dmabuf; + struct dma_buf_io_map *map; + long ret; + + dma_resv_assert_held(dmabuf->resv); + + if (ctx->is_dead) + return ERR_PTR(-ENOENT); + + map =3D __dma_buf_io_get_map(ctx); + if (map) + return map; + + map =3D ctx->dev_ops->map(ctx); + if (IS_ERR(map)) + return map; + + if (WARN_ON_ONCE(!map->min_seg_shift)) + return ERR_PTR(-EFAULT); + + ret =3D dma_resv_wait_timeout(dmabuf->resv, DMA_RESV_USAGE_KERNEL, + true, MAX_SCHEDULE_TIMEOUT); + if (ret <=3D 0) { + if (!ret) + ret =3D -EAGAIN; + dma_buf_io_map_release(map); + return ERR_PTR(ret); + } + + /* get a reference for the caller */ + percpu_ref_get(&map->refs); + rcu_assign_pointer(ctx->map, map); + return map; +} + +struct dma_buf_io_map *dma_buf_io_create_map(struct dma_buf_io_ctx *ctx) +{ + struct dma_buf_io_map *map; + int ret; + + ret =3D dma_resv_lock_interruptible(ctx->dmabuf->resv, NULL); + if (ret) + return ERR_PTR(ret); + + map =3D __dma_buf_io_create_map(ctx); + dma_resv_unlock(ctx->dmabuf->resv); + return map; +} + +static void dma_buf_io_ctx_shutdown(struct dma_buf_io_ctx *ctx) +{ + dma_resv_lock(ctx->dmabuf->resv, NULL); + ctx->is_dead =3D true; + dma_buf_io_kill_map(ctx); + dma_resv_unlock(ctx->dmabuf->resv); +} + +int dma_buf_io_ctx_create(struct file *file, + struct dma_buf *dmabuf, + enum dma_data_direction dir, + struct dma_buf_io_ctx **out_ctx) +{ + struct dma_buf_io_ctx *ctx; + int ret; + + if (!file->f_op->init_dma_buf_io_ctx) + return -EOPNOTSUPP; + + ctx =3D kzalloc_obj(*ctx); + if (!ctx) + return -ENOMEM; + ctx->dir =3D dir; + ctx->dmabuf =3D dmabuf; + get_dma_buf(dmabuf); + + ret =3D file->f_op->init_dma_buf_io_ctx(file, ctx); + if (ret) { + kfree(ctx); + dma_buf_put(dmabuf); + return ret; + } + + if (WARN_ON_ONCE(!ctx->dev_ops || + !ctx->dev_ops->map || + !ctx->dev_ops->unmap || + !ctx->dev_ops->release)) + return -EINVAL; + + *out_ctx =3D ctx; + return 0; +} + +void dma_buf_io_ctx_release(struct dma_buf_io_ctx *ctx) +{ + dma_buf_io_ctx_shutdown(ctx); + + if (WARN_ON_ONCE(rcu_dereference_protected(ctx->map, true))) + return; + + ctx->dev_ops->release(ctx); + dma_buf_put(ctx->dmabuf); + kfree(ctx); +} + +void dma_buf_io_invalidate_mappings(struct dma_buf_io_ctx *ctx) +{ + dma_buf_io_kill_map(ctx); +} +EXPORT_SYMBOL_NS_GPL(dma_buf_io_invalidate_mappings, "DMA_BUF"); + +void dma_buf_io_detach(struct dma_buf_io_ctx *ctx) +{ + dma_buf_io_ctx_shutdown(ctx); +} +EXPORT_SYMBOL_NS_GPL(dma_buf_io_detach, "DMA_BUF"); diff --git a/include/linux/dma-buf-io.h b/include/linux/dma-buf-io.h new file mode 100644 index 000000000000..8ac338df51ff --- /dev/null +++ b/include/linux/dma-buf-io.h @@ -0,0 +1,105 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DMA_BUF_IO_H__ +#define __DMA_BUF_IO_H__ + +#include + +struct dma_buf_io_ctx; +struct dma_buf_io_map; + +struct dma_buf_io_ops { + /* + * Create a new map for the given ctx. Called with the reservation + * lock held. + */ + struct dma_buf_io_map *(*map)(struct dma_buf_io_ctx *ctx); + + /* + * Clean up device specific parts of the @map. Called with the + * reservation lock held. + */ + void (*unmap)(struct dma_buf_io_ctx *ctx, struct dma_buf_io_map *map); + + /* + * The user tries to destroy the ctx. Release all device specific + * parts of the token. + */ + void (*release)(struct dma_buf_io_ctx *); +}; + +struct dma_buf_io_map { + /* + * Counts attached requests and other users. Device specific unmapping + * is deferred until all refs are dropped. + */ + struct percpu_ref refs; + /* + * Shift for the minimum segment size of the mapping. + */ + unsigned min_seg_shift; + + struct dma_buf_io_ctx *ctx; + struct completion drained; +}; + +struct dma_buf_io_ctx { + struct dma_buf_io_map __rcu *map; + struct dma_buf *dmabuf; + enum dma_data_direction dir; + bool is_dead; + + void *dev_priv; + const struct dma_buf_io_ops *dev_ops; +}; + +int dma_buf_io_ctx_create(struct file *file, + struct dma_buf *dmabuf, + enum dma_data_direction dir, + struct dma_buf_io_ctx **ctx); +void dma_buf_io_ctx_release(struct dma_buf_io_ctx *ctx); + +struct dma_buf_io_map *dma_buf_io_create_map(struct dma_buf_io_ctx *ctx); + +static inline struct dma_buf_io_map * +__dma_buf_io_get_map(struct dma_buf_io_ctx *ctx) +{ + struct dma_buf_io_map *map; + + guard(rcu)(); + + map =3D rcu_dereference(ctx->map); + if (unlikely(!map || !percpu_ref_tryget_live_rcu(&map->refs))) + return NULL; + + return map; +} + +static inline struct dma_buf_io_map * +dma_buf_io_get_map(struct dma_buf_io_ctx *ctx, bool nowait) +{ + struct dma_buf_io_map *map; + + map =3D __dma_buf_io_get_map(ctx); + if (likely(map)) + return map; + + if (nowait) + return ERR_PTR(-EAGAIN); + return dma_buf_io_create_map(ctx); +} + +static inline void dma_buf_io_map_drop(struct dma_buf_io_map *map) +{ + percpu_ref_put(&map->refs); +} + +/* + * Device API + */ + +void dma_buf_io_invalidate_mappings(struct dma_buf_io_ctx *ctx); +int dma_buf_io_init_map(struct dma_buf_io_ctx *ctx, struct dma_buf_io_map = *map, + struct sg_table *sgt); +void dma_buf_io_detach(struct dma_buf_io_ctx *ctx); + +#endif diff --git a/include/linux/fs.h b/include/linux/fs.h index f9d1e05e8ae6..05c1ff495732 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1914,6 +1914,7 @@ struct dir_context { #define COPY_FILE_SPLICE (1 << 0) =20 struct io_uring_cmd; +struct dma_buf_io_ctx; struct offset_ctx; =20 struct file_operations { @@ -1960,6 +1961,7 @@ struct file_operations { int (*uring_cmd_iopoll)(struct io_uring_cmd *, struct io_comp_batch *, unsigned int poll_flags); int (*mmap_prepare)(struct vm_area_desc *); + int (*init_dma_buf_io_ctx)(struct file *, struct dma_buf_io_ctx *); } __randomize_layout; =20 /* Supports async buffered reads */ --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 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 47727554092 for ; Tue, 13 Oct 2026 20:55:18 +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=1791924921; cv=none; b=EqqhJgDBjdoHt1hqrZpLUpwEKVRn0cg85HoGxDJsSE26I7H/75QsGSm96TI3XAhyvWZm4mU9Xrf5iOGOTdUsxZrbS9kD5b5yaR7SsdpFig9XtTOIgidQqGIfUh3zmY48mNvFjSUEnBTKp6XYVNH74WjlqgcL45VY5SnHcwkMqbU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924921; c=relaxed/simple; bh=r0p2adqwMj/5lT7C+TYVmZHcVYZ+gdU2HSJ4o7+sSAQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uXjGPejxw0KadswMUAUxrRkZA4U/H+pI2nURbMscc086W4t1CISYOkvwUPAjRGm3VRK2Y4usFJGXCf8j0x3uBzR5m+5/QSuFAdAZjAL4I2X9G5Dr/bmrM1I+1aUxaicLiugqf0UXYKCJcAgIYxIxqlwGfBIKphrmOTLysFa0KbM= 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=WAFmD8ob; 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="WAFmD8ob" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4a16c399641so34061175e9.2 for ; Tue, 13 Oct 2026 13:55:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924916; x=1792529716; 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=u2SC7dcI1Y+PPMkABrALMaBjWk253olXayI/6F0cq90=; b=WAFmD8ob6aOFNADV6rTYDAa0jwRaH0S3/AactAry1PJhfzwb5XeJU/3idIDhjPur8u 6Uu59M0Dc0QwVxOw5GOSQIGyQFwxmx7CXQD9Kp5fzavojXDzVNUhNNxlcdIrr1fGP8f4 9Emu/9PKvOATPPRKiG/NGPRGYcZqTz0KD3xYuAW3adW55a2mrXQtA7ayThJBPyPIsEvH sT4RoBTknYSJCtEiRyvuoc4b1Mhbzy5q92sZi448XLVMecza5m/EuaQwYyFZfNHDK7hQ R0ZZdFg0d2L+yz256eH+0bK2pszpxQD+CdGodTRzaaEKaA9E0mzqai79IAWBFl/fa9/X tORg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924916; x=1792529716; 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=u2SC7dcI1Y+PPMkABrALMaBjWk253olXayI/6F0cq90=; b=zdDD1/X9ytu6ezRlTpmYFNKjM7miUFwbsX9PwPbVaWLEDPcKZRExeRs/JAns2Sw/8S ejpADfa5utkULStWwUA1gQ5CJ6H1qEORTCaiazkhOHXhZHtUoZdJq/K2Fnu2as2oiwtM 2stB81RfX7SzFnSvkyQk13Lpf12pD6EQc4rR31qCn7Zecfwul5aO6H1rltvx4ZdXIDgV K5O4t8i/Nqn4kV3WeyjQ46Di2Qtw3VHCoEPF87NgPUI1LeTFT5AVu0Ct2/Lr3pjbSf2X Ivmj+ExO207/eQeZEBhuW8ZK/LCMTN5/rzI09mPKL9JuKoKUaENxXG4tl8nJ8olA28Dr EK9Q== X-Forwarded-Encrypted: i=1; AKwUvBzEUFMCraLVvO/tfHeHFgXVJLx4dg1oRcChVDYdvhsgrr+zdvANFFYq183h2oXhjIokMmtmE8jHkrZEeGQ=@vger.kernel.org X-Gm-Message-State: AFq9FYKafeWm9RjLqmnQwXZoO/1cF+Vqu7AxIpfL/q1hlaydqRShTPld 2ydKdLCUa79ZZVgb/tO9bIIZjFEnXBB51Zc8P+knj+sQcGAyUNTeKgtS X-Gm-Gg: AYBFou0Yxm/TGwoCoUJCwNDsdNeDYTyr5k49ahZbDCWAym1CHShJ9eAUbKBZrUbweMn gx4QBQEULqQMsJWVKUaOWwN0rSDn4+a+fegt5W//gHVgbxpzBSxaDGdA2X98r/6TKZgXw4rVxMH k+s+/nCn6eh2oNn9NDbgqXzKA8D+KN1Q9sikXbbt3lqV43tR8x92SN0ieewr6d6GvPNekgupCt3 cxGCw2ReKs4Q1hq/Koa5JTeqELAs5QCRJOGwIXu03oZsagRR7IxdUoLvvjISAR9Ws0aY58ef2wv 1f5hN8c1tCkyS4pEujCSu9MtyflaUAz+RGkc7Ux/bRiWipkbmsWlaJv1Ns4Vf97Hw6TxMrjxxHy /wo0pbnoKB/oSnYIaYgCHoKnFd7qyeLmcKrCeu/vdPapKXPp7RFP+hRVJTIuvg6/QbCrIpAt45b l15xT5iDD5OAvAq7LAJDEJiPH/zJahcPsHTiWlWUzZAfPEA7qaaIxaffj3XXHeDW3sp05RkVhVG LzyAe0NmZGgzYhjxFn7y9Zr3fnU0WRnVWgFz+L6xqjUTso4DUQkkra2od7ifnOlXt3otogMyG/v X-Received: by 2002:a05:600c:1553:b0:49f:e8bf:8f9b with SMTP id 5b1f17b1804b1-4a18e443ea6mr263806405e9.4.1791924916136; Tue, 13 Oct 2026 13:55:16 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:13 -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 v10 02/13] iov_iter: add iterator type for dmabuf maps Date: Tue, 13 Oct 2026 21:54:46 +0100 Message-ID: <20b8e9c900c7656e43e039a0d97213a2a781ba4f.1791924581.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: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce a new iterator type for dmabuf maps. The map in an opaque object with internals and format specific to the subsystem / driver, and only it can use that subsystem / driver for issuing IO. The task of the middle layers is to pass the map / iterator further down, maybe doing basic splitting and length checking. The iterator can only be used by operations of the file the associated map was created for. Suggested-by: Keith Busch Reviewed-by: Christoph Hellwig Signed-off-by: Pavel Begunkov --- include/linux/iov_iter.h | 2 ++ include/linux/uio.h | 11 +++++++++++ lib/iov_iter.c | 29 +++++++++++++++++++++++------ 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/include/linux/iov_iter.h b/include/linux/iov_iter.h index f9a17fbbd398..2f91884d733b 100644 --- a/include/linux/iov_iter.h +++ b/include/linux/iov_iter.h @@ -310,6 +310,8 @@ size_t iterate_and_advance2(struct iov_iter *iter, size= _t len, void *priv, return iterate_folioq(iter, len, priv, priv2, step); if (iov_iter_is_xarray(iter)) return iterate_xarray(iter, len, priv, priv2, step); + if (WARN_ON_ONCE(iov_iter_is_dmabuf_map(iter))) + return 0; return iterate_discard(iter, len, priv, priv2, step); } =20 diff --git a/include/linux/uio.h b/include/linux/uio.h index fe2e985d74d2..638c1116e912 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -12,6 +12,7 @@ =20 struct page; struct folio_queue; +struct dma_buf_io_map; =20 typedef unsigned int __bitwise iov_iter_extraction_t; =20 @@ -29,6 +30,7 @@ enum iter_type { ITER_FOLIOQ, ITER_XARRAY, ITER_DISCARD, + ITER_DMABUF_MAP, }; =20 #define ITER_SOURCE 1 // =3D=3D WRITE @@ -71,6 +73,7 @@ struct iov_iter { const struct folio_queue *folioq; struct xarray *xarray; void __user *ubuf; + struct dma_buf_io_map *dmabuf_map; }; size_t count; }; @@ -155,6 +158,11 @@ static inline bool iov_iter_is_xarray(const struct iov= _iter *i) return iov_iter_type(i) =3D=3D ITER_XARRAY; } =20 +static inline bool iov_iter_is_dmabuf_map(const struct iov_iter *i) +{ + return iov_iter_type(i) =3D=3D ITER_DMABUF_MAP; +} + static inline unsigned char iov_iter_rw(const struct iov_iter *i) { return i->data_source ? WRITE : READ; @@ -300,6 +308,9 @@ void iov_iter_folio_queue(struct iov_iter *i, unsigned = int direction, unsigned int first_slot, unsigned int offset, size_t count); void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xa= rray *xarray, loff_t start, size_t count); +void iov_iter_dmabuf_map(struct iov_iter *i, unsigned int direction, + struct dma_buf_io_map *map, + loff_t off, size_t count); ssize_t iov_iter_get_pages2(struct iov_iter *i, struct page **pages, size_t maxsize, unsigned maxpages, size_t *start); ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i, struct page ***pages, diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 2072c04e99d0..6831a5d9396e 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -575,7 +575,8 @@ void iov_iter_advance(struct iov_iter *i, size_t size) { if (unlikely(i->count < size)) size =3D i->count; - if (likely(iter_is_ubuf(i)) || unlikely(iov_iter_is_xarray(i))) { + if (likely(iter_is_ubuf(i)) || unlikely(iov_iter_is_xarray(i)) || + unlikely(iov_iter_is_dmabuf_map(i))) { i->iov_offset +=3D size; i->count -=3D size; } else if (likely(iter_is_iovec(i) || iov_iter_is_kvec(i))) { @@ -631,7 +632,8 @@ void iov_iter_revert(struct iov_iter *i, size_t unroll) return; } unroll -=3D i->iov_offset; - if (iov_iter_is_xarray(i) || iter_is_ubuf(i)) { + if (iov_iter_is_xarray(i) || iter_is_ubuf(i) || + iov_iter_is_dmabuf_map(i)) { BUG(); /* We should never go beyond the start of the specified * range since we might then be straying into pages that * aren't pinned. @@ -775,6 +777,20 @@ void iov_iter_xarray(struct iov_iter *i, unsigned int = direction, } EXPORT_SYMBOL(iov_iter_xarray); =20 +void iov_iter_dmabuf_map(struct iov_iter *i, unsigned int direction, + struct dma_buf_io_map *map, + loff_t off, size_t count) +{ + WARN_ON(direction & ~(READ | WRITE)); + *i =3D (struct iov_iter){ + .iter_type =3D ITER_DMABUF_MAP, + .data_source =3D direction, + .dmabuf_map =3D map, + .count =3D count, + .iov_offset =3D off, + }; +} + /** * iov_iter_discard - Initialise an I/O iterator that discards data * @i: The iterator to initialise. @@ -856,7 +872,7 @@ unsigned long iov_iter_alignment(const struct iov_iter = *i) return iov_iter_alignment_bvec(i); =20 /* With both xarray and folioq types, we're dealing with whole folios. */ - if (iov_iter_is_folioq(i)) + if (iov_iter_is_folioq(i) || iov_iter_is_dmabuf_map(i)) return i->iov_offset | i->count; if (iov_iter_is_xarray(i)) return (i->xarray_start + i->iov_offset) | i->count; @@ -872,7 +888,7 @@ unsigned long iov_iter_gap_alignment(const struct iov_i= ter *i) size_t size =3D i->count; unsigned k; =20 - if (iter_is_ubuf(i)) + if (iter_is_ubuf(i) || iov_iter_is_dmabuf_map(i)) return 0; =20 if (WARN_ON(!iter_is_iovec(i))) @@ -1469,11 +1485,12 @@ EXPORT_SYMBOL_GPL(import_ubuf); void iov_iter_restore(struct iov_iter *i, struct iov_iter_state *state) { if (WARN_ON_ONCE(!iov_iter_is_bvec(i) && !iter_is_iovec(i) && - !iter_is_ubuf(i)) && !iov_iter_is_kvec(i)) + !iter_is_ubuf(i) && !iov_iter_is_kvec(i) && + !iov_iter_is_dmabuf_map(i))) return; i->iov_offset =3D state->iov_offset; i->count =3D state->count; - if (iter_is_ubuf(i)) + if (iter_is_ubuf(i) || iov_iter_is_dmabuf_map(i)) return; /* * For the *vec iters, nr_segs + iov is constant - if we increment --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 22B5B5540A0 for ; Tue, 13 Oct 2026 20:55:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924926; cv=none; b=F0D8QA93d9z41EL9E6HcZ2iXVJ05FV0b1ny3e4xwzQp0N9ZlOpWq0yGLNKQwbUJZDBnFrnuZ+DDf5M/2J1dCvAgTlM73lyX3m8eTvWz3elZgALJ2wLJrZtP72xhNG7r3xXlLmpQeDzdVQHWkHdlUmxMBXeXyBanWnBB3/RSfoSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924926; c=relaxed/simple; bh=lqtmMOq9NyJHWkCTixF/EfRvdzo9ti4x7BRbdW0dvpo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KBCNH4lJSK8BsOWoPCwi0AxDQwGYwa1835GUEKvzEz5QwnUN3W9PH3kFFns5WwLD7m5Oss46OC0OI4GZu+wUDOBPchwgKNu5WFqOG4Irg6KgSY3q713kACKuPiJaGtB1+j+YaWJLdVgJkBk4RgdK+1pNE+8rB38ywg7ARuwDc0A= 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=SmFXR4vu; arc=none smtp.client-ip=209.85.128.47 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="SmFXR4vu" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4a018792ab3so28468325e9.0 for ; Tue, 13 Oct 2026 13:55:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924920; x=1792529720; 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=BooWm7URUcyrH2E2qkRWxlx7KQoz7GWFpr53v56Fl9k=; b=SmFXR4vuCaMo3QNHNg+lOj2KNs21jJ78u9JC2s7IhIvdMjkgms30I+9HuzrwHHrfhE Fs9RJ6L1imwZvtHQsc63YyH0SOPVY5DJvt2CyTkJ7KNKbNFGBmlUKa61Cqr61Ifkx+rm Of718itS7uUl6lFhsO977+ejz/fJuSFBr9gaRDLlPWjlFoXWSWQUPG2nTKJ55VDTrXvo 7P4x51h6lGorsQCrvKZ2zv7V5FsqWS90FhUlQs6wpI4x/X1Best+JcL+HxQ9osvFXE5e vQXtMBoDYsDSc6n4oCjaWwJCfPgCiVuwnj6TSAHUmx5P0/0i85mSvWrl56EfUaTxQ+5j F/IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924920; x=1792529720; 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=BooWm7URUcyrH2E2qkRWxlx7KQoz7GWFpr53v56Fl9k=; b=OVX+4PWzrW5d/WwRigBTaro1bStCg1Tn3U22XqMb+emN0rUPKCu9H10XV1vEwrFTKc sYR1Le1ACjbmoBTd11EiZVxDJv4TryIyXcyCNr3SslInir2fBBFLRQ52KAbc6G498diA elt/ln1IhewIuZnDBZ55yHjgvGTT+zzjIPLSIRdQUkkgaL2scZzrzU9KCQU+oi9Lf8sN 6dt4mZKnWHfUmI5zj5Bvtwjb85yyjBZ8gKCUIsL85++CYfsurMs2bnlNGVs/QAl0tPK0 4xdUn+0sb/v8G4zPSwUaO3RZ4+lBXoWqBMbN6bR8xVaQKOILr7DjoXSOhIY4+5YefZrV em5Q== X-Forwarded-Encrypted: i=1; AKwUvBy5EaXqmx0f2NtVYauzYi2PcIM/8NZPL1cDSoPFcSQPeWBPJp6gTGDEyo52TqQkR+JNUQjVulZrdEfTArQ=@vger.kernel.org X-Gm-Message-State: AFq9FYJcBYoihBu6rXDO/mlh6OXC8UbdyUxP+OpQLJWyeHgTLKMdpwg7 LdZH3vy2pH7u8eKshiPP0DttBc1EOgngezxKKVgq/jFazzrhd6w5+5eD X-Gm-Gg: AYBFou04tn35MFGNXoogT6ZTVUzhELLuJwMDskr9+/ylsHXjRZYd1iDc1KJu1eKtbLI E7zL3ZTnE1/Lr6aucCvtN0H9u0VYjrrs3iCGl/F+03ENRghOpRjDUdL/cIba2xaaH9HB0ps2Ail BpR+eJJOi0tO7j086FxOxlUQcyF/qTD1ntuoazzjljc3dxXYMcPbp+8PMSm59wC9igFEWJTqqGL o26vuF4Go+TCK62zbsHW+DX9i6cUJcTin4mCf1iWew7GCgSYyljnjUKEzlU4+YPZ6PZdpDEQz/Z 3JDSdR4SREges6ELThKsvI1vFVBofal7dXtdH2qG3FdEvOUhCn5AcSiwrGqvx+KecJqvxi3n9Tu /IpCyKjER7rTQzxEndvxdgT/yaT9LgQBoUpsrNz9BzoEuxLo0uMqOR93+xib30mYPm/oaClBVVB /gGlLVUKZ2bgkcQODYPiOUJ1jJNGjb3JP4Bzzt0kAJMKhYJGUQClBss8xg43AVRo3gL7fSizbwa mKW0UAghbqzZBXF+YKi3Jvm25Q+ceQgg/eshzVEeZ//dbQYyY0KfGlchpvw+c2wWHrz12CU61KV X-Received: by 2002:a05:600c:3e83:b0:4a1:6d35:779a with SMTP id 5b1f17b1804b1-4a18e446880mr243665015e9.3.1791924919983; Tue, 13 Oct 2026 13:55:19 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:18 -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 v10 03/13] block: always adjust bi_offset on bio_advance_iter Date: Tue, 13 Oct 2026 21:54:47 +0100 Message-ID: <007fe19ad4e949ec70ee74ef5cb05774656c62e2.1791924581.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: quoted-printable Content-Type: text/plain; charset="utf-8" Extend bio_no_advance_iter() iteration to also increment the offset. It's not currently needed because the currently listed request types don't have a buffer, but will be useful once we add bios backed by dma-buf, which don't have a bvec but work with a single range. Suggested-by: Christoph Hellwig Reviewed-by: Christoph Hellwig Signed-off-by: Pavel Begunkov --- drivers/md/dm-io-rewind.c | 6 ++++-- include/linux/bio.h | 12 ++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/md/dm-io-rewind.c b/drivers/md/dm-io-rewind.c index 04f3fc8aeb6f..b22719c6411c 100644 --- a/drivers/md/dm-io-rewind.c +++ b/drivers/md/dm-io-rewind.c @@ -113,10 +113,12 @@ static inline void dm_bio_rewind_iter(const struct bi= o *bio, iter->bi_sector -=3D bytes >> 9; =20 /* No advance means no rewind */ - if (bio_no_advance_iter(bio)) + if (bio_no_advance_iter(bio)) { iter->bi_size +=3D bytes; - else + iter->bi_offset -=3D bytes; + } else { dm_bvec_iter_rewind(bio->bi_io_vec, iter, bytes); + } } =20 /** diff --git a/include/linux/bio.h b/include/linux/bio.h index 17944e44b584..892ca469c570 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -113,11 +113,13 @@ static inline void bio_advance_iter(const struct bio = *bio, { iter->bi_sector +=3D bytes >> 9; =20 - if (bio_no_advance_iter(bio)) + if (bio_no_advance_iter(bio)) { iter->bi_size -=3D bytes; - else + iter->bi_offset +=3D bytes; + } else { bvec_iter_advance(bio->bi_io_vec, iter, bytes); /* TODO: It is reasonable to complete bio with error here. */ + } } =20 /* @bytes should be less or equal to bvec[i->bi_idx].bv_len */ @@ -127,10 +129,12 @@ static inline void bio_advance_iter_single(const stru= ct bio *bio, { iter->bi_sector +=3D bytes >> 9; =20 - if (bio_no_advance_iter(bio)) + if (bio_no_advance_iter(bio)) { iter->bi_size -=3D bytes; - else + iter->bi_offset +=3D bytes; + } else { bvec_iter_advance_single(bio->bi_io_vec, iter, bytes); + } } =20 void __bio_advance(struct bio *, unsigned bytes); --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.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 A9A64556BB3 for ; Tue, 13 Oct 2026 20:55:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924931; cv=none; b=IDaGWYz8HIk2fU2IIijqGx761pOPKQgyFUnczmPAhuWonVv4ApHrA5cU4VO/2AjqdQ4si8mGlFNUlDmjNxKlItj/rdRKHkeWxr+JOfwaT38NXilNBCkTwSl38ax6LDmG9wFCuyEn8gMCW7IwGkv4+7cEtWjy90R8WND2NpMHNHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924931; c=relaxed/simple; bh=WSYuJ2CSe5MQPAXNnecfuqbBxEyZXfqX7o9X0AvpCs0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Na2iHT8ChhabDctabqF/0UIZPfLPrQrvHNHal58Pi+Thl0F22fSjsIStNBvsrFjmUCZKnNn/Do3EKU1PgsS4Rm1pA+nx9KWBuLkFOes3t5gb0SCezHOPfX43XpUk0ySJ5KUG0Kq8qHfxvBwXA6pz9RMZ3Zc/xHHnpoSiaAMAteg= 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=jxrCDe9T; arc=none smtp.client-ip=209.85.221.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="jxrCDe9T" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-48afcd7ba9bso1922156f8f.3 for ; Tue, 13 Oct 2026 13:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924923; x=1792529723; 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=VU42MfuIm5UeQYpyXXcu/MIJJ21cHTHg0N7CAKjDZ/U=; b=jxrCDe9TDH9NGJtftY+APdEXzU/6/7Zkc2Y16/5A1cpk7XozzZkb+Q8G4to1SUgiL4 dH0ggmROwycpwbDoePX8+KWSkYTOu42NNQpyIeX7T//7DF/gvEbZssuRCAjSBBiTHWwd cbqQrwn8gNT4fKekEYVAvg4CEMJp/NyaAEoS3fMhv9OWkh/iokt9+4umKQwEF7hgRS1D q0ow/kw+I3qLWpmy/T/TfdINnn3/d6fjhrrEC2kwiIrUN191lazUjGWsaJJjR4+3Yhkv C63RuRYlZfp+ohOn/P5MBf0BkzlobgYikxWjngVM46jduGzii0QX1VpEMx6y1Ur7YiiI Kenw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924923; x=1792529723; 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=VU42MfuIm5UeQYpyXXcu/MIJJ21cHTHg0N7CAKjDZ/U=; b=xa+D9Yz8BU1eZnQYAsvPLqHaXOj+b5gRcscAv2+do8/gyDxtcHyFrBQh7RzXol3fl2 ZME2dRb9nJdnboH+e673tpU7yV313pIvkdk6Pzv89+iIzBncY9Uf1fRA8zuNYH4lqiEN 7Nq3BakYlXWmBWcCMsz9S1cj0HOx9qd8lo+ccZcenhj7izGt0TRRbITtr4z1PXpqSSQU stQzzW3W8RoQBeXL/nnwmV/8ZyZaiIE19i5BRuOVZVLu/4wYq75Lf/3n+2CXhzSivVNE EXCAqFj3dKuM4vqR5HU7Kz9hAs6wvp85pFbYNYH5kYCM63CJiI1AcfYUKLs+NMZXJBgX m7TA== X-Forwarded-Encrypted: i=1; AKwUvBz6ZOoDN7TF1f3gVC8Id6sDeYwsMNa5ruUhl8L7dSGsP//3miNO3k0NVLAIYKb5m2k5wQTgjLB8IPBfj5I=@vger.kernel.org X-Gm-Message-State: AFq9FYKtKNRi2n2W7F/2sa5LgnWSdwtIR4NEi20sEMtpGpbZSpStxKpq yOdLz2PsHvmmeiuJ5QOAsVcB5OGBeUbBYrBL80JT6l6MC1saCZDAiogq X-Gm-Gg: AYBFou3Es+LwI+xGKboPfQsrLCqWIz2WGHxJ9NOA/uiTsftxnArstKJMLmKWcF1TX15 Sq3FvUC05nF1IAmh/4Rhv42GI3RbGV8FDdYpNCrhUOUXB3lAU++jFHBNqSCOH5STAcAaCgwA+PZ O43zCoD+QFL1m3+5s4JyY7LlD4cWR1DWEwqrlsx5wj9tmKkVPHakwAd8mWCqSCsW3PuZ700h8g5 ckTyDsC8s/RZIclrrWNDMDquywkmAnwyyXDTVVUWfxuWYb7cSUgojTid2XuoD2/5yeqRviO1o8D KWaRZl/LoiGO4qT5J44ANU1NzOu+e9/e0FtObuxCNOdPSP+nyqNFU3SpDClXB9ZSK2oIS6nNfLE 9HngY2kvEYSPyC6t5gUd/xVYxZeylbh4PYiPedZgAmQgcJ9mkFZhRA7GUPVW7mYM5Aoqs+ZSqwd gnUKoDBCig7R1WzwYUs4ob+VtcIjNPAhkTz0ioPMHMBJlK8aj71Epw8Nh0UtjchrXViKEZmyf8g fgEKzE24uSX6BKB/w26weO9FaZ858KwnLbZZ/c/dM9WiiVubfV1jcqFaKXh3TbX9MJw0qAurUF8 QaY9ppI4uSg= X-Received: by 2002:a05:6000:4594:b0:48d:debc:dc12 with SMTP id ffacd0b85a97d-48ddebcdc57mr8980574f8f.23.1791924922619; Tue, 13 Oct 2026 13:55:22 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:21 -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 v10 04/13] block: introduce dma map backed bio type Date: Tue, 13 Oct 2026 21:54:48 +0100 Message-ID: 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: quoted-printable Content-Type: text/plain; charset="utf-8" Premapped buffers don't require a generic bio_vec since these have already been dma mapped. Repurpose the bi_io_vec space to store dmabuf maps as they are mutually exclusive. The bio splitting differs from the normal path because it's already pre-mapped and for the block layer it's just an offset into the dma-buf. The actual segmentation is only available to the importer driver and not the block layer, however, it doesn't contain alignment gaps and we don't have to check it. For the same reason we can't precisely split by the number of segments, but we use ->min_seg_shift stored in the map to calculate the minimum number of bytes a request consisting of lim->max_segments full segments can cover and split by that. It's stricter and can add extra splitting. E.g. for a {4K, 4G} segmentation, the min segment size is 4K, and we'll split it into bios of (4K * lim->max_segments) bytes each, but it should be good enough for now to cover the most popular use cases. Suggested-by: Keith Busch Signed-off-by: Pavel Begunkov --- block/bio.c | 15 +++++++++-- block/blk-merge.c | 52 +++++++++++++++++++++++++++++++++++++++ block/blk-mq.c | 6 +++++ block/fops.c | 2 +- include/linux/bio.h | 9 ++++--- include/linux/blk-mq.h | 7 ++++++ include/linux/blk_types.h | 14 ++++++++++- include/linux/bvec.h | 3 ++- 8 files changed, 99 insertions(+), 9 deletions(-) diff --git a/block/bio.c b/block/bio.c index b48091c7663f..1e0d9714c541 100644 --- a/block/bio.c +++ b/block/bio.c @@ -881,7 +881,11 @@ static int __bio_clone(struct bio *bio, struct bio *bi= o_src, gfp_t gfp) bio->bi_write_stream =3D bio_src->bi_write_stream; bio->bi_bvec_gap_bit =3D bio_src->bi_bvec_gap_bit; bio->bi_iter =3D bio_src->bi_iter; - bio->bi_io_vec =3D bio_src->bi_io_vec; + + if (op_is_dmabuf(bio->bi_opf)) + bio->bi_dmabuf_map =3D bio_src->bi_dmabuf_map; + else + bio->bi_io_vec =3D bio_src->bi_io_vec; =20 if (bio->bi_bdev) { if (bio->bi_bdev =3D=3D bio_src->bi_bdev && @@ -1204,16 +1208,23 @@ EXPORT_SYMBOL_GPL(__bio_release_pages); =20 bool bio_iov_iter_set(struct bio *bio, const struct iov_iter *iter) { - if (!iov_iter_is_bvec(iter)) + if (!iov_iter_is_bvec(iter) && !iov_iter_is_dmabuf_map(iter)) return false; =20 WARN_ON_ONCE(bio->bi_max_vecs); =20 + static_assert(offsetof(struct bio, bi_io_vec) =3D=3D + offsetof(struct bio, bi_dmabuf_map)); + static_assert(offsetof(struct iov_iter, bvec) =3D=3D + offsetof(struct iov_iter, dmabuf_map)); + bio->bi_io_vec =3D (struct bio_vec *)iter->bvec; bio->bi_iter.bi_idx =3D 0; bio->bi_iter.bi_offset =3D iter->iov_offset; bio->bi_iter.bi_size =3D iov_iter_count(iter); bio_set_flag(bio, BIO_CLONED); + if (iov_iter_is_dmabuf_map(iter)) + bio->bi_opf |=3D REQ_NOMERGE | REQ_DMABUF; return true; } =20 diff --git a/block/blk-merge.c b/block/blk-merge.c index 258a726071d1..501ddc01c449 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -9,6 +9,7 @@ #include #include #include +#include =20 #include =20 @@ -319,6 +320,41 @@ static inline unsigned int bvec_seg_gap(struct bio_vec= *bvprv, return bv->bv_offset | (bvprv->bv_offset + bvprv->bv_len); } =20 +static inline int bio_split_io_at_dmabuf(struct bio *bio, + const struct queue_limits *lim, unsigned *segs, + unsigned max_bytes, unsigned len_align_mask, + unsigned start_align_mask) +{ + unsigned bytes =3D min(bio->bi_iter.bi_size, max_bytes); + unsigned seg_shift =3D bio->bi_dmabuf_map->min_seg_shift; + unsigned offset =3D bio->bi_iter.bi_offset & ((1U << seg_shift) - 1); + u64 max_segs_bytes; + + /* + * dma-buf maps don't expose the underlying segmentation, but they're + * guaranteed to not have alignment gaps, we only need to check the + * start and length alignment. + */ + if ((bio->bi_iter.bi_offset & start_align_mask) || + (bio->bi_iter.bi_size & len_align_mask)) + return -EINVAL; + + /* Presented as a single contiguous range into the dma-buf */ + *segs =3D 1; + + /* + * Limit by the number of segments by using the minimal segment size. + * Any I/O consisting of N full segments should be able to cover at + * least N multiplied by the segment size. It's stricter than walking + * the segments and might cause extra splitting. + */ + max_segs_bytes =3D (u64)lim->max_segments << seg_shift; + bytes =3D min_t(u64, bytes, max_segs_bytes - offset); + if (bytes !=3D bio->bi_iter.bi_size) + return bytes; + return 0; +} + /** * bio_split_io_at - check if and where to split a bio * @bio: [in] bio to be split @@ -346,6 +382,19 @@ int bio_split_io_at(struct bio *bio, const struct queu= e_limits *lim, len_align_mask |=3D (bc->bc_key->crypto_cfg.data_unit_size - 1); } =20 + if (op_is_dmabuf(bio->bi_opf)) { + int ret; + + ret =3D bio_split_io_at_dmabuf(bio, lim, &nsegs, max_bytes, + len_align_mask, start_align_mask); + if (ret < 0) + return ret; + if (!ret) + goto out; + bytes =3D ret; + goto split; + } + bio_for_each_bvec(bv, bio, iter) { if (bv.bv_offset & start_align_mask || bv.bv_len & len_align_mask) @@ -376,6 +425,7 @@ int bio_split_io_at(struct bio *bio, const struct queue= _limits *lim, bvprvp =3D &bvprv; } =20 +out: *segs =3D nsegs; bio->bi_bvec_gap_bit =3D ffs(gaps); return 0; @@ -493,6 +543,8 @@ unsigned int blk_recalc_rq_segments(struct request *rq) =20 if (!rq->bio) return 0; + if (op_is_dmabuf(rq->bio->bi_opf)) + return 1; =20 switch (bio_op(rq->bio)) { case REQ_OP_DISCARD: diff --git a/block/blk-mq.c b/block/blk-mq.c index e929f94b25c7..1b7f8cbbda8b 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -3150,6 +3150,12 @@ void blk_mq_submit_bio(struct bio *bio) goto queue_exit; } =20 + if (unlikely(op_is_dmabuf(bio->bi_opf) && + bdev_has_integrity_csum(bio->bi_bdev))) { + bio_endio_status(bio, BLK_STS_NOTSUPP); + goto queue_exit; + } + if ((bio->bi_opf & REQ_POLLED) && !blk_mq_can_poll(q)) { bio_endio_status(bio, BLK_STS_NOTSUPP); goto queue_exit; diff --git a/block/fops.c b/block/fops.c index 9905ed24a157..827dc9eecba7 100644 --- a/block/fops.c +++ b/block/fops.c @@ -362,7 +362,7 @@ static ssize_t __blkdev_direct_IO_async(struct kiocb *i= ocb, * Users don't rely on the iterator being in any particular * state for async I/O returning -EIOCBQUEUED, hence we can * avoid expensive iov_iter_advance(). Bypass - * bio_iov_iter_get_pages() and set the bvec directly. + * bio_iov_iter_get_pages() and set the bvec/dmabuf directly. */ if (!bio_iov_iter_set(bio, iter)) { ret =3D blkdev_iov_iter_get_pages(bio, iter, bdev); diff --git a/include/linux/bio.h b/include/linux/bio.h index 892ca469c570..7a794ce723b8 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -80,7 +80,8 @@ static inline bool bio_no_advance_iter(const struct bio *= bio) { return bio_op(bio) =3D=3D REQ_OP_DISCARD || bio_op(bio) =3D=3D REQ_OP_SECURE_ERASE || - bio_op(bio) =3D=3D REQ_OP_WRITE_ZEROES; + bio_op(bio) =3D=3D REQ_OP_WRITE_ZEROES || + op_is_dmabuf(bio->bi_opf); } =20 static inline void *bio_data(struct bio *bio) @@ -438,12 +439,12 @@ static inline void bio_wouldblock_error(struct bio *b= io) =20 /* * Calculate number of bvec segments that should be allocated to fit data - * pointed by @iter. If @iter is backed by bvec it's going to be reused - * instead of allocating a new one. + * pointed by @iter. If @iter is backed by a bvec or a dmabuf, the bvec ar= ray / + * the dma map are going to be reused, and so no extra allocation is requi= red. */ static inline int bio_iov_vecs_to_alloc(struct iov_iter *iter, int max_seg= s) { - if (iov_iter_is_bvec(iter)) + if (iov_iter_is_bvec(iter) || iov_iter_is_dmabuf_map(iter)) return 0; return iov_iter_npages(iter, max_segs); } diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index af878597afb8..7c7504c84e09 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -1017,6 +1017,13 @@ static inline void *blk_mq_rq_to_pdu(struct request = *rq) return rq + 1; } =20 +static inline bool blk_mq_rq_is_dmabuf(struct request *rq) +{ + if (!IS_ENABLED(CONFIG_DMA_SHARED_BUFFER)) + return false; + return rq->bio && op_is_dmabuf(rq->bio->bi_opf); +} + static inline struct blk_mq_hw_ctx *queue_hctx(struct request_queue *q, in= t id) { struct blk_mq_hw_ctx *hctx; diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 98e21b4cbf32..0cc09b975d8f 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -233,7 +233,12 @@ struct bio { atomic_t __bi_remaining; =20 /* The actual vec list, preserved by bio_reset() */ - struct bio_vec *bi_io_vec; + union { + struct bio_vec *bi_io_vec; + /* Driver specific dma map, valid IFF REQ_DMABUF is set */ + struct dma_buf_io_map *bi_dmabuf_map; + }; + struct bvec_iter bi_iter; =20 union { @@ -402,6 +407,7 @@ enum req_flag_bits { __REQ_DRV, /* for driver use */ __REQ_FS_PRIVATE, /* for file system (submitter) use */ __REQ_ATOMIC, /* for atomic write operations */ + __REQ_DMABUF, /* Using premmaped dma buffers */ /* * Command specific flags, keep last: */ @@ -434,6 +440,7 @@ enum req_flag_bits { #define REQ_DRV (__force blk_opf_t)(1ULL << __REQ_DRV) #define REQ_FS_PRIVATE (__force blk_opf_t)(1ULL << __REQ_FS_PRIVATE) #define REQ_ATOMIC (__force blk_opf_t)(1ULL << __REQ_ATOMIC) +#define REQ_DMABUF (__force blk_opf_t)(1ULL << __REQ_DMABUF) =20 #define REQ_NOUNMAP (__force blk_opf_t)(1ULL << __REQ_NOUNMAP) =20 @@ -487,6 +494,11 @@ static inline bool op_is_discard(blk_opf_t op) return (op & REQ_OP_MASK) =3D=3D REQ_OP_DISCARD; } =20 +static inline bool op_is_dmabuf(blk_opf_t op) +{ + return op & REQ_DMABUF; +} + /* * Check if a bio or request operation is a zone management operation. */ diff --git a/include/linux/bvec.h b/include/linux/bvec.h index fc566ee1c1ff..b63914ff56e3 100644 --- a/include/linux/bvec.h +++ b/include/linux/bvec.h @@ -108,7 +108,8 @@ struct bvec_iter { unsigned int bi_idx; =20 /* - * Current offset in the bvec entry pointed to by `bi_idx`. + * Current offset in the bvec entry pointed to by `bi_idx` or into + * a dma-buf map. */ unsigned int bi_offset; } __packed __aligned(4); --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 D4DFE559C8E for ; Tue, 13 Oct 2026 20:55:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924932; cv=none; b=gPn2LotCguCTp5Z2c47prWoNEKPgrDlmijN2pCq2LVndkC80cV1DR7MEKwgMu7j6N1rnHHuF/80Nc8evhGMlpcdvNPmtxwihboOsLas62I3QmMz/AWuzV218FAEdKInp8J19TV8S4zxHlqdIm5cCM7zClUaMXnXmz3+dG1FyVNw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924932; c=relaxed/simple; bh=poMU3IMk+s1i+OL6PspfjWv+5wjZjdnLVtCEDY3Hn+k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r6q7leFzfOHXieMS1xFSNYWrK7w85p+HpHPt4U+NWC6s2to11hKUHG4x03RYNkvt2D6k4MEHuD8jltijHbjOfRkq66XKTiNfJziiNLNtUcycqe6xxT54f0jEF37hk312fHwpXTbRpXdWZHoayPQeWOhS6BHI9AKJ118wc6cZVYA= 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=cpx1yTle; arc=none smtp.client-ip=209.85.221.53 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="cpx1yTle" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-48b0946c2c2so2151032f8f.3 for ; Tue, 13 Oct 2026 13:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924927; x=1792529727; 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=sjQY12JZJkEEoHUMGZ5pLsy3Pmh4yJs101KM8nm2S/U=; b=cpx1yTleLYGeSHlX9yy3Sxz8IdjAPl+6Qo8dMsIM1xUdhWk9hVBqChb2Ft2PMIToUM l5f431zB4lkLv5sd9yrqxMwO9wQDdAcXTc5j9ewInPWInwqbQyd6O+dzYoK2/DJiDpN3 p3I9xKC8xUbr6TC1/KeoicEAuiHUJPo2lSpPcs6c1ACIZnD1UngpaWeyvA5LNWbJYwCz upwd2Waem9goDNXoRXMXGSDrhZo/viSvfHebc9upJlNQRScoPHsQJ1/g4iOLceA0jdSj J6PIQXejwkh1IPolJDgKBakNFh8OvtzJjBr2X+rAQ8AASpc+hg4JPYb50tlQrydlREa1 5TCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924927; x=1792529727; 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=sjQY12JZJkEEoHUMGZ5pLsy3Pmh4yJs101KM8nm2S/U=; b=KxFpjsESOrdS+5f9v9/kdicM10zTqxEHbmpBw/+YLPpnGhaehstdwLASw+sLvDdZGU LW2nOKws+/uRZCSrwCxD6dZO1gdjreM+IfXFwPUlnDDwtdcgvJpSGooCHkDoR0EJAO4j usiJaUeARoD82dnCnik/+MXeaPuOlY+Z6K+KEM4+0wKxTZwbj6jvMQ+E6MWZH4Ce353H R5NFsZDnuKdjF0HfA86TO8NkjOLJPb/EgK8gVdIVaaNCBEMVF+7/Q0CqICImKnyvgGc3 nUU+reSyr2FK1bpqXU851r5xOPCKlCcLHNUbIzDuU5vY6+q3pcHHau5VKrJBl8eBVQnc n70Q== X-Forwarded-Encrypted: i=1; AKwUvBxZ5Xnr+Dtr9KSOYNKI1Q/VBIp0tAN2KDn4UbBe1Po+lQNPC1VOr/kOiDhHsU6EdgBb3PL73/FMNlFq3r0=@vger.kernel.org X-Gm-Message-State: AFq9FYI9ekBMpBPH8hoHwG/EZQlIz2rEHcfLGBuFgvnBvNmAiWZ7SlqJ 5p2QsyAXkfsegxCQ1JRqpNsi9TWfdjh9U8QTiddZ6YBnnCQu88zwwW4t X-Gm-Gg: AYBFou19EOl2m4lYW5DEtEG1BS3nWzRZq9rNx3OqD623/i7T0R4Z+hMhHGnooFF6P8M ISWxtknPqbEgfE7hXGOvbciOliL7G3/QltppGzU++y16fZt86SSS6MwNrCQo/1Ia2GfJWmOqbgj 9JwqY54j0JLHz7w2rhu6mv0T+xJ32ySB0wioI+VKTGrhXCzEYNj8wXSh9jzlDOQ3wBJBl7Kx/Sd 3qdzYqdxtyCBEHyBwsJaNVLYch+Ipwz15tgO8zuKTWZIJ17xI/c1+qocQ2N97ix9IrVYvt0bD03 LEpLGpRZii0cMNIA8HNVDkIGuBTsUVmeFkPWx9oafv+D+QwHwWbc182BvWwD/tBoEuSADt0GJFw PrkrUkVNbkoyfWoAhDMEGq19zRiMXR7AwtfZzE3NtzU6uOSEfuPlP1bJ1ebMzMK/3eQxC7ODnJN iSc7Xc+rdx99Ezi1/zD7CahSlOs46yDbIEwAxl18ppmV88kjGT903v98fy8DYs8DSXkKX5l7k/a wGkthbhYzSl+AtgxVVV5gxeB/RETjntmzwJlmDgTL9SdRVIq5TnBhXn3+owgiMACVg6gm0v+OkQ X-Received: by 2002:a5d:5d09:0:b0:482:fd9c:3740 with SMTP id ffacd0b85a97d-48dbaae8af0mr23656771f8f.22.1791924926558; Tue, 13 Oct 2026 13:55:26 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:24 -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 v10 05/13] block: add dma-buf support for raw bdev Date: Tue, 13 Oct 2026 21:54:49 +0100 Message-ID: <78b3f2bb6e3ce576ee99252b88f0af8602b436d1.1791924581.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: quoted-printable Content-Type: text/plain; charset="utf-8" Add a simple proxy implementation of init_dma_buf_io_ctx() forwarding the call to a new struct block_device_operations operation. Also reject dma-buf backed iterators for buffered IO. Reviewed-by: Christoph Hellwig [pavel: reject dma-buf without O_DIRECT] Signed-off-by: Pavel Begunkov --- block/fops.c | 24 ++++++++++++++++++++++++ include/linux/blkdev.h | 2 ++ 2 files changed, 26 insertions(+) diff --git a/block/fops.c b/block/fops.c index 827dc9eecba7..6c6700df943c 100644 --- a/block/fops.c +++ b/block/fops.c @@ -730,6 +730,9 @@ blkdev_direct_write(struct kiocb *iocb, struct iov_iter= *from) =20 static ssize_t blkdev_buffered_write(struct kiocb *iocb, struct iov_iter *= from) { + if (unlikely(iov_iter_is_dmabuf_map(from))) + return -EOPNOTSUPP; + return iomap_file_buffered_write(iocb, from, &blkdev_iomap_ops, NULL, NULL); } @@ -855,6 +858,11 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, st= ruct iov_iter *to) if (ret < 0 || !count) goto reexpand; } + if (unlikely(iov_iter_is_dmabuf_map(to))) { + if (!ret) + ret =3D -EOPNOTSUPP; + goto reexpand; + } =20 /* * Take i_rwsem and invalidate_lock to avoid racing with set_blocksize @@ -958,6 +966,21 @@ static int blkdev_mmap_prepare(struct vm_area_desc *de= sc) return generic_file_mmap_prepare(desc); } =20 +static int blkdev_init_dma_buf_io_ctx(struct file *file, + struct dma_buf_io_ctx *ctx) +{ + struct block_device *bdev =3D file_bdev(file); + struct gendisk *disk =3D bdev->bd_disk; + + if (!(file->f_flags & O_DIRECT)) + return -EINVAL; + if (!disk->fops->init_dma_buf_io_ctx) + return -EOPNOTSUPP; + if (bdev_has_integrity_csum(bdev)) + return -EOPNOTSUPP; + return disk->fops->init_dma_buf_io_ctx(bdev, ctx); +} + const struct file_operations def_blk_fops =3D { .open =3D blkdev_open, .release =3D blkdev_release, @@ -976,6 +999,7 @@ const struct file_operations def_blk_fops =3D { .fallocate =3D blkdev_fallocate, .uring_cmd =3D blkdev_uring_cmd, .fop_flags =3D FOP_BUFFER_RASYNC | FOP_DONTCACHE, + .init_dma_buf_io_ctx =3D blkdev_init_dma_buf_io_ctx, }; =20 static __init int blkdev_init(void) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d003a9d2d1f6..2d5c30823aab 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1599,6 +1599,8 @@ struct block_device_operations { /* returns the length of the identifier or a negative errno: */ int (*get_unique_id)(struct gendisk *disk, u8 id[16], enum blk_unique_id id_type); + int (*init_dma_buf_io_ctx)(struct block_device *, + struct dma_buf_io_ctx *); struct module *owner; const struct pr_ops *pr_ops; =20 --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 2F27C55820E for ; Tue, 13 Oct 2026 20:55:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924935; cv=none; b=HpqFS87vfQUtUycVNZd7V2Qloc5mKbwaoTfS3BCclpR+Mmix/t5omQmfe8kBR/2nJAFJ5EPqWUaBwDnd035vWlP8jyxTvVPKX82or4XxS0+qiqFOn7+ToH3fg04j2tJC6eHUd9HdlMu3C7W7NiuqnYMLdRcz61uzaWO96tFAA6A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924935; c=relaxed/simple; bh=0a99AkCdYYlGDSLNyvcoHvxyA0h7cLM0HZDY04APdmg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U8GqH2ZWLzpYKEyjjB5f5ojWSBkEtLKSXAbYA/Si1Vsaa1w+7OBlAGC1wIYagwSExYR81GomxiCJaVKwt0X3VG1P6O3Aw0rafjwOENHVBKpyIe4eL8P9n8mVmNtviXOabCysWyJlJR88KILvU8+jWoyrcRJAlKcUwgkaKj1NqBI= 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=LwcO8KdU; arc=none smtp.client-ip=209.85.221.54 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="LwcO8KdU" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-48c6955a7c3so906746f8f.1 for ; Tue, 13 Oct 2026 13:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924928; x=1792529728; 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=SVgIYOF9sl5M4BcUqDAxFWbO5yiW+j2eX94ter+J4Q4=; b=LwcO8KdUHyYrdKQ/8j7tAKiNFwHbDujT8GdFEX2KNcqlHFfG/Na5K5kxM9B1aG/3XM UopK6UUi7ijG+DVl0L5VdYAdDQ9I5KVXnl9K4yNUsLrXbjkdYgCeUmeM2orJUZ6wJk49 V4XRyAyXaQo9AbwQMG55LhvqPfWwjfWLV0rVhmLJSkuS9+HyZWRmeJUcwdQMGRw8KYaN zVivHMHc0OobZ548LI1ZHAplQU9CqVRAzggD5J04MEBpto8/6C9n3vYEmdGSXmvc2Z39 B21/xy+LGe9qvbbIKlqo2VKgw5gmXchSSo40VSvJn/J2OQQYl/waRhyPMtrNBQiMToSh FT0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924928; x=1792529728; 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=SVgIYOF9sl5M4BcUqDAxFWbO5yiW+j2eX94ter+J4Q4=; b=1xiAa10UGlAm9jxu+K7JV1AN9lS3be5YVYJuEhjzQ9t3bqocsg7EN8wjbdedB8+7Vc hlKH5l/rcO+SQtLtIXECTnrdbkk3UxvL4NrAq1wcQzLimA6JlNzuaMDwtusgikCmnafV CUBudtiiE9F5WjPDXpADcn7O0hfFkwyuRiqXnO/2qUvSQK/+encmG/T9Ic0pYag/aL5x v8SaS0M14p153VtmASNFh9mgn414xfCzJ4i/pp7By7POA2jOMS3EAaLH1KoxTahBfoRr ygOa60qDsnMpayLvcXL0r79DsuWF4dfHYOeWpCdP6YltEpSdJA5FEyZ3ZFqfbOhQ+iZu uaEw== X-Forwarded-Encrypted: i=1; AKwUvBz2+jhnTW9f+6ODM4u+A0Auza6itCAEJbh+X3h3gfoavruO3twu3orFCX1Be8Tzd3xPF5E/7oPQXZlDTf8=@vger.kernel.org X-Gm-Message-State: AFq9FYLmF8m+Rfqv5hy9sENHc/mRT2r60KlZ7NXrEdgTZMMru56obm8H e1xZXAyYDJYITeSn+JwzSHiA9Qmh3Eds+iFJBLVjP++d5q3OReV8zj7p X-Gm-Gg: AYBFou07iTc0zdhUuFGvK26f4hfLJ4ZfwXLbRXEu21LwQ6fneSlYznvXleUtDiUinb/ lSN54rqFw1lFn6lZun320mNELR8Wxr1Mn2BogWi5Gg9RVvoPgDedgINOhNHyL/7UiH+ivWfVSHD 8dtH5uPjCzVOPPNHmylNZmMvgy0qrnuFHjPg3Wvh+iAE9pWQwCJ9zTQD8yYeiD7xm9VZ89b23St 8EBZw2xcCaYpWtcdPvl4AfPolP+VeAHWbBs6Kx4TQbwommFTxyglnJ+KSFBS/Ya8OkY0pVvd+lC 3xFGJjathxdl5gs/0MPDhVHW6dl2JT9Tivp6iKQvixovpWUPejvJiOJQrdMFxWVkIYE2upFzZO4 Bi1U1nmMJ5Ji4NOdUaEZl8nKRs+nyV14Gzucc6NAYL4ICuGtYsU3zE/Mb8FhKXX9zLWguW+ixlD kcYaM+0qW2GA2NEYOf/aV5qVYeuK7uyJxIDi5Qrm9Pz7FHmjp2fjopwgToE7GzBldJeI6bsrKtW ja8jSBcCMisDRE27qltjBPtT/sbVFw41LQ4RCfx3WaL55lbs66XBAFfGW72Vz3aDLU0QjCs6tY7 X-Received: by 2002:a05:6000:186f:b0:48c:7c69:2dce with SMTP id ffacd0b85a97d-48dbace9dfemr26073729f8f.16.1791924928152; Tue, 13 Oct 2026 13:55:28 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:27 -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 v10 06/13] nvme-pci: rename nvme_pci_sgl_set_data to nvme_pci_dma_iter_set_sgl Date: Tue, 13 Oct 2026 21:54:50 +0100 Message-ID: <54f1186d20a7c24075dd38eda1dfc7ac3705a13e.1791924581.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: quoted-printable Content-Type: text/plain; charset="utf-8" From: Anuj Gupta Rename the blk_dma_iter based nvme_pci_sgl_set_data() to nvme_pci_dma_iter_set_sgl(). Suggested-by: Christoph Hellwig Reviewed-by: Christoph Hellwig Signed-off-by: Anuj Gupta Signed-off-by: Pavel Begunkov --- drivers/nvme/host/pci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 77317e5d00f9..a65b77726e4b 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1147,7 +1147,7 @@ static blk_status_t nvme_pci_setup_data_prp(struct re= quest *req, return BLK_STS_IOERR; } =20 -static void nvme_pci_sgl_set_data(struct nvme_sgl_desc *sge, +static void nvme_pci_dma_iter_set_sgl(struct nvme_sgl_desc *sge, struct blk_dma_iter *iter) { sge->addr =3D cpu_to_le64(iter->addr); @@ -1177,7 +1177,7 @@ static blk_status_t nvme_pci_setup_data_sgl(struct re= quest *req, iod->cmd.common.flags =3D NVME_CMD_SGL_METABUF; =20 if (entries =3D=3D 1 || blk_rq_dma_map_coalesce(&iod->dma_state)) { - nvme_pci_sgl_set_data(&iod->cmd.common.dptr.sgl, iter); + nvme_pci_dma_iter_set_sgl(&iod->cmd.common.dptr.sgl, iter); iod->total_len +=3D iter->len; return BLK_STS_OK; } @@ -1199,7 +1199,7 @@ static blk_status_t nvme_pci_setup_data_sgl(struct re= quest *req, iter->status =3D BLK_STS_IOERR; break; } - nvme_pci_sgl_set_data(&sg_list[mapped++], iter); + nvme_pci_dma_iter_set_sgl(&sg_list[mapped++], iter); iod->total_len +=3D iter->len; } while (blk_rq_dma_map_iter_next(req, nvmeq->dev->dev, iter)); =20 @@ -1359,13 +1359,13 @@ static blk_status_t nvme_pci_setup_meta_iter(struct= request *req) iod->cmd.common.metadata =3D cpu_to_le64(sgl_dma); if (entries =3D=3D 1) { iod->meta_total_len =3D iter.len; - nvme_pci_sgl_set_data(sg_list, &iter); + nvme_pci_dma_iter_set_sgl(sg_list, &iter); return BLK_STS_OK; } =20 sgl_dma +=3D sizeof(*sg_list); do { - nvme_pci_sgl_set_data(&sg_list[++i], &iter); + nvme_pci_dma_iter_set_sgl(&sg_list[++i], &iter); iod->meta_total_len +=3D iter.len; } while (blk_rq_integrity_dma_map_iter_next(req, dev->dev, &iter)); =20 --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 A1827559CB1 for ; Tue, 13 Oct 2026 20:55:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924941; cv=none; b=J7GfQCellalzY8bYqnm5K7+GckyPpQo7xneIfCGP9gpooUHGgEccSk5ImzuHElamnqr7ErwETHIuulOlh8F7I7RAzB5Q6XO2u2XI+0NHVkQhL4c0yHQ60UXucs94pJk9FIAXqMbueUSsAcpIp887tl2dJiRTdthPP/BdrCs1SVs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924941; c=relaxed/simple; bh=/NvXn2611EZ5Dhm5IgWeuptC0wM+hlzK+9iqfjOLj+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r/SG+SRVrTrkMP8iqO8rAtAkg1+mbh8Jg7d4KE6Pt0Gf1vEeNlpsGX8QZufdTaVd6IAv2Q6QsEs72KqU9HdwRVJKDcs4NYzcbFz+FPTgg3Fvwzd/3cOywxwZ3lhPHr9hamJC2avLp9RG3dok1EN/fn1H8IsfQQVMmZgEZm9db18= 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=DjSGPhVK; arc=none smtp.client-ip=209.85.221.44 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="DjSGPhVK" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-48c411d6615so2464305f8f.3 for ; Tue, 13 Oct 2026 13:55:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924932; x=1792529732; 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=WxdwTtThoaZM7kRe7LSi9UKYoH+QvEHRZ2qh0fXeXAc=; b=DjSGPhVKXcpexb8gSpMxgYPifT1ghl078Q7crVo0b7AN7kYlMZsDWXf1VJNSd8Qm7y QKNOm3EHUb/qqRkyMa+RvJYK8oZJLK/8c31DwE8gpFPIcKdTh2SsXHHb60h42LkCv8D5 8XYvOmYmnNJnTFoFnwgIVvo04UDJQHd+ugUK15hwx/5iciKD1PHJVX+BGQhyq+Mx46XG b615QLxQW5kYqnaC9K4WibNtUtbVTehXUDtGSkpMToL4+BEY9G+BNto9CdE4DwzAiSaH 8bNCpn8tKx/H3LRKSdXQNqLgCZUrwCNXPC4PfapIZb1ta+EUlyLRtIAyRBtXvvmdHMnK wyPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924932; x=1792529732; 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=WxdwTtThoaZM7kRe7LSi9UKYoH+QvEHRZ2qh0fXeXAc=; b=WCJ7ziwGFBZONU6BQ0s2PnuKLSlqo/pP7u7MmYtdH2KMx6drMAZZMM0NJpA8nWO1+E EV+6eQ15pB/1IIrCwxjQq+IXF+D8or3vRlZGbPkQusitvG9XDHRXaepfD/FgOCOIQaf8 q9xVCE3I226KXawIg54qznpEtDXR6T5p/AbYZQR92dFCqSwqTao4sEvQE+hfHKdP2She o/DoNPuZxHvGTfABBYmDuAbAAoKsHfJu3tdF6LBPRRVd4vGaNQ6V73/VZlZ3AjuRpL8b C7vfwIQ/gFTTThO52HjOKblMp+9ZMsiMJVrGCdhgkBLiMTmSOt+fvBRdL9f18HRKrbrE k80g== X-Forwarded-Encrypted: i=1; AKwUvBxWetb4C2EYHm+Cept6GYuWA6an8hiWt0dnNW9r2PSSF4O6EuOvcXWu6525ne7tXZLF7aVlET8JaPHMY04=@vger.kernel.org X-Gm-Message-State: AFq9FYI525OVtxXFt77vm98MFR4dY5AL/kkrpTf8d2GatKDRUeEtA+Ml Vb1RzqtPxg/RDat8ZgyB1UF5OunkawH79aMh6lbQtL5y/i7PWHTCyoUK X-Gm-Gg: AYBFou3J+UOXOZeRblUbIsIPBa3oidgp1Ta1NuyjjY7se9yOcpG8oHJTMbjE/AxqdUU ddrEgz1jl3AWDf5CRY1J1WXpmfGiFGstQEdkN7QTr0ujD3zSb9BFXJvJ03GyF6oGdvNzlG2thnC ogVRPWijWJaVUb3scmnec7Z7pBPjum4LE0I+K+7jYIQzXPj7BALiorg2O3636PmhMfQOJ1lqi8S Rhl45Hr5o1CKNOsuuTrJ8fyA6Xad6c5Wh6pz0c5T59AhYlmkKx+RdXqlVHqUhnNXmmA06hE1Vu+ VKCKgTh29Ndo6brFHUFE8RSjIyMOoYXIHoUX04sC643iKaeSZ35jegfj1G9wCGnvXd2xnekLQ02 ZNt4VrgAEyNfUBTeFFR9TMiQSSAHUl8s1fNfEGg7AnVqJ4nrLo0lITTHpDKg2XTwjW5ThHbmsQ+ 0PgfrrksVlVYT/+7WXYoLvg8Qjn1sWcImjI4McSq5D1fQ98o5MCpmXM1kLe0jw6X1RHEnODfV/o iM6+p9H7SLn9KyLuVBzGTDuW1MLFVttDgXh9NsDyCCDX6uIKbuKZrdyz4au0i40kTqmF24ueDhk X-Received: by 2002:a05:6000:12c7:b0:48b:28e:2f13 with SMTP id ffacd0b85a97d-48dbacffdfdmr19813874f8f.52.1791924931584; Tue, 13 Oct 2026 13:55:31 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:30 -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 v10 07/13] nvme-pci: implement dma-buf backed requests Date: Tue, 13 Oct 2026 21:54:51 +0100 Message-ID: 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/Makefile | 1 + drivers/nvme/host/core.c | 12 +++ drivers/nvme/host/nvme.h | 2 + drivers/nvme/host/pci-dmabuf.c | 165 +++++++++++++++++++++++++++++++++ drivers/nvme/host/pci-dmabuf.h | 73 +++++++++++++++ drivers/nvme/host/pci.c | 93 +++++++++++++++++++ 6 files changed, 346 insertions(+) create mode 100644 drivers/nvme/host/pci-dmabuf.c create mode 100644 drivers/nvme/host/pci-dmabuf.h diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile index 67563a69f7dc..8288b986d713 100644 --- a/drivers/nvme/host/Makefile +++ b/drivers/nvme/host/Makefile @@ -21,6 +21,7 @@ nvme-core-$(CONFIG_NVME_HWMON) +=3D hwmon.o nvme-core-$(CONFIG_NVME_HOST_AUTH) +=3D auth.o =20 nvme-y +=3D pci.o +nvme-$(CONFIG_DMA_SHARED_BUFFER) +=3D pci-dmabuf.o =20 nvme-fabrics-y +=3D fabrics.o =20 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, s= ector_t sector, #define nvme_report_zones NULL #endif /* CONFIG_BLK_DEV_ZONED */ =20 +static int nvme_init_dma_buf_io_ctx(struct block_device *bdev, + struct dma_buf_io_ctx *ctx) +{ + struct nvme_ns *ns =3D bdev->bd_disk->private_data; + struct nvme_ctrl *ctrl =3D 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 =3D { .owner =3D THIS_MODULE, .ioctl =3D nvme_ioctl, @@ -2718,6 +2729,7 @@ const struct block_device_operations nvme_bdev_ops = =3D { .get_unique_id =3D nvme_get_unique_id, .report_zones =3D nvme_report_zones, .pr_ops =3D &nvme_pr_ops, + .init_dma_buf_io_ctx =3D nvme_init_dma_buf_io_ctx, }; =20 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); }; =20 diff --git a/drivers/nvme/host/pci-dmabuf.c b/drivers/nvme/host/pci-dmabuf.c new file mode 100644 index 000000000000..8dab59d93650 --- /dev/null +++ b/drivers/nvme/host/pci-dmabuf.c @@ -0,0 +1,165 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Code for supporting dma-buf I/O maps in the NVMe driver. + * Copyright (C) 2026 Pavel Begunkov + */ + +#include + +#include "pci-dmabuf.h" + +static void nvme_dmabuf_invalidate_mappings(struct dma_buf_attachment *att= ach) +{ + struct dma_buf_io_ctx *ctx =3D attach->importer_priv; + + dma_buf_io_invalidate_mappings(ctx); +} + +static const struct dma_buf_attach_ops nvme_dmabuf_importer_ops =3D { + .invalidate_mappings =3D nvme_dmabuf_invalidate_mappings, + .allow_peer2peer =3D true, +}; + +static struct dma_buf_io_map *nvme_dma_buf_io_map(struct dma_buf_io_ctx *c= tx) +{ + unsigned nr_entries =3D ctx->dmabuf->size / NVME_CTRL_PAGE_SIZE; + struct nvme_dma_buf_io_ctx *nvme_ctx =3D ctx->dev_priv; + struct dma_buf_attachment *attach =3D nvme_ctx->attach; + unsigned long tmp, i =3D 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 =3D kvmalloc_flex(*map, dma_list, nr_entries); + if (!map) + return ERR_PTR(-ENOMEM); + map->nr_entries =3D nr_entries; + + sgt =3D dma_buf_map_attachment(attach, ctx->dir); + if (IS_ERR(sgt)) { + ret =3D PTR_ERR(sgt); + sgt =3D NULL; + goto err; + } + + for_each_sgtable_dma_sg(sgt, sg, tmp) { + dma_addr_t dma_addr =3D sg_dma_address(sg); + unsigned long sg_len =3D sg_dma_len(sg); + + if ((sg_len % NVME_CTRL_PAGE_SIZE) || + (dma_addr % NVME_CTRL_PAGE_SIZE)) { + ret =3D -EINVAL; + goto err; + } + while (sg_len) { + map->dma_list[i++] =3D dma_addr; + dma_addr +=3D NVME_CTRL_PAGE_SIZE; + sg_len -=3D NVME_CTRL_PAGE_SIZE; + } + } + + ret =3D dma_buf_io_init_map(ctx, &map->base, sgt); + if (ret) + goto err; + map->sgt =3D 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 =3D ctx->dev_priv; + struct nvme_dmabuf_map *map =3D 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 *base_ctx) +{ + struct nvme_dma_buf_io_ctx *ctx =3D base_ctx->dev_priv; + struct nvme_dma_buf_list *buf_list =3D ctx->buf_list; + + mutex_lock(&buf_list->lock); + if (!list_empty(&ctx->list)) { + dma_buf_detach(ctx->base->dmabuf, ctx->attach); + list_del_init(&ctx->list); + } + mutex_unlock(&buf_list->lock); + + nvme_put_ctrl(ctx->ctrl); + kfree(ctx); +} + +void __nvme_pci_remove_dmabuf(struct nvme_dma_buf_list *list) +{ + struct nvme_dma_buf_io_ctx *ctx, *tmp; + + mutex_lock(&list->lock); + list_for_each_entry_safe(ctx, tmp, &list->ctxs, list) { + dma_buf_io_detach(ctx->base); + dma_buf_detach(ctx->base->dmabuf, ctx->attach); + list_del_init(&ctx->list); + } + mutex_unlock(&list->lock); +} + +const struct dma_buf_io_ops nvme_dma_buf_io_ops =3D { + .map =3D nvme_dma_buf_io_map, + .unmap =3D nvme_dma_buf_io_unmap, + .release =3D nvme_dma_buf_io_release, +}; + +static int nvme_init_io_ctx_locked(struct nvme_ctrl *ctrl, + struct nvme_dma_buf_list *buf_list, + struct dma_buf_io_ctx *ctx) +{ + struct nvme_dma_buf_io_ctx *nvme_ctx; + struct dma_buf_attachment *attach; + + nvme_ctx =3D kzalloc_obj(*nvme_ctx); + if (!nvme_ctx) + return -ENOMEM; + + attach =3D dma_buf_dynamic_attach(ctx->dmabuf, ctrl->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, &buf_list->ctxs); + nvme_ctx->attach =3D attach; + nvme_ctx->base =3D ctx; + nvme_ctx->ctrl =3D ctrl; + nvme_ctx->buf_list =3D buf_list; + ctx->dev_priv =3D nvme_ctx; + ctx->dev_ops =3D &nvme_dma_buf_io_ops; + return 0; +} + +int __nvme_init_dma_buf_io_ctx(struct nvme_ctrl *ctrl, + struct nvme_dma_buf_list *buf_list, + struct dma_buf_io_ctx *ctx) +{ + int ret; + + mutex_lock(&buf_list->lock); + ret =3D nvme_init_io_ctx_locked(ctrl, buf_list, ctx); + mutex_unlock(&buf_list->lock); + return ret; +} diff --git a/drivers/nvme/host/pci-dmabuf.h b/drivers/nvme/host/pci-dmabuf.h new file mode 100644 index 000000000000..8e91f7f4ece5 --- /dev/null +++ b/drivers/nvme/host/pci-dmabuf.h @@ -0,0 +1,73 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2026 Pavel Begunkov + */ + +#ifndef _NVME_PCI_DMABUF_H +#define _NVME_PCI_DMABUF_H + +#include + +#include "nvme.h" + +struct nvme_dma_buf_list { + struct list_head ctxs; + struct mutex lock; +}; + +struct nvme_dma_buf_io_ctx { + struct dma_buf_attachment *attach; + struct nvme_dma_buf_list *buf_list; + struct dma_buf_io_ctx *base; + struct nvme_ctrl *ctrl; + struct list_head list; +}; + +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); +}; + +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 inline struct nvme_dmabuf_map *nvme_req_to_map(struct request *req) +{ + struct dma_buf_io_map *map =3D req->bio->bi_dmabuf_map; + + return to_nvme_dmabuf_map(map); +} + +void __nvme_pci_remove_dmabuf(struct nvme_dma_buf_list *list); +int __nvme_init_dma_buf_io_ctx(struct nvme_ctrl *ctrl, + struct nvme_dma_buf_list *buf_list, + struct dma_buf_io_ctx *ctx); + +static inline void nvme_pci_remove_dmabuf(struct nvme_dma_buf_list *list) +{ + if (IS_ENABLED(CONFIG_DMA_SHARED_BUFFER)) + __nvme_pci_remove_dmabuf(list); +} + +static inline int nvme_init_dma_buf_io_ctx(struct nvme_ctrl *ctrl, + struct nvme_dma_buf_list *buf_list, + struct dma_buf_io_ctx *ctx) +{ + if (!IS_ENABLED(CONFIG_DMA_SHARED_BUFFER)) + return -EOPNOTSUPP; + return __nvme_init_dma_buf_io_ctx(ctrl, buf_list, ctx); +} + +static inline void nvme_init_buf_list(struct nvme_dma_buf_list *buf_list) +{ + INIT_LIST_HEAD(&buf_list->ctxs); + mutex_init(&buf_list->lock); +} + + +#endif /* _NVME_PCI_DMABUF_H */ \ No newline at end of file diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index a65b77726e4b..a0506c93fa16 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -30,6 +30,7 @@ =20 #include "trace.h" #include "nvme.h" +#include "pci-dmabuf.h" =20 #define SQ_SIZE(q) ((q)->q_depth << (q)->sqes) #define CQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_completion)) @@ -318,6 +319,7 @@ struct nvme_dev { bool hmb; struct sg_table *hmb_sgt; mempool_t *dmavec_mempool; + struct nvme_dma_buf_list dmabufs; =20 /* shadow doorbell buffer support: */ __le32 *dbbuf_dbs; @@ -865,6 +867,76 @@ static void nvme_free_descriptors(struct request *req) } } =20 +static blk_status_t nvme_rq_setup_dmabuf_map(struct request *req, + struct nvme_queue *nvmeq) +{ + struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); + struct nvme_dmabuf_map *map =3D nvme_req_to_map(req); + unsigned bvec_done =3D req->bio->bi_iter.bi_offset; + unsigned map_idx =3D bvec_done / NVME_CTRL_PAGE_SIZE; + unsigned offset =3D bvec_done & (NVME_CTRL_PAGE_SIZE - 1); + int length =3D blk_rq_payload_bytes(req) - (NVME_CTRL_PAGE_SIZE - offset); + dma_addr_t *dma_list =3D map->dma_list; + u64 prp1_dma =3D dma_list[map_idx++] + offset; + u64 dma_addr, prp2_dma; + dma_addr_t prp_dma; + __le64 *prp_list; + unsigned i; + + if (length <=3D 0) { + prp2_dma =3D 0; + goto done; + } + + if (length <=3D NVME_CTRL_PAGE_SIZE) { + prp2_dma =3D dma_list[map_idx]; + goto done; + } + + if (DIV_ROUND_UP(length, NVME_CTRL_PAGE_SIZE) <=3D + NVME_SMALL_POOL_SIZE / sizeof(__le64)) + iod->flags |=3D IOD_SMALL_DESCRIPTOR; + + prp_list =3D dma_pool_alloc(nvme_dma_pool(nvmeq, iod), GFP_ATOMIC, + &prp_dma); + if (!prp_list) + return BLK_STS_RESOURCE; + + iod->descriptors[iod->nr_descriptors++] =3D prp_list; + prp2_dma =3D prp_dma; + i =3D 0; + for (;;) { + if (i =3D=3D NVME_CTRL_PAGE_SIZE >> 3) { + __le64 *old_prp_list =3D prp_list; + + prp_list =3D dma_pool_alloc(nvmeq->descriptor_pools.large, + GFP_ATOMIC, &prp_dma); + if (!prp_list) + goto free_prps; + iod->descriptors[iod->nr_descriptors++] =3D prp_list; + prp_list[0] =3D old_prp_list[i - 1]; + old_prp_list[i - 1] =3D cpu_to_le64(prp_dma); + i =3D 1; + } + + dma_addr =3D dma_list[map_idx++]; + prp_list[i++] =3D cpu_to_le64(dma_addr); + + length -=3D NVME_CTRL_PAGE_SIZE; + if (length <=3D 0) + break; + } +done: + iod->cmd.common.dptr.prp1 =3D cpu_to_le64(prp1_dma); + iod->cmd.common.dptr.prp2 =3D cpu_to_le64(prp2_dma); + return BLK_STS_OK; +free_prps: + iod->cmd.common.dptr.prp1 =3D cpu_to_le64(prp1_dma); + iod->cmd.common.dptr.prp2 =3D 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 =3D blk_mq_rq_to_pdu(req); @@ -943,6 +1015,9 @@ static void nvme_unmap_data(struct request *req) struct device *dma_dev =3D nvmeq->dev->dev; unsigned int attrs =3D 0; =20 + if (blk_mq_rq_is_dmabuf(req)) + goto out_free_desc; + if (iod->flags & IOD_SINGLE_SEGMENT) { static_assert(offsetof(union nvme_data_ptr, prp1) =3D=3D offsetof(union nvme_data_ptr, sgl.addr)); @@ -967,6 +1042,7 @@ static void nvme_unmap_data(struct request *req) nvme_free_prps(req, attrs); } =20 +out_free_desc: if (iod->nr_descriptors) nvme_free_descriptors(req); } @@ -1257,6 +1333,9 @@ static blk_status_t nvme_map_data(struct request *req) struct blk_dma_iter iter; blk_status_t ret; =20 + 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. @@ -3357,6 +3436,9 @@ static void nvme_dev_disable(struct nvme_dev *dev, bo= ol shutdown) nvme_unquiesce_admin_queue(&dev->ctrl); } mutex_unlock(&dev->shutdown_lock); + + if (shutdown) + nvme_pci_remove_dmabuf(&dev->dmabufs); } =20 static int nvme_disable_prepare_reset(struct nvme_dev *dev, bool shutdown) @@ -3564,6 +3646,14 @@ static unsigned long nvme_pci_get_virt_boundary(stru= ct nvme_ctrl *ctrl, return 0; } =20 +static int nvme_pci_init_dma_buf_io_ctx(struct nvme_ctrl *ctrl, + struct dma_buf_io_ctx *ctx) +{ + struct nvme_dev *dev =3D to_nvme_dev(ctrl); + + return nvme_init_dma_buf_io_ctx(ctrl, &dev->dmabufs, ctx); +} + static const struct nvme_ctrl_ops nvme_pci_ctrl_ops =3D { .name =3D "pcie", .module =3D THIS_MODULE, @@ -3579,6 +3669,7 @@ static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = =3D { .print_device_info =3D nvme_pci_print_device_info, .supports_pci_p2pdma =3D nvme_pci_supports_pci_p2pdma, .get_virt_boundary =3D nvme_pci_get_virt_boundary, + .init_dma_buf_io_ctx =3D nvme_pci_init_dma_buf_io_ctx, }; =20 static int nvme_dev_map(struct nvme_dev *dev) @@ -3701,6 +3792,7 @@ 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); + nvme_init_buf_list(&dev->dmabufs); =20 dev->nr_write_queues =3D write_queues; dev->nr_poll_queues =3D poll_queues; @@ -4346,5 +4438,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); --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 49A41552936 for ; Tue, 13 Oct 2026 20:55:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924942; cv=none; b=eFfGAdV12afk+jLLqd0kZDECx1g13D+wjixsy6oPmbrPSu8M6CJg1+E/C3Hw82XUl6aC/p/PqO05Myn59Pv+C2+83QTZuCiRMbnA1lbeqSrmvv2AjuMiFOQqAYnKqngrxt6uqhhjiXOhZc7I/PjTkA6A+j6jZhrG+2x22DJX30E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924942; c=relaxed/simple; bh=iy9U6gJyxks5ymTnPsPTZg2hiScYxD3ewbuzhpHoVzk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DehYikopYYh0WZlUMYmQREsHX4q6oF7Cm3aDcyYoPjHzgvuBNcyLyU8k9duyvYD74x9spibIp+Uv4un06P+eysMwbWCeB+xkwa/KngM599ASiaY1eu/uz2ZgnZx/ZfVMtTdvv5d439dkEX9Hi1kxnQMqgpcvlTUqOgXDA0UbzHM= 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=rxB/KSTH; arc=none smtp.client-ip=209.85.221.48 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="rxB/KSTH" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-48b060ec084so2208279f8f.0 for ; Tue, 13 Oct 2026 13:55:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924935; x=1792529735; 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=SSeH33Tp73HrlxrRD40ZRw/kp0xshqtHbX/nV8WDcGA=; b=rxB/KSTHvWpkavsnom95gTiMDT+JfmZAJB44NlGZhTdwcxrSXV5dw2AqP3OJXkuPr+ NHPCJS0YMm2qrqXYshAb6gGsts7I9pkCZgx0Obymx4o65k9d9pCPLSo6pmBkyufDuX+f ZiQYGtmr7aK4Hlnp+YJYsbpGgDrwnlEyNIdFEF1t7So3pyl5TnvZ7VE/D+r7W9sAaBk7 P4Qqmfrbw4pfFp0UbghV1MiDGmqTHH/OmI9TQmvv85M0SzaCAXCY1gAUQAyL9PLWN3oT xIGiwkA8wXpi6Jdv5+c9MUWX45Bt+zxqBmzTMV+TqOAXJCzX+71tO/rpAS62dSdkFVaL pvEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924935; x=1792529735; 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=SSeH33Tp73HrlxrRD40ZRw/kp0xshqtHbX/nV8WDcGA=; b=q1OKOjehu9fYevrOhrmnhncXSPA030GhDvF+hm6L1wPk4NZGSD3y/2jWlNFZP9BOUq kaiFGnzJvSXABgA/3O0nch6H2Se4MDxq5Of+OQJdVx+NCInB9Ahl8HxXcS4dyoXMQYgk HY88yNZAynkHfIIloXgR9hGn8Ca1aW3RFyj8VpWRO7l1rj42zW6F049Cu1HAlkEeYpLB hGs0mNZrAw8P3eaWapFz8F9P8BHKXAQ47RAOVDpYTMJx29OThKvan6PFfWdHZ1YpkxZQ HEG2jAYTBR2F6PyZJHx4HvHK+9BsPeVDIOX2z5BD/naMqDDV20qMyBwSdQ8YasycZ2US fQ9w== X-Forwarded-Encrypted: i=1; AKwUvBxnE5wthvE9kSmp79kg9NammjNki/AH835Vgrqv/Mj8BOQ0yxlH0hYI2Mkg1ul9Cvbd9KA5+b5zhHEKCpY=@vger.kernel.org X-Gm-Message-State: AFq9FYIA/gQYlqUZL9XqqN5/fTOObJ8Werib4RLQFNsuTYxjRPN1EuBD BNmud99FX32PP331KR8jB6rEw+HN4bXBRY/FF4H1O/X08XKLvgqbTadU X-Gm-Gg: AYBFou0ONS2nlmX5ND0w+QFfqEFegAsoXdIUa3BNqbMdbHB7q3g2PqXN105i40DCPec qYdsIWNH21E/+wspDWu9DdgtLq49jD7east4B+aiMw8FQzBfKeXVsbRFwGKUja3J7xrSh7Ya4Se vkvx0NsyztSwSDEQVp2BHerKux7ypVVh7HhUqnBnaUq2T/263b5sqR5YTF/YxUCRJNc67s9bzdz tgkVKzuuxE55em3oZZ0LsYy/UTavHjozuL1UgTjC3Ym2g61sftLyXhqRD5w6D3Kuu95Glq0ahIc 6+Hsao0nN9wtE6RY9Um/zJzo3zFK6d62e9I7TFzqPJPFSYDlwOmEFhg6Isi0Di8R5phIGeZv9Ix wYQJug1V3h+a3+A0NmsgKJWzji7bbYs+VyeueElx8lUabDO/u6f22TLhBcidkALWvNA1i6quZbS 7G1GgdwtYLWNJo5/kaS+QOmHS7/MqnjjOtV6ByRqL7Z7B5lypgUi/dp8GUtdv1FYMzyXGEeQFNb 4BKxN3S2XSyQSNd/xsZ0px5UjHrrRjgR64MV4nUOdBunk5rVzu/1gs6q4Mg0FCrNp/4C+Wu/EHi suD9A8PXXyE= X-Received: by 2002:a05:6000:2002:b0:48d:b940:af77 with SMTP id ffacd0b85a97d-48dbace21ecmr25776962f8f.36.1791924935206; Tue, 13 Oct 2026 13:55:35 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:32 -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 v10 08/13] nvme-pci: add SGL support for the dmabuf path Date: Tue, 13 Oct 2026 21:54:52 +0100 Message-ID: <892e9887dabf195633d376de113b775b29ae7dd3.1791924581.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: quoted-printable Content-Type: text/plain; charset="utf-8" From: Anuj Gupta Add SGL support in addition to PRP for dmabuf-backed requests, building the descriptor list from the mapping's sg_table. Reviewed-by: Christoph Hellwig Signed-off-by: Anuj Gupta Signed-off-by: Pavel Begunkov --- drivers/nvme/host/pci.c | 150 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 146 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index a0506c93fa16..79b3c1092e4d 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1223,12 +1223,18 @@ static blk_status_t nvme_pci_setup_data_prp(struct = request *req, return BLK_STS_IOERR; } =20 +static void nvme_pci_sgl_set_data(struct nvme_sgl_desc *sge, + dma_addr_t addr, u32 len) +{ + sge->addr =3D cpu_to_le64(addr); + sge->length =3D cpu_to_le32(len); + sge->type =3D NVME_SGL_FMT_DATA_DESC << 4; +} + static void nvme_pci_dma_iter_set_sgl(struct nvme_sgl_desc *sge, struct blk_dma_iter *iter) { - sge->addr =3D cpu_to_le64(iter->addr); - sge->length =3D cpu_to_le32(iter->len); - sge->type =3D NVME_SGL_FMT_DATA_DESC << 4; + nvme_pci_sgl_set_data(sge, iter->addr, iter->len); } =20 static void nvme_pci_sgl_set_seg(struct nvme_sgl_desc *sge, @@ -1239,6 +1245,142 @@ static void nvme_pci_sgl_set_seg(struct nvme_sgl_de= sc *sge, sge->type =3D NVME_SGL_FMT_LAST_SEG_DESC << 4; } =20 +static unsigned int nvme_pci_dmabuf_sgl_nents(struct request *req) +{ + struct bio *bio =3D req->bio; + struct nvme_dmabuf_map *map =3D to_nvme_dmabuf_map(bio->bi_dmabuf_map); + struct scatterlist *sg; + unsigned long tmp; + size_t offset =3D bio->bi_iter.bi_offset; + size_t remaining =3D blk_rq_payload_bytes(req); + unsigned int nents =3D 0; + + for_each_sgtable_dma_sg(map->sgt, sg, tmp) { + size_t sg_len =3D sg_dma_len(sg); + + if (!remaining) + break; + if (offset >=3D sg_len) { + offset -=3D sg_len; + continue; + } + + sg_len -=3D offset; + offset =3D 0; + + do { + size_t chunk =3D min(remaining, sg_len); + + nents++; + sg_len -=3D chunk; + remaining -=3D chunk; + } while (sg_len && remaining); + } + + if (unlikely(remaining)) + return 0; + + return nents; +} + +static blk_status_t nvme_rq_setup_dmabuf_sgl(struct request *req, + struct nvme_queue *nvmeq, unsigned int entries) +{ + struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); + struct nvme_dmabuf_map *map =3D nvme_req_to_map(req); + size_t length =3D blk_rq_payload_bytes(req); + struct nvme_sgl_desc *sg_list =3D &iod->cmd.common.dptr.sgl; + size_t offset =3D req->bio->bi_iter.bi_offset; + bool pooled =3D entries > 1; + dma_addr_t sgl_dma =3D 0; + unsigned int mapped =3D 0; + unsigned long tmp; + struct scatterlist *sg; + size_t remaining =3D length; + + if (!entries) + return BLK_STS_IOERR; + + iod->cmd.common.flags =3D NVME_CMD_SGL_METABUF; + iod->total_len =3D length; + + /* entries =3D=3D 1 fits in the inline descriptor; more needs a pool. */ + if (pooled) { + if (entries <=3D NVME_SMALL_POOL_SIZE / sizeof(*sg_list)) + iod->flags |=3D IOD_SMALL_DESCRIPTOR; + + sg_list =3D dma_pool_alloc(nvme_dma_pool(nvmeq, iod), GFP_ATOMIC, + &sgl_dma); + if (!sg_list) + return BLK_STS_RESOURCE; + iod->descriptors[iod->nr_descriptors++] =3D sg_list; + } + + for_each_sgtable_dma_sg(map->sgt, sg, tmp) { + size_t sg_len =3D sg_dma_len(sg); + dma_addr_t addr =3D sg_dma_address(sg); + + if (!remaining) + break; + if (offset >=3D sg_len) { + offset -=3D sg_len; + continue; + } + + addr +=3D offset; + sg_len -=3D offset; + offset =3D 0; + + do { + u32 chunk =3D min_t(size_t, remaining, sg_len); + + if (WARN_ON_ONCE(mapped =3D=3D entries)) + goto err_free; + nvme_pci_sgl_set_data(&sg_list[mapped++], addr, chunk); + + addr +=3D chunk; + sg_len -=3D chunk; + remaining -=3D chunk; + } while (sg_len && remaining); + } + + if (unlikely(remaining)) + goto err_free; + + if (pooled) + nvme_pci_sgl_set_seg(&iod->cmd.common.dptr.sgl, sgl_dma, + mapped); + return BLK_STS_OK; +err_free: + if (pooled) { + iod->nr_descriptors--; + dma_pool_free(nvme_dma_pool(nvmeq, iod), sg_list, sgl_dma); + } + return BLK_STS_IOERR; +} + +static blk_status_t nvme_rq_setup_dmabuf(struct request *req, + struct nvme_queue *nvmeq, enum nvme_use_sgl use_sgl) +{ + unsigned int entries; + size_t avg_seg; + + if (use_sgl =3D=3D SGL_UNSUPPORTED) + return nvme_rq_setup_dmabuf_map(req, nvmeq); + + entries =3D nvme_pci_dmabuf_sgl_nents(req); + + if (use_sgl =3D=3D SGL_FORCED) + return nvme_rq_setup_dmabuf_sgl(req, nvmeq, entries); + + avg_seg =3D entries ? + DIV_ROUND_UP(blk_rq_payload_bytes(req), entries) : 0; + if (sgl_threshold && avg_seg >=3D sgl_threshold) + return nvme_rq_setup_dmabuf_sgl(req, nvmeq, entries); + + return nvme_rq_setup_dmabuf_map(req, nvmeq); +} + static blk_status_t nvme_pci_setup_data_sgl(struct request *req, struct blk_dma_iter *iter) { @@ -1334,7 +1476,7 @@ static blk_status_t nvme_map_data(struct request *req) blk_status_t ret; =20 if (blk_mq_rq_is_dmabuf(req)) - return nvme_rq_setup_dmabuf_map(req, nvmeq); + return nvme_rq_setup_dmabuf(req, nvmeq, use_sgl); =20 /* * Try to skip the DMA iterator for single segment requests, as that --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 B3D5255C309 for ; Tue, 13 Oct 2026 20:55:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924942; cv=none; b=EH0/BU+n1CcPaQ3oTnVM68s5C75s9EYRWyUs83xbkBqp2U2w2J8uynFzWU9lzpmubh1NgEM9gaJ/XKtrFbg6jM8R1VNLUIEvmVtxAojEEPuFBEaEzxn3/dAMy7MLLYtsESyj9EJU042edeZ9zUuyA5wk2m4OFyI+r4vDJFh3BG8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924942; c=relaxed/simple; bh=VfD6HJzx1Y38GpK6rDkYF3jfCC0ZHJ/tqnfgL8fmZrk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G/8GoLYzek2IWxlns9E8hc7AqJawWH6TCB1JX3z3il2rCciL5fTYTb9JPzQusU8fbkM2TnzV84nQ9iCwl5J6yRehTP7y6NAPLrb4Ftp400YpAcnB5pNShqbKDs5iDEAHmRlLNWggfAbfu4G5wWYAWDoNT0WOscZWmFRSWPtq7BU= 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=NYF1X9dw; arc=none smtp.client-ip=209.85.221.41 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="NYF1X9dw" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-48af4d4e61fso2442355f8f.2 for ; Tue, 13 Oct 2026 13:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924937; x=1792529737; 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=XniK4D9I5IxaguHxPaSeNTaZUyaBimf3PNveaq2tpgg=; b=NYF1X9dw5MEUnL0I/Vo35Pmqx1XgPO/cKl/aSaUBAn83JUwVJDIaq+bC6tXUWHHa9M 6dGrcsLhtLzOCIGuV9VCMgSwoxPI/6H9BcPBmQ3vRn9uQ1YjtLsoamxCU7T5CCt9cZLd onxPh5HLJxv1zkxdYyw1cLVlcuHGNdfq7BZAvMj9GOHwdBYwfS85yBNtfG5tUID85xXb t0nhbaArq+S6CTkLUzi139X1cmKQulUWG+r0PZTXX6R195xjb52iHKHqQCqCSBApHcAH eEDVH82VhYSsBHuQGeas8JsPIl6OwtK2gAs27Z6elehdYeeayqnDxMQs7odCZ1kG3UJc M1Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924937; x=1792529737; 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=XniK4D9I5IxaguHxPaSeNTaZUyaBimf3PNveaq2tpgg=; b=QTi4Yvz+46jVgAnfgS+6CRV53Y4luOs82WD6WwCU9WMeeocTKKZoLl0bDMAEP1sK8i XlQqVkxwKJAGVLqBmxKx9WOgfS6vFLCRKk8ry2ob5CiWlhXS82m7ZSy39b0X5kBkAdme dvWvU2LW2OautCpYfP2IT5azHGLhkp6jHbBTbgyMuRqyqeIt8WArS5SGngpL+CdSfx8I ulIUQpmgA9N9rP9L39GU+Z9CoD1j2NnygIkVswASWyX0g27G9qwde/nxLgjPDfYnA6pA cI+SZWfdo8xRMGZ8Xp4YTYzJGumkd50Zvpp8cK1AM7lyGx6d2csB26WGx0jvd/Sjfl6o vKww== X-Forwarded-Encrypted: i=1; AKwUvBz+W4aPVMJbd7csttnljXiYrANwAjYI4e09ytl5Jb8L/7PvIdOpR3/QHj/mzdn1lUdTj+gy/nJ7Dnsvitg=@vger.kernel.org X-Gm-Message-State: AFq9FYKMDz/YBsp4WSEnufrs8CQn2A8kBMZVYOjt2YwOwCcTjX9/n/ug kELjS8rO7kGcLg9NyiyMucDu5rCDgQG8TYgh6ZLEsbCjhA6z4bv7avCf X-Gm-Gg: AYBFou3OwvtlloKvQGk4KadYRkdI+UmHd1BV5IfToypyXutELoymTWAP3dY5ltjakGV 6o0j7BkaKudeghKyM4gwKBML1xoYzdvEGd5uwXpcM3V1sfNgL3+Yt6ny2lQi8QCBUGpQDYukuLt 4H42G/nblz3vF21MZWoxEOGkmvfuCzO/Oqse9ugxEg0KiquO+jPLfezSQASU0oLCcxMp4Zg/k3j iAqmjDLNO4hDfJnLPdXTD14bNCeMi2IbdO7Bx4QSlCIuWGOS65pNPMhZExV8/Iz5GJmwtjZmNlb xt0oUvpvfON7vTnWJkG2QTc87N3c+ki7vdjyJqsl5MRoxllLf+OV+YlNfvIcNPN/rHF4hOhXWyZ rGbkYeRPpntUFYF0NZ/ba1GYpZ3pUeyGskFlnsjcnzAQ+EIbmIi9XyBIgnN5WAH8DuceJS+9lHe Uc5ROPrs5o5006cGgMRhwAw1VyQd00IElLYUwA2uQZPO2xfWbBiilNOW7wChlmQhpDst7xk7Yi+ mNkQVokVe/HDnA6nDMY2XScBsryqcR9szqe8PLwW4eIXKO+7mRhcnPYztEvU8V1T3WYln7Dkhem X-Received: by 2002:a05:6000:43c5:20b0:487:27f6:a4df with SMTP id ffacd0b85a97d-48dbad3c1e2mr19287115f8f.47.1791924936713; Tue, 13 Oct 2026 13:55:36 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:35 -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 v10 09/13] io_uring/rsrc: introduce buf registration structure Date: Tue, 13 Oct 2026 21:54:53 +0100 Message-ID: <52b9853215688e10e760ba4d6b4d9e91d56b6756.1791924581.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: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation to following changes, instead of passing an iovec for buffer registration introduce a new structure. It'll be moved to uapi later, but for now it's initialised early from a user provided iovec. Signed-off-by: Pavel Begunkov --- io_uring/rsrc.c | 50 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index 1efaf29514e8..7234dcdb8372 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -27,8 +27,13 @@ struct io_rsrc_update { u32 offset; }; =20 +struct io_uring_regbuf_desc { + __u64 uaddr; + __u64 size; +}; + static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, - struct iovec *iov); + struct io_uring_regbuf_desc *desc); =20 static int hpage_acct_ref(struct io_ring_ctx *ctx, struct page *hpage, bool *acct_new) @@ -81,6 +86,15 @@ static bool hpage_acct_unref(struct io_ring_ctx *ctx, st= ruct page *hpage) =20 #define IO_CACHED_BVECS_SEGS 32 =20 +static void io_iov_to_regbuf_desc(const struct iovec *iov, + struct io_uring_regbuf_desc *desc) +{ + *desc =3D (struct io_uring_regbuf_desc) { + .uaddr =3D (u64)(uintptr_t)iov->iov_base, + .size =3D iov->iov_len, + }; +} + int __io_account_mem(struct user_struct *user, unsigned long nr_pages) { unsigned long page_limit, cur_pages, new_pages; @@ -398,6 +412,7 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *= ctx, return -EINVAL; =20 for (done =3D 0; done < nr_args; done++) { + struct io_uring_regbuf_desc desc; struct io_rsrc_node *node; u64 tag =3D 0; =20 @@ -411,7 +426,9 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *= ctx, err =3D -EFAULT; break; } - node =3D io_sqe_buffer_register(ctx, iov); + + io_iov_to_regbuf_desc(iov, &desc); + node =3D io_sqe_buffer_register(ctx, &desc); if (IS_ERR(node)) { err =3D PTR_ERR(node); break; @@ -870,26 +887,29 @@ bool io_check_coalesce_buffer(struct page **page_arra= y, int nr_pages, } =20 static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, - struct iovec *iov) + struct io_uring_regbuf_desc *desc) { + unsigned long uaddr =3D (unsigned long)desc->uaddr; + size_t size =3D desc->size; struct io_mapped_ubuf *imu =3D NULL; struct page **pages =3D NULL; struct io_rsrc_node *node; unsigned long off; - size_t size; int ret, nr_pages, i; struct io_imu_folio_data data; bool coalesced =3D false; =20 - if (!iov->iov_base) { - if (iov->iov_len) + if (uaddr !=3D desc->uaddr || size !=3D desc->size) + return ERR_PTR(-EOVERFLOW); + + if (!uaddr) { + if (size) return ERR_PTR(-EFAULT); /* remove the buffer without installing a new one */ return NULL; } =20 - ret =3D io_validate_user_buf_range((unsigned long)iov->iov_base, - iov->iov_len); + ret =3D io_validate_user_buf_range(uaddr, size); if (ret) return ERR_PTR(ret); =20 @@ -898,8 +918,7 @@ static struct io_rsrc_node *io_sqe_buffer_register(stru= ct io_ring_ctx *ctx, return ERR_PTR(-ENOMEM); =20 ret =3D -ENOMEM; - pages =3D io_pin_pages((unsigned long) iov->iov_base, iov->iov_len, - &nr_pages); + pages =3D io_pin_pages(uaddr, size, &nr_pages); if (IS_ERR(pages)) { ret =3D PTR_ERR(pages); pages =3D NULL; @@ -921,10 +940,9 @@ static struct io_rsrc_node *io_sqe_buffer_register(str= uct io_ring_ctx *ctx, if (ret) goto done; =20 - size =3D iov->iov_len; /* store original address for later verification */ - imu->ubuf =3D (unsigned long) iov->iov_base; - imu->len =3D iov->iov_len; + imu->ubuf =3D uaddr; + imu->len =3D size; imu->folio_shift =3D PAGE_SHIFT; imu->release =3D io_release_ubuf; imu->priv =3D imu; @@ -934,7 +952,7 @@ static struct io_rsrc_node *io_sqe_buffer_register(stru= ct io_ring_ctx *ctx, imu->folio_shift =3D data.folio_shift; refcount_set(&imu->refs, 1); =20 - off =3D (unsigned long)iov->iov_base & ~PAGE_MASK; + off =3D uaddr & ~PAGE_MASK; if (coalesced) off +=3D data.first_folio_page_idx << PAGE_SHIFT; =20 @@ -986,6 +1004,7 @@ int io_sqe_buffers_register(struct io_ring_ctx *ctx, v= oid __user *arg, memset(iov, 0, sizeof(*iov)); =20 for (i =3D 0; i < nr_args; i++) { + struct io_uring_regbuf_desc desc; struct io_rsrc_node *node; u64 tag =3D 0; =20 @@ -1009,7 +1028,8 @@ int io_sqe_buffers_register(struct io_ring_ctx *ctx, = void __user *arg, } } =20 - node =3D io_sqe_buffer_register(ctx, iov); + io_iov_to_regbuf_desc(iov, &desc); + node =3D io_sqe_buffer_register(ctx, &desc); if (IS_ERR(node)) { ret =3D PTR_ERR(node); break; --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 4F81155C323 for ; Tue, 13 Oct 2026 20:55:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924952; cv=none; b=FlTNzu4jDsCE/4W/0MJjRyxImwcdUsHr2W9NCfUjEMylWjBqtpqJMcwWMA6vxHnzHvs8hrtgbpKQ8PU0KjsJW0nupghqVrnSTPs7Tu9+5jq21p42Hcm5q7VVmdohiuP8PFipxLUtWRrIDtkuw5KR6yBLJiQqGQ2rhDNbAgK3jOY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924952; c=relaxed/simple; bh=bXbAIgu8XiflD4WoySdMtpdgz0ClWZkdJULVv1/YSpQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aA3eweTo6W4MUQS56giPYDgXV32QWwV1guonmPK9JqhrahxbFBi2aLkBjuVWtXlBeAOMD6f9+d3jQ1+XSDSF/QOnS/hCww4FbdIrWQZE/Q/zwkHINL0EFthEqYoKqMCjVRQkiWux2SZWcvvtWm4YRDdC3b7HKVuQQRcguRzZhBE= 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=JiOW3K4P; arc=none smtp.client-ip=209.85.221.45 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="JiOW3K4P" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-48afbd2c386so1987077f8f.3 for ; Tue, 13 Oct 2026 13:55:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924938; x=1792529738; 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=jun/zHGshv7Ie+bKLV3PJNKMmcdIRnJjgz+qOkaWbDg=; b=JiOW3K4PVd9zrWU8Dl5RMZulza4Vg+3mJVGB9XRUAbB3Wllf6TmrFiy9+VFu2TeEDT ZLh3ZsTQL5UL7hbKKo2gzQz5yMhxUOxzHs3UoNMr7Ekp2Hw8dcwSQkwj2bMgnwlDHT5m sc8DvxmgZgF9bNv9j9NmfaCVS1ETdUFr9/nsHwOs5dA+pkYWouVmRWVDEh+yAxzIQsYF /Fq/Cw0RrsisFzOPYuAO2A2jkDYfeSXkxWX9DD4mnv+dJgHVqblVvEwI2jPOldn8ZF68 EesEl0rqhwis+Qh7Y6DkXdfk0fww8tjonRYe0pXDstjlXLyfiJuuo2kXmXvGA/ek49C7 OGzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924938; x=1792529738; 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=jun/zHGshv7Ie+bKLV3PJNKMmcdIRnJjgz+qOkaWbDg=; b=KKxe5BVia6/Z7TzzeIlCrX9FD9roQjSDTZwOI1OnjK9ogwxB11/t5wRmvLvp//MwNS YfWnjgGSbdeXNSjfVRA0a6glaEf2SyDNHo8cFVV86ZwS4zi/GdV/oxbvTJJYiDLDmIIh NYkbE+JC6KWc4ncZhexyxi3O6zvbo8nF7XjoK8bwxudUbzk44lvFRIS2SaYtvZ620U+6 rE9VxaOuQI9F0PeOQE+zelaSN40BvfrJPsRN4C2L+jc0rQLeIuRHtO3kmS/5fuyFJJvJ 8Z7dBa8n7fOev9O0kPxEcOxAi5LDy2jWHGfI3djR1KGDKaNbRY/kL/tXNLMLP88SAzXK jL+w== X-Forwarded-Encrypted: i=1; AKwUvBwn7LZRuPsDecsOkkmdBzgIGyeUZQnWYq0ZqV90q6cjWL5yCvVrLNFkzD5Gp5vgE1yMio/EyrWnxYFo2oo=@vger.kernel.org X-Gm-Message-State: AFq9FYKeM9H3Oz8Yt3ONQkJce0Zk/tgZo1FqXHY0vjJ8OoOSjpPNByHU U7Vl6RolfSZb7mrw1fmw/ER5PgA2Jc7Nn5SNXsxTfUzkbYIRuiP2T0h0 X-Gm-Gg: AYBFou3Rz32UmdbXcUPgG2EY1J3WijtUF9an0VQeZa5gxW0uVBh58IkzKO7+SfIbq/K duY5nXOrpqDoE5sfza7LnTljaBgQ6X3FyGDbUJ2GB8+k6H4vgMoG7Bps6D3N8D3QBH5pJFJz1DQ ruvXepdTva6WB8phZavnWJyC/zJIaBGT82kS0PHAeHCO7kDZLwNAfZcSHGuSwcxEwA+EkOTW7Um /eg6saqUR86rBfWI3P7NadErxhMEpw29qGks/PHVKBSa7ZhVlkf+cgOnvR8X+SLzlrzwy6x20Ee 4dCxJTAaqh5sYPsTkHNTZ06hmd+39Zc5NG5wyagyGRbbThVyaCAQToMxjVok0WIyfKoO3lg3xm6 RRmKmncU5GNM77dZjqM5hQjlPrqJrAij9yJ1irjiFfPh67/cBxoWY4jVfsGTegrzL+h31rkCWtO JtE1dfDMUse1KGubilRGonhlg0Ir1AMq1fA+Q2/KmfrJb4g5SQNis/ROAiSeEr6IpmEzgKzDsTg /kc/OWsDufgTXymhpxrt//tF1EpBKZVkJkoMOn8gExZVNUAO2lybZVL/b+It93uv2RbUgOD8q9Z X-Received: by 2002:adf:f704:0:b0:488:894d:20b0 with SMTP id ffacd0b85a97d-48dbad336a7mr19927039f8f.44.1791924938291; Tue, 13 Oct 2026 13:55:38 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:37 -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 v10 10/13] io_uring/rsrc: extend buffer update Date: Tue, 13 Oct 2026 21:54:54 +0100 Message-ID: <0ebd979544306d60e98e9e1afb1c7147fa5da6c1.1791924581.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: quoted-printable Content-Type: text/plain; charset="utf-8" We need to pass more information to buffer registration than we can fit into a single struct iovec. This patch allows users to optionally pass struct io_uring_regbuf_desc. Apart from having more space for future use cases, it also introduces registration types. Currently, the type can be either of IO_REGBUF_TYPE_UADDR, which mirrors the iovec path, or IO_REGBUF_TYPE_EMPTY for leaving a buffer table slot empty. The next patch introduces a dmabuf backed type, and can be useful for other extensions like splicing a list of user addresses (i.e. iovec[]), interoperability with zcrx, kernel allocated memory like was brough up by Cristoph. Note, the type only represents a registration option, which is distinct from how io_uring internally stores it. The flags field is not used yet but always useful to have, e.g. we can encode read-only / write-only restrictions using it. Signed-off-by: Pavel Begunkov --- include/uapi/linux/io_uring.h | 27 +++++++++++++- io_uring/rsrc.c | 68 +++++++++++++++++++++-------------- 2 files changed, 68 insertions(+), 27 deletions(-) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index b42b66b424a7..abb590833a0f 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -791,13 +791,38 @@ struct io_uring_rsrc_update { =20 struct io_uring_rsrc_update2 { __u32 offset; - __u32 resv; + __u32 flags; __aligned_u64 data; __aligned_u64 tags; __u32 nr; __u32 resv2; }; =20 +/* struct io_uring_rsrc_update2::flags */ +enum io_uring_rsrc_reg_flags { + /* + * Use the extended descriptor format for buffer updates, + * see struct io_uring_regbuf_desc + */ + IORING_RSRC_UPDATE_EXTENDED =3D 1U << 1, +}; + +/* Buffer registration type, passed in struct io_uring_regbuf_desc::type */ +enum io_uring_regbuf_type { + IO_REGBUF_TYPE_EMPTY, + IO_REGBUF_TYPE_UADDR, + + __IO_REGBUF_TYPE_MAX, +}; + +struct io_uring_regbuf_desc { + __u32 type; /* enum io_uring_regbuf_type */ + __u32 flags; + __u64 size; + __u64 uaddr; + __u64 __resv[7]; +}; + /* Skip updating fd indexes set to this value in the fd table */ #define IORING_REGISTER_FILES_SKIP (-2) =20 diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index 7234dcdb8372..54774729ee67 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -27,11 +27,6 @@ struct io_rsrc_update { u32 offset; }; =20 -struct io_uring_regbuf_desc { - __u64 uaddr; - __u64 size; -}; - static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, struct io_uring_regbuf_desc *desc); =20 @@ -90,9 +85,12 @@ static void io_iov_to_regbuf_desc(const struct iovec *io= v, struct io_uring_regbuf_desc *desc) { *desc =3D (struct io_uring_regbuf_desc) { + .type =3D IO_REGBUF_TYPE_UADDR, .uaddr =3D (u64)(uintptr_t)iov->iov_base, .size =3D iov->iov_len, }; + if (!desc->uaddr) + desc->type =3D IO_REGBUF_TYPE_EMPTY; } =20 int __io_account_mem(struct user_struct *user, unsigned long nr_pages) @@ -340,6 +338,8 @@ static int __io_sqe_files_update(struct io_ring_ctx *ct= x, return -ENXIO; if (up->offset + nr_args > ctx->file_table.data.nr) return -EINVAL; + if (up->flags) + return -EINVAL; =20 for (done =3D 0; done < nr_args; done++) { u64 tag =3D 0; @@ -399,9 +399,8 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *= ctx, struct io_uring_rsrc_update2 *up, unsigned int nr_args) { + bool extended =3D up->flags & IORING_RSRC_UPDATE_EXTENDED; u64 __user *tags =3D u64_to_user_ptr(up->tags); - struct iovec fast_iov, *iov; - struct iovec __user *uvec; u64 user_data =3D up->data; __u32 done; int i, err; @@ -410,29 +409,49 @@ static int __io_sqe_buffers_update(struct io_ring_ctx= *ctx, return -ENXIO; if (up->offset + nr_args > ctx->buf_table.nr) return -EINVAL; + if (up->flags & ~IORING_RSRC_UPDATE_EXTENDED) + return -EINVAL; =20 for (done =3D 0; done < nr_args; done++) { struct io_uring_regbuf_desc desc; struct io_rsrc_node *node; u64 tag =3D 0; =20 - uvec =3D u64_to_user_ptr(user_data); - iov =3D iovec_from_user(uvec, 1, 1, &fast_iov, io_is_compat(ctx)); - if (IS_ERR(iov)) { - err =3D PTR_ERR(iov); - break; - } if (tags && copy_from_user(&tag, &tags[done], sizeof(tag))) { err =3D -EFAULT; break; } =20 - io_iov_to_regbuf_desc(iov, &desc); + if (extended) { + if (copy_from_user(&desc, u64_to_user_ptr(user_data), + sizeof(desc))) { + err =3D -EFAULT; + break; + } + user_data +=3D sizeof(desc); + } else { + struct iovec __user *uvec =3D u64_to_user_ptr(user_data); + struct iovec fast_iov, *iov; + + if (io_is_compat(ctx)) + user_data +=3D sizeof(struct compat_iovec); + else + user_data +=3D sizeof(struct iovec); + + iov =3D iovec_from_user(uvec, 1, 1, &fast_iov, io_is_compat(ctx)); + if (IS_ERR(iov)) { + err =3D PTR_ERR(iov); + break; + } + io_iov_to_regbuf_desc(iov, &desc); + } + node =3D io_sqe_buffer_register(ctx, &desc); if (IS_ERR(node)) { err =3D PTR_ERR(node); break; } + if (tag) { if (!node) { err =3D -EINVAL; @@ -443,10 +462,6 @@ static int __io_sqe_buffers_update(struct io_ring_ctx = *ctx, i =3D array_index_nospec(up->offset + done, ctx->buf_table.nr); io_reset_rsrc_node(ctx, &ctx->buf_table, i); ctx->buf_table.nodes[i] =3D node; - if (io_is_compat(ctx)) - user_data +=3D sizeof(struct compat_iovec); - else - user_data +=3D sizeof(struct iovec); } return done ? done : err; } @@ -481,7 +496,7 @@ int io_register_files_update(struct io_ring_ctx *ctx, v= oid __user *arg, memset(&up, 0, sizeof(up)); if (copy_from_user(&up, arg, sizeof(struct io_uring_rsrc_update))) return -EFAULT; - if (up.resv || up.resv2) + if (up.resv2) return -EINVAL; return __io_register_rsrc_update(ctx, IORING_RSRC_FILE, &up, nr_args); } @@ -495,7 +510,7 @@ int io_register_rsrc_update(struct io_ring_ctx *ctx, vo= id __user *arg, return -EINVAL; if (copy_from_user(&up, arg, sizeof(up))) return -EFAULT; - if (!up.nr || up.resv || up.resv2) + if (!up.nr || up.resv2) return -EINVAL; return __io_register_rsrc_update(ctx, type, &up, up.nr); } @@ -595,12 +610,9 @@ int io_files_update(struct io_kiocb *req, unsigned int= issue_flags) struct io_uring_rsrc_update2 up2; int ret; =20 + memset(&up2, 0, sizeof(up2)); up2.offset =3D up->offset; up2.data =3D up->arg; - up2.nr =3D 0; - up2.tags =3D 0; - up2.resv =3D 0; - up2.resv2 =3D 0; =20 if (up->offset =3D=3D IORING_FILE_INDEX_ALLOC) { ret =3D io_files_update_with_index_alloc(req, issue_flags); @@ -901,9 +913,13 @@ static struct io_rsrc_node *io_sqe_buffer_register(str= uct io_ring_ctx *ctx, =20 if (uaddr !=3D desc->uaddr || size !=3D desc->size) return ERR_PTR(-EOVERFLOW); + if (desc->type >=3D __IO_REGBUF_TYPE_MAX) + return ERR_PTR(-EINVAL); + if (!mem_is_zero(&desc->__resv, sizeof(desc->__resv)) || desc->flags) + return ERR_PTR(-EINVAL); =20 - if (!uaddr) { - if (size) + if (desc->type =3D=3D IO_REGBUF_TYPE_EMPTY) { + if (uaddr || size) return ERR_PTR(-EFAULT); /* remove the buffer without installing a new one */ return NULL; --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 757C555D868 for ; Tue, 13 Oct 2026 20:55:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924946; cv=none; b=kg+52pUFm51OypRCDGMLmhbuCnZDY2WP0YI/dUHj3ToucdBZD6gxd8MWCNOncWhINbajVE6CNm2trL/I/TmCuLuP95g5p02daDQObPuzgknnOyRVuF4pzRxowBYp3aaI1Dwz60sSDOZzMdgbKnjBsQCSFRSw5bmdUSsYYjV5+I4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924946; c=relaxed/simple; bh=Yz9mg10bqVdj7cVQ9CUCuhVSPCWk27GUE+7ZZMs5kDo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UGcQzWLhFCLhN3t1JXic76hFHYw0cdrTo/K2QCHWYE+94C7/QZFd7f0b3lzSGevGQAy1sncl5fqwRqMifSnBK8fQ1DFhkqXYjifp3eUw5PVxvtGbStdmSJcFq7mZkEJlaPeyE3HmYOLdVyJs58nFdaZAZ5G04NORXhb/6euW/kQ= 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=reXEvNR0; arc=none smtp.client-ip=209.85.221.48 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="reXEvNR0" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-48c4649b35bso3185257f8f.3 for ; Tue, 13 Oct 2026 13:55:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924941; x=1792529741; 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=9CL2BRiyUp3CaHGocQHkhsGpx+V6MY3r8MUNMnInA+U=; b=reXEvNR0/oR539rFg/mAmOONmVBwbmQ5GC0k5RqdLIb/28t4/sJhr9VlDMTRP2selU EI4ngzmBIR9o5vFVZS9V9CaZL5VtDAlekC5OfeqLFQdxj+RDiXxfPjoh+PtAMIyxpKNJ O0DFXdOF0VFWMHxoAo63DYMgxwl+rz83JhX3fFTDS/DfTNvJlOp9F83hbiiJTGFaARTZ JBRYoCS72lG3ocBNO8HKt0IASjzWzzMN9YA70nYzttT1XQA7iPI7j49DK8ba1DVCJZ4u IHzcMBO3S1gfqL1W89gg20Tv22hBES4Q4H7nzrgnZ9u3rn4yvrh8RrmjLnGBW18SAySE sMVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924941; x=1792529741; 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=9CL2BRiyUp3CaHGocQHkhsGpx+V6MY3r8MUNMnInA+U=; b=roVeiGq0Xiq0+tnoRYiYAZvKPtWi5XTbx4VYrMi5QZmTRjsN6dFvYqAo4saIJ7y+bW 4ANahwqIAq6Ju5qrqDX7Zg7NTOH53p/dtqxjJtZetQhKvuk/h7L3v9xpuVPnoEGxpGvO mmsdWC0E3aTUNU9qCOeN/Kv9oIfVVhmLT8+qIFYsLDj1r3wcYXOvOUOIC3IV6tBd7kpq fhkxUz981LI8m2lKwn69mCbedZHexhhBJPB8hgJZdDRvW3Ctr/MaHS59c7lMTtDufzCz d3VQfHEfFUhtk5Cs1FZCpnj40R6mq1Kd2CkujjNSmFMx7tf3JE3gs57T7I0xdVWUomAN inhA== X-Forwarded-Encrypted: i=1; AKwUvBzofxCyptldvNGkGwaJnZQ+9DslzMUpo638U3HbyFgaTeRbtTmH04kQR1vPYYTNwuySHlOuuy/o1qKBCHM=@vger.kernel.org X-Gm-Message-State: AFq9FYJ9r7Y7CDh8x4S7r5+zKyaIfH8nU+nlu++Ob5VMPSFuP1QRFtge 5SbpJfwHRUEH+tfW3Cyveiyz0HOhlUjacLY0SDVd8vmSBywydoK9eEhw X-Gm-Gg: AYBFou2TAET1h9AGYd1EfXLwuhnd9WYsVU7PIJ24MvfFN87rXpXXCVq4mySLneXjZSZ v3yGru4axbJSsmcVMvXQXi6tfArVoDhRE18jhzNIjTxJId5FffjLiLmUxonTWx5JwevVxlVRb1A Dj9kkjgfPMuph5uz9aH3l7JZ9v+CkBBnzyxdSushpUvRYztxuoVdbsCywv5GD+WOohd5Lja7GKD ImU/5msVKm/mv/HZEWUTdJSjZdKE4VBnthr9D9jQ2j2O3/S/hKE5xzvAqM1xzurPypQznVY2Olu ErFU8VVHyWwCQuDK2l1PbXV0GVMxStpefDEGH3Tyi/vx0Fm9oQy+MW4OMkI3oj4hWIyAja987KG hxMORj4X52qDEo5UVqP7M4Q3jO153jyEOX5MHaq2J+O2gHIWb/zO8ukkUXZCrHI7UR4zqNcsfwC Jbf8vrWCFy7wRnBuYIPiCmeWCS+XJrbvkQO8oApaTaXWBslTtRJIS/ybOIqYLmZXcbFABZNTa7O 0IalkODuzuNHTawN/kHHeztyrDmrKMQ7IUSuav9NxIKuW4YoVHR9N4E0hMRsYgclPYHPrHf8non P4Y6EB1QXHE= X-Received: by 2002:a05:6000:2407:b0:487:1ddc:aaff with SMTP id ffacd0b85a97d-48dbace40cfmr24537298f8f.44.1791924941527; Tue, 13 Oct 2026 13:55:41 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:39 -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 v10 11/13] io_uring/rsrc: add uncloneable regbuf flag Date: Tue, 13 Oct 2026 21:54:55 +0100 Message-ID: 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: quoted-printable Content-Type: text/plain; charset="utf-8" It's hard to implement cloning if the internal structure needs to be mutable and/or relies on other ring resources. In preparation to such buffer types, add a flag indicating that the buffer can't be cloned. It might be possible to add cloning in the future for them, but that would likely need reallocating the structure and reacquiring resources in case by case manner. Signed-off-by: Pavel Begunkov --- io_uring/rsrc.c | 5 +++++ io_uring/rsrc.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index 54774729ee67..532866a1e9b9 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -1458,6 +1458,11 @@ static int io_clone_buffers(struct io_ring_ctx *ctx,= struct io_ring_ctx *src_ctx if (!src_node) { dst_node =3D NULL; } else { + if (src_node->buf->flags & IO_REGBUF_F_UNCLONEABLE) { + io_rsrc_data_free(ctx, &data); + return -EOPNOTSUPP; + } + dst_node =3D io_rsrc_node_alloc(ctx, IORING_RSRC_BUFFER); if (!dst_node) { io_rsrc_data_free(ctx, &data); diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h index 9ef88383b363..73d7b1ebf0b6 100644 --- a/io_uring/rsrc.h +++ b/io_uring/rsrc.h @@ -26,7 +26,8 @@ struct io_rsrc_node { }; =20 enum { - IO_REGBUF_F_KBUF =3D 1, + IO_REGBUF_F_KBUF =3D 1 << 0, + IO_REGBUF_F_UNCLONEABLE =3D 1 << 1, }; =20 struct io_mapped_ubuf { --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 BD150560AC2 for ; Tue, 13 Oct 2026 20:55:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924951; cv=none; b=TfCmDzmu+KpJrNW10t7jM3hOlbLnT6ib7F7AJHmsQG75XFXxnW8Y9Cik785BVdHd8TpQl5s1WiWgqpkBI2f8Y+h7/+JRD9ozypjZsdPblcPF2MtdSNqqlqZWyl2CKihTebZI1/cHUHrosOHvlzn41rf5IXf3tYklNkJHVdYYCOQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924951; c=relaxed/simple; bh=r60ha7f86tSXOy7awDRSeceZcMhT0AOlgJWaxT3jtGs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oS834WowJGPDBo09zdUPVaRt3zWJyETd5Qr/P5IaEGUuzo784ByH/QrWtiWwWWLTe2vx3X5djBY8AawTpL18NnTmOkuujVnrS85s224UDPECnF3Ixp0BDRHXB/+C/shIw7M/wquqEvS3rHRVAZkXu5TQu9UjpCyVsSkPN139DlY= 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=LxZZIuOx; arc=none smtp.client-ip=209.85.221.44 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="LxZZIuOx" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-48c4d99c32bso3265444f8f.1 for ; Tue, 13 Oct 2026 13:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924945; x=1792529745; 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=ays4SVba18pfRPB/Hpqu6QDaxGmpKJaoA/2lD097Khk=; b=LxZZIuOxbxtAdJEFuNKtznhoBBpEf3ufoFq8v4kzTbqgOqUFJe9dhejArkyc+vYakg gA82Qb4w+2eaopT9BqTesVEw0igg1/U5EQYOgXmKQZ+GFAM9mPkf740crYic2xoOr666 bEK6oWvBuK1Ob4o/Jy0TZYoXTSAGDutRsS8HyREoYGGVR4WRppv1WzteJN8abdPeTftd UeG0JyYR9+pa4mf5P7/nuFz9by7Zjf/RX2Th4uYYGMDXdZz6oXHcq/hHPDdSqMVMCRWb zDKQ5xki635PLGpoMCHY4SxYCAxVVAJxQwD6gQGdv92GWjFj/PaVwMeRBm/VNv/LfSR9 IO/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924945; x=1792529745; 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=ays4SVba18pfRPB/Hpqu6QDaxGmpKJaoA/2lD097Khk=; b=0GgUdFpP7DShuo+ubpp3NqPJfwH1uZgzOBBCmNWi3s0CAT+brfVcmNBtGvgadseMtE WJjoL5pkM/ragWhCB4akFo+WHS54ZCkNIQoM56x3MCzBB7mpXDZpqpO8yg9lTuREll2v 6eEuWB+H9nW76xZ443YndWAo4SXl3aX8uLYVQ4vg634aQ2wcLx3TAylUBJsB80vCnmVl 5E3mqB1QuCnPdlLDq8Kv+WpzaktTzYuRU+LYON7iVnaYmc8+v9oOocXZkKzSCUs+Q+XM xh7OzP4t9E/G1FPhi0JiebrjVnPYVa2gmZhkYKxFUNp7H2VU2bJFq/tVqLprOkqyxy+A rmoA== X-Forwarded-Encrypted: i=1; AKwUvBzjVRCcdyLU9GEezhxx7Xq0lSlX7YiV7C7xlQW/H714BBYFs2l/WJrlmRKb8cpZCuWEapLe5K6Ed7GM3Jk=@vger.kernel.org X-Gm-Message-State: AFq9FYLHiXd3+lW3Jg1rGnAm1IAdjGRSXYIvMGl6t3DOAIU4NP9y5Kbr QMiiCWOZ5FGhd7Rb9a7Fc8sVnkHJYgLQzLSEG2YEiahhkcwSjxtz/med X-Gm-Gg: AYBFou2CtvMoRl5FwdTCJJjab/gWPuoNP3vZnmeZgSmvA7EU94AZ51UJkpQtSJ7f84i 1IIINyU3n/Glinl+FmS4hm8boV6Z0b+jlr8g119ikZ2mqakRBebx3tp5fxBgcSlHVppRCzyox2Z Vq3mM2dKlUlSpkkC5WPo9IHjN5Kaut5YpaK7vuF7m3PQJ48LnT+uTaUEJ2/1lPZJaxBg/gTwtuB WCUh5oGTgjnBIeGeDF6X8auD/kpF8QYifeo5qq5jEX/kjSDABL06Y2lagd5bsB+O5Co3IpPW96E gj8z6o00zQFW5aV8pIiPvZky0wR+uX+ofJnHJXQYjnRgixSXXgbGf6h2rTuA/FoGeZS8mjPIvqR hGGFTywd02nv7KmVmanMVlhpxtXHKJs7TeoZadFxTSa/SL5TTITTKvGhwxLgC/kU3ijNzLuqlFC BoXknl7C0/esGJ2M/sRRbosEH90eeNfbYi5sLYb7jXiuPuIFPTC9aQYC2Uwm3l6gDaME4p9ct3T 7+Gjef1CXXorVK/07rg1kC2MrG/kl8gCxe/q1A9zfW4mtUat11GCF8CcP3ZGnH/vS9XplfU8vRl dnrf0UAyQag= X-Received: by 2002:a05:6000:27c6:b0:487:27f9:82b with SMTP id ffacd0b85a97d-48dbaae34e3mr16754768f8f.32.1791924944821; Tue, 13 Oct 2026 13:55:44 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:42 -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 v10 12/13] io_uring/rsrc: add regbuf import flags Date: Tue, 13 Oct 2026 21:54:56 +0100 Message-ID: <4b7c13d9860640499460862c8cd4a13602ca174b.1791924581.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: quoted-printable Content-Type: text/plain; charset="utf-8" We'll have special registered buffer types that can't be used with all opcodes and need special handling. Add separate flags to control registered buffer import, which will be used to specify what kind of buffers the caller can handle. Signed-off-by: Pavel Begunkov --- io_uring/rsrc.c | 8 ++++---- io_uring/rsrc.h | 24 ++++++++++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index 532866a1e9b9..f42d201738cd 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -1317,9 +1317,9 @@ inline struct io_rsrc_node *io_find_buf_node(struct i= o_kiocb *req, return NULL; } =20 -int io_import_reg_buf(struct io_kiocb *req, struct iov_iter *iter, +int __io_import_reg_buf(struct io_kiocb *req, struct iov_iter *iter, u64 buf_addr, size_t len, int ddir, - unsigned issue_flags) + unsigned issue_flags, unsigned import_flags) { struct io_rsrc_node *node; =20 @@ -1733,9 +1733,9 @@ static int io_kern_bvec_size(struct iovec *iov, unsig= ned nr_iovs, return 0; } =20 -int io_import_reg_vec(int ddir, struct iov_iter *iter, +int __io_import_reg_vec(int ddir, struct iov_iter *iter, struct io_kiocb *req, struct iou_vec *vec, - unsigned nr_iovs, unsigned issue_flags) + unsigned nr_iovs, unsigned issue_flags, unsigned import_flags) { struct io_rsrc_node *node; struct io_mapped_ubuf *imu; diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h index 73d7b1ebf0b6..351995b61e68 100644 --- a/io_uring/rsrc.h +++ b/io_uring/rsrc.h @@ -62,12 +62,28 @@ int io_rsrc_data_alloc(struct io_rsrc_data *data, unsig= ned nr); =20 struct io_rsrc_node *io_find_buf_node(struct io_kiocb *req, unsigned issue_flags); -int io_import_reg_buf(struct io_kiocb *req, struct iov_iter *iter, +int __io_import_reg_buf(struct io_kiocb *req, struct iov_iter *iter, u64 buf_addr, size_t len, int ddir, - unsigned issue_flags); -int io_import_reg_vec(int ddir, struct iov_iter *iter, + unsigned issue_flags, unsigned import_flags); +int __io_import_reg_vec(int ddir, struct iov_iter *iter, struct io_kiocb *req, struct iou_vec *vec, - unsigned nr_iovs, unsigned issue_flags); + unsigned nr_iovs, unsigned issue_flags, + unsigned import_flags); + +static inline int io_import_reg_buf(struct io_kiocb *req, struct iov_iter = *iter, + u64 buf_addr, size_t len, int ddir, + unsigned issue_flags) +{ + return __io_import_reg_buf(req, iter, buf_addr, len, ddir, issue_flags, 0= ); +} + +static inline int io_import_reg_vec(int ddir, struct iov_iter *iter, + struct io_kiocb *req, struct iou_vec *vec, + unsigned nr_iovs, unsigned issue_flags) +{ + return __io_import_reg_vec(ddir, iter, req, vec, nr_iovs, issue_flags, 0); +} + int io_prep_reg_iovec(struct io_kiocb *req, struct iou_vec *iv, const struct iovec __user *uvec, size_t uvec_segs); =20 --=20 2.54.0 From nobody Sat Oct 24 13:19:47 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 15DE05616BE for ; Tue, 13 Oct 2026 20:55:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924956; cv=none; b=i5Gf6avG1x+ECOCruboP5Ji4c1ROty+IYxfuC17D+u4aKJlhY04GPDrvgcl+FifKPRccgmfm+UrSuKhrNvSe6NXt8ngpzwfEeqZFIg+3zvEOCXFLIl4LkblHygmkIQV9krLRosXzp7TsRo04ft/zIp/XH92A4/o2ZyaEGGpRN3A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924956; c=relaxed/simple; bh=BJdHB/ejV+CxAqyvc96eqP9MAroM09p6ojnCtOYYwsA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OdMrScOj3i//pB7vEkvmYUVLuSgGG5wKFodNOpByDE7SAoOt9ygtoMKwfnGZCKujrCtXXJJCg9LXUmwWVmoS9ip2Ot40pna4m5ekb9lZJsHPW4BSDbxNmtrYYDY0KjORKW1w77SkBYWlI9NLQwQ17L+Uq8LssUYumFs8alUz1PM= 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=pNH5JoTs; arc=none smtp.client-ip=209.85.221.52 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="pNH5JoTs" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-48b9d8055dfso2594118f8f.3 for ; Tue, 13 Oct 2026 13:55:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924948; x=1792529748; 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=Az43PS/qS00pmQNyOpOlhDk/xvxDJzb8VYH9IXe9HrU=; b=pNH5JoTsy0Wy2CoVgwECR6xNAdyMAy/RKJNuLkF03i5NBz7aPdGZ430JWTFMnKK6RX kROUTmKylFxdJrzD5wkrIm419JGiR+S6fjUz1fQRZwsLtRigfVOPykev2kb9iRuD9viR IDPaZ4dW2BNBM5YAatYEKlzZd2S4dDy57qqK/WfuAAbPTptCY5bDkTDhn1PTy5t3nqoE 4ee2xEmp9kA5imTY1qJzxoCnKOHJmqBlDLyxVPK7Pfr4fNuIvBYMc1EVLzwwDeOUYN9p 9CUX7svsQc2C8xsRPy5r1dAYMVJYUWoGYKKjcJPcczTGFJvsPI+z2/Sx9Xxm9barBP7Y LmVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924948; x=1792529748; 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=Az43PS/qS00pmQNyOpOlhDk/xvxDJzb8VYH9IXe9HrU=; b=FL9cXWQ/8PIib4ZwT0Aa0n4nPmJjnJHeuwOcglhY4ydWfY5BllgjjizRpGMjR1s3l7 eIm4o9Vgu/U1hNWRY0/I7IoU1bbjZbwPApEbg1RAqfDDn8M9pPcOm8l1iLJ13ZG7Y2S8 /tXkdwILoEsXJ0Y1GWbq39Ue318TuBNPVoghHMfg+q/ihH9MauGBDQie0SI1yCLcc9jz VNvzi0KDLyDQvAcJpW1nUGHAJl+i/ndJ1hYfp+wS8clFS77BJrf5AD8XXWyk2zrSE0j/ QcqJK8JA4B8LrA/h9tPW4srz7A2jZ/4uUuJMkTqCuoYKlXRtAavlyCOuXg1uf4AoV+r+ ppLA== X-Forwarded-Encrypted: i=1; AKwUvBwow3PiG86VjVoZH5hbKZg73b4URd+OJWfU0N1cPwJlzVs+iqZSfS8frvH9tMEAIMdp0mmgFmx5H2Ym6JI=@vger.kernel.org X-Gm-Message-State: AFq9FYJ/TGGh44i4nxrQwBMo2AhyKyxcMiig85aQ6ySQJ86ndSP/mgko hXv3eNSPBRHVKbUeZgbAYqf+6mPgGtbHQWP323fyiWHP5VrvLOVPVYJr X-Gm-Gg: AYBFou1j7jkMgrV4EERptUa0e89S1HKkVA9D0HGD1nirBPAY+KSPMtQwj8zemaaYmcU K7Us+JA66SJp3BZCiS0F3c5Fk7dfk/ognk0pJABgp9AVbth3lK6BV590hgS1PW3R/8OBUJtQ9TS IXev4u8/6+AjELit8r8NNzEogTLIrC9FA07h73olRpowL4LbGReYELlb31+yMailb62foS+2knH fDd32HSQGFhcUKEj/ciFu+VyIUOfbMk9IyzpijQHuXCARWKcBGDraLBirNoHpg0I/+1OQ3wV25k VeSvc4TbO7XllpiEdLKMvFSz6/1a8nPUoqddSIjikFtSSPPArskB++dZ+6HmJjzsY7cWFZaphC5 /mu/O/XNsel5NtyRIaf3KeAlgBWJoj88vt+5zZpcpW0RxxAGBBkBmmzu0RVRNEYwldXcUIiRcmc cZfG/1LlFQgFcn8IZe9Keq8hvBzt//CXzCX72VGFb+OWTjFWTj75EGtlJ/wMBP/19ysKTe8UAZV Z4xrbjwP+QUmjv9QgJga8z3149RwT0hiFWV6blZbb2XBAAxjeHb7AAokaIsooacudjPf/Hdj3Y/ V+eaVljrxMI= X-Received: by 2002:a05:6000:298e:10b0:487:2387:7c9 with SMTP id ffacd0b85a97d-48dbaadb47emr19950255f8f.14.1791924947986; Tue, 13 Oct 2026 13:55:47 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:46 -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 v10 13/13] io_uring/rsrc: add dmabuf backed registered buffers Date: Tue, 13 Oct 2026 21:54:57 +0100 Message-ID: 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: quoted-printable Content-Type: text/plain; charset="utf-8" Implement dmabuf backed registered buffers. To register them, the user should specify IO_REGBUF_TYPE_DMABUF for the regitration and pass the desired dmabuf fd and a file for which it should be registered. From there, it can be used with io_uring read/write requests IORING_OP_{READ,WRITE}_FIXED) as normal. The requests should be issued against the file specified during registration, and otherwise they'll be failed. The user should also be prepared to handle spurious -EAGAIN by reissuing the request. Internally, dmabuf registered buffers is an optin feature for io_uring request opcodes and they should pass a special flag on import to use it. Suggested-by: David Wei Suggested-by: Vishal Verma Suggested-by: Tushar Gohad Signed-off-by: Pavel Begunkov --- include/linux/io_uring_types.h | 5 +++ include/uapi/linux/io_uring.h | 6 ++- io_uring/Makefile | 1 + io_uring/dma-buf.c | 66 +++++++++++++++++++++++++++++ io_uring/dma-buf.h | 76 ++++++++++++++++++++++++++++++++++ io_uring/rsrc.c | 59 ++++++++++++++++++++++++-- io_uring/rsrc.h | 5 +++ io_uring/rw.c | 33 +++++++++++---- 8 files changed, 237 insertions(+), 14 deletions(-) create mode 100644 io_uring/dma-buf.c create mode 100644 io_uring/dma-buf.h diff --git a/include/linux/io_uring_types.h b/include/linux/io_uring_types.h index 90fea94ad202..73cd11d173df 100644 --- a/include/linux/io_uring_types.h +++ b/include/linux/io_uring_types.h @@ -11,6 +11,7 @@ =20 struct iou_loop_params; struct io_uring_bpf_ops; +struct dma_buf_io_map; =20 enum { /* @@ -610,6 +611,7 @@ enum { REQ_F_IMPORT_BUFFER_BIT, REQ_F_SQE_COPIED_BIT, REQ_F_IOPOLL_BIT, + REQ_F_DMABUF_BIT, =20 /* not a real bit, just to check we're not overflowing the space */ __REQ_F_LAST_BIT, @@ -705,6 +707,8 @@ enum { REQ_F_SQE_COPIED =3D IO_REQ_FLAG(REQ_F_SQE_COPIED_BIT), /* request must be iopolled to completion (set in ->issue()) */ REQ_F_IOPOLL =3D IO_REQ_FLAG(REQ_F_IOPOLL_BIT), + /* there is a dma map attached to request that needs to be dropped */ + REQ_F_DMABUF =3D IO_REQ_FLAG(REQ_F_DMABUF_BIT), }; =20 struct io_tw_req { @@ -827,6 +831,7 @@ struct io_kiocb { /* custom credentials, valid IFF REQ_F_CREDS is set */ const struct cred *creds; struct io_wq_work work; + struct dma_buf_io_map *dmabuf_map; =20 struct io_big_cqe { u64 extra1; diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index abb590833a0f..b456f45fa8de 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -811,6 +811,7 @@ enum io_uring_rsrc_reg_flags { enum io_uring_regbuf_type { IO_REGBUF_TYPE_EMPTY, IO_REGBUF_TYPE_UADDR, + IO_REGBUF_TYPE_DMABUF, =20 __IO_REGBUF_TYPE_MAX, }; @@ -820,7 +821,10 @@ struct io_uring_regbuf_desc { __u32 flags; __u64 size; __u64 uaddr; - __u64 __resv[7]; + + __s32 dmabuf_fd; + __s32 target_fd; + __u64 __resv[6]; }; =20 /* Skip updating fd indexes set to this value in the fd table */ diff --git a/io_uring/Makefile b/io_uring/Makefile index c54e328d1410..965bb60e9f7b 100644 --- a/io_uring/Makefile +++ b/io_uring/Makefile @@ -26,3 +26,4 @@ obj-$(CONFIG_PROC_FS) +=3D fdinfo.o obj-$(CONFIG_IO_URING_MOCK_FILE) +=3D mock_file.o obj-$(CONFIG_IO_URING_BPF) +=3D bpf_filter.o obj-$(CONFIG_IO_URING_BPF_OPS) +=3D bpf-ops.o +obj-$(CONFIG_DMA_SHARED_BUFFER) +=3D dma-buf.o diff --git a/io_uring/dma-buf.c b/io_uring/dma-buf.c new file mode 100644 index 000000000000..1a1a88640823 --- /dev/null +++ b/io_uring/dma-buf.c @@ -0,0 +1,66 @@ +#include "dma-buf.h" + +static inline void io_release_dmabuf(void *priv) +{ + struct io_buf_dma *bd =3D priv; + + fput(bd->target_file); + dma_buf_io_ctx_release(bd->ctx); + kfree(bd); +} + +int __io_register_dmabuf(struct io_ring_ctx *ctx, + struct io_uring_regbuf_desc *desc, + struct io_mapped_ubuf *imu) +{ + struct io_buf_dma *bd =3D NULL; + struct file *target_file =3D NULL; + struct dma_buf *dmabuf =3D NULL; + int ret; + + if (ctx->flags & IORING_SETUP_IOPOLL) + return -EOPNOTSUPP; + if (desc->uaddr || desc->size) + return -EINVAL; + + bd =3D kzalloc(sizeof(*bd), GFP_KERNEL); + if (!bd) + return -ENOMEM; + + target_file =3D fget(desc->target_fd); + if (!target_file) { + ret =3D -EBADF; + goto err; + } + dmabuf =3D dma_buf_get(desc->dmabuf_fd); + if (IS_ERR(dmabuf)) { + ret =3D PTR_ERR(dmabuf); + dmabuf =3D NULL; + goto err; + } + ret =3D io_validate_user_buf_range(0, dmabuf->size); + if (ret) + goto err; + + ret =3D dma_buf_io_ctx_create(target_file, dmabuf, DMA_BIDIRECTIONAL, + &bd->ctx); + if (ret) + goto err; + + bd->target_file =3D target_file; + imu->len =3D dmabuf->size; + imu->release =3D io_release_dmabuf; + imu->priv =3D bd; + imu->flags =3D IO_REGBUF_F_DMABUF | IO_REGBUF_F_UNCLONEABLE; + imu->dir =3D IO_BUF_DEST | IO_BUF_SOURCE; + dma_buf_put(dmabuf); + return 0; +err: + kfree(bd); + if (target_file) + fput(target_file); + if (dmabuf) + dma_buf_put(dmabuf); + return ret; +} + diff --git a/io_uring/dma-buf.h b/io_uring/dma-buf.h new file mode 100644 index 000000000000..a876a9e5e272 --- /dev/null +++ b/io_uring/dma-buf.h @@ -0,0 +1,76 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifndef IOU_DMA_BUF_H +#define IOU_DMA_BUF_H + +#include +#include + +#include "rsrc.h" + +struct io_buf_dma { + struct dma_buf_io_ctx *ctx; + struct file *target_file; +}; + +int __io_register_dmabuf(struct io_ring_ctx *ctx, + struct io_uring_regbuf_desc *desc, + struct io_mapped_ubuf *imu); + +static inline void io_detach_dmabuf_map(struct io_kiocb *req) +{ + if (!IS_ENABLED(CONFIG_DMA_SHARED_BUFFER)) + return; + if (!(req->flags & REQ_F_DMABUF) || !req->dmabuf_map) + return; + dma_buf_io_map_drop(req->dmabuf_map); + req->dmabuf_map =3D NULL; +} + +static inline int io_attach_dmabuf_map(struct io_kiocb *req, + struct iov_iter *iter, + unsigned issue_flags) +{ + bool nowait =3D issue_flags & IO_URING_F_NONBLOCK; + struct dma_buf_io_map *map; + struct io_buf_dma *bd; + + if (!IS_ENABLED(CONFIG_DMA_SHARED_BUFFER)) + return -EOPNOTSUPP; + if (!(req->flags & REQ_F_DMABUF)) + return 0; + + bd =3D req->buf_node->buf->priv; + map =3D dma_buf_io_get_map(bd->ctx, nowait); + if (unlikely(IS_ERR(map))) + return PTR_ERR(map); + req->dmabuf_map =3D map; + iter->dmabuf_map =3D map; + return 0; +} + +static inline int io_import_dmabuf_map(struct io_kiocb *req, + int ddir, struct iov_iter *iter, + struct io_mapped_ubuf *imu, + size_t len, size_t offset) +{ + struct io_buf_dma *bd =3D imu->priv; + + if (!IS_ENABLED(CONFIG_DMA_SHARED_BUFFER)) + return -EOPNOTSUPP; + if (req->file !=3D bd->target_file) + return -EBADF; + req->flags |=3D REQ_F_DMABUF; + iov_iter_dmabuf_map(iter, ddir, NULL, offset, len); + return 0; +} + +static inline int io_register_dmabuf(struct io_ring_ctx *ctx, + struct io_uring_regbuf_desc *desc, + struct io_mapped_ubuf *imu) +{ + if (!IS_ENABLED(CONFIG_DMA_SHARED_BUFFER)) + return -EOPNOTSUPP; + return __io_register_dmabuf(ctx, desc, imu); +} + +#endif /* IOU_DMA_BUF_H */ diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index f42d201738cd..2e89e091afbb 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -10,6 +10,7 @@ #include #include #include +#include =20 #include =20 @@ -19,6 +20,7 @@ #include "rsrc.h" #include "memmap.h" #include "register.h" +#include "dma-buf.h" =20 struct io_rsrc_update { struct file *file; @@ -898,6 +900,38 @@ bool io_check_coalesce_buffer(struct page **page_array= , int nr_pages, return true; } =20 +static struct io_rsrc_node *io_register_dmabuf_desc(struct io_ring_ctx *ct= x, + struct io_uring_regbuf_desc *desc) +{ + struct io_rsrc_node *node =3D NULL; + struct io_mapped_ubuf *imu =3D NULL; + int ret; + + node =3D io_rsrc_node_alloc(ctx, IORING_RSRC_BUFFER); + if (!node) + return ERR_PTR(-ENOMEM); + + imu =3D io_alloc_imu(ctx, 0); + if (!imu) { + ret =3D -ENOMEM; + goto err; + } + memset(imu, 0, sizeof(*imu)); + refcount_set(&imu->refs, 1); + + ret =3D io_register_dmabuf(ctx, desc, imu); + if (ret) + goto err; + node->buf =3D imu; + return node; +err: + if (imu) + io_free_imu(ctx, imu); + if (node) + io_cache_free(&ctx->node_cache, node); + return ERR_PTR(ret); +} + static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, struct io_uring_regbuf_desc *desc) { @@ -918,6 +952,12 @@ static struct io_rsrc_node *io_sqe_buffer_register(str= uct io_ring_ctx *ctx, if (!mem_is_zero(&desc->__resv, sizeof(desc->__resv)) || desc->flags) return ERR_PTR(-EINVAL); =20 + if (desc->type =3D=3D IO_REGBUF_TYPE_DMABUF) + return io_register_dmabuf_desc(ctx, desc); + + if (desc->dmabuf_fd || desc->target_fd) + return ERR_PTR(-EINVAL); + if (desc->type =3D=3D IO_REGBUF_TYPE_EMPTY) { if (uaddr || size) return ERR_PTR(-EFAULT); @@ -1242,9 +1282,12 @@ static int io_import_kbuf(int ddir, struct iov_iter = *iter, return 0; } =20 -static int io_import_fixed(int ddir, struct iov_iter *iter, +static int io_import_fixed(struct io_kiocb *req, + int ddir, struct iov_iter *iter, struct io_mapped_ubuf *imu, - u64 buf_addr, size_t len) + u64 buf_addr, size_t len, + unsigned issue_flags, + unsigned import_flags) { const struct bio_vec *bvec; size_t folio_mask; @@ -1264,6 +1307,11 @@ static int io_import_fixed(int ddir, struct iov_iter= *iter, =20 offset =3D buf_addr - imu->ubuf; =20 + if (imu->flags & IO_REGBUF_F_DMABUF) { + if (!(import_flags & IO_REGBUF_IMPORT_ALLOW_DMABUF)) + return -EFAULT; + return io_import_dmabuf_map(req, ddir, iter, imu, len, offset); + } if (imu->flags & IO_REGBUF_F_KBUF) return io_import_kbuf(ddir, iter, imu, len, offset); =20 @@ -1326,7 +1374,8 @@ int __io_import_reg_buf(struct io_kiocb *req, struct = iov_iter *iter, node =3D io_find_buf_node(req, issue_flags); if (!node) return -EFAULT; - return io_import_fixed(ddir, iter, node->buf, buf_addr, len); + return io_import_fixed(req, ddir, iter, node->buf, buf_addr, len, + issue_flags, import_flags); } =20 static int io_buffer_acct_cloned_hpages(struct io_ring_ctx *ctx, @@ -1753,7 +1802,9 @@ int __io_import_reg_vec(int ddir, struct iov_iter *it= er, iovec_off =3D vec->nr - nr_iovs; iov =3D vec->iovec + iovec_off; =20 - if (imu->flags & IO_REGBUF_F_KBUF) { + if (imu->flags & IO_REGBUF_F_DMABUF) { + return -EOPNOTSUPP; + } else if (imu->flags & IO_REGBUF_F_KBUF) { int ret =3D io_kern_bvec_size(iov, nr_iovs, imu, &nr_segs); =20 if (unlikely(ret)) diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h index 351995b61e68..d893cc5e580a 100644 --- a/io_uring/rsrc.h +++ b/io_uring/rsrc.h @@ -28,6 +28,11 @@ struct io_rsrc_node { enum { IO_REGBUF_F_KBUF =3D 1 << 0, IO_REGBUF_F_UNCLONEABLE =3D 1 << 1, + IO_REGBUF_F_DMABUF =3D 1 << 3, +}; + +enum { + IO_REGBUF_IMPORT_ALLOW_DMABUF =3D 1 << 1, }; =20 struct io_mapped_ubuf { diff --git a/io_uring/rw.c b/io_uring/rw.c index 999d9a1cc5a5..d33b925a848e 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -23,6 +23,7 @@ #include "rsrc.h" #include "poll.h" #include "rw.h" +#include "dma-buf.h" =20 static void io_complete_rw(struct kiocb *kiocb, long res); static void io_complete_rw_iopoll(struct kiocb *kiocb, long res); @@ -358,13 +359,18 @@ static int io_init_rw_fixed(struct io_kiocb *req, uns= igned int issue_flags, struct io_async_rw *io =3D req->async_data; int ret; =20 - if (io->bytes_done) - return 0; + if (!io->bytes_done) { + ret =3D __io_import_reg_buf(req, &io->iter, rw->addr, rw->len, ddir, + issue_flags, IO_REGBUF_IMPORT_ALLOW_DMABUF); + if (ret) + return ret; + iov_iter_save_state(&io->iter, &io->iter_state); + } =20 - ret =3D io_import_reg_buf(req, &io->iter, rw->addr, rw->len, ddir, - issue_flags); - iov_iter_save_state(&io->iter, &io->iter_state); - return ret; + ret =3D io_attach_dmabuf_map(req, &io->iter, issue_flags); + if (ret) + return ret; + return 0; } =20 int io_prep_read_fixed(struct io_kiocb *req, const struct io_uring_sqe *sq= e) @@ -577,6 +583,8 @@ static void io_complete_rw(struct kiocb *kiocb, long re= s) struct io_rw *rw =3D container_of(kiocb, struct io_rw, kiocb); struct io_kiocb *req =3D cmd_to_io_kiocb(rw); =20 + io_detach_dmabuf_map(req); + /* ring owner may block in freeze_super() before task_work runs */ if (kiocb->ki_flags & IOCB_WRITE) io_req_end_write(req); @@ -698,7 +706,7 @@ static ssize_t loop_rw_iter(int ddir, struct io_rw *rw,= struct iov_iter *iter) !(kiocb->ki_filp->f_flags & O_NONBLOCK)) return -EAGAIN; if ((req->flags & REQ_F_BUF_NODE) && - (req->buf_node->buf->flags & IO_REGBUF_F_KBUF)) + (req->buf_node->buf->flags & (IO_REGBUF_F_KBUF|IO_REGBUF_F_DMABUF))) return -EFAULT; =20 ppos =3D io_kiocb_ppos(kiocb); @@ -1226,7 +1234,10 @@ int io_read_fixed(struct io_kiocb *req, unsigned int= issue_flags) if (unlikely(ret)) return ret; =20 - return io_read(req, issue_flags); + ret =3D io_read(req, issue_flags); + if (ret !=3D -EIOCBQUEUED) + io_detach_dmabuf_map(req); + return ret; } =20 int io_write_fixed(struct io_kiocb *req, unsigned int issue_flags) @@ -1237,7 +1248,11 @@ int io_write_fixed(struct io_kiocb *req, unsigned in= t issue_flags) if (unlikely(ret)) return ret; =20 - return io_write(req, issue_flags); + ret =3D io_write(req, issue_flags); + if (ret !=3D -EIOCBQUEUED) + io_detach_dmabuf_map(req); + return ret; + } =20 void io_rw_fail(struct io_kiocb *req) --=20 2.54.0