From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.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 BC27A3B42C7 for ; Sat, 11 Jul 2026 10:49:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783766972; cv=none; b=ZypYCBHDmmRWsh3JFzQR/Z8Qz+koNz8O9ltKuhazjDgY3cMSvNYn7cNYeolx4o10F7zHwL657Kqugm99ytEmCgtPC6LAn9ZKEPY41e3L27C9j7nPFPldc1atp1r5sXNXO98/8eYfNwuMHnZFMmDlIZITr/y60pcs4JE9uSuwLrU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783766972; c=relaxed/simple; bh=oZ3BFAy9cLxeqXthNExBNBD2GMUwMIJfwvoNUFcW7pw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bwn0lmDFGzSYe46IfCHKESt4GfcMZg5xyWW8x4nErXep/prTJlP2jIPVJ9S9VsbqF5ZK/KsoWS/BR0wC9dz+XzzPL0JdGdmi6lKuTSXq/D8RsalXiATgam7tNwiZK39JT5tHvk9+RerneSZRGMiXILPJfJuW8PnGCVsSQ6NGe+U= 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=mUn5FlGH; arc=none smtp.client-ip=209.85.218.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="mUn5FlGH" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-c15ba3a2b4bso213810866b.1 for ; Sat, 11 Jul 2026 03:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783766964; x=1784371764; 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=/6LlJ8gBFfbSI101GpfmueMUxhwNSOZCGEsyX/W5uwU=; b=mUn5FlGHeSp0vaWQoUqJRo7LIaJWYUBjhdO2VOps/nee7oJrcZ4dMnVOBwPjHpDoT3 9bhWI8JataxaDfpGdq0z5PhXtX6lP4NpU6izomSviPAjx4WyL7msWNORolUgpe/UxSNe NgyQSePBDimJLse3sB1ViaU6QNYFS3baVebvnNae+icj3vKIyFNEInMyS/V1rxecYKnm Be/A81xUfJPtVmUlfbIT8TYNCd+4fX8AqrOLr6Efc0CF9tRot523MZ8A+cjaFsUINoB5 2fn6rTOZUprQnL6yDSz/mWfHVpq+Gw75c2+SR5xxVnvZrQ5LVHvCzutYow0cNhAefiul mcZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783766964; x=1784371764; 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=/6LlJ8gBFfbSI101GpfmueMUxhwNSOZCGEsyX/W5uwU=; b=ckVrefcQYos3LvXbdmSzCz9TpNtP+gh4RXVHpBLS//D8iHENM7HRAYOk39E7xflpSg vpgaN4ECEc+FVBcNVRQnOGjP2XLAaeONEfZ0sB8ua2N2zZRAxAhCPPGNXoBUixiquRan ZkZM0oymZ2p9Y5L6lKr+X7JbGXB3V0qmAtPVQMJiEmissxpRARdnR4jE7HEsIgpLlJZS XEiGjsoTCMt7x9ewH0VdLPGm7ip8XoUTYfUV7SVvfnU1ooWXwH/N5O91O7ZAsAXUJddW VfIzIGMPtU0GtZHDV8vW5zkcIL0f81/4s6g0XC9RnpW0uMD7a6lGdCk66IkbgOila002 zJsw== X-Gm-Message-State: AOJu0Yyb1MSuSVAsOnyUH4J6qM9PVKrUODoVYrZza7U66v68iXp5pdk2 KdQwLjP7QZQ6Bt3mm8IKmnwMUZxbm1pcrBXLiwoRjwthnXTinhQWYGT3ywuMgg== X-Gm-Gg: AfdE7clCvh+mORes+z1b9Vd7C2k0M52JUKLxfTq/2NZk1r/gp2rPzExmHND4nVY4M1M sDgn9XZ44OFSu41KZQPEGuIs2I03noUNb7MXQie7oqGoLD5AEi95zgl6KdQ70z8z//OJtAFzLeH KN2T4aauNrLdEq4B/w3p5oDzsFjyyDvGOeu0HKaWRiLfB006vzncgUCBEC8RgPza1jtlI+1vmzh rh6SkXu3WqM4GYnJaNoqUAykDQ4QnAjMwsZXRyDR0lXDY6B1M9go7FBl71rIL3lug0BSJiNJcOk 2SeMYzg16QPT07ii6q7Vkf8jzCQ19X1uuJdxKFgpuns33nN3En5+wMUjkPaDosSHXWJtaWPxAfH HpDlnHm0OQ+3PyTZAr3BNBNlFUMXIMx3GpHjvEIRWBVmShesayLvncSUx7CJCF7HmdfmkoZZcvR 3EsaapYkDKVdfgdehLUK1zl7AMzanl8AjG0/RseqP6KDZ6PM4Lr5T3Qs02cYiAf1rHLpoSNqDmx xXqZ9PIwo51CVzvM+US+DPbNya1SthBDxUzXVmRiyKNnTHkVw== X-Received: by 2002:a17:907:971f:b0:c16:3074:6593 with SMTP id a640c23a62f3a-c1630746c22mr30591666b.12.1783766964205; Sat, 11 Jul 2026 03:49:24 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-222-132.dab.02.net. [82.132.222.132]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c15beb53b86sm609123166b.25.2026.07.11.03.49.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 03:49:23 -0700 (PDT) From: Pavel Begunkov To: netdev@vger.kernel.org Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jamal Hadi Salim , io-uring@vger.kernel.org, asml.silence@gmail.com Subject: [RFC 05/10] io_uring/rsrc: introduce buf registration structure Date: Sat, 11 Jul 2026 11:48:34 +0100 Message-ID: <4b194944dafd65753fe55b6fd2d0c253dfdc24df.1783614400.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@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 8d0f2ee24e0c..8af371ba6c06 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