From nobody Sat Sep 26 14:40:04 2026 Received: from fout-a2-smtp.messagingengine.com (fout-a2-smtp.messagingengine.com [103.168.172.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 04DA73B7759; Mon, 31 Aug 2026 17:35:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197710; cv=none; b=d9sOjUj/ZUmuuhRmjxP+x7byEMqJuOywJIejnFIb47ay+GF4ApqLxhXs8vLE84idusQ2dJU12yaxoN99+SXBbGnjcnqQGX6kaztEBEYXBQGZcfYgYYY2h5olrEthxwBRc6opYdAEzsOsWhFaPhqfJd0Ly3U3ETdjd+ug80cAJKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197710; c=relaxed/simple; bh=2H4gOkjbkosuL2QTSh2px1EMOkBL4zBojeBjpxfKbQg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HKRQeEFmtsDMQay/RAmr7ZFwG7nIwZdYKQSMzjAJKBkcyoEuVxDoz5GKGUGITkEEf8taU2XZ/+Shq3yPpMHrNZe5GiXBHBMCj/5sooeriGWVRZNE+S+EZdYt2Ko2Wxtc9yohMZjXluT/yT30KYERVQXeJ917C0iG/yn7jP1xLQQ= 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=CxkRm/sj; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=TffAw8jC; arc=none smtp.client-ip=103.168.172.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="CxkRm/sj"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="TffAw8jC" Received: from phl-compute-01.internal (phl-compute-01.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id 0888BEC0207; Mon, 31 Aug 2026 13:35:08 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Mon, 31 Aug 2026 13:35:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type: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=1788197708; x=1788284108; bh=8FtdEuSSYu8b/97OkZPFPpyvwZMNqivkR7IA8HKt3VE=; b= CxkRm/sj2cjAM0hZ241h49ZQFJqCBFCFzPpLXHua8BZpE8zRRzzw5oWgTfJsf08v hBU3wiekllzbwa0oz1spUJNUehA0psgmqFwc05/4f9nRnVa9kXvzelZKG40uxwvR GzgOLCvu4XW6PEQdhaRKtXiLZ61LnIZ4k/2H9vfaM01pZ+o2fvBE4u0FYgE7YJ7Y ZOC3EnsORmlej/h+rSyQpbFRoUIEkPG3q7Iu88nRPmIChKNvqfO8bBfu9GjY9P+Z KGQHz1p71FAI+fQjCQM7FZYotGB6SzmxgAk5JcNnKuGnOa1VSy27atLRfMG8iYWl vXWzde6P5u7GX0Hi1zAg4Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=1788197708; x= 1788284108; bh=8FtdEuSSYu8b/97OkZPFPpyvwZMNqivkR7IA8HKt3VE=; b=T ffAw8jCv0ES/9Z134kUyyCFcN8LO+tPpXdTs7n49QjGlWYYt+wglPHOaj7B+BCTy A1grVUD+iHFP30kwJUtVjHwCg1366f3EDQCW8O3flQnKsq+NAvP3BbHaBNRrssAG j3+9rSKPlv1tfi5FYpI8l2kFv7+SvUcK8f922TOva2lkk+iF6xfTjvatkqaAUVfv h/WgcQJ2Afh2rr8qyB1m0XVsclKR0+aXIdPTklDsBrF2p5YFUOwADuoRrwj+FJE1 jCekiOSAGPoudPx9Qp0D5SWkMxRWymIoTj9Xq73H3l+wkfQShEE72e7AJIObsbKm JaFpkCVA6lFEOt5GiIITA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTF6JiRdfk5Vs3phyclJ7AyUnOw1eG5omI5b6IFtHmdMG1Lppg8fUif7VfKKU3b6EJ RBQvPQj6dVCJiEi5e+7Y3+kf8PG/Ge5w4TzaXZZ7j3sTkSkMwX4Mi+MkjA0yTzQsSv7usH 00naaOBrgEdSne1kiz+bIxzSnoR/CSvQ0vMfe1Kjg/eHzpDhX2WM56g/1khOZ1TxFjNTNE 9tDn1+PQ5yGMB+HjfDSkKDiUv+BDB6Z7IT1pYyJBpAMs+BnD/He17cBJuXR66FgqKrkqHU Ytvp0Z86JKudXFPmiy+Ok/IProGM+X4xLlD7XvjGiC7GqHdfdQ3Y+1rrG51Zu4Reqb29Nl Atc0gnHTouGJrHZyf6uHwv5jSx2zwc8mTOwngelw2YYRxBBqBWEKz2Cr6yRJFqzNN/lquI +uqVJPecXkbvq2M0u5cijqsh6m1+LYKTvFNXEYY5mxcBEK1FTOIF4DZkOUvpsHE3vVRpkv qB7gHe/v+EJ81/oHlaI0BnQuZowimB26w9YbFGblC15IiJn/ik51L1WRppTjZGxlapdOQs 3gHXxxYx+9I62TgnOhmVGGDVxXAqSzhHXEOMifV73p6HtIrvdEsyt+jWWA0DGyjzmrONlD BTLZ35MZv5GtuQoS7NegVrvW35wYPZaUAzOWpIEDpSmVWdaCDnnNuSB8kgtQ X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 31 Aug 2026 13:35:07 -0400 (EDT) From: Juanlu Herrero Date: Mon, 31 Aug 2026 12:34:37 -0500 Subject: [PATCH net-next v6 1/6] selftests: net: fix get_refill_ring_size() to use its local variable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-iou-zcrx-v6-1-02d1d012f0fd@fastmail.com> References: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> In-Reply-To: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> To: dw@davidwei.uk, netdev@vger.kernel.org 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@fastmail.com X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1129; i=juanlu@fastmail.com; h=from:subject:message-id; bh=2H4gOkjbkosuL2QTSh2px1EMOkBL4zBojeBjpxfKbQg=; b=owGbwMvMwCWW/91SPSt7w03G02pJDFlTd3uut5SaWiZrtS9qy+4M/drFJ+NSJ9zuXbNg95MzS 71sTcLedExkYRDjYrAUU2TxeCnSojG1ovGuaoQgzBxWJpAh0iINDEDAwsCXm5hXaqRjpGeqbahn aKRjoGPMwMUpAFNd5MfI8Kti7cQsiWVJrU9urf395XXVkh35P7ucXett9U4U37gx7x0jw2LNFW5 3uEV9PWZ7G9d4iWcem8yg+Che/Ag3O1+Aq7MhKwA= X-Developer-Key: i=juanlu@fastmail.com; a=openpgp; fpr=48E9148428957881DD2558116FF739276A6BB0D9 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 Reviewed-by: David Wei --- 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 f6a8fc5fac24..df6b62204343 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.50.1 From nobody Sat Sep 26 14:40:04 2026 Received: from fhigh-a8-smtp.messagingengine.com (fhigh-a8-smtp.messagingengine.com [103.168.172.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 BD95114A60F; Mon, 31 Aug 2026 17:35:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197711; cv=none; b=n289AzG/LOW5mXE6Dormgp6z8/zVkN8gd3vMOXVzgMCjVVw9UbsY5W+uwEk2IonZci+iO3NfMPjJ7vRIE2kBn1H/EyDr8Wdl6nq/8MfwDVZpWE7fqwa7/YxK93uWXP1q4Dx/lr8NZgmFAajBcMjSiw0DxZbF7c1SgZCyW7jJ5Lk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197711; c=relaxed/simple; bh=DEZX7yB5hvGm3kzuhsLGPVm3T+hGf3MNeV/sibLg9bo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D+TOgk2C2d76/XtEF61OgRYn/B8jzg6YiieAhq7vb8wpDc1WviklEx9i9RNC7Ba+TiPhYDkpLBUkkHvoseCgZvujm1SDxAW7PDj9ST/KmClDAvLT2CYQ011+8QzXwrdI9fKlJzNnI3uZ/BXACar0rsyJMZs7Rfw78eRa51FrdaM= 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=eoSdoh1k; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=N5vKKoGk; arc=none smtp.client-ip=103.168.172.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="eoSdoh1k"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="N5vKKoGk" Received: from phl-compute-01.internal (phl-compute-01.internal [10.202.2.41]) by mailfhigh.phl.internal (Postfix) with ESMTP id B12731400139; Mon, 31 Aug 2026 13:35:08 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Mon, 31 Aug 2026 13:35:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type: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=1788197708; x=1788284108; bh=yqUaOTYpRUdIsvweYNWO62QWWSoFqMe5Y9Qks7f38qE=; b= eoSdoh1k9Kc2BbJ6iPyadr0BwNqU4Ecu2eWCv3jOd522Y0QV7tY15xR+wyx9GB1V nzsnfaym8KmZInbD+CrwcwfE9Pnk6nnpK/L3GTHQtrGNfia2gABa5rdSDdmxb70h YDlteW5O+nPEQ8aCgj++5UNnSwuPlYooDD9Zqg+loFwUPCf+f8TCMsXJQ6217YKn V6fkQ3CiA3TWTBvu7hMWKhApFyCGgIzInAsipohQZSzdBPemw0MYpYXySg2FFgg3 OCwyT74I16u4cdu0TEn8Zf2gNSYz+Ua4+phFRsTMuUiG0nyVi1WF8OMisUOLoA2z T49L/lTr4Zh79ISU0HZXzA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=1788197708; x= 1788284108; bh=yqUaOTYpRUdIsvweYNWO62QWWSoFqMe5Y9Qks7f38qE=; b=N 5vKKoGk4DQK9TuZC+i6bCRkuC56JAL90D4N+AhNTcibmhZ67cLjOZCwcx68bhAmQ a33XmsRkodoJVYhVJfMLQ4GgTqsB2iYlAqEzLf8+iQV9y1q2OMNEPQsUBpaPhtFz sM/TUrJyOr6nOhTT6m30O7ilAnaoipUVOdOkMiordV2sTuECmMJOYOHBQhb9c5jg UVWL+H++RceiIbTxE89E+JUBBN70+TZHqPZy9tIYHWRtfYG5QWdHWX2VQJiBAFdM 1adwmOIQg3z5VbjGspKpo8SHTntMqKT0JidQkM9yAcoBA0pJ7PUG0BMOkRWVOSnp VGrX7XLe4lg0RpAh64tZg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTFQfMUdzUqlU7171HqI99VjJPU5FWwAC39cIHa+QBRk2qkpcvNu0Xq8Nu1CLp5rar 4om29N8rUgMPiaAn55b8wqeIgro45ez1ZeVzuUsypZKgI0z9z5C461P46dk5i9RGPeQVNC 5RO0bU8H278ckzq46JJl1odmm5FqcexfFKmzXDdkifmOGP5Oo/W4ocXGHy/L1Z77KjLCdn 3qtoXY0WC3rL9boZM+ekfmscjsxsGZBLz7uQLmXj6cYKr/YOZPdTCosXgag7Oq1y5LvV+v qDfkPmF7m3lAbzyqBNhHaFq4fvSu9gWex5tcetw20poYRNMhykcFTbWATYMfODj+DM7IVi vp8OFkyqr/kUHbQ8DcbShgeXTGM36limqAfoYr+uUdxkTii4AnzX6iwzSO0hvvGNtrHN8M xCyp72m1MFH9RfHDhrkxmDzCANkFOConY2svGnlRyBQHCxV0ryTXWwEwLCtnmBCSdXXlTB Cj+pUGdhKV0qtsMTeh6uPnPimQg616bgHqnKxVLGgJzv56GItaqZ3Ti11S6VI80OwemhLe /TyzoFG0mUw/3AD1tdZ7BxuZUu533d8YvM+WEOvAvW0EqodVgXg9A6ScYYtnuEw9wqw9W6 T3Uf2Co0qTeIOvz08YwIMVg5l4P9iaHBuT0LjBPtxrW4hzMfS7KXFTmSh+FA X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 31 Aug 2026 13:35:08 -0400 (EDT) From: Juanlu Herrero Date: Mon, 31 Aug 2026 12:34:38 -0500 Subject: [PATCH net-next v6 2/6] selftests: net: remove unused variable in process_recvzc() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-iou-zcrx-v6-2-02d1d012f0fd@fastmail.com> References: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> In-Reply-To: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> To: dw@davidwei.uk, netdev@vger.kernel.org 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@fastmail.com X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=901; i=juanlu@fastmail.com; h=from:subject:message-id; bh=DEZX7yB5hvGm3kzuhsLGPVm3T+hGf3MNeV/sibLg9bo=; b=owGbwMvMwCWW/91SPSt7w03G02pJDFlTd3tesv9ynEOMdW1yR8UHKf+0BOWyGTb5X3SzFu/ba 7xyaX5Nx0QWBjEuBksxRRaPlyItGlMrGu+qRgjCzGFlAhkiLdLAAAQsDHy5iXmlRjpGeqbahnqG RjoGOsYMXJwCMNXLDjH8zzPUqbeUDbPskhOR1fSMOip7TOUHn6ftsxPGszfUvZOSZmR41fJ//no XkbPV/46c3uzKoB/3+1LAyuVquudul0y8UKrNAQA= X-Developer-Key: i=juanlu@fastmail.com; a=openpgp; fpr=48E9148428957881DD2558116FF739276A6BB0D9 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 Reviewed-by: David Wei --- 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 df6b62204343..c6dbd0ad5368 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.50.1 From nobody Sat Sep 26 14:40:04 2026 Received: from fhigh-a8-smtp.messagingengine.com (fhigh-a8-smtp.messagingengine.com [103.168.172.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 548343B83E1; Mon, 31 Aug 2026 17:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197712; cv=none; b=DFZhV4r3z1jbsyuRwH1T1hZ1RG+C4yfAj020jgvkA1T5TIbpwiOXXuG+b1EQT7fQE6LfLXc+z5/qOI/UWpEHUW/q5javb1r7O8R1CL0MZnqhnuuiMFNXNK6mZtfPRbc/6FJuWkx8eipZavo/CFHjApM7xWGISkSuIwhTTjKDMxY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197712; c=relaxed/simple; bh=V5x5X2nHvvvZQCsSoOWemQ5m72sWuJ8qNxbbVbklroY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=t/14/ZAdcy52HUu2dX8JPM59LRClmwqVHbv/wlpwDBILPF6UQZdJlKGcE7S8wRJqNz+qdOaejyXw7b0uQ41X1gb80tiM/P0elLXjF9Jp6xy1rx9fnXKtybGPjeHiDyt5tgi82YWAj5rP1n40XQE9lziDccJUaobLRzVwE1J6AA0= 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=YMBFmqFk; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=M9PMylyR; arc=none smtp.client-ip=103.168.172.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="YMBFmqFk"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="M9PMylyR" Received: from phl-compute-03.internal (phl-compute-03.internal [10.202.2.43]) by mailfhigh.phl.internal (Postfix) with ESMTP id 8A15A1400141; Mon, 31 Aug 2026 13:35:09 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Mon, 31 Aug 2026 13:35:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type: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=1788197709; x=1788284109; bh=Tny55NvM/7lMtt+PbOywShwYrqDkMtQcT8Jq6pCvGAE=; b= YMBFmqFkklfHWqhSfkt5Fwegx0SDjgXkCcsw3v4bflVe/H3l0JzRqfxbHAlJs+jR l3Zf/LGJLGTM4e4rDbjKLFGl190Zq/+SWe+fpeq0fpa4AVqx0woafL9cKjuM0Ptp ufAibDzVNAneyOnfWwulmiWwxuSdDQx1Ptr8AnM9LCpXxBnCvdlyvYQbMdpWenXj DYJte31M2RdObKj+sJwwgF+iA2l9rObZP2QUT47nDuR2gfC0NZEXd9BLRLj7qrpH sgwr1RDsIaa5PQbYp2gCkomIrYa9vrKehs0mHKgceJe4Yo5KatjFUhyXOUIHEmQy 9GARnApALeEsRvyZnkNVzw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=1788197709; x= 1788284109; bh=Tny55NvM/7lMtt+PbOywShwYrqDkMtQcT8Jq6pCvGAE=; b=M 9PMylyRC0b48CdN+V3zVjOSM4inOP16urV1azUP4o/lccLAVVYjAuNnHL0kcUy8u QUzZgnN5As9Vy8UDHVcRUinqUMShRvAggu8BZvv9emkA3Do74OK2ype4ntFj3Uch WSD5wba3Jv2K+ZOHZ5cqR87HbIUZGTPwtukuaH97jqLebIjm4hzUXYXCu+owaifC EVkb26KcQYpMsSW/8w49jcTeDMeBGSDdg7LC6pEMi26QOE69tv43VbwD8DK6FQrN StWuTksQ22W31XMbhPk09e4bHO0dAfJmyHnmK5Zn3ASHRmnwnJwn6EfoskxKmNpK fepGz2ZAjio3gTyy3hkYA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTEp27eOetQrqTmJC5SHiFfUBMTmNliYS5usWCzbYkapLLUT52hl/N0MEbDKvhqySC qb98TYqpPMc1L/YY7qg+ez+FKPHclEYBCAPi4LkD2FgZwMQJ1vvcuEdHHSMyatCrytrnqZ qqnvWMlkn2zCaM/cdj3BkyqZs/wgMZ4RfB7zCw8rNpd620DMYF/hW05Abczi/uQaSelA5p pL/P6TP9nSvEgS7w6mv0XtKLh1EQFIiqynWSHx/A0q+tznPq8O/R7BfF9kUkpjnhmD1Rp+ Laxp4qnByQrRpHvji8O28xVYzSgBWD42NVZH+GTr4mQD/t4TfIFYfV2f1E2ZJLdo2aR7b2 GZ1s32XryOW0UATzYmS3V52orI2Z/MgHaxej2I4gYCVu+0qBk9uYBVeTrJqmmTQsvDFh19 LFJU/zJU+c9LaEPQE3aYtsNKqSAP5X3o60rfzaW9i3Ib/r77M+x23MmGLzH2+BCTO0b8Vr voCeJVGD4peZ4cLQ/o801ONaCGHBTK9/4CilNOHKTmc9/h+uho/TL1V8/y05olhl1hZdlp TDHvOtZnNX8KHnJ79PGZKgriZxhF3a4U3WrJ8HzozD6ODWN3oxmxFoRWY9cJol6Ccxn+3s 2BLsXkCoUxNsyhySge5i3d4yLvh2byYkw75Lu9ET4jM0mEYJUSLUeqtal9Sw X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 31 Aug 2026 13:35:08 -0400 (EDT) From: Juanlu Herrero Date: Mon, 31 Aug 2026 12:34:39 -0500 Subject: [PATCH net-next v6 3/6] selftests: net: refactor server state into struct thread_ctx Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-iou-zcrx-v6-3-02d1d012f0fd@fastmail.com> References: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> In-Reply-To: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> To: dw@davidwei.uk, netdev@vger.kernel.org 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@fastmail.com X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=10208; i=juanlu@fastmail.com; h=from:subject:message-id; bh=V5x5X2nHvvvZQCsSoOWemQ5m72sWuJ8qNxbbVbklroY=; b=owGbwMvMwCWW/91SPSt7w03G02pJDFlTd3vmJt4OU9Suf722q31L78yFFyrTTa+/d96qcutb/ W7J781fOyayMIhxMViKKbJ4vBRp0Zha0XhXNUIQZg4rE8gQaZEGBiBgYeDLTcwrNdIx0jPVNtQz NNIx0DFm4OIUgKluEGT479s3p+TAVU/jhQ9XVZrplLzTrX2nl2LzSyTBVdXNZfm5XYwMU6JFIj0 +mqkZOS1e3Cy9ct1HZnPJN6urj7TWNdz9eoyTFQA= X-Developer-Key: i=juanlu@fastmail.com; a=openpgp; fpr=48E9148428957881DD2558116FF739276A6BB0D9 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 Reviewed-by: David Wei Signed-off-by: Juanlu Herrero --- tools/testing/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 c6dbd0ad5368..9b62fd0703e6 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.50.1 From nobody Sat Sep 26 14:40:04 2026 Received: from fhigh-a8-smtp.messagingengine.com (fhigh-a8-smtp.messagingengine.com [103.168.172.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 44C553B9D81; Mon, 31 Aug 2026 17:35:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197713; cv=none; b=a/EnkDvE15e5XN50ZokMrFge0yZp6dEfLf9zRNYqJpji+t6TzU7dYZ+APSodEpEpnZuWVx7m/Uj8Nn6sVWb9aMMCYbbivGkN8uJBWJIgmYN6S2dMvGTQ4o65qGHSqhTVsq0l8Bo7Ab+XjQGDeSTuJo+Li+Uew3ER3t1o/GZAS4g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197713; c=relaxed/simple; bh=+cZeEo+a0++I1r0xjOE4IQlexdTAzk6BpO64xwnD9Oo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dRgjjIKUp9ipYvjjsJuHl8CBgThcDIctGrFwbS1mmrlZDj5Xxh7uy9HT/elzQnjFsJx4lZZ8fcEeaF9Qh13He5m0GSAJeO5a/DzhEv+/V0qWIcZ49m6enyvxbq1YWaEb43ZfqhouWtMGCfPT9T8tePhvYoqC/4cnMuE2Y4PVR+E= 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=hbwEBcGr; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=LYbV3aXL; arc=none smtp.client-ip=103.168.172.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="hbwEBcGr"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="LYbV3aXL" Received: from phl-compute-11.internal (phl-compute-11.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id 6BCEB140015A; Mon, 31 Aug 2026 13:35:10 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Mon, 31 Aug 2026 13:35:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type: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=1788197710; x=1788284110; bh=Eoz5RTS9FtP/9zGLBVui0sj/D8MYQnKfLx8NTj9JzOc=; b= hbwEBcGruTFdD04FXX0c+0GvPwheet92R53ZguWaPeZuJye2VojKELWlT+CGqC2f rr/gmmEynNbBbFEqf/vGcJNQZg12fqMsdPqpLBqriNDF6jL4BGrzM18kwl6yeoOj qTy7L1UPykIso8LYnR4fqCFehYk4FshzBs/jvDGaTo3mc0gebUpRwfntH7yUs+Uo 1UKYWx8imDHUFGEFLgTh5R02sWkJcmFJbtJ3bwoMKJs8hmzl+K0kcEqJ8YWPT02Z vXf67UeI5LgJ6UvDoMRX2eNioZV+qa0RtsEybpcmUZ6Bxb0NJr/2EzRZKC2ME7a/ WwJmj3R9majjf6GSA9z9TA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=1788197710; x= 1788284110; bh=Eoz5RTS9FtP/9zGLBVui0sj/D8MYQnKfLx8NTj9JzOc=; b=L YbV3aXLO88mNwSpexB0zDYYOMF6KwPa2E0w8b2Kpvn3rERERx/mNqR3c+k1s+JGW bqAwCdRiM6g3dvVTuYBj1fDuFkjLQxBZqmJamv3GEn3+7OBmvfQB7NDdCJz8TsLN 7THp4pYUFuPz2bszhMEgE9Nn/v/a6V/v4RmPE0RalkP+PnyzX/0FDv58km+FF16r tD5+hl8xB+0Y/S42/oWwL0vRdy2oWxMaVM1Sm3R9Yp1OxdUxyBH6LdLqVVxn+3xC sxrtQRoGeJmOAKtqKrXsH2a188KALhM/ZcZpsTmjpE57QSLZsmyYDF1Y4hyBPa9T 5SLk5IDJDpVFbKTtbxkDw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTF6JiRdfk5Vs3phyclJ7AyUnOw1eG5omI5b6IFtHmdMG1Lppg8fUif7VfKKU3b6EJ RBQvPQj6dVCJiEi5e+7Y3+kf8PG/Ge5w4TzaXZZ7j3sTkSkMwX4Mi+MkjA0yTzQsSv7usH 00naaOBrgEdSne1kiz+bIxzSnoR/CSvQ0vMfe1Kjg/eHzpDhX2WM56g/1khOZ1TxFjNTNE 9tDn1+PQ5yGMB+HjfDSkKDiUv+BDB6Z7IT1pYyJBpAMs+BnD/He17cBJuXR66FgqKrkqHU Ytvp0Z86JKudXFPmiy+Ok/IProGM+X4xLlD7XvjGiC7GqHdfdQ3Y+1rrG51Zu4Reqb29Bu SiaSZFMpNLIiYkvrGAB1Kc7+eikSe1b4x+tWtV3luTMSpDUNzo7lsrgJtm2xU1+b4asTSn zR1Hm7isf/1Sbbzd355wpmkkeg2M31+F1qV9U/0oWRhDDLbgwA8f5RQ4B71zgPTJlOHJhL pdJn3nrXH8XpyOF1mHsbB6NHsU/QL7jAxgjOSgHYusU/OMdmaKnqnVSIARhKwe6gSqu+on VriSQuVI2fPA05G6UTAFRidP+LMWMBzAJmWWF5oU/yMNFlKWIp1zTz3b3BZ3T+wU8EDs4m xX5usFPjb/QaO0rGW8PZargBINgsap5rVOQdabW7cEfadGB+i6XQJO92dRaA X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 31 Aug 2026 13:35:09 -0400 (EDT) From: Juanlu Herrero Date: Mon, 31 Aug 2026 12:34:40 -0500 Subject: [PATCH net-next v6 4/6] selftests: net: add multithread client support to iou-zcrx Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-iou-zcrx-v6-4-02d1d012f0fd@fastmail.com> References: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> In-Reply-To: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> To: dw@davidwei.uk, netdev@vger.kernel.org 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@fastmail.com X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3455; i=juanlu@fastmail.com; h=from:subject:message-id; bh=+cZeEo+a0++I1r0xjOE4IQlexdTAzk6BpO64xwnD9Oo=; b=owGbwMvMwCWW/91SPSt7w03G02pJDFlTd3v6zuXvNW0vmDehtHaC1r6nbi9kZ67U0uG9n3fne V2JSIBGx0QWBjEuBksxRRaPlyItGlMrGu+qRgjCzGFlAhkiLdLAAAQsDHy5iXmlRjpGeqbahnqG RjoGOsYMXJwCMNX7kxn+V5Uct7zpk+63402+6hLP/ossjgVx5/hWvbNPK5rK3a2xk5HhSGzeiRk rtW/llfSXRD7llFVrmRa4der33EvV3No+s1/wAwA= X-Developer-Key: i=juanlu@fastmail.com; a=openpgp; fpr=48E9148428957881DD2558116FF739276A6BB0D9 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 Reviewed-by: David Wei Signed-off-by: Juanlu Herrero --- tools/testing/selftests/drivers/net/hw/Makefile | 2 +- tools/testing/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 78bb0169350b..37023ba580de 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 9b62fd0703e6..f793a6c04e41 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.50.1 From nobody Sat Sep 26 14:40:04 2026 Received: from fout-a2-smtp.messagingengine.com (fout-a2-smtp.messagingengine.com [103.168.172.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 3054A3BE631; Mon, 31 Aug 2026 17:35:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197714; cv=none; b=R83dfVsyUw2GvBlhZC18eGLbjOrIdI9Ni3719RtJfHy37YwPGdR/wAGH5uxh032/h9ewB7s26eefALIBzON0AHfqJTQw45wgKR3X6wl5gcyIaCoC0/ae6jxVepFqvrsoIDdd6+m35nBnuQLBxWSKMVLgp7Pn8KkJTHcyH+mwZSw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197714; c=relaxed/simple; bh=xLCE8Kuj9dovNKPEMSHmEarO76mTLGB0Dpq5UhMAiq8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VkUmRsBBi3f7XfSzJIj/IP+RfxbZcQraEkWgke9E8qKIcHCL5+NPzt7uMRfapKqM7iuFzgJkk/G3/kAuVIBYVHZrVxXmJxFu5bjYkh8RNyCLgtheZ/5/nM5hZmN1Fsa/pPbBNyJbehnP/WMvIJhiRJ+mzE6oyL/bOlhK9Ww2Z6s= 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=HZuLRu4Z; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=i9WZMOKG; arc=none smtp.client-ip=103.168.172.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="HZuLRu4Z"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="i9WZMOKG" Received: from phl-compute-03.internal (phl-compute-03.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id 41F9AEC020E; Mon, 31 Aug 2026 13:35:11 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Mon, 31 Aug 2026 13:35:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type: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=1788197711; x=1788284111; bh=eaNL8hyaxT1y3CjXq3GhutXkgbRGGEaFe4AygAITepg=; b= HZuLRu4ZuwDASuFqF/WDz5sNSmTKH720dCd00P1TuXcLkF4He7rxadrGkGBTn8SD Bsmo4HphxHLze3z7AADhPUK+PD38YIR4Yqw1ooJHewzhlIxXGYL8XOnX0IJzmU4X ox6Wc2Z0Gymic4wM965tQ85SLYv6hhTaONZtMAdAWyOCjlXZYPz4YVO/BeGH8hIT j5DhhYkDmXcuoXJ8m8uaGPYw7jN72shxr6raHdC7UVV4Wp8UWRJOMQoSTYhHq0K9 18hX3iBnDy+tX9+DyIj9JDacEJ+e7olz/p2255hvDzCp95Zxq0WQxJRWeuTemW8r hFNw+s1ioYaT/A0z3C5SKA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=1788197711; x= 1788284111; bh=eaNL8hyaxT1y3CjXq3GhutXkgbRGGEaFe4AygAITepg=; b=i 9WZMOKGGswJnAHUk6cI1lgZTpKjHLaMbO8MN16CBlMKE6BJAHnEtBJh5ed/KMoI5 ioF5Ds/zyppni1+nFfeajAgApkImbiZCTOJGBdrwNFNq6luj2zSMzy4J21QPPsgQ A7PFHjbeWkH3V8LsH/ffvy4fNi8/qTcq5Vy6sR0Yr8NzkjXhdiKvjRzpcqH6QYfI B/55YZya1jkrAnLM8dsQpRbJsT5K6AYrPRyXUuJMm+w41eAhVzoF7jnmbBPWZYqD tu9xN9mg2+pqpmrBkqxOlzJ6MXyl+ltYLw5HKSnEpCBKq0demO2ChaAyFq3cjJvl gtl17+Wy7wkw8KSRZQjKA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTEp27eOetQrqTmJC5SHiFfUBMTmNliYS5usWCzbYkapLLUT52hl/N0MEbDKvhqySC qb98TYqpPMc1L/YY7qg+ez+FKPHclEYBCAPi4LkD2FgZwMQJ1vvcuEdHHSMyatCrytrnqZ qqnvWMlkn2zCaM/cdj3BkyqZs/wgMZ4RfB7zCw8rNpd620DMYF/hW05Abczi/uQaSelA5p pL/P6TP9nSvEgS7w6mv0XtKLh1EQFIiqynWSHx/A0q+tznPq8O/R7BfF9kUkpjnhmD1Rp+ Laxp4qnByQrRpHvji8O28xVYzSgBWD42NVZH+GTr4mQD/t4TfIFYfV2f1E2ZJLdo2aR7UH IdbLp8QZDsPNmPTep301jIgASfjDNe4iDdh66z4ZZMvtwustYFDEbHyiBjl+QNRhhFT6L7 Ik14mfRdF2Mgp9DD8mT+ZeBiSo9/vXCme+qkyj1ENntifuy+LaOZiO9avjculq/kDz4kdj zagSia/gPsXP9qoeFz5ye4UActgDa+V8063kcc59lj7Hl31uyn2PndyqJKxy/wBFtsgGtO g96suIK4U06++yEoreanSV9mgXoMgYQkKhqf9FmoZfhK0Sk7x9OEup5Y8hfjEAVrv/ypGg W+EfPNp51cX/n9kDW6RSt4mEmpGMRdL2weHZB2wDmIjbDo1ahvU9sPgsnvBg X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 31 Aug 2026 13:35:10 -0400 (EDT) From: Juanlu Herrero Date: Mon, 31 Aug 2026 12:34:41 -0500 Subject: [PATCH net-next v6 5/6] selftests: net: add multithread server support to iou-zcrx Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-iou-zcrx-v6-5-02d1d012f0fd@fastmail.com> References: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> In-Reply-To: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> To: dw@davidwei.uk, netdev@vger.kernel.org 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@fastmail.com X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=12202; i=juanlu@fastmail.com; h=from:subject:message-id; bh=xLCE8Kuj9dovNKPEMSHmEarO76mTLGB0Dpq5UhMAiq8=; b=owGbwMvMwCWW/91SPSt7w03G02pJDFlTd3tpV/IGnN3uIHbxrEzO6orOdZsnz3i99u/lD1EPL jup3fXZ3DGRhUGMi8FSTJHF46VIi8bUisa7qhGCMHNYmUCGSIs0MAABCwNfbmJeqZGOkZ6ptqGe oZGOgY4xAxenAEy1hSDD//yHR08mv7+ezxx7Py/8PNs2g7PBWU0LH75LmmTrxRqWLs3wv0LP58d Bu1aV04cNdnF+/jL509P4PYxCGxc+FxFgmCjylgkA X-Developer-Key: i=juanlu@fastmail.com; a=openpgp; fpr=48E9148428957881DD2558116FF739276A6BB0D9 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 Reviewed-by: David Wei --- tools/testing/selftests/drivers/net/hw/Makefile | 5 +- tools/testing/selftests/drivers/net/hw/iou-zcrx.c | 263 ++++++++++++++++--= ---- 2 files changed, 196 insertions(+), 72 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/Makefile b/tools/testin= g/selftests/drivers/net/hw/Makefile index 37023ba580de..f613c88fffc5 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 f793a6c04e41..29905cb3b243 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,14 @@ 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]--; + return; } } 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 +296,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 +312,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 +444,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.50.1 From nobody Sat Sep 26 14:40:04 2026 Received: from fout-a2-smtp.messagingengine.com (fout-a2-smtp.messagingengine.com [103.168.172.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 E185D3B774A; Mon, 31 Aug 2026 17:35:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197714; cv=none; b=WHqebmYyJq+y/VTjLMxk8gB0H3QjNYolGc98nbiIjkyhXYLPGJWa91zh4wzWl4pBjnySRls4TVfAj64dVthnNjioOn5UZoNHGsBdwj335PyTZ4Mmp9WeL3eBrLsEcJsdBKluYtKBAuu/xDspvOVW8fecpfPvAq5dUcmbTLs8Ip4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788197714; c=relaxed/simple; bh=bb5BYgKa09OW6lhhuFRqBlw0NXbM/PKnsSXjhp92tdg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=I9CsYtwsw0W5UXgIl9T//pkYnGavGmvHIVoxkgA6q1yHmjWuDilgb7Yp33hBXgHZiwi5YzP7A8YKHc+hf0GBNzo+IEK+6lOcXrgdoSo5QsTtXBzDqDlflBgfT8Y0QV/7QzbgBxUP9dFl5kmc2jo3IDUR1wYnG+75DZ0DWd5UIaY= 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=LWi9udXJ; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Mffu6n0j; arc=none smtp.client-ip=103.168.172.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="LWi9udXJ"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Mffu6n0j" Received: from phl-compute-04.internal (phl-compute-04.internal [10.202.2.44]) by mailfout.phl.internal (Postfix) with ESMTP id 31249EC01CC; Mon, 31 Aug 2026 13:35:12 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Mon, 31 Aug 2026 13:35:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type: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=1788197712; x=1788284112; bh=zoVUj5F+8FVqGG22Q1uCXrQ58eGyDtPNSPzvgjqr55k=; b= LWi9udXJXaSTU3ohNbSk4edl781X7HKkql3D1KCSCxeUH0nxH9sxhVbjANpjJK52 U+LPzzqU5Li1vh7UHZFM9FH7YyQpN/wlamCEMktSB6eceDj25djOuA++gyEe8cSd VNoyj4PXsXxS57rMnnW+ru1kfs3+rlBrUHQakCr2DSl3xArQSdBGISljI75nxBpN 8B82DfXyM17ZcZJZuci1ZcAglPxW65xveRca2yw+sRC1aWsb1huepuBnUS68u0cx NZ7euiYcpCKSqRlOY86D3sdBEf06NTXH7h0t8cXCQEnUOpSpozrnN311uvs9mdm2 gmmj7ubAdRIOY/oR8L3Riw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=1788197712; x= 1788284112; bh=zoVUj5F+8FVqGG22Q1uCXrQ58eGyDtPNSPzvgjqr55k=; b=M ffu6n0jxdMzEyBaJU/h7AA+T4Gd5cHJ5oJ2/qDOGPrxp0epb5E9B0wW+8ML3BeYx 3VqD8ikvuGkKVOT3FUN6Pn+cZCz3tHoVTUO35eILJAT+7/KPRSr0M6KR11Yd8naP X3I5mxpnwNSBo6Nl5SyHihYPOTonsDtOnEXRsvtLQ2uNp7EdQeASEvSLF3aRvkLi ilD/vN8Wezov11HQYYOHwu81Y2UyBTgQdIvH6Rhth+aMCjx6ZGbKXwueErV17sZS uWtWLsstSn1FmGKRuFYsmGQMG9QVGGlsPlqf0UeVgzTKBN1efCceyFXZ11ldSYDW oG1NF6szDLDQ2pMqTf54A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTF6JiRdfk5Vs3phyclJ7AyUnOw1eG5omI5b6IFtHmdMG1Lppg8fUif7VfKKU3b6EJ RBQvPQj6dVCJiEi5e+7Y3+kf8PG/Ge5w4TzaXZZ7j3sTkSkMwX4Mi+MkjA0yTzQsSv7usH 00naaOBrgEdSne1kiz+bIxzSnoR/CSvQ0vMfe1Kjg/eHzpDhX2WM56g/1khOZ1TxFjNTNE 9tDn1+PQ5yGMB+HjfDSkKDiUv+BDB6Z7IT1pYyJBpAMs+BnD/He17cBJuXR66FgqKrkqHU Ytvp0Z86JKudXFPmiy+Ok/IProGM+X4xLlD7XvjGiC7GqHdfdQ3Y+1rrG51Zu4Reqb29D6 YhFYCFHGpXLFzKXci2uHF8CpA8AMuKtJcvFmZ9IEnAtXEXQwXNIHxl8Fs1G1WU4l8wrKJU smEI35lqNW6lBUXQSe4OL65QB+EWXO/gJehvoh6Araa0/ONmZean4DP79qWzqIML/yHJix ouGtg1uU9iblmbbo2n2R9QQgYNeVxGBt0vlgBKaDxu+w/KNqEnkMlc/HwrNCKPTRXk8PUw qcTBpcdvvPP5Le1F3m+UYqLU4/19ERZO8Hn59kmxtDpqTEp9VvZANcaAkNw2YNyYQz51sE lP/Pa+vMxyRcXEnN7lx7YUm2sLOhu8nFKUeXG5HZFeJEqkCTOhmQe3+T6psw X-ME-Proxy: Feedback-ID: i80b64ba7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 31 Aug 2026 13:35:11 -0400 (EDT) From: Juanlu Herrero Date: Mon, 31 Aug 2026 12:34:42 -0500 Subject: [PATCH net-next v6 6/6] selftests: net: add rss_multiqueue test variant to iou-zcrx Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260831-iou-zcrx-v6-6-02d1d012f0fd@fastmail.com> References: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> In-Reply-To: <20260831-iou-zcrx-v6-0-02d1d012f0fd@fastmail.com> To: dw@davidwei.uk, netdev@vger.kernel.org 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@fastmail.com X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3662; i=juanlu@fastmail.com; h=from:subject:message-id; bh=bb5BYgKa09OW6lhhuFRqBlw0NXbM/PKnsSXjhp92tdg=; b=owGbwMvMwCWW/91SPSt7w03G02pJDFlTd3utifjK8eXPlRNd1yLjQ/psj4vxno05fvmRnpNd7 37/4tCVHRNZGMS4GCzFFFk8Xoq0aEytaLyrGiEIM4eVCWSItEgDAxCwMPDlJuaVGukY6ZlqG+oZ GukY6BgzcHEKwFQrZTH8Zr+zacPyeEfefc8fZaixZHXMWSR4+krN3c9rJ1zS/vfcRZGR4Yby3O0 Nh+7Mm78tZT2f8WEGgdaNc1+rhFZOl46WEV/HzAcA X-Developer-Key: i=juanlu@fastmail.com; a=openpgp; fpr=48E9148428957881DD2558116FF739276A6BB0D9 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 Reviewed-by: David Wei Signed-off-by: Juanlu Herrero --- tools/testing/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 b7a225fe4bea..c833535d8a03 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.50.1