From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 401F4186E58 for ; Tue, 10 Feb 2026 00:31:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770683502; cv=none; b=D8t+owaxbgJcsCP0SNJDb66cj/EI8jv2IV1SaskwQTm8dPmgPZH4unk+8Tygj7BXmdWgqdECxZ2FUkE+FtCmvcZ8Ybu13Tm/zpbyTyeeVCO94Bkmu5Xn/OHfgnQN3u8p2N+qBzOkcF0kQEyX/OnKHVcJ58uib6fjcu2aBn+6w0k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770683502; c=relaxed/simple; bh=dp2zva6XdINCiTjEpcMbColOXMvyIKntsFlV87rumig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sXFZUgNJ2LcayOFcjWjqSRbQ1Mfe60+qz9D9AWqNUJ9R6yIrnDwhgGLryaTUIqA4lfcfVGugvI70V28eMPCVxw6ojm65LXYp+ZsQREJLocgdpzTEsi0vNVCk8BhhMUGbaTCLFioshgSea43i0NtTxvibddzzHoUq6eJ6OMAoizc= 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=nebUW9Y6; arc=none smtp.client-ip=209.85.210.175 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="nebUW9Y6" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-8244c048d41so2811856b3a.0 for ; Mon, 09 Feb 2026 16:31:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770683501; x=1771288301; 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=bXVdfIxRj4rkJkTIegBArW50gKoXsTjbuIeJDop4OiI=; b=nebUW9Y6WdUU1RRxW0Z88IGirkHYR2VF9P81WMtb0BjJbT42bdrBvfIgsp3vgp8+e7 geYuiJZvRrhs6LIsbuucK06H5t9ZHXsRteUDTpQMrHx4V8iuC7e5ifKp6UDUCZYD6HQ+ IPPgDNq5lV6ZZt1KsydtsIbg83GoXr7M3nKGhLc/zg1jdAOo0rhr0bc94nCtqngPXY12 ea9JpdFfNfrLDftVIYgKGr+rMiY3XfBOoI7vF2DExEpBaSQfKfBoDiba4k7FDl6GxdvL x+ZG3ZrTdEUHQyc1oCeG1aYy5w1iEJ/3fjOcDu8UsCVZaT2MWHykmVbSPiLdJLFAVAAQ x93Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770683501; x=1771288301; 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=bXVdfIxRj4rkJkTIegBArW50gKoXsTjbuIeJDop4OiI=; b=aFMm8bQZkWEH+MFBVKLJutZMHdgeE5JRGdE0JV7NcukRwijwvbXjxy3WNSZTskV93v 5EcBV6gn8YYCAdXYx/GDdIZ83UI/C0jdFBjuB2q/a8uzu9QAnRytNpNiOqDQES6r5/Zb IYZbN2NcVlYSBu4AnM89zFI7iph2KW5a53x6Ymlqyt83HYuqwMgjxbO2Re9s1mjvhZFt zOhhCYYXrHdN1a6M7dGlLvFkZEmMJh+E8RxU5vGYRESOeoq+guc94RhlSRcB2oMe4OTa QJV9Q5/G9ZMuCcrhllu33fl4KeNPRyUNpgnshiswtfGQkkQd+uSWUrvLs/EfF/fM3AN5 /YZA== X-Forwarded-Encrypted: i=1; AJvYcCWv0rldkbtcOhLaoNnNH6CWlV4YDyv9BLkrSsieKuX4yXpvqOdL1lZF1WTX5AHWtYc+EIs5+8OBEQ==@vger.kernel.org X-Gm-Message-State: AOJu0YxAz1kfpBvwRNHJhwmlPppaBCMoXAv3O/zeZQV0xHMn10M1CfYg 7T+7sJod8i9YpxWAQRNhVrdxlRBIcOeac8rDZ3UB+F+njPTvzVYArImC X-Gm-Gg: AZuq6aKYYGyyogqsV6oM6RVQgV6nAKfxmrUN96gk6q3XrB22PLR8gMzgiT4N65O6zu6 86uxy5Ek3S15OVW6UDp5rHMyq7T1KQ1emi97qfune0S3gtdom0ZHMaaay/GdfQZMFcafNNs+KIr 4IR29PRerkcnJzT8I/c3ZkFyncl8Sme7mQQc19HIWDlPwiB7GfKCMBi7U716tt/6J9eN8yTgaRy WfJlqdDSnbOqUPgCMT+gh7Ogs9bvNCLDWUSoJev0GL2ZGg4JgYwQW8hfjnsdlRXDAUWqTRljZ8Q aqqMJUoZGhqxjH6oC4L4Y5rJ0RqEp9VOcTzvzTlyc76BGnyp+CG/tvlst3tQFtsA7izX8620n6E xWCd4yV5QWh78t3BqvPv8LAitHlkj7VHk4s8SUnjiIYQRR25qHAUzkt2yw6m2EQvN8OXYcM6GRG QcGw6KqQ== X-Received: by 2002:a05:6a21:e0aa:b0:38d:fe2a:4b13 with SMTP id adf61e73a8af0-394182110ccmr387084637.77.1770683500533; Mon, 09 Feb 2026 16:31:40 -0800 (PST) Received: from localhost ([2a03:2880:ff:73::]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c6dcb5e406asm14987924a12.22.2026.02.09.16.31.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Feb 2026 16:31:40 -0800 (PST) From: Joanne Koong To: axboe@kernel.dk, io-uring@vger.kernel.org Cc: csander@purestorage.com, krisman@suse.de, bernd@bsbernd.com, hch@infradead.org, asml.silence@gmail.com, linux-fsdevel@vger.kernel.org Subject: [PATCH v1 01/11] io_uring/kbuf: refactor io_register_pbuf_ring() logic into generic helpers Date: Mon, 9 Feb 2026 16:28:42 -0800 Message-ID: <20260210002852.1394504-2-joannelkoong@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260210002852.1394504-1-joannelkoong@gmail.com> References: <20260210002852.1394504-1-joannelkoong@gmail.com> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Refactor the logic in io_register_pbuf_ring() into generic helpers: - io_copy_and_validate_buf_reg(): Copy out user arg and validate user arg and buffer registration parameters - io_alloc_new_buffer_list(): Allocate and initialize a new buffer list for the given buffer group ID - io_setup_pbuf_ring(): Sets up the physical buffer ring region and handles memory mapping for provided buffer rings This is a preparatory change for upcoming kernel-managed buffer ring support which will need to reuse some of these helpers. Signed-off-by: Joanne Koong --- io_uring/kbuf.c | 129 +++++++++++++++++++++++++++++++----------------- 1 file changed, 85 insertions(+), 44 deletions(-) diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c index 67d4fe576473..850b836f32ee 100644 --- a/io_uring/kbuf.c +++ b/io_uring/kbuf.c @@ -596,55 +596,73 @@ int io_manage_buffers_legacy(struct io_kiocb *req, unsigned int issue_flags) return IOU_COMPLETE; } -int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) +static int io_copy_and_validate_buf_reg(const void __user *arg, + struct io_uring_buf_reg *reg, + unsigned int permitted_flags) { - struct io_uring_buf_reg reg; - struct io_buffer_list *bl; - struct io_uring_region_desc rd; - struct io_uring_buf_ring *br; - unsigned long mmap_offset; - unsigned long ring_size; - int ret; - - lockdep_assert_held(&ctx->uring_lock); - - if (copy_from_user(®, arg, sizeof(reg))) + if (copy_from_user(reg, arg, sizeof(*reg))) return -EFAULT; - if (!mem_is_zero(reg.resv, sizeof(reg.resv))) + + if (!mem_is_zero(reg->resv, sizeof(reg->resv))) return -EINVAL; - if (reg.flags & ~(IOU_PBUF_RING_MMAP | IOU_PBUF_RING_INC)) + if (reg->flags & ~permitted_flags) return -EINVAL; - if (!is_power_of_2(reg.ring_entries)) + if (!is_power_of_2(reg->ring_entries)) return -EINVAL; /* cannot disambiguate full vs empty due to head/tail size */ - if (reg.ring_entries >= 65536) + if (reg->ring_entries >= 65536) return -EINVAL; + return 0; +} - bl = io_buffer_get_list(ctx, reg.bgid); - if (bl) { +static struct io_buffer_list * +io_alloc_new_buffer_list(struct io_ring_ctx *ctx, + const struct io_uring_buf_reg *reg) +{ + struct io_buffer_list *list; + + list = io_buffer_get_list(ctx, reg->bgid); + if (list) { /* if mapped buffer ring OR classic exists, don't allow */ - if (bl->flags & IOBL_BUF_RING || !list_empty(&bl->buf_list)) - return -EEXIST; - io_destroy_bl(ctx, bl); + if (list->flags & IOBL_BUF_RING || !list_empty(&list->buf_list)) + return ERR_PTR(-EEXIST); + io_destroy_bl(ctx, list); } - bl = kzalloc(sizeof(*bl), GFP_KERNEL_ACCOUNT); - if (!bl) - return -ENOMEM; + list = kzalloc(sizeof(*list), GFP_KERNEL_ACCOUNT); + if (!list) + return ERR_PTR(-ENOMEM); + + list->nr_entries = reg->ring_entries; + list->mask = reg->ring_entries - 1; + list->flags = IOBL_BUF_RING; + + return list; +} + +static int io_setup_pbuf_ring(struct io_ring_ctx *ctx, + const struct io_uring_buf_reg *reg, + struct io_buffer_list *bl) +{ + struct io_uring_region_desc rd; + unsigned long mmap_offset; + unsigned long ring_size; + int ret; - mmap_offset = (unsigned long)reg.bgid << IORING_OFF_PBUF_SHIFT; - ring_size = flex_array_size(br, bufs, reg.ring_entries); + mmap_offset = (unsigned long)reg->bgid << IORING_OFF_PBUF_SHIFT; + ring_size = flex_array_size(bl->buf_ring, bufs, reg->ring_entries); memset(&rd, 0, sizeof(rd)); rd.size = PAGE_ALIGN(ring_size); - if (!(reg.flags & IOU_PBUF_RING_MMAP)) { - rd.user_addr = reg.ring_addr; + if (!(reg->flags & IOU_PBUF_RING_MMAP)) { + rd.user_addr = reg->ring_addr; rd.flags |= IORING_MEM_REGION_TYPE_USER; } + ret = io_create_region(ctx, &bl->region, &rd, mmap_offset); if (ret) - goto fail; - br = io_region_get_ptr(&bl->region); + return ret; + bl->buf_ring = io_region_get_ptr(&bl->region); #ifdef SHM_COLOUR /* @@ -656,25 +674,48 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) * should use IOU_PBUF_RING_MMAP instead, and liburing will handle * this transparently. */ - if (!(reg.flags & IOU_PBUF_RING_MMAP) && - ((reg.ring_addr | (unsigned long)br) & (SHM_COLOUR - 1))) { - ret = -EINVAL; - goto fail; + if (!(reg->flags & IOU_PBUF_RING_MMAP) && + ((reg->ring_addr | (unsigned long)bl->buf_ring) & + (SHM_COLOUR - 1))) { + io_free_region(ctx->user, &bl->region); + return -EINVAL; } #endif - bl->nr_entries = reg.ring_entries; - bl->mask = reg.ring_entries - 1; - bl->flags |= IOBL_BUF_RING; - bl->buf_ring = br; - if (reg.flags & IOU_PBUF_RING_INC) + if (reg->flags & IOU_PBUF_RING_INC) bl->flags |= IOBL_INC; + + return 0; +} + +int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) +{ + unsigned int permitted_flags; + struct io_uring_buf_reg reg; + struct io_buffer_list *bl; + int ret; + + lockdep_assert_held(&ctx->uring_lock); + + permitted_flags = IOU_PBUF_RING_MMAP | IOU_PBUF_RING_INC; + ret = io_copy_and_validate_buf_reg(arg, ®, permitted_flags); + if (ret) + return ret; + + bl = io_alloc_new_buffer_list(ctx, ®); + if (IS_ERR(bl)) + return PTR_ERR(bl); + + ret = io_setup_pbuf_ring(ctx, ®, bl); + if (ret) { + kfree(bl); + return ret; + } + ret = io_buffer_add_list(ctx, bl, reg.bgid); - if (!ret) - return 0; -fail: - io_free_region(ctx->user, &bl->region); - kfree(bl); + if (ret) + io_put_bl(ctx, bl); + return ret; } -- 2.47.3