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; From patchwork Wed Jan 24 02:53:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 191314 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp742029dyi; Tue, 23 Jan 2024 18:57:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHvk9iG5tYUGc11XwwQnCChGR3N2OKuVkSJrXfHlCbbRbC9ASGTrHbA/3gpA2IphCquSFm9 X-Received: by 2002:a17:906:6a07:b0:a28:b183:fccc with SMTP id qw7-20020a1709066a0700b00a28b183fcccmr488034ejc.122.1706065064414; Tue, 23 Jan 2024 18:57:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706065064; cv=pass; d=google.com; s=arc-20160816; b=yXF/HC+lQ0oiX7ZE4gKiobJz/NBjQzG9SUObwRE+Dvr+PrKwJThGm522pWbfy2K7/H DH3EizOwK36S79EzZgF8AE9YTJxI6axfXnPpGJfXZuQcFj3Gz6SmKWS6RBektLKUetDZ GivUtpaHMdZ1mSm7J70As/igBbUJO5xJpdRLVkZis8A4t9H8eGHI55zOBiusMmi+88bY pHr7e39JL0uMFuKkafCp+rzJ80MCR31+Te8YZN2yjaNDA1+DeqeZyVpg91BoBzIhEHqI 4O747GziSOLiykmIB9CRUqUdXxP8fa7DmPffjgUehudIETL6AVCdX0N8ivmWAyo0uE5e ykwA== 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=bq2iCmnPB94WcqySTTnm3WLG+4jkf9fY7fGI3ZdGS38=; fh=aFIXqCW31H7YljGst8EX7D53zRUuwuw6gSUU8K6IRI8=; b=KV1DKltzLLE3d4+tTeRd0Gud5qf1kZmsPH98UYb3QpEBDObr4WyFO+6lejaK2eNL/1 zl9+CHpU0hbRLAgdgC91eNUmslBT+kQMZmiZcIcve7gqoKpNKuCVpXxd1FZQzwplXl0h 3Mm8UaPkHwwVGFre+s1m9Wi5eJSEQFTmGPIbZlpC6FqW0QOeP0rMNBzPXq38H7jCsV5X NE+Z9aa3pCgyNHsi3+OgPr3jzHmuyZ6AaBLHa7xSGfF/wV3SIsHP87yTkjNVkxX15cLw Z+EWEZBF6KKxK4pS/pSrIAflEH57K56TpNPM2jfpc79P59V5L6jSXK4Ey5oZTAb36Zrv Ye3g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@fastly.com header.s=google header.b=tH9zr1wY; 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-36365-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36365-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fastly.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id s1-20020a170906060100b00a2e0af0cabfsi6027064ejb.33.2024.01.23.18.57.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 18:57:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-36365-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@fastly.com header.s=google header.b=tH9zr1wY; 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-36365-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36365-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 0E4B81F218FE for ; Wed, 24 Jan 2024 02:57:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 57EFE6FDD; Wed, 24 Jan 2024 02:54:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="tH9zr1wY" Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 3ED9917545 for ; Wed, 24 Jan 2024 02:54:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706064869; cv=none; b=dvieLRvjcY9/kbw/vNwV7BihYjY7enWTbzeEZJu6SmmkKpDZCraam24vKK5Ktbxx4rkR28hXxkSmalT2/Vw434HsAg4Zn1Vf+04G9FuXOrTkOiQun9t/bxWwRRWAW7F5zO1bytf7e+hveiP+G36rPI0xlp7zmjXPNbxrI55dinE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706064869; c=relaxed/simple; bh=tt8whk6QkKHecHFyCKI/nRn5ZBU9W9pAuOHdt0se2xg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uhihqm79EcwVNnCbylNd7kk82zYoU49m8ReGeqQm+uOkEgj7Hq+ETP5mSroPAwCUMotp5KWil6D3NfHp04lESa68vfa2WItCtY3of1b/5FiQFKmw1pi3fr1KbKObhPG7PgO/aH+K3bO3Ezq5aLUehY2a/64oKnijSMmOTusvqC0= 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=tH9zr1wY; arc=none smtp.client-ip=209.85.210.180 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-f180.google.com with SMTP id d2e1a72fcca58-6dc6f47302bso1936473b3a.1 for ; Tue, 23 Jan 2024 18:54:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1706064867; x=1706669667; 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=bq2iCmnPB94WcqySTTnm3WLG+4jkf9fY7fGI3ZdGS38=; b=tH9zr1wY32bhLbQn/L8zBfhSab4FuzEwR8XHnAg0JZxyF5etL9PHPdUzaJ52dEUPDe aZs2FFZBtJjjfqqAKfOWFHCosxXBC3i0vhbrN+yKlSBRUksx57UhpyNsIfo5r8vxq5Ye U2bIvWJLs0ih0exY0aDVnO8rRndkkhP2Ts2JQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706064867; x=1706669667; 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=bq2iCmnPB94WcqySTTnm3WLG+4jkf9fY7fGI3ZdGS38=; b=m7Wfyh63DUkVwk5GvtfSaptxmv4Va6HQgU5yWlivM7TRFzILN9v5X45s5NwPJugYhS /bzHKGEw6kXmn0ohEZkZk8neWJY5JXvarFJRfEEup5CJflhtkqfh3Hi51KFHXaScih1F 9zvlhyOm9ki7AJqh1ePtScx52rVnE2lnop0ZtJzZd7BVgd/LqqH0OatR730MlLMDANuA 9vmKhiV79rGOVh7ttA2lWA+Wb+lB0VhRCwQe8k3LL+7jNEvZdILOnr4xhR0StnqL336H ZR227p4VaLsjnSYvx24lcQipkyCMDMNDCKGmPN1NpsVB9R3DQINtFLDyG6M929p12Az3 Qxng== X-Gm-Message-State: AOJu0YwxYOVhVFCqg28lIaMM1TFUl4/dCztY4vYeL8sflphBS6uHDwOR rdtPp+jGh/KVUCjIwCB1cyYmOOLPe4D+a/tmzn13EDiPDFJHpN+dMsHyWri/xMk= X-Received: by 2002:a05:6a00:3a09:b0:6db:a0e5:7ec3 with SMTP id fj9-20020a056a003a0900b006dba0e57ec3mr9228809pfb.22.1706064867592; Tue, 23 Jan 2024 18:54:27 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 18:54:26 -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 2/3] eventpoll: Add per-epoll busy poll packet budget Date: Wed, 24 Jan 2024 02:53:58 +0000 Message-Id: <20240124025359.11419-3-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: 1788938880788561620 X-GMAIL-MSGID: 1788938880788561620 When using epoll-based busy poll, the packet budget is hardcoded to BUSY_POLL_BUDGET (8). Add support for a per-epoll context busy poll packet budget. If not specified, the default value (BUSY_POLL_BUDGET) is used. Signed-off-by: Joe Damato --- fs/eventpoll.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 4503fec01278..40bd97477b91 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -229,6 +229,8 @@ struct eventpoll { unsigned int napi_id; /* busy poll timeout */ u64 busy_poll_usecs; + /* busy poll packet budget */ + u16 busy_poll_budget; #endif #ifdef CONFIG_DEBUG_LOCK_ALLOC @@ -437,10 +439,14 @@ static bool ep_busy_loop_end(void *p, unsigned long start_time) static bool ep_busy_loop(struct eventpoll *ep, int nonblock) { unsigned int napi_id = READ_ONCE(ep->napi_id); + u16 budget = READ_ONCE(ep->busy_poll_budget); + + if (!budget) + budget = BUSY_POLL_BUDGET; 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); + budget); if (ep_events_available(ep)) return true; /* @@ -2098,6 +2104,7 @@ static int do_epoll_create(int flags) } #ifdef CONFIG_NET_RX_BUSY_POLL ep->busy_poll_usecs = 0; + ep->busy_poll_budget = 0; #endif ep->file = file; fd_install(fd, file); From patchwork Wed Jan 24 02:53:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Damato X-Patchwork-Id: 191315 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp742364dyi; Tue, 23 Jan 2024 18:58:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IE7P3NYuFMpLdk1qolY1aPrLSLHHIcSIdRwfElYuhHOBWIuCb8DeENpU5mXby2HVHiSteU+ X-Received: by 2002:a05:6a20:12d5:b0:19c:6383:c3fe with SMTP id v21-20020a056a2012d500b0019c6383c3femr161625pzg.13.1706065121928; Tue, 23 Jan 2024 18:58:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706065121; cv=pass; d=google.com; s=arc-20160816; b=EZ/7R2JRv4Bto/JkK4qKcFFgG7MYhFHzG26ngaarX6ZOsxlPMDhSGzjwrnd7ITAaG2 HVMTJnFIldk6sbEFUkJZWZ1wdB+mDW/RHy2rLugL1YW/IW0P/avcGcl4A8o2xKcGmo5q 4RzlKWGrgYFBq0PNr1CF0Loz4Fg7bPGpe3Ech36xPKXLr5Z4fJjzZRaoZBM7V0GQio/b DBeONBM+1EsBosq6autp9KSXt0GO7S2mXftyqKOem45evJb2N0Fv/v9K1ihmnQMr5wlx Om3gQAswGfbN3Me7YLAgtxN4oKIILXX5lD0qN3Jt59Ru4U+2v30x7jsKJROvKhs3po/D +0IA== 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=vDDvozY18VzUKM9utNCLkKJpAjjBedBawVpo6PogSYE=; fh=aFIXqCW31H7YljGst8EX7D53zRUuwuw6gSUU8K6IRI8=; b=b/xj9R/jtJpB/rFe0kJa1sFueEa6FIs0Obt036+DgZDgK4SIv+T9hX6uwsGgG5GkBm a5k/qRsxi5uSD8tz+NEC2aCnoYWt3CMEQl16ouPd5m34twevSmglGubSueYtdO4TuG4/ dTj/M8E1t7ia9L+ZTrXUIAM/oRCm2t8fFsKZHdFQojF5GrM83dxLD97Q3ufTSbiLWbEj 5AmAK39/VFrxjDbHsko9y6tb7IMAL7hGcAGe3trA/CbR/Kp0EnMjNLJtZVxua501NsHW zshbw6zxTeNZA4h0VTkoR4FTz2zB1XPh1yqvHZmbZFuVZuH05zVm0ncbles140XLPOh7 GpEw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@fastly.com header.s=google header.b=RxqyEH6O; 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-36366-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36366-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fastly.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id u3-20020a170902e5c300b001d4beb54473si11237532plf.608.2024.01.23.18.58.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 18:58:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-36366-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@fastly.com header.s=google header.b=RxqyEH6O; 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-36366-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36366-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 80FAD283EE7 for ; Wed, 24 Jan 2024 02:58:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D23271798C; Wed, 24 Jan 2024 02:54:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="RxqyEH6O" Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.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 F028117578 for ; Wed, 24 Jan 2024 02:54:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706064872; cv=none; b=ZFFIHSpWdimTIzIfH0tbuIsIyJiZZ85muiOoq5mfNZUhpVR7Xf/9jhQbHnDSwvB7KluIcPLSbjluGK3yNIPiiK5vQCVKhXTJtufdsg3xkwAE9fldGHJUkFUiaFIkRnZ1p9ta0kmw27V9GVwbGK+itaddXF8FtDmwvQF2+zd2jrs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706064872; c=relaxed/simple; bh=jEpGsvLii/mVQkq2gxlG8k/giShd2XXjSIODjknHbrE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NrtPcX5nBzbtR4moAsMTK5403tNO9Se1r05GyAasZ79my5LSWt7LeEvX4Ye5DBueh48VZJzCP+glzEtNtsD+OChPye3MMXZJyXi9tleS4A87xkNiA8enYWjZAx7jeU8cgWzUq1od2x7v4GsZENa0aG07LKCi7fZ1qauuaqO85sU= 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=RxqyEH6O; arc=none smtp.client-ip=209.85.167.179 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-oi1-f179.google.com with SMTP id 5614622812f47-3bd5c4cffefso4946382b6e.1 for ; Tue, 23 Jan 2024 18:54:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1706064869; x=1706669669; 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=vDDvozY18VzUKM9utNCLkKJpAjjBedBawVpo6PogSYE=; b=RxqyEH6OU/Dc7j7G6TLwlM6PZR/QaiwtH4HVR1DnCmRJe/4X1w2Bnc9H4NUsebsm+G RJVqLhphdsHx3sLt+FkjQ8KIqONYPkdSbic+l2OoFYB7tNH0IkLdTEBF7VX9fTDQrHR0 aevov3B87YxPeJ+AVArv6QjT6f2Ej5LDqxnxc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706064869; x=1706669669; 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=vDDvozY18VzUKM9utNCLkKJpAjjBedBawVpo6PogSYE=; b=vJjWsAskAm1vFzC0qklgE7P4tPQVtch0gOvz9/qtE75HoINrQANwUeu7Xl2dKD5kL0 4H4aJmNaibSmvHst6pnDISJ3nuFeLwfIZDh1UxQSUB7KHKWDS+KQcymXpqs9gFQ/138m dR5cJnJKAFjbNSUnYjjJBy5stSdM2tn9i+WB88+u6S6cMT+QV3XOI8LszKClWbezcu7k kuJZ94+2Yj977KhrnjleXJ9DVYa4wRzSI6D96C6A56vUt0OxQnVE2Ock929NA4SCxjIE g6mgWqLAC4Ls26kXHw582ip0lXw/4VJ8REk/ZtWBaPKirOWajSo/YQrAvtJMIvDlrCmc bpGg== X-Gm-Message-State: AOJu0YwRlNIyba8oKYkAEZURh8qWxHP76zpbFS0ePCv1UmWiutJbLaRK hpGIOkH5ERMVhJrcAeJfMux1UeGlpI2aMQLSc3aDyWS1fyvWmnnGL9SolTi8O+U= X-Received: by 2002:a05:6808:1916:b0:3bd:bf4a:686c with SMTP id bf22-20020a056808191600b003bdbf4a686cmr1015263oib.18.1706064869015; Tue, 23 Jan 2024 18:54:29 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 18:54:28 -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 3/3] eventpoll: Add epoll ioctl for epoll_params Date: Wed, 24 Jan 2024 02:53:59 +0000 Message-Id: <20240124025359.11419-4-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: 1788938941434175128 X-GMAIL-MSGID: 1788938941434175128 Add an ioctl for getting and setting epoll_params. User programs can use this ioctl to get and set the busy poll usec time or packet budget params for a specific epoll context. Signed-off-by: Joe Damato --- .../userspace-api/ioctl/ioctl-number.rst | 1 + fs/eventpoll.c | 41 +++++++++++++++++++ include/uapi/linux/eventpoll.h | 12 ++++++ 3 files changed, 54 insertions(+) diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst index 457e16f06e04..b33918232f78 100644 --- a/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -309,6 +309,7 @@ Code Seq# Include File Comments 0x89 0B-DF linux/sockios.h 0x89 E0-EF linux/sockios.h SIOCPROTOPRIVATE range 0x89 F0-FF linux/sockios.h SIOCDEVPRIVATE range +0x8A 00-1F linux/eventpoll.h 0x8B all linux/wireless.h 0x8C 00-3F WiNRADiO driver diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 40bd97477b91..d973147c015c 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -869,6 +869,45 @@ static void ep_clear_and_put(struct eventpoll *ep) ep_free(ep); } +static long ep_eventpoll_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +{ + int ret; + struct eventpoll *ep; + struct epoll_params epoll_params; + void __user *uarg = (void __user *) arg; + + if (!is_file_epoll(file)) + return -EINVAL; + + ep = file->private_data; + + switch (cmd) { +#ifdef CONFIG_NET_RX_BUSY_POLL + case EPIOCSPARAMS: + if (copy_from_user(&epoll_params, uarg, sizeof(epoll_params))) + return -EFAULT; + + ep->busy_poll_usecs = epoll_params.busy_poll_usecs; + ep->busy_poll_budget = epoll_params.busy_poll_budget; + return 0; + + case EPIOCGPARAMS: + memset(&epoll_params, 0, sizeof(epoll_params)); + epoll_params.busy_poll_usecs = ep->busy_poll_usecs; + epoll_params.busy_poll_budget = ep->busy_poll_budget; + if (copy_to_user(uarg, &epoll_params, sizeof(epoll_params))) + return -EFAULT; + + return 0; +#endif + default: + ret = -EINVAL; + break; + } + + return ret; +} + static int ep_eventpoll_release(struct inode *inode, struct file *file) { struct eventpoll *ep = file->private_data; @@ -975,6 +1014,8 @@ static const struct file_operations eventpoll_fops = { .release = ep_eventpoll_release, .poll = ep_eventpoll_poll, .llseek = noop_llseek, + .unlocked_ioctl = ep_eventpoll_ioctl, + .compat_ioctl = compat_ptr_ioctl, }; /* diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h index cfbcc4cc49ac..9211103779c4 100644 --- a/include/uapi/linux/eventpoll.h +++ b/include/uapi/linux/eventpoll.h @@ -85,4 +85,16 @@ struct epoll_event { __u64 data; } EPOLL_PACKED; +struct epoll_params { + u64 busy_poll_usecs; + u16 busy_poll_budget; + + /* for future fields */ + uint8_t data[118]; +} EPOLL_PACKED; + +#define EPOLL_IOC_TYPE 0x8A +#define EPIOCSPARAMS _IOW(EPOLL_IOC_TYPE, 0x01, struct epoll_params) +#define EPIOCGPARAMS _IOR(EPOLL_IOC_TYPE, 0x02, struct epoll_params) + #endif /* _UAPI_LINUX_EVENTPOLL_H */