From patchwork Tue Feb 18 16:57:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Wei X-Patchwork-Id: 13980274 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B2B226FA59 for ; Tue, 18 Feb 2025 16:57:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739897842; cv=none; b=rq+qLZ+y08sT+UmZFryGDzemlIqqH6EfAYZG+rE5l9Xwd7Yt9RNINzb9gfqx+44zwKmGn0vyHmhV9kCgp4Nbi6vHqxeMRh6K22K+hYVcFYz390RHJCkWtYhuyWDnHYphGaXiM9miN3R10O/BS/BlPdM2gcSGoL+GgTprX61kqlE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739897842; c=relaxed/simple; bh=9Y7YJSRAQ7z5jg8snzZsmh2d/JVshhTsLe0Bym3i8GU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NRrCJKHMQwylC62tHOyIbXCdkSOy2Vn0sjzDSEt/W+rzWz7lDdoFLlzZeDIqHChZT8908DxUeD31YBSbvQXjbMz3SUenZ54lcy5cNb/AVu3+m4/wBniHm+YJli8oZST5FBcpiQvU9iNvJrhz/F4HDI0BrU5/XYz1URlV+QjKOak= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk; spf=none smtp.mailfrom=davidwei.uk; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b=BEVUy5jZ; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b="BEVUy5jZ" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2212a930001so62169125ad.0 for ; Tue, 18 Feb 2025 08:57:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidwei-uk.20230601.gappssmtp.com; s=20230601; t=1739897839; x=1740502639; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VQIadInEqZcmDRRaKuQ5fqFZ4vJm04VV/2ZJqNFL7Vo=; b=BEVUy5jZHlXSs0ip5v5dOJy1KNg6Hx4dTmJqzdCkvpXE6tcOYaQ/8Zv3IPawN4DXcP uNeokKuA6LVVjIdO7zg5Flbdh3666AbDfjkjzsBcIhUugqHp2pxjtLEnP0mJNAcqXcOP dEEWkCMcyqorUKG+idbmrrRcn6j0y3oZWtCYllL5ZCwmh+ZtfBsB9qZ44rYJ1C0wrxoy 2khx1a6wRWYjI5HCH2ItY91VaZggbzXDFmUcI0t/4j0qnqpyId1R7bRb7xmxHwTfajQh jnPwSzZAGmePS3e21s7VUTTAgGD1Y1M1pBce54l/fAAF855t+FbjMvbMviPft9ArCF0n bQDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739897839; x=1740502639; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VQIadInEqZcmDRRaKuQ5fqFZ4vJm04VV/2ZJqNFL7Vo=; b=ICnvCbAIG3mNFcT5Vb1H5bzb+Jp4vpzG7orwRhN1GHHtYq2F+VYLsNqDo42OwIfnkf 6yacPyoxAenZHqer97FVaHLCSRRkn8qIPpBZRxXZvIlx8QR4UzQQyw9zOTJoeHTYucvr 2LGQ6c/hABc/TSOoODgZDhrhEXxVMpK20YpfisUQV4254QcVMCa9ecmw6CQZohMV8pgl awBvX9NL4kZe6cM8mvSpSWTgx5Zejs6Y3ZFvgVCpJBhBNC0mF1dxCyCR7mTg39An7R5x 2gIW8klUC2g+uZdBjVJbAUWtZapv42sG9DeTc3Q+0VDq38uB53tumP5sIS/juRtv2RsF KbNg== X-Forwarded-Encrypted: i=1; AJvYcCV1KrZleyo3p7zc2wNsX2bB/E5FrzmsMJQkzf1XxD028l5CTrFt5FbAKSqcFuuJhGEMqAKhn0Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxU85ozJlCHujLaZK4wSqjacJdvwwHgPBWkot0xRf/+1bhxQL6H D29TFBqz2w+a2tD+BQV90CqwCbTp1HTmrgr+4/Qtbd2FybG4kgoTI4lVQGly425bxizcRailtsI / X-Gm-Gg: ASbGncuh/TQyX/5osbsr3uKUfdUQUZpq4ZLPaitWi3uSyqmA9T6wvOpPajqz8XvWHDp LayGUKxSGYDX5nBDiTX24ci+dWomtZ7QlNW734vZguazShUdz5p8mh//MLG5zXGeVx73bxXbChg PxCATPecWZQruVG6f/qKCzqnwHFbgpUr5BLYI+oPxLJwO9wkXd6nI9w3d33ec/mh/LBe2dO7TN4 brzaMwbS5PfQino+XTNXzxxxXQyjBAwOGQ8gRpQGqFEb/kGXIu7Ntgq72YVf51QTriPQdCGu2o= X-Google-Smtp-Source: AGHT+IGBkbI5mevWFMlzeDUaPRAhP14dnWLriFA5GQYH4C4r1VlgKI1PqcC5sOkO3Dse4e9RArHdrQ== X-Received: by 2002:a17:902:d542:b0:216:644f:bc0e with SMTP id d9443c01a7336-2210404f783mr288840545ad.24.1739897838571; Tue, 18 Feb 2025 08:57:18 -0800 (PST) Received: from localhost ([2a03:2880:ff:5::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d5349226sm91790055ad.24.2025.02.18.08.57.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 08:57:18 -0800 (PST) From: David Wei To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: Jens Axboe , Pavel Begunkov , Jakub Kicinski , Paolo Abeni , "David S. Miller" , Eric Dumazet , Simon Horman Subject: [PATCH v1 1/2] io_uring/zcrx: add single shot recvzc Date: Tue, 18 Feb 2025 08:57:13 -0800 Message-ID: <20250218165714.56427-2-dw@davidwei.uk> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250218165714.56427-1-dw@davidwei.uk> References: <20250218165714.56427-1-dw@davidwei.uk> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Currently only multishot recvzc requests are supported, but sometimes there is a need to do a single recv e.g. peeking at some data in the socket. Add single shot recvzc requests where IORING_RECV_MULTISHOT is _not_ set and the sqe->len field is set to the number of bytes to read N. There could be multiple completions containing data, like the multishot case, since N bytes could be split across multiple frags. This is followed by a final completion with res and cflags both set to 0 that indicate the completion of the request, or a -res that indicate an error. Signed-off-by: David Wei --- io_uring/net.c | 26 ++++++++++++++++++-------- io_uring/zcrx.c | 17 ++++++++++++++--- io_uring/zcrx.h | 2 +- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/io_uring/net.c b/io_uring/net.c index 000dc70d08d0..d3a9aaa52a13 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -94,6 +94,7 @@ struct io_recvzc { struct file *file; unsigned msg_flags; u16 flags; + u32 len; struct io_zcrx_ifq *ifq; }; @@ -1241,7 +1242,7 @@ int io_recvzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) unsigned ifq_idx; if (unlikely(sqe->file_index || sqe->addr2 || sqe->addr || - sqe->len || sqe->addr3)) + sqe->addr3)) return -EINVAL; ifq_idx = READ_ONCE(sqe->zcrx_ifq_idx); @@ -1250,6 +1251,9 @@ int io_recvzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) zc->ifq = req->ctx->ifq; if (!zc->ifq) return -EINVAL; + zc->len = READ_ONCE(sqe->len); + if (zc->len == UINT_MAX) + return -EINVAL; zc->flags = READ_ONCE(sqe->ioprio); zc->msg_flags = READ_ONCE(sqe->msg_flags); @@ -1257,12 +1261,14 @@ int io_recvzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return -EINVAL; if (zc->flags & ~(IORING_RECVSEND_POLL_FIRST | IORING_RECV_MULTISHOT)) return -EINVAL; - /* multishot required */ - if (!(zc->flags & IORING_RECV_MULTISHOT)) - return -EINVAL; - /* All data completions are posted as aux CQEs. */ - req->flags |= REQ_F_APOLL_MULTISHOT; - + if (zc->flags & IORING_RECV_MULTISHOT) { + if (zc->len) + return -EINVAL; + /* All data completions are posted as aux CQEs. */ + req->flags |= REQ_F_APOLL_MULTISHOT; + } + if (!zc->len) + zc->len = UINT_MAX; return 0; } @@ -1281,7 +1287,7 @@ int io_recvzc(struct io_kiocb *req, unsigned int issue_flags) return -ENOTSOCK; ret = io_zcrx_recv(req, zc->ifq, sock, zc->msg_flags | MSG_DONTWAIT, - issue_flags); + issue_flags, zc->len); if (unlikely(ret <= 0) && ret != -EAGAIN) { if (ret == -ERESTARTSYS) ret = -EINTR; @@ -1296,6 +1302,10 @@ int io_recvzc(struct io_kiocb *req, unsigned int issue_flags) return IOU_OK; } + if (zc->len != UINT_MAX) { + io_req_set_res(req, ret, 0); + return IOU_OK; + } if (issue_flags & IO_URING_F_MULTISHOT) return IOU_ISSUE_SKIP_COMPLETE; return -EAGAIN; diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index ea099f746599..834c887743c8 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -106,6 +106,7 @@ struct io_zcrx_args { struct io_zcrx_ifq *ifq; struct socket *sock; unsigned nr_skbs; + unsigned long len; }; static const struct memory_provider_ops io_uring_pp_zc_ops; @@ -826,6 +827,10 @@ io_zcrx_recv_skb(read_descriptor_t *desc, struct sk_buff *skb, int i, copy, end, off; int ret = 0; + if (args->len == 0) + return -EINTR; + len = (args->len != UINT_MAX) ? min_t(size_t, len, args->len) : len; + if (unlikely(args->nr_skbs++ > IO_SKBS_PER_CALL_LIMIT)) return -EAGAIN; @@ -920,17 +925,21 @@ io_zcrx_recv_skb(read_descriptor_t *desc, struct sk_buff *skb, out: if (offset == start_off) return ret; + args->len -= (offset - start_off); + if (args->len == 0) + desc->count = 0; return offset - start_off; } static int io_zcrx_tcp_recvmsg(struct io_kiocb *req, struct io_zcrx_ifq *ifq, struct sock *sk, int flags, - unsigned issue_flags) + unsigned issue_flags, unsigned long len) { struct io_zcrx_args args = { .req = req, .ifq = ifq, .sock = sk->sk_socket, + .len = len, }; read_descriptor_t rd_desc = { .count = 1, @@ -956,6 +965,8 @@ static int io_zcrx_tcp_recvmsg(struct io_kiocb *req, struct io_zcrx_ifq *ifq, ret = IOU_REQUEUE; } else if (sock_flag(sk, SOCK_DONE)) { /* Make it to retry until it finally gets 0. */ + if (len != UINT_MAX) + goto out; if (issue_flags & IO_URING_F_MULTISHOT) ret = IOU_REQUEUE; else @@ -968,7 +979,7 @@ static int io_zcrx_tcp_recvmsg(struct io_kiocb *req, struct io_zcrx_ifq *ifq, int io_zcrx_recv(struct io_kiocb *req, struct io_zcrx_ifq *ifq, struct socket *sock, unsigned int flags, - unsigned issue_flags) + unsigned issue_flags, unsigned long len) { struct sock *sk = sock->sk; const struct proto *prot = READ_ONCE(sk->sk_prot); @@ -977,7 +988,7 @@ int io_zcrx_recv(struct io_kiocb *req, struct io_zcrx_ifq *ifq, return -EPROTONOSUPPORT; sock_rps_record_flow(sk); - return io_zcrx_tcp_recvmsg(req, ifq, sk, flags, issue_flags); + return io_zcrx_tcp_recvmsg(req, ifq, sk, flags, issue_flags, len); } #include diff --git a/io_uring/zcrx.h b/io_uring/zcrx.h index a16bdd921f03..85da6a14543f 100644 --- a/io_uring/zcrx.h +++ b/io_uring/zcrx.h @@ -46,7 +46,7 @@ void io_unregister_zcrx_ifqs(struct io_ring_ctx *ctx); void io_shutdown_zcrx_ifqs(struct io_ring_ctx *ctx); int io_zcrx_recv(struct io_kiocb *req, struct io_zcrx_ifq *ifq, struct socket *sock, unsigned int flags, - unsigned issue_flags); + unsigned issue_flags, unsigned long len); #else static inline int io_register_zcrx_ifq(struct io_ring_ctx *ctx, struct io_uring_zcrx_ifq_reg __user *arg) From patchwork Tue Feb 18 16:57:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Wei X-Patchwork-Id: 13980275 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 66AC426FA6F for ; Tue, 18 Feb 2025 16:57:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739897842; cv=none; b=PFKKrGMVzbsq72OAdrsvW7RWhLfolfxefHQsQwK7WyotdYd5TVocqq0ge2LkWJ5ZDu/zUQDt8vmOoJGxVJ8qeRkZCT/AwXDyk0l3HhWz+Do+CKhO09pU4/B4yLgNn0IWwosrukgOdgVaQnrYE7r9ISIiE3HleRYJAm+hqedU1iE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739897842; c=relaxed/simple; bh=6PS//lO+rorS7RVWVpqSRGD/hz7YUE+g1sY+VjICbhQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UbJODcUFIEVhzn4STuBnaYYlRKYiv21/Uk9uOtlq249NxzH9bIpSVQvu3VC/xvfOt+r4962q2aonY+7jDh0kMA648pBVNUtCf3b9fZEbYY+RqM1pRwLMnI8+btkBtei88kctnAzrlU7vr0WMsekMO+PlCrxI9FsYypnyqbnemRs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk; spf=none smtp.mailfrom=davidwei.uk; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b=yq9aPGG4; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b="yq9aPGG4" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-220d132f16dso83176955ad.0 for ; Tue, 18 Feb 2025 08:57:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidwei-uk.20230601.gappssmtp.com; s=20230601; t=1739897839; x=1740502639; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NOCzxCVxAvNYsJunStzLE+uJyOxRfSh+zzOduGNwM6o=; b=yq9aPGG4SSI1l5G3+l1ot7mMDZrusf7OrhPjabP601YJBGJ9EzVgDSGjHeythqj3Ij fM3CZ8peSFVBX6lE5SWFhWWI3NNqqoP3WAWmzWjHpNxCVt9wHEt8QXoXG38ITi3hPn8S jxYhtuzWfLZKPbkKqgt+cv6c/u2ZugIMzeehD158ra/SZzeaYolU3ldVSnFlzdsBv6+p ZBJ3uU28dXikgDqR5OU8GpBHxkMPgRvVBnsZuqdMLMt8/FQMfIKNa65tpamYMZl4fERi z+/XLvpjUuDzhBnpR+m+1dvmipnlq8iUrelEvn6i9rQXFoHLRxkfyeU2qpenzGOsnTRf FyPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739897839; x=1740502639; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NOCzxCVxAvNYsJunStzLE+uJyOxRfSh+zzOduGNwM6o=; b=mLqDOKE+xXzNHqZ90xnMXRF/cTB+GAcVyyIsOOYl7DQ4UoX68TusHYxu9tuLM1mM3l WQPAL31gRJyjywYx9DddZ2LrIJ1hzXVZy2syX3+ibxzGWAi3J/eTxbJCw+HKnJOGfCDb yWbeHHzQy5VNl1HdoS5et4a4BhzM+9hCWNTaho3iSb+65NXsgJUGrIEVNcJfJnYxVFD+ 19Vwogu+kbZd06wSrLkoP0YEbkpRE6dNC3e1ompyX3RV1hGXkO+k5HTszIBcrDp6nq8Q a9qtggnA9BdB0LLvM6NiXtoAM5ts4CSl3EXVY408j1j1NTXrtCktW3OOmnmkqRFYLCwT /eeQ== X-Forwarded-Encrypted: i=1; AJvYcCXbwSrXVStdasnZyujOKr/WHWhQpiSSQuwbhRQ9VPeWsWUfZxOsgB11EpJsQZ9gyEq7A1CCBas=@vger.kernel.org X-Gm-Message-State: AOJu0YyUvJJPVi0nJp1DCSg6hOdjInQYwBx6y3Rn9b/n0bKOGfRCeYd2 K0HeYs+C6oGqRZCFWSBQf7rqm/PN8N8xkeWay9KOdpCOVrQXV/VEluUU2aN6CC8= X-Gm-Gg: ASbGncskiL6aYIfEzf9Wf2/Kg02ewUlvK6H+MOBh5Ba52kYj9LHJXBFclGiuEXKZOqt gEjQ4acyDS4N3tL8Oog4cEWlEDKDcuAazGktsnitnHfi5kdrq8/+yziTALL7O0mkkQxD1DrRX4r dBVBFgpVa5Ir/zuEMTpbWv0zPVhgkgbr+tF63qIWoWa2Uo4N6XDrig1l/Ll2LGPxODvmh79SWYw N7kvOZVt7JuD+chM4/GEzh/POOmpRdew/pH7kYFxkeIGdUnb5aee5Rrn8C5WBlzWp6nhJWIic3U X-Google-Smtp-Source: AGHT+IHrBY1zHRHYuJwNRTUUiPrjLEbsi+HbbM1cKYH1pTj4lnerUD971C+dgGwGEIVOFndsOX6tnw== X-Received: by 2002:a17:902:d2c6:b0:220:be86:a42d with SMTP id d9443c01a7336-22170777df8mr3063875ad.21.1739897839536; Tue, 18 Feb 2025 08:57:19 -0800 (PST) Received: from localhost ([2a03:2880:ff:16::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d5590770sm90673115ad.231.2025.02.18.08.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 08:57:19 -0800 (PST) From: David Wei To: io-uring@vger.kernel.org, netdev@vger.kernel.org Cc: Jens Axboe , Pavel Begunkov , Jakub Kicinski , Paolo Abeni , "David S. Miller" , Eric Dumazet , Simon Horman Subject: [PATCH v1 2/2] io_uring/zcrx: add selftest case for single shot recvzc Date: Tue, 18 Feb 2025 08:57:14 -0800 Message-ID: <20250218165714.56427-3-dw@davidwei.uk> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250218165714.56427-1-dw@davidwei.uk> References: <20250218165714.56427-1-dw@davidwei.uk> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add a selftest case to iou-zcrx where the sender sends 4x4K = 16K and the receiver does 4x4K single shot recvzc. Validate that the requests are successful and the data is not corrupted. Signed-off-by: David Wei --- .../selftests/drivers/net/hw/iou-zcrx.c | 42 ++++++++++++++++--- .../selftests/drivers/net/hw/iou-zcrx.py | 27 +++++++++++- 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c b/tools/testing/selftests/drivers/net/hw/iou-zcrx.c index 5d04dd55ae55..e7f0688991ab 100644 --- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.c +++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.c @@ -61,6 +61,9 @@ static int cfg_port = 8000; static int cfg_payload_len; static const char *cfg_ifname; static int cfg_queue_id = -1; +static bool cfg_oneshot; +static int cfg_oneshot_recvs; +static int cfg_send_size = SEND_SIZE; static struct sockaddr_in6 cfg_addr; static char payload[SEND_SIZE] __attribute__((aligned(PAGE_SIZE))); @@ -196,6 +199,16 @@ static void add_recvzc(struct io_uring *ring, int sockfd) sqe->user_data = 2; } +static void add_recvzc_oneshot(struct io_uring *ring, int sockfd, size_t len) +{ + struct io_uring_sqe *sqe; + + sqe = io_uring_get_sqe(ring); + + io_uring_prep_rw(IORING_OP_RECV_ZC, sqe, sockfd, NULL, len, 0); + sqe->user_data = 2; +} + static void process_accept(struct io_uring *ring, struct io_uring_cqe *cqe) { if (cqe->res < 0) @@ -204,7 +217,10 @@ static void process_accept(struct io_uring *ring, struct io_uring_cqe *cqe) error(1, 0, "Unexpected second connection"); connfd = cqe->res; - add_recvzc(ring, connfd); + if (cfg_oneshot) + add_recvzc_oneshot(ring, connfd, PAGE_SIZE); + else + add_recvzc(ring, connfd); } static void process_recvzc(struct io_uring *ring, struct io_uring_cqe *cqe) @@ -218,7 +234,7 @@ static void process_recvzc(struct io_uring *ring, struct io_uring_cqe *cqe) ssize_t n; int i; - if (cqe->res == 0 && cqe->flags == 0) { + if (cqe->res == 0 && cqe->flags == 0 && cfg_oneshot_recvs == 0) { stop = true; return; } @@ -226,8 +242,14 @@ static void process_recvzc(struct io_uring *ring, struct io_uring_cqe *cqe) if (cqe->res < 0) error(1, 0, "recvzc(): %d", cqe->res); - if (!(cqe->flags & IORING_CQE_F_MORE)) + if (cfg_oneshot) { + if (cqe->res == 0 && cqe->flags == 0 && cfg_oneshot_recvs) { + add_recvzc_oneshot(ring, connfd, PAGE_SIZE); + cfg_oneshot_recvs--; + } + } else if (!(cqe->flags & IORING_CQE_F_MORE)) { add_recvzc(ring, connfd); + } rcqe = (struct io_uring_zcrx_cqe *)(cqe + 1); @@ -237,7 +259,7 @@ static void process_recvzc(struct io_uring *ring, struct io_uring_cqe *cqe) for (i = 0; i < n; i++) { if (*(data + i) != payload[(received + i)]) - error(1, 0, "payload mismatch"); + error(1, 0, "payload mismatch at ", i); } received += n; @@ -313,7 +335,7 @@ static void run_server(void) static void run_client(void) { - ssize_t to_send = SEND_SIZE; + ssize_t to_send = cfg_send_size; ssize_t sent = 0; ssize_t chunk, res; int fd; @@ -360,7 +382,7 @@ static void parse_opts(int argc, char **argv) usage(argv[0]); cfg_payload_len = max_payload_len; - while ((c = getopt(argc, argv, "46sch:p:l:i:q:")) != -1) { + while ((c = getopt(argc, argv, "sch:p:l:i:q:o:z:")) != -1) { switch (c) { case 's': if (cfg_client) @@ -387,6 +409,14 @@ static void parse_opts(int argc, char **argv) case 'q': cfg_queue_id = strtoul(optarg, NULL, 0); break; + case 'o': { + cfg_oneshot = true; + cfg_oneshot_recvs = strtoul(optarg, NULL, 0); + break; + } + case 'z': + cfg_send_size = strtoul(optarg, NULL, 0); + break; } } diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py index ea0a346c3eff..d301d9b356f7 100755 --- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py +++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py @@ -34,14 +34,37 @@ def test_zcrx(cfg) -> None: raise KsftSkipEx('at least 2 combined channels required') rx_ring = _get_rx_ring_entries(cfg) - rx_cmd = f"{cfg.bin_remote} -s -p 9999 -i {cfg.ifname} -q {combined_chans - 1}" - tx_cmd = f"{cfg.bin_local} -c -h {cfg.remote_v6} -p 9999 -l 12840" + try: + ethtool(f"-G {cfg.ifname} rx 64", host=cfg.remote) + ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}", host=cfg.remote) + flow_rule_id = _set_flow_rule(cfg, combined_chans - 1) + + rx_cmd = f"{cfg.bin_remote} -s -p 9999 -i {cfg.ifname} -q {combined_chans - 1}" + tx_cmd = f"{cfg.bin_local} -c -h {cfg.remote_v6} -p 9999 -l 12840" + with bkg(rx_cmd, host=cfg.remote, exit_wait=True): + wait_port_listen(9999, proto="tcp", host=cfg.remote) + cmd(tx_cmd) + finally: + ethtool(f"-N {cfg.ifname} delete {flow_rule_id}", host=cfg.remote) + ethtool(f"-X {cfg.ifname} default", host=cfg.remote) + ethtool(f"-G {cfg.ifname} rx {rx_ring}", host=cfg.remote) + + +def test_zcrx_oneshot(cfg) -> None: + cfg.require_v6() + + combined_chans = _get_combined_channels(cfg) + if combined_chans < 2: + raise KsftSkipEx('at least 2 combined channels required') + rx_ring = _get_rx_ring_entries(cfg) try: ethtool(f"-G {cfg.ifname} rx 64", host=cfg.remote) ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}", host=cfg.remote) flow_rule_id = _set_flow_rule(cfg, combined_chans - 1) + rx_cmd = f"{cfg.bin_remote} -s -p 9999 -i {cfg.ifname} -q {combined_chans - 1} -o 4" + tx_cmd = f"{cfg.bin_local} -c -h {cfg.remote_v6} -p 9999 -l 4096 -z 16384" with bkg(rx_cmd, host=cfg.remote, exit_wait=True): wait_port_listen(9999, proto="tcp", host=cfg.remote) cmd(tx_cmd)