From mboxrd@z Thu Jan 1 00:00:00 1970 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 54689382380 for ; Wed, 29 Apr 2026 15:27:01 +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=1777476423; cv=none; b=mq1FIPhHKZF6/Q4Yfurp+Oc/GnRU4evejtRz6yDY7WL2ilrr6c7tL/1ibF8S6PFAtI/iq+Zhjop0fyFxq32GzfIQ5/W0+baYZvuNsckNE0/E6/THAjH+Bear95ZuK9WT/Tf73Haco74Cvh2yNdDkGJ7NQQ1NkR9YwuSjvBElp2s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777476423; c=relaxed/simple; bh=8Q724PKAeWMa6roOSMmfJBPXkxkRSKnlWqU8HQUxKDI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WdPAfzoZkgfmrkywcQ8KT2jiMGbSTqvJcAyBd+WBVKbXGnspPW4GXxSiyqGE1fYDmzQA9nqzAQH9OoBgY6dexApFLo+TRtfN8lA/1lUUnYEsqiCbYEwGh7JZ/2PbW3HRS3fn1soCs9bYjEPObGfnVIbfF7WTfaVy/VtYfFMkEs0= 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=itq6qZ7P; 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="itq6qZ7P" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-43d73422431so11812579f8f.2 for ; Wed, 29 Apr 2026 08:27:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777476420; x=1778081220; 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; bh=Okho95RNKRmNJtlBZrtRfvb3jbBLTZKlsmbr0Q4pBPI=; b=itq6qZ7PTBJI54cVGL7/SgM5oWV1agvjlAAOYuZW4kRdal5vy2XeXvfkrJCaMztAQp ngePVXhwmcThB6gUEOgDruHlCvQsy15ncOeLhubY/U7i1aWdUk/YrEekg31w/lAJaBbe Uf3mjWpRVSn+a/bFdvdIL7x60AjxfTWYjvMUhsl4RpUUXsRMADB91a4ivaSVHAxR3ztv /ftx/Z4W7eTDhwSqOYwKWJ6iqn+hx7M2LrFxwH7i4PpeynJmBRuB6m61vgdJI2iJMbnG tL9HtOOsVgKQ2r3gjPXx7HyyEHrCs5vBSGF+KEsTXOIxTV82BU87wO3L5A/yXzZnb6CA dJoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777476420; x=1778081220; 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; bh=Okho95RNKRmNJtlBZrtRfvb3jbBLTZKlsmbr0Q4pBPI=; b=TVnSMjjXhwW/cNMFtfhrI8Gj2SgLzkxLVXA9biYwx2mJOouPgmP9M1hciDmcaXDbfo njb1wgvBYQP9NyanECCj/8AHu3g9f6VbSUvOXq7UHmklUpo/GRP8ritMv+/2taDw0w95 JIBTHpGgHHYl91HmgCXDTYcOMi7ojLYfVa3IsKaX/Fpwar3006H0cYbHXeoxc7xYGqpp HFIWDli4nBEHEUr985VKbyleUopl1C2hObdHnE400RQlEUn4AR3qptr2L0hOtSMjZYZo 2aymAFwLhkFgvC8T1iYhf2/gYNNhaJI952Md1ARCpfts6ZlvebcG+uRigOesqb87U7mA 23fA== X-Forwarded-Encrypted: i=1; AFNElJ8+9PCwIt2Fl1+5TPOkLcTEGUsJUGPnuMV4n2IePXPekyifYfaR4yiKDG9Z/R6afheEFrOkAgPkOhMIYWHk@vger.kernel.org X-Gm-Message-State: AOJu0YxnE0LzP3Pu7qDnds4ggGSbpXmwF8vdUX9T3sZv7sv9cir5VGYR DVYK/FabwN56GqKuU5RTQViS8IFkBWfUiyBs4CIIYEV9COGRR3mfcMdI X-Gm-Gg: AeBDietVOLCkGWF6IgemnS1d57KvR918pNLWzT8SMSsebdpS//x28kn8W0TojFkTkdn AIf6sjdv4YbT8QF0R1FUi9ietXLTzs6OKMeHS2EFqrvphjX5sSr8T6RCrt23BHnsakxbeAaffOS eq1nff+D8mS6Grd+UO3y+hQECtEU8nhAjaGGSNe3YZK4TCrcVIaz5iIyoHmjjTXclZkQnnKv0PC RIqPQJJ1zfiJ9qdeS3sUaVpEES2uMVwboO9e0yKV2Qn7fIbNHs738XdBOUE59vAWLD1R4Ijf/kE weiB93vAyf2y5ZLkn8bUEsT0UPgiSdx4OM/0LAfJdKZkqSLf0LYpuOngo0RamNdhlnXMnoGZXIV PU38UkDNIEzPPfSI9pFafohODjT6FwVLXXi/OKaRGEorjfSySUvuoNW2kKm4402bOBlSRyfIMpF 5n9G9ktehflZGctT9LW+jm64bzp79s78/GDfe+nqlhJIlleeReKNaFDfRWzEHPRFEI7fAcxiihB irOLtcZeW/voPs1WgAXRMWzGL94y97UmWpMMpgy+IjV X-Received: by 2002:a05:6000:1a89:b0:43d:7d6f:f529 with SMTP id ffacd0b85a97d-44790a325e5mr7826316f8f.31.1777476419464; Wed, 29 Apr 2026 08:26:59 -0700 (PDT) Received: from 127.0.0.1localhost ([82.132.184.31]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-447b76e5c22sm6382951f8f.28.2026.04.29.08.26.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2026 08:26:58 -0700 (PDT) From: Pavel Begunkov To: Jens Axboe , Keith Busch , Christoph Hellwig , Sagi Grimberg , Alexander Viro , Christian Brauner , Andrew Morton , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Cc: asml.silence@gmail.com, Nitesh Shetty , Kanchan Joshi , Anuj Gupta , Tushar Gohad , William Power , Phil Cayton , Jason Gunthorpe Subject: [PATCH v3 08/10] io_uring/rsrc: introduce buf registration structure Date: Wed, 29 Apr 2026 16:25:54 +0100 Message-ID: <881422d8d613a8370ed98b158d2b57b46bb37230.1777475843.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, 34 insertions(+), 16 deletions(-) diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index c4a7a77d1ee9..ba00238941ed 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -27,8 +27,14 @@ struct io_rsrc_update { u32 offset; }; +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 page **last_hpage); + struct io_uring_regbuf_desc *desc, + struct page **last_hpage); /* only define max */ #define IORING_MAX_FIXED_FILES (1U << 20) @@ -36,6 +42,15 @@ static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, #define IO_CACHED_BVECS_SEGS 32 +static void io_iov_to_regbuf_desc(const struct iovec *iov, + struct io_uring_regbuf_desc *desc) +{ + *desc = (struct io_uring_regbuf_desc) { + .uaddr = (u64)iov->iov_base, + .size = iov->iov_len, + }; +} + int __io_account_mem(struct user_struct *user, unsigned long nr_pages) { unsigned long page_limit, cur_pages, new_pages; @@ -291,6 +306,7 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, return -EINVAL; for (done = 0; done < nr_args; done++) { + struct io_uring_regbuf_desc desc; struct io_rsrc_node *node; u64 tag = 0; @@ -304,7 +320,9 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, err = -EFAULT; break; } - node = io_sqe_buffer_register(ctx, iov, &last_hpage); + + io_iov_to_regbuf_desc(iov, &desc); + node = io_sqe_buffer_register(ctx, &desc, &last_hpage); if (IS_ERR(node)) { err = PTR_ERR(node); break; @@ -760,27 +778,27 @@ bool io_check_coalesce_buffer(struct page **page_array, int nr_pages, } static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, - struct iovec *iov, - struct page **last_hpage) + struct io_uring_regbuf_desc *desc, + struct page **last_hpage) { + unsigned long uaddr = (unsigned long)desc->uaddr; + size_t size = desc->size; struct io_mapped_ubuf *imu = NULL; struct page **pages = 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 = false; - if (!iov->iov_base) { - if (iov->iov_len) + if (!uaddr) { + if (size) return ERR_PTR(-EFAULT); /* remove the buffer without installing a new one */ return NULL; } - ret = io_validate_user_buf_range((unsigned long)iov->iov_base, - iov->iov_len); + ret = io_validate_user_buf_range(uaddr, size); if (ret) return ERR_PTR(ret); @@ -789,8 +807,7 @@ static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, return ERR_PTR(-ENOMEM); ret = -ENOMEM; - pages = io_pin_pages((unsigned long) iov->iov_base, iov->iov_len, - &nr_pages); + pages = io_pin_pages(uaddr, size, &nr_pages); if (IS_ERR(pages)) { ret = PTR_ERR(pages); pages = NULL; @@ -812,10 +829,9 @@ static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, if (ret) goto done; - size = iov->iov_len; /* store original address for later verification */ - imu->ubuf = (unsigned long) iov->iov_base; - imu->len = iov->iov_len; + imu->ubuf = uaddr; + imu->len = size; imu->folio_shift = PAGE_SHIFT; imu->release = io_release_ubuf; imu->priv = imu; @@ -825,7 +841,7 @@ static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, imu->folio_shift = data.folio_shift; refcount_set(&imu->refs, 1); - off = (unsigned long)iov->iov_base & ~PAGE_MASK; + off = uaddr & ~PAGE_MASK; if (coalesced) off += data.first_folio_page_idx << PAGE_SHIFT; @@ -878,6 +894,7 @@ int io_sqe_buffers_register(struct io_ring_ctx *ctx, void __user *arg, memset(iov, 0, sizeof(*iov)); for (i = 0; i < nr_args; i++) { + struct io_uring_regbuf_desc desc; struct io_rsrc_node *node; u64 tag = 0; @@ -901,7 +918,8 @@ int io_sqe_buffers_register(struct io_ring_ctx *ctx, void __user *arg, } } - node = io_sqe_buffer_register(ctx, iov, &last_hpage); + io_iov_to_regbuf_desc(iov, &desc); + node = io_sqe_buffer_register(ctx, &desc, &last_hpage); if (IS_ERR(node)) { ret = PTR_ERR(node); break; -- 2.53.0