From patchwork Sat Feb 15 00:09:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Wei X-Patchwork-Id: 13975784 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00BAA152E12 for ; Sat, 15 Feb 2025 00:10:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739578212; cv=none; b=hwdLUY5t6UU+xC9dZTqmbPr9vkEPb9IVBwb34lCKvu8nD4sKphksl7dPw75+f4yOJGxDjvbR88srrgh8ieEBZpv/+dg6WCkqHnJLQ9kiH2Bz8Z7iD6mGVYfG0dJw/NrYyoXBuUkqNmgvRlDwhXx59S9tXX9SQ/V9jbMFqRkG8EY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739578212; c=relaxed/simple; bh=0MhYOdt8cjrVmKwEWCLWnrpFJTfV5rsb6X7z7fMlHBk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DO6D5nHy9daBI9yEqL7ORrKoGDVMCUVl95kuHC70cuPWMNg9VJrffZ5lGfBBXVjnT0/T8rHD4/i1Y9ObLwOkC5oZ+m5DFhikkxpgZupVLL/2M95BCkOs5DSMrHSgC+OndHydi7q0IXm8CutKxIDb+x7jshCdnqTneiQyi2LDMZk= 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=ZC7ByNfX; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=davidwei.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=davidwei-uk.20230601.gappssmtp.com header.i=@davidwei-uk.20230601.gappssmtp.com header.b="ZC7ByNfX" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2fc292b3570so2587538a91.1 for ; Fri, 14 Feb 2025 16:10:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidwei-uk.20230601.gappssmtp.com; s=20230601; t=1739578209; x=1740183009; 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=VsiC6df/8ep3kbOMlvv6NHk6oNEYLUzPa8XU1Wwcwfk=; b=ZC7ByNfXE3l7MFiPD1cXGbUoNNyT3v1Cwbj5IZEtVEFSoHXC+d3NAskgvmJDiJlOt7 kKuViUW87q+NiMIL849Bf2AF+SOnGE5A8qJIpneiTNj/3I6z+dsJTC6IHgDbjKZCAIeR OgI0CabA6DRf+e+3O6TAlgC0BCp5LQjnD1RuslssaX2BWWYyT4R6Bq0y4OWRvJTai5RU 7WYz++e5EGaF9E58XLmVNefU65a9AeU6KdFNwi6VntqqsrKfLHVORgp8NJDgaeILK9gG 3D3CKLdN1zFqfU/m4YQBDyJ6exxG87V72hWYdr+bLdrrLALHPpCZN9gm9H8fpjfOcAQU 5veA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739578209; x=1740183009; 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=VsiC6df/8ep3kbOMlvv6NHk6oNEYLUzPa8XU1Wwcwfk=; b=RESq6oix4qw87CF2ISsMwP/Edsw4PfC5ilfKS79z9dgn5jsep5teKIqUlt/jZLBIvC ejXzB9tyu40oAlJjflK3DxUamGzHiGLIIUklp6u3T+uNfLZWSte/oUFBV8eMROFCDHSa Fn5/my1zYws4kU6UatwsTl5YSh4EZAK72JWvyFD6x0dVc5gglzOUSVYDBw1yb8hRdO2u 0R42w8lj7J7Py8R60+nSXWj9PpMtnQ1Miz+DoNH23SpKVwojer/tM9cbjLJBaLh39nJg cQbuSNsE6fo1EjEaLWV79yP8hRjXe+1V+nFnB6Pjf0yeFPqmU3EPP1zNKxhG9RdAT7zb fr7g== X-Forwarded-Encrypted: i=1; AJvYcCUMXpRHBabj3xrfe/9auzhYShism7WUi7ewV0A888YyWCiPIbdc3lGR3Pm6aEqVa7VrSP+dSGs=@vger.kernel.org X-Gm-Message-State: AOJu0YzgoCADSoaWNogWWoOkjIOAsIGinzhHYrWYBOWH4ikYKxZlxX5Q jZspd3kQdpC2M3kMuukpILiZAe2/V1Xof2h65TSf3CGiT9hYM8RFA/0REuPN7VU= X-Gm-Gg: ASbGnctTw3tHJEGeO38sTTyYl5LNHxnQITFULN+ThqUUDh75HRWpUPlOCtIZgDivfrk HNc1eiOAfYo5lyZa+OnyEeMD/3wz6NlUkL2uQIulWbv3gyjae5RNIYBG6RR3hbp/6vlVSJsPcSx u6DEfQMXiJrUDASTw1vPD5V+2Oa76re8lvTmDQMVaqE21jvU3jPv1xE98fSioG6xLIHF3ernEW4 i7mvYBUu2RiOkmHq14ortyDAW6KqPT8Vj+OyhGzDCjUMrtfwEJ6sRg2nYKEGJXa76/OHS9We7o= X-Google-Smtp-Source: AGHT+IHugWOSLZs+TvP13HCCC7S3wQ76eEDjldwt9oMOrHcveDSC9AhwnXDIS5a7f4CumTvw/f2SSg== X-Received: by 2002:a17:90a:d44c:b0:2ee:bf84:4fe8 with SMTP id 98e67ed59e1d1-2fc41153f71mr1530599a91.30.1739578209221; Fri, 14 Feb 2025 16:10:09 -0800 (PST) Received: from localhost ([2a03:2880:ff:7::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fc13aafebesm3690961a91.4.2025.02.14.16.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 16:10:08 -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 , Jesper Dangaard Brouer , David Ahern , Mina Almasry , Stanislav Fomichev , Joe Damato , Pedro Tammela , lizetao Subject: [PATCH v14 08/11] io_uring/zcrx: throttle receive requests Date: Fri, 14 Feb 2025 16:09:43 -0800 Message-ID: <20250215000947.789731-9-dw@davidwei.uk> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250215000947.789731-1-dw@davidwei.uk> References: <20250215000947.789731-1-dw@davidwei.uk> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Pavel Begunkov io_zc_rx_tcp_recvmsg() continues until it fails or there is nothing to receive. If the other side sends fast enough, we might get stuck in io_zc_rx_tcp_recvmsg() producing more and more CQEs but not letting the user to handle them leading to unbound latencies. Break out of it based on an arbitrarily chosen limit, the upper layer will either return to userspace or requeue the request. Reviewed-by: Jens Axboe Signed-off-by: Pavel Begunkov Signed-off-by: David Wei --- io_uring/net.c | 2 ++ io_uring/zcrx.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/io_uring/net.c b/io_uring/net.c index 260eb73a5854..000dc70d08d0 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -1285,6 +1285,8 @@ int io_recvzc(struct io_kiocb *req, unsigned int issue_flags) if (unlikely(ret <= 0) && ret != -EAGAIN) { if (ret == -ERESTARTSYS) ret = -EINTR; + if (ret == IOU_REQUEUE) + return IOU_REQUEUE; req_set_fail(req); io_req_set_res(req, ret, 0); diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index 7d24fc98b306..7e0cba1e0f39 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -94,10 +94,13 @@ static void io_zcrx_sync_for_device(const struct page_pool *pool, #define IO_RQ_MAX_ENTRIES 32768 +#define IO_SKBS_PER_CALL_LIMIT 20 + struct io_zcrx_args { struct io_kiocb *req; struct io_zcrx_ifq *ifq; struct socket *sock; + unsigned nr_skbs; }; static const struct memory_provider_ops io_uring_pp_zc_ops; @@ -720,6 +723,9 @@ io_zcrx_recv_skb(read_descriptor_t *desc, struct sk_buff *skb, int i, copy, end, off; int ret = 0; + if (unlikely(args->nr_skbs++ > IO_SKBS_PER_CALL_LIMIT)) + return -EAGAIN; + start = skb_headlen(skb); start_off = offset; @@ -810,6 +816,9 @@ static int io_zcrx_tcp_recvmsg(struct io_kiocb *req, struct io_zcrx_ifq *ifq, ret = -ENOTCONN; else ret = -EAGAIN; + } else if (unlikely(args.nr_skbs > IO_SKBS_PER_CALL_LIMIT) && + (issue_flags & IO_URING_F_MULTISHOT)) { + ret = IOU_REQUEUE; } else if (sock_flag(sk, SOCK_DONE)) { /* Make it to retry until it finally gets 0. */ if (issue_flags & IO_URING_F_MULTISHOT)