From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (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 348FA4A4EF7 for ; Mon, 21 Sep 2026 13:39:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789997996; cv=none; b=EvcYuDywntsHE+9mWKcSqkYhkFV6k5Sxqm5t65fJ/qaTtpICqXkTKTKcXsfW6EIxhshtvc+pIR/5WBYb54eSB4BuFO/OMsVv3Rw/iPJvJlDkUqaiDMz7XQgQFFyaO/FOtlIPyrAMGEVkglZ0wAFwqfg5XfHLIk5q5ZVEOw1jXrU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789997996; c=relaxed/simple; bh=Z4vOxks9qTIFK+TCf+DcsECaWrDahRJWHvnK/Oy0YsE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ou+1wQ6DNvpNzSBoMkDJOWxmYj+BwiBS9K193x7qcFAbKOwzXfUbAgO2OQzrO1Lj1m0BL+Tx5ewVot/bLxNignfRNHIpLgfmqPhStODPDRCxioY7XLQGP6xNEkNkJJTkz8GiVJuFK6Q/mTf4GSpk6lJ6MYmUcwemUzRio9CFLiU= 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=fcYiafm8; arc=none smtp.client-ip=74.125.225.141 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="fcYiafm8" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49ccfd61ecaso26283455e9.3 for ; Mon, 21 Sep 2026 06:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789997991; x=1790602791; 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=/RT09IM6iAPFk2VI7P8d4NpW1v04uxG67FoGdSGxGhI=; b=fcYiafm8WU+PsHRjH0kBI4wrr69zkXEz7/dHrIMdS1Z/IFxyLYqxbvjL/7VyDJi8Ld Jpa6Vc6CfYPjuicYz74Ga+Dh7Vw+gpR24aYwywaCtE3A+VObPrOoZ569w6NQghrXi81l hCzCS9HVe9HBEa1PYdxPSP2GcnXEYJYpB9W1KeLKNW2IqMxw25mx5mD1Negm+gU82j6P Bwr1NPRIt5MNZn/ynUqrtU0IVtWykr8mO1MM++j+r/IQGxxuUGg+vYgADzl6XI4GjeZ2 bU0fPWvVUZ+5faGWAp2h219j1GTQ518m4kyuyFj3qUdctv2uFuJsniJ676LO29k4Vvr6 8wRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789997991; x=1790602791; 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=/RT09IM6iAPFk2VI7P8d4NpW1v04uxG67FoGdSGxGhI=; b=jAxicmVNsk3aS4fNQo67RbwGRCN8VHkWZ2NExbiFl0HSJMkQve4miC9BGIz9FpOhk1 YkhE07R5iIAszfmmBSlJ8cDhNsKobOp6x8qH7ECNgaAjEXHJW5Q5M8/t5RhypQcuCUFR JvlGcPJnrnYPlqiwSI/1E1lOpJgKUhJP8Lov/KXEX4D6mtBzHRW0JLZN8ILSDgAaI/S/ EQuGik0bn3nWAZDaiM/EHUrSvqxnu0vjxzNAE3yvFkIrtcvwo7UEeqwfu4GfNuNku1Mu YYAEn0Rqz4WL2InLNgx9XgGcAQnLwQ2jCDuoFLU1XMvkSSA3LEvurXfaRhHudVy9Fn5S vnwg== X-Forwarded-Encrypted: i=1; AKwUvBxAG0t1l0lo+3Ap3uKqfwi8DSkaCPhbMyI7BWTfFArbKPZslXYogSSeMpPrYCa4YW2uGW8z5lxErSzdeT4=@vger.kernel.org X-Gm-Message-State: AFuF++l8PGNLYGV53PUFeTE7o8C3jhuTNyQ47aKguBKugVNfu51W9Tu/ gVmcpsEduw87RsVywVbdN680lCSnf25B66Re0n39LIkbGP/5uC9MgweJ X-Gm-Gg: AYBFou2lPQ9CWFDalH6aHxOZFwgbQ6stAi3ZG4jt8+HcsaFbosdclKKsZe8kMfHBsHr ZQnv4vruz+ln8EXHNC2Uz+sSLYhsRnFzoyFGbHGkNkmbX1YNqhNKb98gtnE+LDQwSv0LRJco7zp Ds1Zn+RzUdkr/Crpv0N+wAslz5WmtVLv/gupVIDgU12R3WqJuJTZXow9D2ZMzGeHCP8tOvAC+KU /OHLSYm7GeGzUpjzHjpQ+OTHsXF5UNMdBpYDq+R+A6cwvhYzwigOT/WH5EVo+CAL6blo7KQVwrE e8eXGd69Oy1wUCS4TlD9i5kmPQCRvqN56f/JdsEJ5eDyqfryLPKS5x1L1C6nP2Fhynrb4r6iXYr L06rHFdkZRlCNP8gMdAM3R82dqs8DktrtP82IHV2PUyVaQdvSme1+QmYNRX8qfb0i260EBUEXTU nJ6ALnN2duYi0md3vyCsQz7HCvlaFgsF5kuO+HgnulNNbO4NZimcGOtUGn54FnoS9PHYhdyW3I3 6l7fThiVGIKBbL2ZEAOxHTQhNigkCR4vUXv4J099J18lQuYDfkqZl7G2DrL0gQC5IrvYld7CAc/ LuW7SV6ps4uAm97SitwqJdzxTPVIDQ== X-Received: by 2002:a05:600c:e558:20b0:49f:ce73:5e97 with SMTP id 5b1f17b1804b1-49fce735f5bmr54726715e9.35.1789997991415; Mon, 21 Sep 2026 06:39:51 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-213-26.dab.02.net. [82.132.213.26]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc585920fsm617171605e9.4.2026.09.21.06.39.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2026 06:39:49 -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 , Phil Cayton , Matthew Brost , Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Benjamin Marzinski , dm-devel@lists.linux.dev Subject: [PATCH v6 09/13] io_uring/rsrc: introduce buf registration structure Date: Mon, 21 Sep 2026 14:38:53 +0100 Message-ID: <13677c50b853ec0518528ad03ba06012342f1316.1789997898.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index 51b46e624ddd..da767b34eb55 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -27,8 +27,13 @@ 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 io_uring_regbuf_desc *desc); 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, struct page *hpage) #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)(uintptr_t)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; @@ -381,6 +395,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; @@ -394,7 +409,9 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, err = -EFAULT; break; } - node = io_sqe_buffer_register(ctx, iov); + + io_iov_to_regbuf_desc(iov, &desc); + node = io_sqe_buffer_register(ctx, &desc); if (IS_ERR(node)) { err = PTR_ERR(node); break; @@ -853,26 +870,26 @@ 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 io_uring_regbuf_desc *desc) { + 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); @@ -881,8 +898,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; @@ -904,10 +920,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; @@ -917,7 +932,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; @@ -969,6 +984,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; @@ -992,7 +1008,8 @@ int io_sqe_buffers_register(struct io_ring_ctx *ctx, void __user *arg, } } - node = io_sqe_buffer_register(ctx, iov); + io_iov_to_regbuf_desc(iov, &desc); + node = io_sqe_buffer_register(ctx, &desc); if (IS_ERR(node)) { ret = PTR_ERR(node); break; -- 2.54.0