From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (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 3B9952773CA for ; Sat, 11 Jul 2026 09:12:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783761140; cv=none; b=mqTcpk+/1Wf++sXKL+qbfbA01Df0tp2Pzavsxx97nz0GokLqzKY8Y5IvL5yq8glbn+EgMVGj2gKQg7uTkpUVO/8KXHLKivH2xuvu5Ve6/lABOZiIVPqHXsVEw1koCve3JFliZpaIRWd/8ut8vREB3aIV+AT/fkkd8Rtjpm2b1XY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783761140; c=relaxed/simple; bh=E6cOOOK8JRaX4aDVdN1M0+1MtzS0eNCG8VJsAdIuLwg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e1Lsx4sY3JQCwKiRgR0bK5F6/4nEITvon8pnfwfOEL8uxPpAbYncIQ+aEZqHFCBXSGKgx26m34fhYMGZy4mivYe9pv5xdTl0kcTT0mDxHvCm79qy5VEWJ4Fi4AdqiGgEsNWdBsTEMlrFkp3XxWAa/EDW5FK4YJwQweuUWvPJc/k= 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=tJ6tL3bn; arc=none smtp.client-ip=209.85.208.45 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="tJ6tL3bn" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-69c5fda04a8so1008343a12.1 for ; Sat, 11 Jul 2026 02:12:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783761138; x=1784365938; 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=dvOpz0r7ZGyorI3Hc7NN1bB6/9+WhAP8KvikiSMDSlo=; b=tJ6tL3bnChp+YcRF1+X3EyhkD4QJ9pVyVxIEJHm0a2KxMlMuNtG27CrnWcV7QPdt7H E5ciJMTLWH+c83IR9EL0brFQwm9P7FkcLyEhlqSVTaEdXDcXwclbd8W9VGm08XQUryVs nOB9rN0WTx8Ci4w+rVzcpTBKQxChyCVp605a+Ggc9+PJOg4WZTkZRBXJ/nMKIEWk3NQq 6jY2fuBpddH8aNHky9kJ648zPsHpmWhQZYYGE7cgBIAVIsgfO9dnf+r/MjKyjbv3NGej KTSHgvJ+hlY3gFEAjOGpN11zkvN7FijRNkl5rbL4xQ8K4zTSH/hejrOeoiIrr0RHPKU7 IWQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783761138; x=1784365938; 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=dvOpz0r7ZGyorI3Hc7NN1bB6/9+WhAP8KvikiSMDSlo=; b=OwB4F9VtVNCuwhy2KPCUBAhbGMib3VUATN5HaxA2PdDgRdzhLpX2sV6Lwe2A54ZUyb kmiaOIGAcyfewNk87J7hgYUzgA51Xi7zJIwbWCqmOd4HVXbl58yfucgrqB+cE2Qc5fq4 36m38X8rfenjbfoH7wyw21mLiLaaYy7ZORtR+vVRxYObjzp9rOVw8Vsvsm3Cb7fQWwyu A6S5mvyo19gweACx150/JvS+IJurdKgjrrAMaOE/V18od/622ygS9KPXwInAgLmo9x9V DP0/SvFMzU3Lhl1Vug7UTR0T2a2UI5wI3eJbhr+CNGVZwJsuprlrItCGGcForPUGm/pp sxrw== X-Gm-Message-State: AOJu0YxOJhSF95uDusYhLpjVBQ76wZ3q6sJT3RzWz/CO5uWcG0z3HWNG bVV+ANPpuURFaCkOnleQVF0zmGAU/nOzOKssGJw9MrYfF3bUmq0SRnq2OPGMZg== X-Gm-Gg: AfdE7cmboYrIkpvHrwlokp4+KN8pA40i1DusGOodhliNbkeIxf8Me5xtBpPRZ3XKfNf EMsZuyHTzRNSl0YqYraM+22LIsGDt1woDPAS9vlAoZKUWxdlZhM1c/ed1BqWkGNNwoqfxwMSOMH E8/9hwjBTVrhkm2Zsivw24z5UZt8eJ8Am/oCgWHE6Tx0omsJtm0hxhAYxxdg1AogW6ieaJyM1PV 2stu3EpSKJZBJy/OYxRHe9zLCsX6vVJqJ4ZxS2Ridk34VhEHDqW5MlXgB6Vq6hNn5ldyRnHVAre p2IeTvARqKp4p2I7qpypjVgcYXCMUHwVivOOc+pmU++F1MSp6wpEtC/R477hA8NtCAviyaUK0v3 CiT4M01Hw2h4Ps+/5jjE9C3iM6xteQJiDtu7e9GlOU5msfI8Y+/bbrpFltAJsySk82r1YZ4wLZR jI/azSbC9+3lngHAQB51Yb6+4bfZpyHLKRy97kEz8ZCfAd/E6E1UDORfKVYdop2/PbI66HVaXqj zz5WIH/qrgjDxTWn/qREqs+3Z1UZydxZxA6VUoXNtuoHpE= X-Received: by 2002:a05:6402:2695:b0:697:d475:9692 with SMTP id 4fb4d7f45d1cf-69c5efaf7a0mr1144254a12.11.1783761137561; Sat, 11 Jul 2026 02:12:17 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-221-54.dab.02.net. [82.132.221.54]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-69c60d47188sm681191a12.27.2026.07.11.02.12.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 02:12:15 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, netdev@vger.kernel.org Subject: [PATCH review-only 03/17] io_uring/zcrx: add RQ iterator Date: Sat, 11 Jul 2026 10:11:26 +0100 Message-ID: X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add a iterator structure and helper functions for the refill queue processing to avoid polluting io_zcrx_ring_refill() with extra state and logic once it's extended in following patches. Signed-off-by: Pavel Begunkov --- io_uring/zcrx.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index c4a9a663eba4..45b178afbbc3 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -1088,6 +1088,10 @@ void io_unregister_zcrx(struct io_ring_ctx *ctx) xa_destroy(&ctx->zcrx_ctxs); } +struct zcrx_rq_iter { + int rqes_left; +}; + static inline u32 zcrx_rq_entries(struct zcrx_rq *rq) { u32 entries; @@ -1103,6 +1107,24 @@ static struct io_uring_zcrx_rqe *zcrx_next_rqe(struct zcrx_rq *rq, unsigned mask return &rq->rqes[idx]; } +static inline void zcrx_rq_iter_init(struct zcrx_rq_iter *it, + struct zcrx_rq *rq) +{ + it->rqes_left = min_t(unsigned, zcrx_rq_entries(rq), ZCRX_REFILL_CAP); +} + +static inline bool zcrx_rq_iter_next(struct zcrx_rq_iter *it, + struct zcrx_rq *rq, + struct io_uring_zcrx_rqe **rqe) +{ + it->rqes_left--; + if (unlikely(it->rqes_left < 0)) + return false; + + *rqe = zcrx_next_rqe(rq, rq->nr_entries - 1); + return true; +} + static inline bool io_parse_rqe(struct io_uring_zcrx_rqe *rqe, struct io_zcrx_ifq *ifq, struct net_iov **ret_niov) @@ -1131,17 +1153,15 @@ static unsigned io_zcrx_ring_refill(struct page_pool *pp, netmem_ref *netmems, unsigned to_alloc) { struct zcrx_rq *rq = &ifq->rq; - unsigned int mask = rq->nr_entries - 1; - unsigned int rqes_left; + struct io_uring_zcrx_rqe *rqe; + struct zcrx_rq_iter it; unsigned allocated = 0; guard(spinlock_bh)(&rq->lock); - rqes_left = zcrx_rq_entries(rq); - rqes_left = min_t(unsigned, rqes_left, ZCRX_REFILL_CAP); + zcrx_rq_iter_init(&it, rq); - for (; rqes_left; rqes_left--) { - struct io_uring_zcrx_rqe *rqe = zcrx_next_rqe(rq, mask); + while (zcrx_rq_iter_next(&it, rq, &rqe)) { struct net_iov *niov; netmem_ref netmem; -- 2.54.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (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 E0F4A3BBA0F for ; Sat, 11 Jul 2026 10:40:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783766440; cv=none; b=RaX7KDEIgQSVWvpAPZl84usu4x0MtSrnY5wd6p3eiAUhRzHve2Xw4ArktfX2TlIXhf+qdTYuB2d5Q6yGZH1sVPPz5MJX7fDdusxuUpTgT1jwI4GOTrBbQl2SLKoONxkuRwxqsRLctceaOlS04dAb8QXQF+zCthy43I3xnlYox9A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783766440; c=relaxed/simple; bh=E6cOOOK8JRaX4aDVdN1M0+1MtzS0eNCG8VJsAdIuLwg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G8/OTKRnaXAsSHkSgdZkBZMSsDesQd3x9gliZ29dboL9X4JMqpYu6FTN0HqJAgAwaM7hDytKY/Aa5aXpjqSRe3LeltJ6Zr+LEN/cVSJpIeykX4WH0kK5bJaQgs0pdj/DirtasidBURZy55JQbVjM64j2aTyR/eQQZRiFLzrVRg4= 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=ghIg4nZR; arc=none smtp.client-ip=209.85.218.52 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="ghIg4nZR" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-c15ba3a2b4bso213362466b.1 for ; Sat, 11 Jul 2026 03:40:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783766437; x=1784371237; 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=dvOpz0r7ZGyorI3Hc7NN1bB6/9+WhAP8KvikiSMDSlo=; b=ghIg4nZRSWfB3jpks7gT83/0l/RxVwSxmKgfxiCZYYLw46eGpI2jHcaU6vNj19s0Or mSjLfJMtFTYh1K45TajB0uwoY7KstWyZd8rtYapWiIdCPMTGUL8ptP24WCS4u/i6Lk7m +lso9rw7fUdp86lOudMl6hUeVAyqHur9NOWsGvjnVJxH2cnWNCstDcWEdJoBXtTIqCDp nDwS9KOJkJx+aQMlYRJ5Uu+nJprf0HVA8Dro0vR6a4frPsFJHjTr6K4vsCzaa9SJHOCN lbcg+eRZN40L4b19HYTPSfezILC3IsXn7uBT+ZfUZF3kGtSs+JvgqDA4HSsJxSlwG5LB kYdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783766437; x=1784371237; 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=dvOpz0r7ZGyorI3Hc7NN1bB6/9+WhAP8KvikiSMDSlo=; b=lOPt4sIz4tZlVLXf8ervGKnErlQ+Bh/E4bv7TAyrfNQ5B75gPSUiA1y1Ow153MqVbT e2HB7/rB8/Ng2wO4rivoiUESPA7lCZO52Zsr4y53XhLzhltXugpBKGnBO/ce1ZDqAcHh hNj8J4w5upLipmTG5NfRkB0SugXlO/Ir951oZZhRiS8VDvE5+ZyHr3ykawi0WHY1U1gJ ETQGQqbaTcsSehOgQ9scrd9Pbfl0YCEXH7vGCw4LUfMA+4g713hh6NrzelWvAgoLVC3H 3vxlykAcVtOlLJln0OBuFPBrvDjmZ8qvTU3vI4j9cqKroP7YdT13P6Xn5kjEqdS5gbLr y21Q== X-Gm-Message-State: AOJu0Yw6qJ0wBCxqNtaKSkZAnXIVi/nvnouo9Y0sQbqsbHvJBVKJibpq jtEeBZ3vaZ54UEe0fa+I6zQgtvSlt1hVro5U5XmiIdYIlS1a3tU7fd5ZSPKJhw== X-Gm-Gg: AfdE7cm2PckxN7a4cIhvMDKpHn1alHpIvZOBDgeMIvdsRB4zIArjCCOP1Emzyx0XnJg w+tKl3ER1zrTXNgYi2I2VlrqEn2H336UY+45BT+ORFNO6sRBf4yHJyArhjRxgxspkCnq0yx+QEB 7/IjXd8vXgWdrOOh6mjNZMBdyoKhFBmGBZ8VOMbJnOlztxGt1VRJE3l1+sf33a0VRS0PuxhFfl9 +JIzyGGCv3/JS1LkKtv5bKfnaRrkZN21s7uafx1U7/LVMRYL49Xq0d0DspxFoDMNIk4I2yA7bNx 7y/DEMGdo/UyvDzzkc3fO/2XXwqZvcI1Cgs4EI+7cZ2JGaUL8SEQyyrH2ujTDFBZ7VvxKVh5IWM uGM77j6jCsTlf7ZjwjGku36m2hEZcbuXXzZ3GVdyc1QHe1AKtFk6Xs3CFRyAZFfcsMXFjpMs0/G TzklRJk8h0djib/63L74traz45kyQg4yUIg1x6A8zdF3v/ig6Ybb/jLtLgEh7eE1X0Iop+53aSt 2Q2qgZYK2tKtBhF2/2fmiVzBq+J5k5xiQLAJwWlNR2UhtNNdA== X-Received: by 2002:a17:907:9604:b0:c12:34ed:e108 with SMTP id a640c23a62f3a-c161f37e257mr76942666b.58.1783766437237; Sat, 11 Jul 2026 03:40:37 -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-c15d5de95e6sm483041566b.39.2026.07.11.03.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 03:40:36 -0700 (PDT) From: Pavel Begunkov To: io-uring@vger.kernel.org Cc: asml.silence@gmail.com, netdev@vger.kernel.org Subject: [PATCH review-only 03/17] io_uring/zcrx: add RQ iterator Date: Sat, 11 Jul 2026 11:39:56 +0100 Message-ID: X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID: <20260711103956.2oQcUYe2KaPKxNnTSKkhzujI0K8ZGc496GooBIUTIp0@z> Add a iterator structure and helper functions for the refill queue processing to avoid polluting io_zcrx_ring_refill() with extra state and logic once it's extended in following patches. Signed-off-by: Pavel Begunkov --- io_uring/zcrx.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index c4a9a663eba4..45b178afbbc3 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -1088,6 +1088,10 @@ void io_unregister_zcrx(struct io_ring_ctx *ctx) xa_destroy(&ctx->zcrx_ctxs); } +struct zcrx_rq_iter { + int rqes_left; +}; + static inline u32 zcrx_rq_entries(struct zcrx_rq *rq) { u32 entries; @@ -1103,6 +1107,24 @@ static struct io_uring_zcrx_rqe *zcrx_next_rqe(struct zcrx_rq *rq, unsigned mask return &rq->rqes[idx]; } +static inline void zcrx_rq_iter_init(struct zcrx_rq_iter *it, + struct zcrx_rq *rq) +{ + it->rqes_left = min_t(unsigned, zcrx_rq_entries(rq), ZCRX_REFILL_CAP); +} + +static inline bool zcrx_rq_iter_next(struct zcrx_rq_iter *it, + struct zcrx_rq *rq, + struct io_uring_zcrx_rqe **rqe) +{ + it->rqes_left--; + if (unlikely(it->rqes_left < 0)) + return false; + + *rqe = zcrx_next_rqe(rq, rq->nr_entries - 1); + return true; +} + static inline bool io_parse_rqe(struct io_uring_zcrx_rqe *rqe, struct io_zcrx_ifq *ifq, struct net_iov **ret_niov) @@ -1131,17 +1153,15 @@ static unsigned io_zcrx_ring_refill(struct page_pool *pp, netmem_ref *netmems, unsigned to_alloc) { struct zcrx_rq *rq = &ifq->rq; - unsigned int mask = rq->nr_entries - 1; - unsigned int rqes_left; + struct io_uring_zcrx_rqe *rqe; + struct zcrx_rq_iter it; unsigned allocated = 0; guard(spinlock_bh)(&rq->lock); - rqes_left = zcrx_rq_entries(rq); - rqes_left = min_t(unsigned, rqes_left, ZCRX_REFILL_CAP); + zcrx_rq_iter_init(&it, rq); - for (; rqes_left; rqes_left--) { - struct io_uring_zcrx_rqe *rqe = zcrx_next_rqe(rq, mask); + while (zcrx_rq_iter_next(&it, rq, &rqe)) { struct net_iov *niov; netmem_ref netmem; -- 2.54.0