From patchwork Wed Jan 24 02:53:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 191313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp741995dyi; Tue, 23 Jan 2024 18:57:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IGYujkKkQYd/MJHfUkSBI7+v6mHImze/FgeTa2YjocZSAOuG+A6zIiMQRvkgsD5LFeJa+cr X-Received: by 2002:ac8:5946:0:b0:42a:4d7b:bddf with SMTP id 6-20020ac85946000000b0042a4d7bbddfmr2167574qtz.9.1706065055748; Tue, 23 Jan 2024 18:57:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706065055; cv=pass; d=google.com; s=arc-20160816; b=LAtJ8QyhlRkaZtD+FTgagCV2znvqGPsaT6UFMghDtUFM/e4qhHvKIdqnPmP3eZzbJt 0StsgDaVxGgBGXyUrJBQLpNzwr+KjRqv2hgV42IPiPSxOIAIjmzz99hKOvBBDjs6xeqk acxwiJ3yhZnORmGZpG6SQ0Ufvu+cPQamAGatgl/gUAcqgX3WaU/gZRu9Nbt+4yAarlu8 eH177Tk77/VInnEDcwdB1DDu+Q2Z24BDmNNtodWlck1nn6TnHQb+TpkaMmf6gzqNjJ3c G5Ho9f/PL3JPFyYOL+lt0uA85kiiwsKj3sKyrijQCYdveHEDDhKH9j9/W80ShpZH50oA R8wA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=005kpyubXBPQOHjxUqpZWTUrOf8Qcj4Qiatp9b0UiEQ=; fh=aFIXqCW31H7YljGst8EX7D53zRUuwuw6gSUU8K6IRI8=; b=dezFTC4QhQkurbuB24N+dMZJUEUYneDmrbK+ZXXyUxZ7S1s3NC+n5rUSpBwxoUW9Kw xZEmLOUjZwXrAe3szCfuWwvIVWE6jkcdHrRW7EYbC1K08hHHAW9dbN+BuO9shitZyy2u N7/Cm7lkIGsxPZ5tZ5XXkvBeTBpYf09XkhPACuU8RJGd1DPGLR1GTcY+nyJo37ZD/Jmr Fx/Gh+vU9g8ayQCupe+AU0TA5OmJcIdZwBMg7oEJDOPTyrPbg1pnQJ/gqx/wWtqk+fv9 kY0sND24knh551vEz3ZghrR/yfQZUCrxIc2PfwA44YDPSU71X96qoLSy5vbihDEGoWty 0cEg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@fastly.com header.s=google header.b=dxKpYYNe; arc=pass (i=1 spf=pass spfdomain=fastly.com dkim=pass dkdomain=fastly.com dmarc=pass fromdomain=fastly.com); spf=pass (google.com: domain of linux-kernel+bounces-36364-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36364-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fastly.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id b5-20020a05622a020500b0042a3274a0ebsi8666421qtx.758.2024.01.23.18.57.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 18:57:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-36364-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@fastly.com header.s=google header.b=dxKpYYNe; arc=pass (i=1 spf=pass spfdomain=fastly.com dkim=pass dkdomain=fastly.com dmarc=pass fromdomain=fastly.com); spf=pass (google.com: domain of linux-kernel+bounces-36364-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36364-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fastly.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 795A91C2267F for ; Wed, 24 Jan 2024 02:57:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6A44F1643A; Wed, 24 Jan 2024 02:54:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="dxKpYYNe" Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 BAF896FDD for ; Wed, 24 Jan 2024 02:54:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706064868; cv=none; b=cTr8gsn4z+ERM5gW/kpXYSepE14zaU8yHdyTUp+6ta26Q3IBIiKMkSaw+fo/rTutDJ9o6XNAM4Wqg3kxddlv6Z1SeGey6giMrYzPgHXvRu4sDRGs1VZN7EX3FFelvFdJHWf8ACw9r+Gk71aE06gpQ3ydRGhgi4zLBcnb7DurU5U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706064868; c=relaxed/simple; bh=x9OhPpSYWyV//QzVZ+AyBMkwYyqs6YawOXB0aB4LXI8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=L/yTISi7zV34dmE4SfBsKk9pK2c5dzIUCiiK2BvBZ2t/cO0QwNj7w0HuEJiZ/Hmr0bNjQxj0zS9q9sDAn8wHtv6NwWTzTIGrXMLFr60hj1m7EjRrRUA3kwKXeo1d3b2Bjdh4amXGo3LQMPmj9pxM6AYcp9/xbALKSg70yoPmoBc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com; spf=pass smtp.mailfrom=fastly.com; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b=dxKpYYNe; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fastly.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastly.com Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6d9f94b9186so4939094b3a.0 for ; Tue, 23 Jan 2024 18:54:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1706064866; x=1706669666; 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=005kpyubXBPQOHjxUqpZWTUrOf8Qcj4Qiatp9b0UiEQ=; b=dxKpYYNeGx0O3hiHTJm4sRj7+dBvgF2ad2bTB1sv2khpRtX/HUUrkmn/thcx+tAmj1 j3+SJktksiKroIJjp6cHGn8SUlRIIUitgcfG1cMZvRGiCAKafwq43SJjmEIqUJLSeWL6 h/D1Q5zzAfrTTZ5H4DMqVwrwBr7toN7hShZxE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706064866; x=1706669666; 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=005kpyubXBPQOHjxUqpZWTUrOf8Qcj4Qiatp9b0UiEQ=; b=a7ZlXKZPXWBAd0EMWibbwdTcGKNMgQtYClNB+gOAfdxlPYL4JelIkt8JuIChoCIwpQ E7ynXnqJN51e5gmYtIFryjIXXdAd3YoTzgHOzRFq0U8nb3g2EvYGhMEsc+OPihCVt1fz 2E5dU4oqU/1i2xeA5JOlXfjpomsN5DyoY29iSynhKJSYG2fpBlYQNn2axlP3AzdOQaoI wvha5B2NLkbj1dWDydl9gSveAA9pqUM4d3OLGOypGkZaQny3Mm/rYsq7nCCZb6VNmoNr 65l7oR4gHM4SFFr2EmzChKQz6bwSpzoROWIYUCkkYFe/IXYjvUyk8+D6bscgu43RRJmx aLKA== X-Gm-Message-State: AOJu0YxXmic/pSXNA9/uETrjkPdaHJP3MGq8dY9JGE+h9r/J+5p36jFR WKVovQLBGaXn+fCIsKYDCkeW4fJjXllhmQ9gzMLXrxpF6CC2xY3/FneeWuMh2UU= X-Received: by 2002:a05:6a20:7d89:b0:19c:63ac:edec with SMTP id v9-20020a056a207d8900b0019c63acedecmr305042pzj.8.1706064866083; Tue, 23 Jan 2024 18:54:26 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c018:0:ea8:be91:8d1:f59b]) by smtp.gmail.com with ESMTPSA id z14-20020a62d10e000000b006d9b38f2e75sm12974229pfg.32.2024.01.23.18.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 18:54:25 -0800 (PST) From: Joe Damato To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: chuck.lever@oracle.com, jlayton@kernel.org, linux-api@vger.kernel.org, brauner@kernel.org, edumazet@google.com, davem@davemloft.net, alexander.duyck@gmail.com, sridhar.samudrala@intel.com, kuba@kernel.org, Joe Damato Subject: [net-next 1/3] eventpoll: support busy poll per epoll instance Date: Wed, 24 Jan 2024 02:53:57 +0000 Message-Id: <20240124025359.11419-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240124025359.11419-1-jdamato@fastly.com> References: <20240124025359.11419-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788938871826315812 X-GMAIL-MSGID: 1788938871826315812 Allow busy polling on a per-epoll context basis. The per-epoll context usec timeout value is preferred, but the pre-existing system wide sysctl value is still supported if it specified. Signed-off-by: Joe Damato --- fs/eventpoll.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 3534d36a1474..4503fec01278 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -227,6 +227,8 @@ struct eventpoll { #ifdef CONFIG_NET_RX_BUSY_POLL /* used to track busy poll napi_id */ unsigned int napi_id; + /* busy poll timeout */ + u64 busy_poll_usecs; #endif #ifdef CONFIG_DEBUG_LOCK_ALLOC @@ -386,12 +388,44 @@ static inline int ep_events_available(struct eventpoll *ep) READ_ONCE(ep->ovflist) != EP_UNACTIVE_PTR; } +/** + * busy_loop_ep_timeout - check if busy poll has timed out. The timeout value + * from the epoll instance ep is preferred, but if it is not set fallback to + * the system-wide global via busy_loop_timeout. + * + * @start_time: The start time used to compute the remaining time until timeout. + * @ep: Pointer to the eventpoll context. + * + * Return: true if the timeout has expired, false otherwise. + */ +static inline bool busy_loop_ep_timeout(unsigned long start_time, struct eventpoll *ep) +{ +#ifdef CONFIG_NET_RX_BUSY_POLL + unsigned long bp_usec = READ_ONCE(ep->busy_poll_usecs); + + if (bp_usec) { + unsigned long end_time = start_time + bp_usec; + unsigned long now = busy_loop_current_time(); + + return time_after(now, end_time); + } else { + return busy_loop_timeout(start_time); + } +#endif + return true; +} + #ifdef CONFIG_NET_RX_BUSY_POLL +static bool ep_busy_loop_on(struct eventpoll *ep) +{ + return !!ep->busy_poll_usecs ^ net_busy_loop_on(); +} + static bool ep_busy_loop_end(void *p, unsigned long start_time) { struct eventpoll *ep = p; - return ep_events_available(ep) || busy_loop_timeout(start_time); + return ep_events_available(ep) || busy_loop_ep_timeout(start_time, ep); } /* @@ -404,7 +438,7 @@ static bool ep_busy_loop(struct eventpoll *ep, int nonblock) { unsigned int napi_id = READ_ONCE(ep->napi_id); - if ((napi_id >= MIN_NAPI_ID) && net_busy_loop_on()) { + if ((napi_id >= MIN_NAPI_ID) && ep_busy_loop_on(ep)) { napi_busy_loop(napi_id, nonblock ? NULL : ep_busy_loop_end, ep, false, BUSY_POLL_BUDGET); if (ep_events_available(ep)) @@ -430,7 +464,8 @@ static inline void ep_set_busy_poll_napi_id(struct epitem *epi) struct socket *sock; struct sock *sk; - if (!net_busy_loop_on()) + ep = epi->ep; + if (!ep_busy_loop_on(ep)) return; sock = sock_from_file(epi->ffd.file); @@ -442,7 +477,6 @@ static inline void ep_set_busy_poll_napi_id(struct epitem *epi) return; napi_id = READ_ONCE(sk->sk_napi_id); - ep = epi->ep; /* Non-NAPI IDs can be rejected * or @@ -466,6 +500,10 @@ static inline void ep_set_busy_poll_napi_id(struct epitem *epi) { } +static inline bool ep_busy_loop_on(struct eventpoll *ep) +{ + return false; +} #endif /* CONFIG_NET_RX_BUSY_POLL */ /* @@ -2058,6 +2096,9 @@ static int do_epoll_create(int flags) error = PTR_ERR(file); goto out_free_fd; } +#ifdef CONFIG_NET_RX_BUSY_POLL + ep->busy_poll_usecs = 0; +#endif ep->file = file; fd_install(fd, file); return fd;