From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f44.google.com (mail-oo1-f44.google.com [209.85.161.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 387C62FFF89 for ; Mon, 3 Nov 2025 23:41:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762213280; cv=none; b=a7WHCsg/t9FVt472Ul5nfC3xh9WX54jnp+gqNcfWIJsy2M4p5A/9E1pEpGIS8KJnghjZdVW//88/Y96BqaBZ2rt39UcKlDxkj1uWjmzCJTw+PR08KBALHdj3Z5rmgQ9X0RpqB2b6arK45r87OuCzbBwBSSqTljrwzUTC8Cwu+qg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762213280; c=relaxed/simple; bh=kWgLpn99r2uccXtAZ5hHigzLPk/KX0jMRx78svgRyTk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LI34ZRITA9FyJFT4bo7LhM1RHmxW1CyEJLuIgBJ/BdwRTz4YC7KVcXK6BSMnbOEAERQybQk77/2PFBIs1DVIdyLhcYXa6AKnF42D1GjUExd3FMFh70LZN30SuS8D3KyAkXSWlJWOMhg6lkAQQ7ndn8QFljbjfImBblTOUkJDqSY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk; spf=none smtp.mailfrom=davidwei.uk; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b=K6MB4B4K; arc=none smtp.client-ip=209.85.161.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b="K6MB4B4K" Received: by mail-oo1-f44.google.com with SMTP id 006d021491bc7-656a5e7b07dso440023eaf.0 for ; Mon, 03 Nov 2025 15:41:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidwei-uk.20230601.gappssmtp.com; s=20230601; t=1762213278; x=1762818078; 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=Au71y5tGG7FoutQx3iuhLTtL9ni/7HS75sjfoRLhoTw=; b=K6MB4B4K/gTdkG9NH9B9CDrtBKVAMlHk1rl30+R8LQdeyCxU8hF9f0ef8oRGJhqJX6 UqZ4RRdCEh8pchsA/ybQDSDWQcHrOyYw3ANCDaXijMhVLGr9FzrwPBVPQ4XaeWaDvkVt XjiFUuKJwv8HbNxfGNJy+YQjuRfTIQ1+Kf3LiSwPLQbrQy4dHV5EjWFK4Rx7UwUCu7kI dY+jb0yaPKS40q7BBiTHdWBj7Y/1s0lpqiBU6rWFdLmDxzjVwInhlUugR9zwCxGWbJAi cU1HtT39oEtqVDgDqKae/F5KDNtw9NZDODM7NuH5pqztNsYolJ98cr/Z64goybMiXAJc +d1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762213278; x=1762818078; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Au71y5tGG7FoutQx3iuhLTtL9ni/7HS75sjfoRLhoTw=; b=qs9UYurDLRQP4gdJFuYxRWsAr5KbKPGzNizEiwtK7cys/+sWzqCUankfsmQjVO0o25 tUHXSMJctgI5HKre8+KdB7m8hk37ahYTnFwBCI31EnMTiugQUesBO11uJ4TLwdEkNWh+ 50TGpX12cMFIsspr4pL9oPkp0mvEGGZ8BcIiJtGqKjneiRbcwq87QREjmVxDsDmFxaQH rzF1yHGYnLm8cnjUWIcB72B9UoPach18yY8ML/dcJH7Weeqsha1NoQEB32bNIkA7uYzH Pm+jVkgsWyfY/dJpMny5RmaUGagWoKYuLj3UE+ER3x5vL4Wzc7QA5gXb9qCmxd788JeO BibQ== X-Gm-Message-State: AOJu0YxGW9WkLjnxzUJ2WTK9N9sG8fW9k59c7iPn6vUo/ePTTOI0GoX3 tIay+r3QVETiUgcareti4i6OweQsrXLbM82muTorzRBJ7mi2p9vbKFlqlQVw3NvaygbV0/mrLWl XQRn/ X-Gm-Gg: ASbGnct6eEDTrBsukgOyNa+dnw55AoxKjUXJ6ExK9IK6ci4dOIKzZC3g1oJHL/2/g0Q PuSkdvdvKu2eG+DiMXjeVaS7T4pvyvU4qtsgXbeIubZE33TeAN8Zf8hATD7qhS/ta0jJWZB6iRr PFG3i1aY1v5mU3qR2DLsyHWQEr7iXC7eMhRj5Q1TkERuiammCB2A5/SM4GM1+WjB1WrBatz4D8i AuEzKWX5YrGK3yoawJSofpzYZ/qLa6VmtLshYiJ5EXwpsqp6DdaFpPcQIn+sC7OPrRVbDur0HvS 41GWVq6vCIosnpu6GBHsRub7SywKwjyfeRCYzVOOrsf0V6lqOPoQyqkDm6udtQhzMOCSLvrpp3r u4ZvW+aRnKtUMNplYOCAeCamSyyyaoiBau6DQ65MHolB38cESUuPz1d8MvCjoASa8Wb63VPKTOE LXUktUDQKPTd+6yfQDbmum7xlIk/orbA== X-Google-Smtp-Source: AGHT+IGwmwEvp/L5haWMWL0GlANjkivMG6Qdljk3C5JK2jhrSs9vWeVCuWMmctQC7Nz5WvU1Rov7Ww== X-Received: by 2002:a05:6808:c1e4:b0:44e:b245:1c09 with SMTP id 5614622812f47-44f95df8eddmr6605591b6e.12.1762213278311; Mon, 03 Nov 2025 15:41:18 -0800 (PST) Received: from localhost ([2a03:2880:12ff:73::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-656ad40e244sm461942eaf.11.2025.11.03.15.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Nov 2025 15:41:17 -0800 (PST) From: David Wei To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: Jens Axboe , Pavel Begunkov Subject: [PATCH v4 01/12] io_uring/zcrx: remove sync refill uapi Date: Mon, 3 Nov 2025 15:40:59 -0800 Message-ID: <20251103234110.127790-2-dw@davidwei.uk> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251103234110.127790-1-dw@davidwei.uk> References: <20251103234110.127790-1-dw@davidwei.uk> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Pavel Begunkov There is a better way to handle the problem IORING_REGISTER_ZCRX_REFILL solves. Disable it for now and remove relevant uapi, it'll be reworked for next release. Signed-off-by: Pavel Begunkov Signed-off-by: David Wei --- include/uapi/linux/io_uring.h | 12 ------------ io_uring/register.c | 3 --- io_uring/zcrx.c | 11 +++++++++++ 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 04797a9b76bc..e96080db3e4d 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -697,9 +697,6 @@ enum io_uring_register_op { /* query various aspects of io_uring, see linux/io_uring/query.h */ IORING_REGISTER_QUERY = 35, - /* return zcrx buffers back into circulation */ - IORING_REGISTER_ZCRX_REFILL = 36, - /* this goes last */ IORING_REGISTER_LAST, @@ -1081,15 +1078,6 @@ struct io_uring_zcrx_ifq_reg { __u64 __resv[3]; }; -struct io_uring_zcrx_sync_refill { - __u32 zcrx_id; - /* the number of entries to return */ - __u32 nr_entries; - /* pointer to an array of struct io_uring_zcrx_rqe */ - __u64 rqes; - __u64 __resv[2]; -}; - #ifdef __cplusplus } #endif diff --git a/io_uring/register.c b/io_uring/register.c index 1a3e05be6e7b..d8ce1b5cc3a2 100644 --- a/io_uring/register.c +++ b/io_uring/register.c @@ -826,9 +826,6 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode, case IORING_REGISTER_QUERY: ret = io_query(ctx, arg, nr_args); break; - case IORING_REGISTER_ZCRX_REFILL: - ret = io_zcrx_return_bufs(ctx, arg, nr_args); - break; default: ret = -EINVAL; break; diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index a816f5902091..b694fa582d29 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -931,6 +931,16 @@ static const struct memory_provider_ops io_uring_pp_zc_ops = { #define IO_ZCRX_MAX_SYS_REFILL_BUFS (1 << 16) #define IO_ZCRX_SYS_REFILL_BATCH 32 +struct io_uring_zcrx_sync_refill { + __u32 zcrx_id; + /* the number of entries to return */ + __u32 nr_entries; + /* pointer to an array of struct io_uring_zcrx_rqe */ + __u64 rqes; + __u64 __resv[2]; +}; + + static void io_return_buffers(struct io_zcrx_ifq *ifq, struct io_uring_zcrx_rqe *rqes, unsigned nr) { @@ -955,6 +965,7 @@ static void io_return_buffers(struct io_zcrx_ifq *ifq, } } +__maybe_unused int io_zcrx_return_bufs(struct io_ring_ctx *ctx, void __user *arg, unsigned nr_arg) { -- 2.47.3