From nobody Tue Sep 29 01:18:19 2026 Received: from fhigh-b8-smtp.messagingengine.com (fhigh-b8-smtp.messagingengine.com [202.12.124.159]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 58B552F3C10; Fri, 14 Aug 2026 01:23:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670638; cv=none; b=cIfxrwHjJJL+xhZii02kcEiyKxCjpH4cONEqehK/ZLzjyQ9kaDDfjbAaXTqbV5DjvLVHvKFFnlTOsiE5FkzSMpup3ReqbG8PoMlvRP8W25mxBHaIY+OeB56QtYL94/91oxcPosh5WAi4ivMM5ZJ1by755lsQhAzDOBDH7peCsMc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670638; c=relaxed/simple; bh=eWDj3kkPBFHQfyTEjMW902qILN3TU2T9Zq2jz1SA9nE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=heN1URvJAhIrKqBNsrHxoOsFOq59wc1pBZGQh/MPFVqRvtIJpuL1aaSIIGBOQLMYErrg+mm7w2EQibnz4SwI6d7BTDzDiY/vQGCh4Ehkn7KF0G9Ne45js4pvw18yPfwzDMOHOjSD0Dz/u0OSohrvFeuQ78vlk4+AvzQA79eskCQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com; spf=pass smtp.mailfrom=fastmail.com; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b=SmQL7wxZ; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=jAgHIWsW; arc=none smtp.client-ip=202.12.124.159 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b="SmQL7wxZ"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="jAgHIWsW" Received: from phl-compute-04.internal (phl-compute-04.internal [10.202.2.44]) by mailfhigh.stl.internal (Postfix) with ESMTP id 2F8737A0119; Thu, 13 Aug 2026 21:23:55 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Thu, 13 Aug 2026 21:23:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1786670635; x= 1786757035; bh=q7pte3tk23ZD+tvkYa9GrmKRYW53b1N7+AJyYvzvjS4=; b=S mQL7wxZSGDr4btt0W7XzJ6rUeImdb0t8r05ZUBCrFHgP+FbrKKEABjrSDsxVyp0y atAv26dV/H0pYXsgKk9ZC5Tosg2y3VcnJA0cOAtRfd33lFV/zgsmG39SncoPUINw Y8s54j8+McuRiJ/oOZ2/0WJFsjtE1ndL6y00xkXHXU3rFiNB99fSnIW0OsGltXkx tJmCJFENY+Xxhq5KaC4kVnq42EyIZeNvmLnAqbONxPdEir5ozW/u4gXZMji4x7Jj JKrzJUJRibeiJ/DUakqQK10ZYXtsE3i2eh4VIjCd34dnXxqAzfcMAxPgbNbRNvJq QiMp2XYCEOtosUic3Rk2Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1786670635; x=1786757035; bh=q 7pte3tk23ZD+tvkYa9GrmKRYW53b1N7+AJyYvzvjS4=; b=jAgHIWsW6xmWLjjw4 G3NjqQKvwCYDCFHvDJgC6Ruok+u1kNYrSAw+QAAWcfVCPPGrjTCl9pnQz6paxZPz mkI16mhAKPGJfKYFGI7oI//GlF9qW7aQcljwMZTqAdeGz6XT+ylJOvWIikRSxsyY bl2y/EKU2wN+QGbUFAODINzDZZQSU9ZqDXzVA+wbVhj3UzkireiiLhUUlkspIllH 3w314lW8169rY/fZez2ljKNLKvScrnY+ipCxLQmwJnp3hO7tegrd9+HaP86B51w3 i8rEuZk3AUWz/BqZghICs/ca5focp1+Q1gedDWZ6C+rZVfj2+A0c8fWnW3h3gT5/ lSYsQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTGlnKkc0TwPTb5JNCkAi+5Y8WSjcjjDWnkOIL2wNpUcV13CZto/qOXRm0nqGz7tPy KJEebetoFzGPCWAi43zBJPWh3lU6UkLAyBFZ6j4oxxM9R/f/XZ4XCVK2pzL/y7LQGFZvpR D/CrmLT9KZ1KsmxXyRJ2t1g6Nt6RO09HBhWhLe5eSw/EkIsnwI9+bk4+c3v7X8vnF67GAZ x5aPFmOtLpYkgdaSPCL5jXIqRgeyslKNbDZfP9OeqYyBjk5QInrgyNovvVM3MvStCRC0Vf KMYutq9dcLsVOl/YKHQj65USZyVlLayx+Z5CvgQ+ECO90Jd7U6/TgSqqZrFbLu3cB39nWP gYleAIr8Fsng95jrIU6TUaHFCATJJLvhBzmxAQ/qL8zZtwKE+6K86PK568VH0lYFgbO0C6 X0Lp1mFT4nHGOQpCrqD4GfFtuVWcdWUyi/pJ5IRpjm4fTd9qvGDXBo0URff+DHfVZaoSu8 eV8ty4xIizH+kOaAY1xUinretF69uHjgXBaseGAFlONt1Lh9TEuCLhlTt0gPqOrHRwptUw OzUdMJN9td/PikvDRe98MvMk0JN1C7Ta35E9x2/g7sCdhfy83V5AgusOqjItDqLQKtVQIp 8+MWpwc9SfUFsxdiwSs2wqE285H0Ud5IZriW4qFxtW5VDkQrJywcir4NsJ0w X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 Aug 2026 21:23:54 -0400 (EDT) From: Juanlu Herrero To: netdev@vger.kernel.org, dw@davidwei.uk Cc: io-uring@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kuba@kernel.org, asml.silence@gmail.com, pabeni@redhat.com, shuah@kernel.org, Juanlu Herrero Subject: [PATCH net-next v5 1/6] selftests: net: fix get_refill_ring_size() to use its local variable Date: Thu, 13 Aug 2026 20:23:43 -0500 Message-ID: <20260814012348.46958-2-juanlu@fastmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260814012348.46958-1-juanlu@fastmail.com> References: <20260814012348.46958-1-juanlu@fastmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation for multi-threaded rss selftests, fix get_refill_ring_size() to use its local `size` variable instead of assigning to the file-global `ring_size`. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Juanlu Herrero --- tools/testing/selftests/drivers/net/hw/iou-zcrx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c b/tools/test= ing/selftests/drivers/net/hw/iou-zcrx.c index f6a8fc5fac241..df6b622043438 100644 --- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c +++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.c @@ -132,10 +132,10 @@ static inline size_t get_refill_ring_size(unsigned in= t rq_entries) { size_t size; =20 - ring_size =3D rq_entries * sizeof(struct io_uring_zcrx_rqe); + size =3D rq_entries * sizeof(struct io_uring_zcrx_rqe); /* add space for the header (head/tail/etc.) */ - ring_size +=3D page_size; - return ALIGN_UP(ring_size, page_size); + size +=3D page_size; + return ALIGN_UP(size, page_size); } =20 static void setup_zcrx(struct io_uring *ring) --=20 2.53.0-Meta From nobody Tue Sep 29 01:18:19 2026 Received: from fhigh-b8-smtp.messagingengine.com (fhigh-b8-smtp.messagingengine.com [202.12.124.159]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 806331DDC1B; Fri, 14 Aug 2026 01:23:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670640; cv=none; b=JfdyssIoWn8JMIjUw3KBqytvw0M3DnQAy3yrAcp0q/eJS8pI0+MhrkaLIDwYfmBzWSC22y7E140ro2t49QA7oHKR20HMeBnHycxWHuweHpkDmvGLxdjoryt6NZCIf8k2uGQ0Au78m8f4jsfPfhjq4iPPFeBP8oFx/EPkMk9QR6U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670640; c=relaxed/simple; bh=UmyFBuNz5X5Hyy0U3LR+Mq37vswOtP3oWtdCOBjjgA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g9AjLzWtfizF3tZllHhzJYic6fw/bYVV3YILCvX3tjywCEiE+EbC1rKt0R8KCuiebMV7PP1sYqBldNjAeM0QxG3CFkH6R5IQF2A7/E8xxMBd8WVOdckUsD5/nlt1E+YtI8kdFAO6QC4jXaYXeSllufgC7TBD366V9t+7pjSmOeo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com; spf=pass smtp.mailfrom=fastmail.com; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b=XjG1jDQA; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=iwFtbyGO; arc=none smtp.client-ip=202.12.124.159 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b="XjG1jDQA"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="iwFtbyGO" Received: from phl-compute-11.internal (phl-compute-11.internal [10.202.2.51]) by mailfhigh.stl.internal (Postfix) with ESMTP id 806AB7A03A8; Thu, 13 Aug 2026 21:23:56 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Thu, 13 Aug 2026 21:23:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1786670636; x= 1786757036; bh=ufTrcvY/DK0DEwSsselNdijiTnLcHUJsYKTgG4UIkBE=; b=X jG1jDQAapb8lRL98xXgzehk/KaX149O89btrYUzuZIxgoltPZcsG+OBg3+QvOxNy lkY8sSv5iOZ/sghKSgXLP3K1SR3NpzOAEVZQFfRkIAvab50bJqci2l415jXuIpLa WCjkJuGxWdRjZW9+VggLyDnUmjWY69M2F9in6TZERRGabpyxpCi/PBV2Ud/Se5Vl zXOK/lV7MfvtwjRJ9EdRJ/KJDVn09cigsynnriN1Ydk6/fNzvL+/JEDw689xZvxP 4L7K4Fj3WCtfCxhNYuRWBzoP1lmkKgX/q6m+efqagtf6rPr4OSJZ3xPFOPrpc4OB YRgEmYeVVaN9blqYJCReg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1786670636; x=1786757036; bh=u fTrcvY/DK0DEwSsselNdijiTnLcHUJsYKTgG4UIkBE=; b=iwFtbyGOYPjotaIh0 ZXNkpuGilBrmL/6KquiESMky1NYBa284IC+f4iCGkuCM6lljRxdJgGGij28WWUI7 4uJPs/+9hZQYyQSpljwEVlakEjONYglBanwfaglfkNSjupiHuBPcE3QEjlhrDmOv qLqlSJ9b1FNn9+awxf0YyQkcNRq5xxJtKWTNoC46uwGxpmNYVelvAvhVTmo3ZIhM XP7IeN/QmkrfBlvSUSt9TfL1c66nJId6Bw/TOHV774JH2D5G8rBvTbJDe2Ep7L8B EnYloKlWHcg+JAcBaWmBD+UU9h0QRleeweYNA6uJ9poW/bBbS3fTQyaj0MCG30yA XVidw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTGo0I8vV6iwJjg6+n5OzY/NHD8n+wMxypil3f3+Fyb5+CaBlVpsyMYRFyR6Cj6Peb 3MudDlo3h3kwtiPZdPtAF2Nmtt5ogGSeh7VxMmddczBOsDqJrVnbTg0lx0d69qc28z6c0W w/6SX5Qx9K+rMdBL+YDnsSPFR3HaoWxkwpevo+tqEiVnZloNDsM5SPUtv78Y52JK6yTnuW 4lWon23r25Gl9NuJVyMvrtP6HzMnLd56THO4PC7uAIyd4skiuTlFBhdzYMaCcFId/QoZCQ TgT6xHUpaZW7TeTykfRc/hBvm2JXGIofdMoKI8YJLA1XzV3vHWrZUayF8q4k/3GYrWRmXh CN5Hc+04HbJhAp0wD5LoOfA+ooIERXK6dhj4ulqm1A6jfjq5E1xusnGWQtFL0Kqj2qqXYl DfZLnXzISWAkOFhJdRV2gx7X6UgDgvUcLL/BPvK25GXDH1Ju23ATeJAqpFh1IhDa+m+9r9 yAodt6XpbMbuEcFk8zWU/hgPSWjaHdV6PI6n5Q0eg0k+4lmpk+X6qu/RyfDk+BaRCLb4cT rtMc2Qq9CTzRB5P+xN4Mu9u32wLGzm0dKBYNkCvCUc5pau0XNo04AU2RP3tyW1qzRUhcW8 V3p8z2STM84GQLSeAnbkUeo0hi8T9qmtzLqXupQx5t/8E/wcc09CaI3cfYTw X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 Aug 2026 21:23:55 -0400 (EDT) From: Juanlu Herrero To: netdev@vger.kernel.org, dw@davidwei.uk Cc: io-uring@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kuba@kernel.org, asml.silence@gmail.com, pabeni@redhat.com, shuah@kernel.org, Juanlu Herrero Subject: [PATCH net-next v5 2/6] selftests: net: remove unused variable in process_recvzc() Date: Thu, 13 Aug 2026 20:23:44 -0500 Message-ID: <20260814012348.46958-3-juanlu@fastmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260814012348.46958-1-juanlu@fastmail.com> References: <20260814012348.46958-1-juanlu@fastmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the unused `sqe` variable in preparation for the multiqueue rss selftest changes to process_recvzc() in the following commits. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Juanlu Herrero --- tools/testing/selftests/drivers/net/hw/iou-zcrx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c b/tools/test= ing/selftests/drivers/net/hw/iou-zcrx.c index df6b622043438..c6dbd0ad53681 100644 --- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c +++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.c @@ -269,7 +269,6 @@ static void process_recvzc(struct io_uring *ring, struc= t io_uring_cqe *cqe) unsigned rq_mask =3D rq_ring.ring_entries - 1; struct io_uring_zcrx_cqe *rcqe; struct io_uring_zcrx_rqe *rqe; - struct io_uring_sqe *sqe; uint64_t mask; char *data; ssize_t n; --=20 2.53.0-Meta From nobody Tue Sep 29 01:18:19 2026 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A15423016F5; Fri, 14 Aug 2026 01:23:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670640; cv=none; b=mJY5lIoOdBpJSHOr9Cb+21X7rgjGgs9cIif+O1n7TP8gUSVzjF1fFzhbzLEIyGMoNkkUL8EHD7MVRtx7dLZj1F7zATE4e59ivX06k9R+EnVphBtImdAVOGeqBD909QNSAV/5IZdp67Z/q+2Ms65GCfifyI5PNIEuqmd9jFSRkoc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670640; c=relaxed/simple; bh=ZWPFvoRyrvnJsflPTlk63Xy5ZT27x7jwQlCWWZ/pct0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KoVtihGeCt52gFja5V9xWReQP4Oe0c9/50k/2FCMU6nCDz9LpfHvsv423u1sufs9zVxMPdNRtzpSOJtmqDExaaZCADoMnvC3GFue/++GmtxqOOpOSnntsb7iSVPqLY3my7dtgdow0rxZyieltsEesi2D154naNTBRd6e8mJM3tg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com; spf=pass smtp.mailfrom=fastmail.com; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b=Ah95oiG9; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=VYhk31xM; arc=none smtp.client-ip=202.12.124.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b="Ah95oiG9"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="VYhk31xM" Received: from phl-compute-05.internal (phl-compute-05.internal [10.202.2.45]) by mailfout.stl.internal (Postfix) with ESMTP id B0AB01D00367; Thu, 13 Aug 2026 21:23:57 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Thu, 13 Aug 2026 21:23:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1786670637; x= 1786757037; bh=Pkr0bWo5PyfxNbPe7FMXAwo56pMSREqoXVUV6Z5Ur04=; b=A h95oiG9Gn3BJthqnsl4nNyThJjhvjxjzErnr2N6MRXMo+HJ6so+YQN/gC58FtfZA 4BgVvSpdNm7LWXsf+SCV/JKAukZhzt746d3dadGiMr8cFQ3+kShU0jjNkWrcEXGD yzcOpg/eBmKMT+G0MQL275NDLREKsD4Y3CWM6uYBtd1FSAWyqPoeUaCDy+agfrdf 7nsZv9qfmCon1Rhbd5SvyeHHbAuW40MX8SMa6AbmkAFFxVl4cIBE/iRTxSXL0cAI 63ZI5MS5hbAJA1N/HnT7sV7c5lLiOOG/9xF3ZvnlbjNQ2sf+4x6T8yMOHXAgm6ws IukMMScFs+fJLIALKxk/A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1786670637; x=1786757037; bh=P kr0bWo5PyfxNbPe7FMXAwo56pMSREqoXVUV6Z5Ur04=; b=VYhk31xMTTPvfLuWY VX9mU3Tq1FuYj1u+EU49TzyCG6yiHOUwfyFvwE9GzKY3m4vo4SzORRp1oAS/06Es VY8agWPd1qzeG1/pl2KvTAHXf1A0zMVUfvC07lV3rxQ2LJYBd+/pi8QWunP5I2/7 sYQnYn6sSn81B4TuRKqngf9A6OfnttbLvALmGos4m0P7htlz/8dCBRVLp/f2eOSe hjWTcStPLn54Hf2qWeXV3jqQTQd0xqCh7+ImBh7s/u0/liZ0JJm3CBgHhKsVsL3L lP1RiNSa41x0mWb9E/HWqlVgBAz6IGeFa7paC4R5VH44YdIbOJ3MCDPspqOOgDxY eilBA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTGlnKkc0TwPTb5JNCkAi+5Y8WSjcjjDWnkOIL2wNpUcV13CZto/qOXRm0nqGz7tPy KJEebetoFzGPCWAi43zBJPWh3lU6UkLAyBFZ6j4oxxM9R/f/XZ4XCVK2pzL/y7LQGFZvpR D/CrmLT9KZ1KsmxXyRJ2t1g6Nt6RO09HBhWhLe5eSw/EkIsnwI9+bk4+c3v7X8vnF67GAZ x5aPFmOtLpYkgdaSPCL5jXIqRgeyslKNbDZfP9OeqYyBjk5QInrgyNovvVM3MvStCRC0Vf KMYutq9dcLsVOl/YKHQj65USZyVlLayx+Z5CvgQ+ECO90Jd7U6/TgSqqZrFbLu3cB39nEC sxNJIkpMmke0wuhYG449bOnAHW1ebJYWYF8rkL8Vsjax/mVaMiep7yNNA2YgYebxAmkbaq mHK0pzOVAzUxT3Y4mzta+ePdg209vpfgZvGofUvfo8wEVizcj269cPNRE4eQSEd8bupFtP 7ESmDFervYeFFStHCpdUaMcfi/Q1q3osPefsTvS3Kh8uvHjQvwFxTB3GX7wXSB5n7CHYvQ kh/ElGM1FQjNsZ2nQCoNfKl6XOzk0hZTSsUyUwkn299M/jpJiR5piJTR9tiO0viBKg0gIy 87r2UcUpNjvU8Q65uwpMTiaeDkHrg4wxMhks8LlmczAFbdmn54RwaMUoIjOA X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 Aug 2026 21:23:56 -0400 (EDT) From: Juanlu Herrero To: netdev@vger.kernel.org, dw@davidwei.uk Cc: io-uring@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kuba@kernel.org, asml.silence@gmail.com, pabeni@redhat.com, shuah@kernel.org, Juanlu Herrero Subject: [PATCH net-next v5 3/6] selftests: net: refactor server state into struct thread_ctx Date: Thu, 13 Aug 2026 20:23:45 -0500 Message-ID: <20260814012348.46958-4-juanlu@fastmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260814012348.46958-1-juanlu@fastmail.com> References: <20260814012348.46958-1-juanlu@fastmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move server-side state (io_uring ring, zcrx area, refill ring, receive tracking) from global variables into a local struct thread_ctx. This is a pure refactor with no behavior change: run_server still allocates a single context on the stack and runs single-threaded, using io_uring accept and recvzc as before. This prepares the ground for the multithread server support in the following commits, which spawns N worker threads each with their own struct thread_ctx. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Juanlu Herrero Reviewed-by: David Wei --- .../selftests/drivers/net/hw/iou-zcrx.c | 156 +++++++++--------- 1 file changed, 80 insertions(+), 76 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c b/tools/test= ing/selftests/drivers/net/hw/iou-zcrx.c index c6dbd0ad53681..9b62fd0703e61 100644 --- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c +++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.c @@ -87,14 +87,18 @@ static unsigned int cfg_rx_buf_len; static bool cfg_dry_run; =20 static char *payload; -static void *area_ptr; -static void *ring_ptr; -static size_t ring_size; -static struct io_uring_zcrx_rq rq_ring; -static unsigned long area_token; -static int connfd; -static bool stop; -static size_t received; + +struct thread_ctx { + struct io_uring ring; + void *area_ptr; + void *ring_ptr; + size_t ring_size; + struct io_uring_zcrx_rq rq_ring; + unsigned long area_token; + int connfd; + bool stop; + size_t received; +}; =20 static unsigned long gettimeofday_ms(void) { @@ -138,7 +142,7 @@ static inline size_t get_refill_ring_size(unsigned int = rq_entries) return ALIGN_UP(size, page_size); } =20 -static void setup_zcrx(struct io_uring *ring) +static void setup_zcrx(struct thread_ctx *ctx) { unsigned int ifindex; unsigned int rq_entries =3D 4096; @@ -149,44 +153,44 @@ static void setup_zcrx(struct io_uring *ring) error(1, 0, "bad interface name: %s", cfg_ifname); =20 if (cfg_rx_buf_len && cfg_rx_buf_len !=3D page_size) { - area_ptr =3D mmap(NULL, - AREA_SIZE, - PROT_READ | PROT_WRITE, - MAP_ANONYMOUS | MAP_PRIVATE | - MAP_HUGETLB | MAP_HUGE_2MB, - -1, - 0); - if (area_ptr =3D=3D MAP_FAILED) { + ctx->area_ptr =3D mmap(NULL, + AREA_SIZE, + PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_PRIVATE | + MAP_HUGETLB | MAP_HUGE_2MB, + -1, + 0); + if (ctx->area_ptr =3D=3D MAP_FAILED) { printf("Can't allocate huge pages\n"); exit(SKIP_CODE); } } else { - area_ptr =3D mmap(NULL, - AREA_SIZE, - PROT_READ | PROT_WRITE, - MAP_ANONYMOUS | MAP_PRIVATE, - 0, - 0); - if (area_ptr =3D=3D MAP_FAILED) + ctx->area_ptr =3D mmap(NULL, + AREA_SIZE, + PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_PRIVATE, + 0, + 0); + if (ctx->area_ptr =3D=3D MAP_FAILED) error(1, 0, "mmap(): zero copy area"); } =20 - ring_size =3D get_refill_ring_size(rq_entries); - ring_ptr =3D mmap(NULL, - ring_size, - PROT_READ | PROT_WRITE, - MAP_ANONYMOUS | MAP_PRIVATE, - 0, - 0); + ctx->ring_size =3D get_refill_ring_size(rq_entries); + ctx->ring_ptr =3D mmap(NULL, + ctx->ring_size, + PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_PRIVATE, + 0, + 0); =20 struct io_uring_region_desc region_reg =3D { - .size =3D ring_size, - .user_addr =3D (__u64)(unsigned long)ring_ptr, + .size =3D ctx->ring_size, + .user_addr =3D (__u64)(unsigned long)ctx->ring_ptr, .flags =3D IORING_MEM_REGION_TYPE_USER, }; =20 struct io_uring_zcrx_area_reg area_reg =3D { - .addr =3D (__u64)(unsigned long)area_ptr, + .addr =3D (__u64)(unsigned long)ctx->area_ptr, .len =3D AREA_SIZE, .flags =3D 0, }; @@ -200,7 +204,7 @@ static void setup_zcrx(struct io_uring *ring) .rx_buf_len =3D cfg_rx_buf_len, }; =20 - ret =3D io_uring_register_ifq(ring, (void *)®); + ret =3D io_uring_register_ifq(&ctx->ring, (void *)®); if (cfg_rx_buf_len && (ret =3D=3D -EINVAL || ret =3D=3D -EOPNOTSUPP || ret =3D=3D -ERANGE)) { printf("Large chunks are not supported %i\n", ret); @@ -209,64 +213,64 @@ static void setup_zcrx(struct io_uring *ring) error(1, 0, "io_uring_register_ifq(): %d", ret); } =20 - rq_ring.khead =3D (unsigned int *)((char *)ring_ptr + reg.offsets.head); - rq_ring.ktail =3D (unsigned int *)((char *)ring_ptr + reg.offsets.tail); - rq_ring.rqes =3D (struct io_uring_zcrx_rqe *)((char *)ring_ptr + reg.offs= ets.rqes); - rq_ring.rq_tail =3D 0; - rq_ring.ring_entries =3D reg.rq_entries; + ctx->rq_ring.khead =3D (unsigned int *)((char *)ctx->ring_ptr + reg.offse= ts.head); + ctx->rq_ring.ktail =3D (unsigned int *)((char *)ctx->ring_ptr + reg.offse= ts.tail); + ctx->rq_ring.rqes =3D (struct io_uring_zcrx_rqe *)((char *)ctx->ring_ptr = + reg.offsets.rqes); + ctx->rq_ring.rq_tail =3D 0; + ctx->rq_ring.ring_entries =3D reg.rq_entries; =20 - area_token =3D area_reg.rq_area_token; + ctx->area_token =3D area_reg.rq_area_token; } =20 -static void add_accept(struct io_uring *ring, int sockfd) +static void add_accept(struct thread_ctx *ctx, int sockfd) { struct io_uring_sqe *sqe; =20 - sqe =3D io_uring_get_sqe(ring); + sqe =3D io_uring_get_sqe(&ctx->ring); =20 io_uring_prep_accept(sqe, sockfd, NULL, NULL, 0); sqe->user_data =3D 1; } =20 -static void add_recvzc(struct io_uring *ring, int sockfd) +static void add_recvzc(struct thread_ctx *ctx, int sockfd) { struct io_uring_sqe *sqe; =20 - sqe =3D io_uring_get_sqe(ring); + sqe =3D io_uring_get_sqe(&ctx->ring); =20 io_uring_prep_rw(IORING_OP_RECV_ZC, sqe, sockfd, NULL, 0, 0); sqe->ioprio |=3D IORING_RECV_MULTISHOT; sqe->user_data =3D 2; } =20 -static void add_recvzc_oneshot(struct io_uring *ring, int sockfd, size_t l= en) +static void add_recvzc_oneshot(struct thread_ctx *ctx, int sockfd, size_t = len) { struct io_uring_sqe *sqe; =20 - sqe =3D io_uring_get_sqe(ring); + sqe =3D io_uring_get_sqe(&ctx->ring); =20 io_uring_prep_rw(IORING_OP_RECV_ZC, sqe, sockfd, NULL, len, 0); sqe->ioprio |=3D IORING_RECV_MULTISHOT; sqe->user_data =3D 2; } =20 -static void process_accept(struct io_uring *ring, struct io_uring_cqe *cqe) +static void process_accept(struct thread_ctx *ctx, struct io_uring_cqe *cq= e) { if (cqe->res < 0) error(1, 0, "accept()"); - if (connfd) + if (ctx->connfd) error(1, 0, "Unexpected second connection"); =20 - connfd =3D cqe->res; + ctx->connfd =3D cqe->res; if (cfg_oneshot) - add_recvzc_oneshot(ring, connfd, page_size); + add_recvzc_oneshot(ctx, ctx->connfd, page_size); else - add_recvzc(ring, connfd); + add_recvzc(ctx, ctx->connfd); } =20 -static void process_recvzc(struct io_uring *ring, struct io_uring_cqe *cqe) +static void process_recvzc(struct thread_ctx *ctx, struct io_uring_cqe *cq= e) { - unsigned rq_mask =3D rq_ring.ring_entries - 1; + unsigned int rq_mask =3D ctx->rq_ring.ring_entries - 1; struct io_uring_zcrx_cqe *rcqe; struct io_uring_zcrx_rqe *rqe; uint64_t mask; @@ -275,7 +279,7 @@ static void process_recvzc(struct io_uring *ring, struc= t io_uring_cqe *cqe) int i; =20 if (cqe->res =3D=3D 0 && cqe->flags =3D=3D 0 && cfg_oneshot_recvs =3D=3D = 0) { - stop =3D true; + ctx->stop =3D true; return; } =20 @@ -284,56 +288,56 @@ static void process_recvzc(struct io_uring *ring, str= uct io_uring_cqe *cqe) =20 if (cfg_oneshot) { if (cqe->res =3D=3D 0 && cqe->flags =3D=3D 0 && cfg_oneshot_recvs) { - add_recvzc_oneshot(ring, connfd, page_size); + add_recvzc_oneshot(ctx, ctx->connfd, page_size); cfg_oneshot_recvs--; } } else if (!(cqe->flags & IORING_CQE_F_MORE)) { - add_recvzc(ring, connfd); + add_recvzc(ctx, ctx->connfd); } =20 rcqe =3D (struct io_uring_zcrx_cqe *)(cqe + 1); =20 n =3D cqe->res; mask =3D (1ULL << IORING_ZCRX_AREA_SHIFT) - 1; - data =3D (char *)area_ptr + (rcqe->off & mask); + data =3D (char *)ctx->area_ptr + (rcqe->off & mask); =20 for (i =3D 0; i < n; i++) { - if (*(data + i) !=3D payload[(received + i)]) + if (*(data + i) !=3D payload[(ctx->received + i)]) error(1, 0, "payload mismatch at %d", i); } - received +=3D n; + ctx->received +=3D n; =20 - rqe =3D &rq_ring.rqes[(rq_ring.rq_tail & rq_mask)]; - rqe->off =3D (rcqe->off & ~IORING_ZCRX_AREA_MASK) | area_token; + rqe =3D &ctx->rq_ring.rqes[(ctx->rq_ring.rq_tail & rq_mask)]; + rqe->off =3D (rcqe->off & ~IORING_ZCRX_AREA_MASK) | ctx->area_token; rqe->len =3D cqe->res; - io_uring_smp_store_release(rq_ring.ktail, ++rq_ring.rq_tail); + io_uring_smp_store_release(ctx->rq_ring.ktail, ++ctx->rq_ring.rq_tail); } =20 -static void server_loop(struct io_uring *ring) +static void server_loop(struct thread_ctx *ctx) { struct io_uring_cqe *cqe; unsigned int count =3D 0; unsigned int head; int i, ret; =20 - io_uring_submit_and_wait(ring, 1); + io_uring_submit_and_wait(&ctx->ring, 1); =20 - io_uring_for_each_cqe(ring, head, cqe) { + io_uring_for_each_cqe(&ctx->ring, head, cqe) { if (cqe->user_data =3D=3D 1) - process_accept(ring, cqe); + process_accept(ctx, cqe); else if (cqe->user_data =3D=3D 2) - process_recvzc(ring, cqe); + process_recvzc(ctx, cqe); else error(1, 0, "unknown cqe"); count++; } - io_uring_cq_advance(ring, count); + io_uring_cq_advance(&ctx->ring, count); } =20 static void run_server(void) { + struct thread_ctx ctx =3D {}; unsigned int flags =3D 0; - struct io_uring ring; int fd, enable, ret; uint64_t tstop; =20 @@ -356,22 +360,22 @@ static void run_server(void) flags |=3D IORING_SETUP_SUBMIT_ALL; flags |=3D IORING_SETUP_CQE32; =20 - io_uring_queue_init(512, &ring, flags); + io_uring_queue_init(512, &ctx.ring, flags); =20 - setup_zcrx(&ring); + setup_zcrx(&ctx); if (cfg_dry_run) return; =20 if (listen(fd, 1024) < 0) error(1, 0, "listen()"); =20 - add_accept(&ring, fd); + add_accept(&ctx, fd); =20 tstop =3D gettimeofday_ms() + 5000; - while (!stop && gettimeofday_ms() < tstop) - server_loop(&ring); + while (!ctx.stop && gettimeofday_ms() < tstop) + server_loop(&ctx); =20 - if (!stop) + if (!ctx.stop) error(1, 0, "test failed\n"); } =20 --=20 2.53.0-Meta From nobody Tue Sep 29 01:18:19 2026 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E05292C15A9; Fri, 14 Aug 2026 01:23:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670642; cv=none; b=d1cC9ErBf+s4KhYlTu4RYuHZNaKz1EYoppgyuHb7XNTn2PC6YCMBvgAME4wIwCBsltVazOm6GYL/A1ApcdZywedgNggp3DkJ/C/GxwTTF45Fl+8Jo/UHKE/+bH9/LFUqLce0ur7r6Nx17ikDTEbizf+uQTCVao9cCdQ0n/XqOkg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670642; c=relaxed/simple; bh=JsyvOg9rjTf2hAeKT1VysvEtzgppe/dkSdHBwPkBKBA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZURkvUazEG0qV0GOoyaxUpLXAE/186g45KWxn66B2p4uo12NYBtfxufTHVFfHddOvMSPJw/elB644SykG0sktdF3Vkg0E9Xirnqz0t9/o3W3FJ++TAan535i5RU7P8o0fAcq+qa98gkG8WL/eJuwVnpbu6oCiLyVFAwstKL0m2s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com; spf=pass smtp.mailfrom=fastmail.com; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b=chkyoF/a; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=WZE6aCbG; arc=none smtp.client-ip=202.12.124.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b="chkyoF/a"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="WZE6aCbG" Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfout.stl.internal (Postfix) with ESMTP id 0AD321D00369; Thu, 13 Aug 2026 21:23:59 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Thu, 13 Aug 2026 21:23:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1786670638; x= 1786757038; bh=rJLxpVcsRT8Jm6zvl8Grul58U/k9DfNInr4+C1bG06c=; b=c hkyoF/aUNVMiMve8rGi0EEwgyfGHkY+7bg0kb1seeKX2ASrqOscc80aG0dfAtnDQ ikfzwl0KbFiJodnD5Y6vNEW/fsKGLcqBqF9QheYGhh3+P6/35bYTuOtqlhuWw6d8 DgV0E430Qi0rwV5RZuyV4xDnS32WV6VDlKVuwnpBJDQ7NSZpIZRXbE850DKHlzo9 Q4f3pqEVyIN7WQkA7003VhW48m8V/b0U2RrZorCqHa0ZUk91NnWWCgxE5YdR8coT F1QMp0aZRzc61GgEK7YCZCs+ESFsGQ3K2DOoiDbwQFWatqOrIYk52qLmTAw7uXfI o/lOMzL39+3yIPMQty/CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1786670638; x=1786757038; bh=r JLxpVcsRT8Jm6zvl8Grul58U/k9DfNInr4+C1bG06c=; b=WZE6aCbGVSvpRqXeV VXxCYnOQsz9deuooCRCHXnRxp2jBhyNNPLHt5ysWeMSOFFbHlpnhxwFJfv3JC4JA s42UekWlMNKvH6Xh0mt6XAzygbQlV55G1mv+V5HZSHnlNcRojQkZNSMVNaeRWWpi lqSbHDDedENRSxpmj6Lh9rLrBcKcQXe6C6VY6tneftnx8SmDi9AIPNo7MyzPKBgP 4/150Eq72GKmyXED6pIpIYYgPSevrKUhH3lVd6QoQRq5p7JQdb5wlRV+gyse+LbY JjvSTg4NxNe+BtPC3rCxxI3M1xixkkXkk2M9yAe53ozpX76nE3BK7vHJ29PIcrgh NJjYQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTGlnKkc0TwPTb5JNCkAi+5Y8WSjcjjDWnkOIL2wNpUcV13CZto/qOXRm0nqGz7tPy KJEebetoFzGPCWAi43zBJPWh3lU6UkLAyBFZ6j4oxxM9R/f/XZ4XCVK2pzL/y7LQGFZvpR D/CrmLT9KZ1KsmxXyRJ2t1g6Nt6RO09HBhWhLe5eSw/EkIsnwI9+bk4+c3v7X8vnF67GAZ x5aPFmOtLpYkgdaSPCL5jXIqRgeyslKNbDZfP9OeqYyBjk5QInrgyNovvVM3MvStCRC0Vf KMYutq9dcLsVOl/YKHQj65USZyVlLayx+Z5CvgQ+ECO90Jd7U6/TgSqqZrFbLu3cB39ngO m8WCv8SRr8SVjfatIJpnKDbHvvyYPYGihdxKWE6oXt1NvXMNMf5d2ohaHZTvR36J1WQBPH AJ9JIG/VFfPwHWoHh4CmoI9UZ54Y67Mpvj7iBs7vmfhVAoITAFm/cPc5JfKC3YKzva0Kyk frUhty89a+OTQ0BqQW09Y/s4ZKl2oqpMZkYAL1Dwq95OXlKtAe28v6kXZ3gWNbZ2Zl7XFS 6S9CbK8AZtvrDid2c1qf87W1PPdICY5NTAhj2dNv+mqgD28+dFsbH3dmRkiYvp7L5dgP77 YENw9rOKQA75TIH8XnV/q6QAgxFiy1cE37Y+oIHS1xMEy3FYmCfPI0G5JLJg X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 Aug 2026 21:23:58 -0400 (EDT) From: Juanlu Herrero To: netdev@vger.kernel.org, dw@davidwei.uk Cc: io-uring@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kuba@kernel.org, asml.silence@gmail.com, pabeni@redhat.com, shuah@kernel.org, Juanlu Herrero Subject: [PATCH net-next v5 4/6] selftests: net: add multithread client support to iou-zcrx Date: Thu, 13 Aug 2026 20:23:46 -0500 Message-ID: <20260814012348.46958-5-juanlu@fastmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260814012348.46958-1-juanlu@fastmail.com> References: <20260814012348.46958-1-juanlu@fastmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add pthreads to the iou-zcrx client so that multiple connections can be established simultaneously. Each client thread connects to the server and sends its payload independently. Introduce the -t option to control the number of threads (default 1), preserving backwards compatibility with existing tests. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Juanlu Herrero Reviewed-by: David Wei --- .../testing/selftests/drivers/net/hw/Makefile | 2 +- .../selftests/drivers/net/hw/iou-zcrx.c | 35 +++++++++++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/Makefile b/tools/testin= g/selftests/drivers/net/hw/Makefile index 78bb0169350b2..37023ba580de7 100644 --- a/tools/testing/selftests/drivers/net/hw/Makefile +++ b/tools/testing/selftests/drivers/net/hw/Makefile @@ -91,5 +91,5 @@ include ../../../net/ynl.mk include ../../../net/bpf.mk =20 ifeq ($(HAS_IOURING_ZCRX),y) -$(OUTPUT)/iou-zcrx: LDLIBS +=3D -luring +$(OUTPUT)/iou-zcrx: LDLIBS +=3D -luring -lpthread endif diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c b/tools/test= ing/selftests/drivers/net/hw/iou-zcrx.c index 9b62fd0703e61..f793a6c04e412 100644 --- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c +++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -85,6 +86,7 @@ static int cfg_send_size =3D SEND_SIZE; static struct sockaddr_in6 cfg_addr; static unsigned int cfg_rx_buf_len; static bool cfg_dry_run; +static int cfg_num_threads =3D 1; =20 static char *payload; =20 @@ -379,7 +381,7 @@ static void run_server(void) error(1, 0, "test failed\n"); } =20 -static void run_client(void) +static void *client_worker(void *arg) { ssize_t to_send =3D cfg_send_size; ssize_t sent =3D 0; @@ -405,12 +407,36 @@ static void run_client(void) } =20 close(fd); + return NULL; +} + +static void run_client(void) +{ + int total_conns =3D cfg_num_threads * cfg_num_threads; + pthread_t *threads; + int i, ret; + + threads =3D calloc(total_conns, sizeof(*threads)); + if (!threads) + error(1, 0, "calloc()"); + + for (i =3D 0; i < total_conns; i++) { + ret =3D pthread_create(&threads[i], NULL, client_worker, NULL); + if (ret) + error(1, ret, "pthread_create()"); + } + + for (i =3D 0; i < total_conns; i++) + pthread_join(threads[i], NULL); + + free(threads); } =20 static void usage(const char *filepath) { error(1, 0, "Usage: %s (-4|-6) (-s|-c) -h -p " - "-l -i -q", filepath); + "-l -i -q -t", + filepath); } =20 static void parse_opts(int argc, char **argv) @@ -428,7 +454,7 @@ static void parse_opts(int argc, char **argv) usage(argv[0]); cfg_payload_len =3D max_payload_len; =20 - while ((c =3D getopt(argc, argv, "sch:p:l:i:q:o:z:x:d")) !=3D -1) { + while ((c =3D getopt(argc, argv, "sch:p:l:i:q:o:z:x:dt:")) !=3D -1) { switch (c) { case 's': if (cfg_client) @@ -469,6 +495,9 @@ static void parse_opts(int argc, char **argv) case 'd': cfg_dry_run =3D true; break; + case 't': + cfg_num_threads =3D strtoul(optarg, NULL, 0); + break; } } =20 --=20 2.53.0-Meta From nobody Tue Sep 29 01:18:19 2026 Received: from fhigh-b8-smtp.messagingengine.com (fhigh-b8-smtp.messagingengine.com [202.12.124.159]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6005330BB8A; Fri, 14 Aug 2026 01:24:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670653; cv=none; b=KZ6P0izUkDvnoig0KB/pm6Hxrokg80cjp4hgNkpfVaw1JPGWTblPxeW+eUruehkg9cjUpoVIkgj9Kq5Ki3L72w2TNTxgOUXpIKvb+wGf3SeEynBCcaqfiuK4vka8H1UNtx5VtBXlzDO4tJBGDbqVApoxm7TWXsggg3ZoopHHPU8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670653; c=relaxed/simple; bh=lm7tP/MI8jTGE0bDgS19j+jpDgaR99C/xxfzfA99Yfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=csy0lmWZO6CJFbfcx1GB8Y9hb57D+aqP4Tik87PtFmqpNvEF0yFcdZMuZaJAMdW3Gk03vkKSXMziLa0ArEN8B8TZV4RjaVtZ9VxRBjvSLRauSpsFRmmTwLnFxjVhyr3wnA+c20WBxh0hXLkEP6pN3r0dIHCPR6A0t7BNZEcsyW8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com; spf=pass smtp.mailfrom=fastmail.com; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b=lsdVsz7h; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=l+OIk4eY; arc=none smtp.client-ip=202.12.124.159 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b="lsdVsz7h"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="l+OIk4eY" Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfhigh.stl.internal (Postfix) with ESMTP id 7F1497A0173; Thu, 13 Aug 2026 21:24:00 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Thu, 13 Aug 2026 21:24:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1786670640; x= 1786757040; bh=YD53kWyId63F2OwSI2bl+nEdpALFJL/gzrCxuCBPERg=; b=l sdVsz7h8UJPWZmxHdiLVsltsZUG+r10DyLRIhIqZyIH7NjNgU0fjtvQTywnAbYa7 NA2OVfppnYvFOBwSEMUvmex3PoFblAtvow2eAOUOoIrB8YVSpNYeLgTSMhjSrcyQ ITOCpB/Ry88nYTCXsnl4M8+p7wlCR0Zl/Lpe2dH5eKYh+D1yk3pXGXVaTAhMFXP9 WMTEI9AvLZG7f2iRzqXE7TTx5Fexb6vePkdRgjcZe4uF4fbSwxT613LWADEI5h8m ijKXbfbfo2qoRP4HiMb940J/y3ylaqWYBLJ9enSVOhQrnd2+UoC6S7lakZbDJrpN 0m4zhsJj4xmqvIdn+ZH+Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1786670640; x=1786757040; bh=Y D53kWyId63F2OwSI2bl+nEdpALFJL/gzrCxuCBPERg=; b=l+OIk4eYHrljb/0rB PdqS8X6QGCrlT0l331yukGMHSRLj5lte6nDPp90OLzk1KOaLUUSLNSzlQF0dE68+ IZBY574DW0i4ueS4+trPGQPpiEiZv35C0bXFelWs/oiPfeSFBMqhnDLQfjkO1GS+ 4XJBJO6oN4eVj70Mozp6ZBwtYE+e2yNxsrj3essd6tD0AJqEjUeQZuKfvfHHV/xl nuJ34RSG+aZagDlhx8Jbbub1SwZYeEWQObRMwFfKkXXMLH0YJKgWgXJl1CC3xPDQ U09pt1tFANXxd3KDd4HWLsZDkiiy+uwnl+iVFwELjsz3LK2IS+3EG/5JTrxUAfQN HCZFw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTEm22De8ExjFQylpDaiwWPsj5UCBWcTiW8VSFtTxcd6DQsif/Q5uZX/68BEELxHbF 9VL3TL1IqvF5ntXobI2WW3MOEpGRFfamwLo/wpTnxOYmN7ZXjqxzqtjGjIghxkLoKgqcde QPoOMaE37nHLjG459U4VH0F4UpJg9Uu7GB++Bs6TY5nsmUHvvI+qELVqqeZ9Z27Evvo5Y7 4TQw/2EuVuymM0bYdmaMXY7mryuPj6akSkzc4asecrlitNxL1LvgtMmo7hEg+Y7f7/mWZ+ +V4CzSxUQeZFzanVg7gCfxkG1FRxGTq2OYQxe2tO5CIicEWBE8aAlDjxRfn5g0rMpaJYmc qIGlSxqUABWndhBMPVlJBWJFftk8oCOKLD/xgCZc4is94ZjH1oJ+taOCOsAVYiBjksz39P flfJiZdLe9ogfliw9xSmyd+eEH74ETJeC9nm6iRBLFXpLFxiH+zQ+clsl4dD1mptfHRwM+ W92PIpTHhvWoMM361LzpIKgJaqeLiw1c+jLW4sPMqDX6bKmjP1eCCNXCJMi3Af6F/JBo2f kHXtxSLKO2/8fAziFRrIsEFItMP3cYaYlQLafyJhjlL6vWQuLG7XVPWhKuwEO+4i9hFY6E 5fDcyiPQz89qez53Ay3VM4FuuH/7Crmj/Wveac72clBbvB7cV7+QeUhst33g X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 Aug 2026 21:23:59 -0400 (EDT) From: Juanlu Herrero To: netdev@vger.kernel.org, dw@davidwei.uk Cc: io-uring@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kuba@kernel.org, asml.silence@gmail.com, pabeni@redhat.com, shuah@kernel.org, Juanlu Herrero Subject: [PATCH net-next v5 5/6] selftests: net: add multithread server support to iou-zcrx Date: Thu, 13 Aug 2026 20:23:47 -0500 Message-ID: <20260814012348.46958-6-juanlu@fastmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260814012348.46958-1-juanlu@fastmail.com> References: <20260814012348.46958-1-juanlu@fastmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Run the iou-zcrx server as N worker threads, each owning one receive queue with its own io_uring and zero-copy receive (zcrx) ifq, so the test can exercise multi-queue zero-copy receive. The main thread owns the listening socket, accepts connections, and dispatches each to the worker owning the queue it landed on by matching SO_INCOMING_NAPI_ID against per-queue NAPI IDs. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Juanlu Herrero --- .../testing/selftests/drivers/net/hw/Makefile | 5 +- .../selftests/drivers/net/hw/iou-zcrx.c | 262 +++++++++++++----- 2 files changed, 195 insertions(+), 72 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/Makefile b/tools/testin= g/selftests/drivers/net/hw/Makefile index 37023ba580de7..f613c88fffc53 100644 --- a/tools/testing/selftests/drivers/net/hw/Makefile +++ b/tools/testing/selftests/drivers/net/hw/Makefile @@ -13,10 +13,6 @@ else $(warning excluding iouring tests, liburing not installed or too old) endif =20 -TEST_GEN_FILES :=3D \ - $(COND_GEN_FILES) \ -# end of TEST_GEN_FILES - TEST_PROGS =3D \ csum.py \ devlink_rate_cross_esw.py \ @@ -74,6 +70,7 @@ TEST_INCLUDES :=3D \ YNL_GEN_FILES :=3D \ ncdevmem \ toeplitz \ + $(COND_GEN_FILES) \ # end of YNL_GEN_FILES TEST_GEN_FILES +=3D $(YNL_GEN_FILES) TEST_GEN_FILES +=3D $(patsubst %.c,%.o,$(wildcard *.bpf.c)) diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c b/tools/test= ing/selftests/drivers/net/hw/iou-zcrx.c index f793a6c04e412..008d3f4b76263 100644 --- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c +++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.c @@ -38,6 +38,8 @@ #include =20 #include +#include +#include "netdev-user.h" =20 #define SKIP_CODE 42 =20 @@ -90,6 +92,8 @@ static int cfg_num_threads =3D 1; =20 static char *payload; =20 +#define MAX_CONNS_PER_THREAD 64 + struct thread_ctx { struct io_uring ring; void *area_ptr; @@ -97,9 +101,15 @@ struct thread_ctx { size_t ring_size; struct io_uring_zcrx_rq rq_ring; unsigned long area_token; - int connfd; - bool stop; - size_t received; + int queue_id; + int napi_id; + pthread_barrier_t *setup_done; + pthread_barrier_t *dispatch_done; + + int connfds[MAX_CONNS_PER_THREAD]; + size_t received[MAX_CONNS_PER_THREAD]; + int oneshot_recvs[MAX_CONNS_PER_THREAD]; + int nr_conns; }; =20 static unsigned long gettimeofday_ms(void) @@ -199,7 +209,7 @@ static void setup_zcrx(struct thread_ctx *ctx) =20 struct t_io_uring_zcrx_ifq_reg reg =3D { .if_idx =3D ifindex, - .if_rxq =3D cfg_queue_id, + .if_rxq =3D ctx->queue_id, .rq_entries =3D rq_entries, .area_ptr =3D (__u64)(unsigned long)&area_reg, .region_ptr =3D (__u64)(unsigned long)®ion_reg, @@ -224,53 +234,32 @@ static void setup_zcrx(struct thread_ctx *ctx) ctx->area_token =3D area_reg.rq_area_token; } =20 -static void add_accept(struct thread_ctx *ctx, int sockfd) +static void add_recvzc(struct thread_ctx *ctx, int conn_idx) { struct io_uring_sqe *sqe; =20 sqe =3D io_uring_get_sqe(&ctx->ring); =20 - io_uring_prep_accept(sqe, sockfd, NULL, NULL, 0); - sqe->user_data =3D 1; -} - -static void add_recvzc(struct thread_ctx *ctx, int sockfd) -{ - struct io_uring_sqe *sqe; - - sqe =3D io_uring_get_sqe(&ctx->ring); - - io_uring_prep_rw(IORING_OP_RECV_ZC, sqe, sockfd, NULL, 0, 0); + io_uring_prep_rw(IORING_OP_RECV_ZC, sqe, ctx->connfds[conn_idx], + NULL, 0, 0); sqe->ioprio |=3D IORING_RECV_MULTISHOT; - sqe->user_data =3D 2; + sqe->user_data =3D conn_idx; } =20 -static void add_recvzc_oneshot(struct thread_ctx *ctx, int sockfd, size_t = len) +static void add_recvzc_oneshot(struct thread_ctx *ctx, int conn_idx, size_= t len) { struct io_uring_sqe *sqe; =20 sqe =3D io_uring_get_sqe(&ctx->ring); =20 - io_uring_prep_rw(IORING_OP_RECV_ZC, sqe, sockfd, NULL, len, 0); + io_uring_prep_rw(IORING_OP_RECV_ZC, sqe, ctx->connfds[conn_idx], + NULL, len, 0); sqe->ioprio |=3D IORING_RECV_MULTISHOT; - sqe->user_data =3D 2; + sqe->user_data =3D conn_idx; } =20 -static void process_accept(struct thread_ctx *ctx, struct io_uring_cqe *cq= e) -{ - if (cqe->res < 0) - error(1, 0, "accept()"); - if (ctx->connfd) - error(1, 0, "Unexpected second connection"); - - ctx->connfd =3D cqe->res; - if (cfg_oneshot) - add_recvzc_oneshot(ctx, ctx->connfd, page_size); - else - add_recvzc(ctx, ctx->connfd); -} - -static void process_recvzc(struct thread_ctx *ctx, struct io_uring_cqe *cq= e) +static void process_recvzc(struct thread_ctx *ctx, struct io_uring_cqe *cq= e, + int conn_idx) { unsigned int rq_mask =3D ctx->rq_ring.ring_entries - 1; struct io_uring_zcrx_cqe *rcqe; @@ -280,8 +269,9 @@ static void process_recvzc(struct thread_ctx *ctx, stru= ct io_uring_cqe *cqe) ssize_t n; int i; =20 - if (cqe->res =3D=3D 0 && cqe->flags =3D=3D 0 && cfg_oneshot_recvs =3D=3D = 0) { - ctx->stop =3D true; + if (cqe->res =3D=3D 0 && cqe->flags =3D=3D 0 && + ctx->oneshot_recvs[conn_idx] =3D=3D 0) { + ctx->nr_conns--; return; } =20 @@ -289,12 +279,13 @@ static void process_recvzc(struct thread_ctx *ctx, st= ruct io_uring_cqe *cqe) error(1, 0, "recvzc(): %d", cqe->res); =20 if (cfg_oneshot) { - if (cqe->res =3D=3D 0 && cqe->flags =3D=3D 0 && cfg_oneshot_recvs) { - add_recvzc_oneshot(ctx, ctx->connfd, page_size); - cfg_oneshot_recvs--; + if (cqe->res =3D=3D 0 && cqe->flags =3D=3D 0 && + ctx->oneshot_recvs[conn_idx]) { + add_recvzc_oneshot(ctx, conn_idx, page_size); + ctx->oneshot_recvs[conn_idx]--; } } else if (!(cqe->flags & IORING_CQE_F_MORE)) { - add_recvzc(ctx, ctx->connfd); + add_recvzc(ctx, conn_idx); } =20 rcqe =3D (struct io_uring_zcrx_cqe *)(cqe + 1); @@ -304,10 +295,10 @@ static void process_recvzc(struct thread_ctx *ctx, st= ruct io_uring_cqe *cqe) data =3D (char *)ctx->area_ptr + (rcqe->off & mask); =20 for (i =3D 0; i < n; i++) { - if (*(data + i) !=3D payload[(ctx->received + i)]) + if (*(data + i) !=3D payload[(ctx->received[conn_idx] + i)]) error(1, 0, "payload mismatch at %d", i); } - ctx->received +=3D n; + ctx->received[conn_idx] +=3D n; =20 rqe =3D &ctx->rq_ring.rqes[(ctx->rq_ring.rq_tail & rq_mask)]; rqe->off =3D (rcqe->off & ~IORING_ZCRX_AREA_MASK) | ctx->area_token; @@ -320,28 +311,124 @@ static void server_loop(struct thread_ctx *ctx) struct io_uring_cqe *cqe; unsigned int count =3D 0; unsigned int head; - int i, ret; =20 io_uring_submit_and_wait(&ctx->ring, 1); =20 io_uring_for_each_cqe(&ctx->ring, head, cqe) { - if (cqe->user_data =3D=3D 1) - process_accept(ctx, cqe); - else if (cqe->user_data =3D=3D 2) - process_recvzc(ctx, cqe); - else - error(1, 0, "unknown cqe"); + process_recvzc(ctx, cqe, cqe->user_data); count++; } io_uring_cq_advance(&ctx->ring, count); } =20 -static void run_server(void) +static void *server_worker(void *arg) { - struct thread_ctx ctx =3D {}; - unsigned int flags =3D 0; - int fd, enable, ret; + struct io_uring_params params =3D { }; + struct thread_ctx *ctx =3D arg; uint64_t tstop; + int i; + + params.flags |=3D IORING_SETUP_COOP_TASKRUN; + params.flags |=3D IORING_SETUP_SINGLE_ISSUER; + params.flags |=3D IORING_SETUP_DEFER_TASKRUN; + params.flags |=3D IORING_SETUP_SUBMIT_ALL; + params.flags |=3D IORING_SETUP_CQE32; + params.flags |=3D IORING_SETUP_CQSIZE; + params.cq_entries =3D AREA_SIZE / page_size; + + io_uring_queue_init_params(512, &ctx->ring, ¶ms); + setup_zcrx(ctx); + + if (cfg_dry_run) + return NULL; + + pthread_barrier_wait(ctx->setup_done); + pthread_barrier_wait(ctx->dispatch_done); + + for (i =3D 0; i < ctx->nr_conns; i++) { + if (cfg_oneshot) { + ctx->oneshot_recvs[i] =3D cfg_oneshot_recvs; + add_recvzc_oneshot(ctx, i, page_size); + } else { + add_recvzc(ctx, i); + } + } + + tstop =3D gettimeofday_ms() + 5000; + while (ctx->nr_conns > 0 && gettimeofday_ms() < tstop) + server_loop(ctx); + + if (ctx->nr_conns !=3D 0) + error(1, 0, "test failed: %d connections incomplete", + ctx->nr_conns); + + return NULL; +} + +static int query_napi_id(unsigned int ifindex, int queue_id) +{ + struct netdev_queue_get_req *req; + struct netdev_queue_get_rsp *rsp; + struct ynl_error yerr; + struct ynl_sock *ys; + int napi_id; + + ys =3D ynl_sock_create(&ynl_netdev_family, &yerr); + if (!ys) + error(1, 0, "ynl_sock_create: %s", yerr.msg); + + req =3D netdev_queue_get_req_alloc(); + netdev_queue_get_req_set_ifindex(req, ifindex); + netdev_queue_get_req_set_type(req, NETDEV_QUEUE_TYPE_RX); + netdev_queue_get_req_set_id(req, queue_id); + + rsp =3D netdev_queue_get(ys, req); + if (!rsp) + error(1, 0, "netdev_queue_get(q=3D%d): %s", queue_id, + ys->err.msg); + if (!rsp->_present.napi_id) + error(1, 0, "netdev_queue_get(q=3D%d): napi_id not present", + queue_id); + + napi_id =3D rsp->napi_id; + + netdev_queue_get_req_free(req); + netdev_queue_get_rsp_free(rsp); + ynl_sock_destroy(ys); + + return napi_id; +} + +static int find_thread_by_conn(struct thread_ctx *ctxs, int connfd) +{ + socklen_t len =3D sizeof(int); + int napi_id, i; + + if (getsockopt(connfd, SOL_SOCKET, SO_INCOMING_NAPI_ID, &napi_id, &len)) + error(1, errno, "getsockopt(SO_INCOMING_NAPI_ID)"); + + for (i =3D 0; i < cfg_num_threads; i++) { + if (ctxs[i].napi_id =3D=3D napi_id) + return i; + } + + error(1, 0, "unknown NAPI ID: %d", napi_id); + return -1; +} + +static void run_server(void) +{ + pthread_barrier_t setup_done, dispatch_done; + int total_conns, accepted =3D 0, connfd; + struct thread_ctx *ctxs; + int fd, ret, enable, i; + unsigned int ifindex; + pthread_t *threads; + + ctxs =3D calloc(cfg_num_threads, sizeof(*ctxs)); + threads =3D calloc(cfg_num_threads, sizeof(*threads)); + if (!ctxs || !threads) + error(1, 0, "calloc()"); =20 fd =3D socket(AF_INET6, SOCK_STREAM, 0); if (fd =3D=3D -1) @@ -356,29 +443,68 @@ static void run_server(void) if (ret < 0) error(1, 0, "bind()"); =20 - flags |=3D IORING_SETUP_COOP_TASKRUN; - flags |=3D IORING_SETUP_SINGLE_ISSUER; - flags |=3D IORING_SETUP_DEFER_TASKRUN; - flags |=3D IORING_SETUP_SUBMIT_ALL; - flags |=3D IORING_SETUP_CQE32; + pthread_barrier_init(&setup_done, NULL, cfg_num_threads + 1); + pthread_barrier_init(&dispatch_done, NULL, cfg_num_threads + 1); + + for (i =3D 0; i < cfg_num_threads; i++) { + ctxs[i].queue_id =3D cfg_queue_id + i; + ctxs[i].setup_done =3D &setup_done; + ctxs[i].dispatch_done =3D &dispatch_done; + } =20 - io_uring_queue_init(512, &ctx.ring, flags); + for (i =3D 0; i < cfg_num_threads; i++) { + ret =3D pthread_create(&threads[i], NULL, + server_worker, &ctxs[i]); + if (ret) + error(1, ret, "pthread_create()"); + } =20 - setup_zcrx(&ctx); if (cfg_dry_run) - return; + goto join; =20 if (listen(fd, 1024) < 0) error(1, 0, "listen()"); =20 - add_accept(&ctx, fd); + pthread_barrier_wait(&setup_done); =20 - tstop =3D gettimeofday_ms() + 5000; - while (!ctx.stop && gettimeofday_ms() < tstop) - server_loop(&ctx); + if (cfg_num_threads > 1) { + ifindex =3D if_nametoindex(cfg_ifname); + if (!ifindex) + error(1, 0, "bad interface name: %s", cfg_ifname); + for (i =3D 0; i < cfg_num_threads; i++) + ctxs[i].napi_id =3D query_napi_id(ifindex, + ctxs[i].queue_id); + } + + total_conns =3D cfg_num_threads * cfg_num_threads; + + while (accepted < total_conns) { + int idx =3D 0; + + connfd =3D accept(fd, NULL, NULL); + if (connfd < 0) + error(1, errno, "accept()"); =20 - if (!ctx.stop) - error(1, 0, "test failed\n"); + if (cfg_num_threads > 1) + idx =3D find_thread_by_conn(ctxs, connfd); + + if (ctxs[idx].nr_conns >=3D MAX_CONNS_PER_THREAD) + error(1, 0, "worker %d connection overflow", idx); + ctxs[idx].connfds[ctxs[idx].nr_conns++] =3D connfd; + accepted++; + } + + pthread_barrier_wait(&dispatch_done); + +join: + for (i =3D 0; i < cfg_num_threads; i++) + pthread_join(threads[i], NULL); + + pthread_barrier_destroy(&setup_done); + pthread_barrier_destroy(&dispatch_done); + close(fd); + free(threads); + free(ctxs); } =20 static void *client_worker(void *arg) --=20 2.53.0-Meta From nobody Tue Sep 29 01:18:19 2026 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE21E30566A; Fri, 14 Aug 2026 01:24:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670654; cv=none; b=EdE2CfGIXO6G+Xpi50CR0GD5t3LIIJtp8qI+U/jwEKm6CKalEhB60nW9Tx2GNqkV4DntuAresjhtcv8k6XJVk0OyGMidEKK0MY/4OvgE1gy1Neh7EUOxYSMPSYGqbXYINJHsvyy1+XjkjlrKL7ur2+a8qVu2I0/43b9tZUNv7rs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786670654; c=relaxed/simple; bh=e7LYKBFbEvthm11PSs/C6zIgbmJth/AwSzGHUbofwiE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EQTiWsazqd5CIVKoMC9osN+SZhrDBE+B6vyXehM0xR1LcwC0wzdE+FOSDHRLU+3RuuekZag3OPoIOMx75r0v9dUmOUltuxWCAnt1/QVcfsIEBNMhuOFRyfaZixVAD5F4q7Iqylg1PGOZU1RNNIFvzFehMyXQc+DRe3QxV24SN80= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com; spf=pass smtp.mailfrom=fastmail.com; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b=TIcpuIbl; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=MZER5n+P; arc=none smtp.client-ip=202.12.124.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b="TIcpuIbl"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="MZER5n+P" Received: from phl-compute-02.internal (phl-compute-02.internal [10.202.2.42]) by mailfout.stl.internal (Postfix) with ESMTP id 95DF31D00367; Thu, 13 Aug 2026 21:24:01 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-02.internal (MEProxy); Thu, 13 Aug 2026 21:24:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1786670641; x= 1786757041; bh=z7+hOQG2YGb/JFBuAeH6YH/vIHUf6ESYw2NhiMLrbag=; b=T IcpuIblS6p05P19hgoz9Sqtwr2qCqmsjhRy29FgBheIpDfX70SA6RdvVvqV+vP3W KpV3Mrc7xWrdy8pwAaTnPBhyuQViEsrJU/fvrit2dPz4VGfAJ/1Tz4azLUs4ufqP 5VW8tXcQF9aOElyusst2sGAettNuJgIW2GHd1J4gKrC5bgBRAjKOdQFOjkFoOog8 5/cqlL8xWXYwnAfKtZhaUs6oDUVVz0o0jROn6tUuWlwnMB64q1OY5D2KVhBJU9Dw 7YYJKqTDFpnOZWh1+kbp2FLiOIbSDn14nskmTeUrwFnP7gmSvqM2euSlzYF4xvUh +pgKCtc+azHXtV7tWbW/A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1786670641; x=1786757041; bh=z 7+hOQG2YGb/JFBuAeH6YH/vIHUf6ESYw2NhiMLrbag=; b=MZER5n+P0Nt1r0WsF RH/Uni2DpF5ql//WpK5+PNbi8nVzjfMX8ihbQ73xu5EpT+IVgpk5bxvzTgaYB/EQ aR7+I3p7+v/QcfnFZiP5RAnCcu/YfOQFG5sV4yPHioDwQ/uy07lc4+9+5RHhw8M7 z5G5x8dk0xcJMOAMHYhRR7GIxfd56ZSeFB6TCOPAoNfVelwd9eD3K0ytsUn9XgzA 0WLDicWUz3ahZKhcylRHXFJ7ghJbHaWiiifW1d5yltMelKzvejH+XHFvV0lyiLnB dTqO2VyUeIJbZdN/Njr8m5OT7+DrkRa1d+6HoeeO6PwOGXo+KHp1JNjFtGU/TXq4 K5Spg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTGlnKkc0TwPTb5JNCkAi+5Y8WSjcjjDWnkOIL2wNpUcV13CZto/qOXRm0nqGz7tPy KJEebetoFzGPCWAi43zBJPWh3lU6UkLAyBFZ6j4oxxM9R/f/XZ4XCVK2pzL/y7LQGFZvpR D/CrmLT9KZ1KsmxXyRJ2t1g6Nt6RO09HBhWhLe5eSw/EkIsnwI9+bk4+c3v7X8vnF67GAZ x5aPFmOtLpYkgdaSPCL5jXIqRgeyslKNbDZfP9OeqYyBjk5QInrgyNovvVM3MvStCRC0Vf KMYutq9dcLsVOl/YKHQj65USZyVlLayx+Z5CvgQ+ECO90Jd7U6/TgSqqZrFbLu3cB39ndQ uWN+CX7tAeFgFapYKKYoGHb8QyK+5VbnCb3J1/DnlUAdrjsE22npxMMBlj4hxfc0mEa2jH Scv4dg+wSRORVy/gw7xCQFDaP4cepXQ+r2lJSaVm+Te41finFYW5xCl/1RoABDMjUy8mkR olODTuBT9a3NYwJ7Up7qxU4XE3+vWFd4EDm1jo3lW6pwkK4w9qkeJriaExiHLh0y3V0ugl dUDUMAJRbRiY28p4aTU9zZ4aS+6n4jos1DAZWBWoW8SU0mQU6oAoobSNS1NxFdP/83YeTN Z/X6CNNE9Yo5l4bcdDGJuBrXnlXIRq/NN75m3rX0aE6ncS/Z7dDEnBiI2Jnw X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 Aug 2026 21:24:00 -0400 (EDT) From: Juanlu Herrero To: netdev@vger.kernel.org, dw@davidwei.uk Cc: io-uring@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kuba@kernel.org, asml.silence@gmail.com, pabeni@redhat.com, shuah@kernel.org, Juanlu Herrero Subject: [PATCH net-next v5 6/6] selftests: net: add rss_multiqueue test variant to iou-zcrx Date: Thu, 13 Aug 2026 20:23:48 -0500 Message-ID: <20260814012348.46958-7-juanlu@fastmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260814012348.46958-1-juanlu@fastmail.com> References: <20260814012348.46958-1-juanlu@fastmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a rss_multiqueue Python test variant that exercises multi-queue zero-copy receive on a single listening socket. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Juanlu Herrero Reviewed-by: David Wei --- .../selftests/drivers/net/hw/iou-zcrx.py | 50 ++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py b/tools/tes= ting/selftests/drivers/net/hw/iou-zcrx.py index b7a225fe4beae..c833535d8a03c 100755 --- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py +++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py @@ -30,6 +30,13 @@ def create_rss_ctx(cfg): return int(values) =20 =20 +def create_rss_ctx_multi(cfg, start, count): + """Create an RSS context spanning count queues from start, return its = ID.""" + output =3D ethtool(f"-X {cfg.ifname} context new start {start} equal {= count}").stdout + values =3D re.search(r'New RSS context is (\d+)', output).group(1) + return int(values) + + def set_flow_rule(cfg): output =3D ethtool(f"-N {cfg.ifname} flow-type tcp6 dst-port {cfg.port= } action {cfg.target}").stdout values =3D re.search(r'ID (\d+)', output).group(1) @@ -127,17 +134,56 @@ def _require_ntuple(cfg): defer(ethtool, f"-K {cfg.ifname} ntuple-filters off") =20 =20 +def rss_multiqueue(cfg): + """Steer the test flow to a multi-queue RSS context for multi-thread z= crx.""" + channels =3D cfg.ethnl.channels_get({'header': {'dev-index': cfg.ifind= ex}}) + channels =3D channels['combined-count'] + if channels < 3: + raise KsftSkipEx('Test requires NETIF with at least 3 combined cha= nnels') + + rings =3D cfg.ethnl.rings_get({'header': {'dev-index': cfg.ifindex}}) + rx_rings =3D rings['rx'] + hds_thresh =3D rings.get('hds-thresh', 0) + + cfg.ethnl.rings_set({'header': {'dev-index': cfg.ifindex}, + 'tcp-data-split': 'enabled', + 'hds-thresh': 0, + 'rx': 64}) + defer(cfg.ethnl.rings_set, {'header': {'dev-index': cfg.ifindex}, + 'tcp-data-split': 'unknown', + 'hds-thresh': hds_thresh, + 'rx': rx_rings}) + defer(mp_clear_wait, cfg) + + cfg.num_threads =3D 2 + cfg.target =3D channels - cfg.num_threads + ethtool(f"-X {cfg.ifname} equal {cfg.target}") + defer(ethtool, f"-X {cfg.ifname} default") + + rss_ctx_id =3D create_rss_ctx_multi(cfg, cfg.target, cfg.num_threads) + defer(ethtool, f"-X {cfg.ifname} delete context {rss_ctx_id}") + + flow_rule_id =3D set_flow_rule_rss(cfg, rss_ctx_id) + defer(ethtool, f"-N {cfg.ifname} delete {flow_rule_id}") + + @ksft_variants([ KsftNamedVariant("single", single), KsftNamedVariant("rss", rss), + KsftNamedVariant("rss_multiqueue", rss_multiqueue), ]) def test_zcrx(cfg, setup) -> None: cfg.require_ipver('6') _require_ntuple(cfg) =20 + cfg.num_threads =3D 1 + setup(cfg) - rx_cmd =3D f"{cfg.bin_local} -s -p {cfg.port} -i {cfg.ifname} -q {cfg.= target}" - tx_cmd =3D f"{cfg.bin_remote} -c -h {cfg.addr_v['6']} -p {cfg.port} -l= 12840" + + rx_cmd =3D (f"{cfg.bin_local} -s -p {cfg.port} -i {cfg.ifname} " + f"-q {cfg.target} -t {cfg.num_threads}") + tx_cmd =3D (f"{cfg.bin_remote} -c -h {cfg.addr_v['6']} -p {cfg.port} " + f"-l 12840 -t {cfg.num_threads}") with bkg(rx_cmd, exit_wait=3DTrue): wait_port_listen(cfg.port, proto=3D"tcp") cmd(tx_cmd, host=3Dcfg.remote) --=20 2.53.0-Meta