Received: by 2002:a05:7412:d1aa:b0:fc:a2b0:25d7 with SMTP id ba42csp1383370rdb; Tue, 30 Jan 2024 17:48:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IGh40eK8CVjdfxUn29xc6st9iuwtZ/x/EtMMLt4FljCVwEMs9J4T2tpT72G5nNDZt21wJx8 X-Received: by 2002:a2e:8404:0:b0:2cd:633c:55d6 with SMTP id z4-20020a2e8404000000b002cd633c55d6mr126027ljg.25.1706665698502; Tue, 30 Jan 2024 17:48:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706665698; cv=pass; d=google.com; s=arc-20160816; b=O92vW2lrcTk0UiMqFUz26TZTcQAMXy/Wep+3sc4k1ryLP+dv7MuSXdEw94VUzXi3Al 5Qe6Mqf3vGTO5P++PV0UF95buNlUVhNH/bq4QXJsKOiBYcdeB4bjfKO3E5/gJpIDk74G NN72yxorTGo4oMSx4Yn2eT9D2hHV021qZnYav2Pe4mnO8rLx0hIo5DHJ+IYEXboIeYjC wy75rJq2mQ4ZgiNlZpC/zVMbXQ+TMMFMEpS0JxBbdr58HNT5x+GDMWyNjBLqJmffSY09 Q+SWlg8dLc4649rxyIwo/eyWazIr3MyqtiB6aWhhIy8spKQGDr/ZTsgUDPx2GklBodVB vf3A== 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=XPyBFpA03VgPUcSSFnhqRnjQDUKtK8Zok+qzBXzC1y0=; fh=wkPP9vboaFcTz7Jd7ZXibgL7k1mXiggPO0R4dXhFzRU=; b=EAVjungQjvuC3RUvgepw/6Nf2UpEn8dMwKPAWmS1xpDwyYZygdr7mHRhGHZVXJtheA 4DD3L7/I3MUdszFh//rp2+nOwIrUz0YKzGA+yYBs4jIZQV7TcRUcETJERHY7yEdIdB6i U7LKCAmGb+pMqlACmbxUFOYfG9WU3Z3+Ta99nuOq6Cylq2Mz3lgDleYpDrGYRvWiOeyq J+Pcbt6L9gNMcVZZbk64kbDxQCGqAC0GAhQaC8ZI3HwxJeTbrBNxyrc+/hZ+eliDP0Ot GMUbD+TFAvX5FTIDPjF2FTuj1oTnnN3wHObiTLIVCHIyCUxsye6Rn6/n71WeblrmojAl SoPQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@fastly.com header.s=google header.b=Ct4VVviF; 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-45605-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45605-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fastly.com X-Forwarded-Encrypted: i=1; AJvYcCWCBSbjoeJnLd6Ro/NsXdf6uBk7D874is+MWU8U5AaNqAb39EMevPTpENzhVpGfb2bVh/npw5qxtQ3YCrhs21NP0FjKRmao89JGphUV8g== Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id z17-20020aa7c651000000b0055f0787a8c4si2328736edr.116.2024.01.30.17.48.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 17:48:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-45605-linux.lists.archive=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=Ct4VVviF; 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-45605-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45605-linux.lists.archive=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 18D491F257C7 for ; Wed, 31 Jan 2024 01:48:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E362463C7; Wed, 31 Jan 2024 01:47:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=fastly.com header.i=@fastly.com header.b="Ct4VVviF" Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (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 3F4345223 for ; Wed, 31 Jan 2024 01:47:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706665668; cv=none; b=ab9ZpmzTAuus4B56nVRYxSIa4g4ivIEq+zyY1lQ0OBpe+PGl5kd0bndvcFDBGMBWQeauxCsajijXuqs3B07h4K+ADpyjGkubW0FwDpR4BMXYAOZ/LxL2OCeBKyw9cRi/E8LpUtgqdHNlWZv55b1YMwj4ALHhcVeAY9MCg7sNcws= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706665668; c=relaxed/simple; bh=iOH3rDvMU6l8EibI+PkwMyfqV5hY0EoK3y01y1v3/4g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mYNsMxyMRcMXmwUxHpzg23osWdr6YqKDH4rptGsfiH3IoMW1ht7mYb8CKqXRFfYxTOy4RYly1NVl4q/1PXkp8ow0LCyajJE8Q5zbOTW8KgsqFPxT0koJx+tZKh/9L7O74I/s1hk9WdNZAC9Kkq3WzSAT1jh1/tzkxWBHbq9DqXU= 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=Ct4VVviF; arc=none smtp.client-ip=209.85.215.169 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-pg1-f169.google.com with SMTP id 41be03b00d2f7-5dbcfa0eb5dso864398a12.3 for ; Tue, 30 Jan 2024 17:47:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastly.com; s=google; t=1706665666; x=1707270466; 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=XPyBFpA03VgPUcSSFnhqRnjQDUKtK8Zok+qzBXzC1y0=; b=Ct4VVviF+wjqtFEpy8XDL9kaii13JkxQL/TJTDbUmzvPA32VNjCrqlJMKNAXZneaJF 92XRAfVg7kZE44t8ZxMYJj7S2lBm0pqXl3vSMDEHxjdgl5F5RvBJLDlXFKE5s3FZIbFb 5TvPhIEBEjW0dVPmStvud9ktM5dZh4+P8M0ZA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706665666; x=1707270466; 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=XPyBFpA03VgPUcSSFnhqRnjQDUKtK8Zok+qzBXzC1y0=; b=i3wEhaCj47cTqT4//yTYbttMELc6KIuYLC6yje5bgz4ZbA5wHNyTnMWg1enI/BYVcA SyZEEo1ya1ltiI9mq/vsvUr0qd+214JFjF4ttSwiexC343s9vbJ3CmEP0pqVFrAwIjCZ uD7IPlh3PZf4EdxgKKGiryjMXuUBFFwcPdlRZDiws9YdBTPOnUh+jrl13ZztmtMENsV+ +MzVAwZ2TnOWbUElwv1MzBALs/cNuN2i/3upIoZHfD5dvpyCBvciF1fFk8Ty4CAP4svd TU05z6T+hLbNvFX5hgoq+7YfpM9pLw4Yugu9TkI/pqTCzRxX4QbHsScS1rD2AH78j2w1 PXvg== X-Gm-Message-State: AOJu0YxhW7XbPNUq1/mMkHlWGYDdeaczJgHoKkzucL5ONukr0EZam+Jq V3//LhImCkpNriYPo4RuYYjuE+4qJyPz/+x6iUph2OnMaKcRBsFE3lZ+Dd54C0fxM66BLdTYuSA 6shlShrkhkI5DXjhgjiaeBGeLhcKWQ1AJvwGYc3CXiGJ4xpCfT6TJXeFDXpb/zSnNAFMdJ9RDZE tWdfobZO9/w6rOSXxsu5PIOSovSJ8tZDs7wcWOFCPRtsoXZg== X-Received: by 2002:a05:6a20:7002:b0:19c:8fa7:66da with SMTP id h2-20020a056a20700200b0019c8fa766damr207347pza.1.1706665665985; Tue, 30 Jan 2024 17:47:45 -0800 (PST) Received: from localhost.localdomain ([2620:11a:c018:0:ea8:be91:8d1:f59b]) by smtp.gmail.com with ESMTPSA id li6-20020a170903294600b001d90fe6da6esm1837846plb.305.2024.01.30.17.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 17:47:45 -0800 (PST) From: Joe Damato To: linux-kernel@vger.kernel.org, netdev@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, willemdebruijn.kernel@gmail.com, weiwan@google.com, David.Laight@ACULAB.COM, arnd@arndb.de, Joe Damato , Alexander Viro , Jan Kara , linux-fsdevel@vger.kernel.org (open list:FILESYSTEMS (VFS and infrastructure)) Subject: [PATCH net-next v4 1/3] eventpoll: support busy poll per epoll instance Date: Wed, 31 Jan 2024 01:47:31 +0000 Message-Id: <20240131014738.469858-2-jdamato@fastly.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240131014738.469858-1-jdamato@fastly.com> References: <20240131014738.469858-1-jdamato@fastly.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Note that this change uses an xor: either per epoll instance busy polling is enabled on the epoll instance or system wide epoll is enabled. Enabling both is disallowed. 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..ce75189d46df 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; -- 2.25.1