From: Jens Axboe <axboe@kernel.dk>
To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 2/6] eventpoll: don't pass in 'timed_out' to ep_busy_loop()
Date: Sun, 30 Oct 2022 16:01:59 -0600 [thread overview]
Message-ID: <20221030220203.31210-3-axboe@kernel.dk> (raw)
In-Reply-To: <20221030220203.31210-1-axboe@kernel.dk>
It's known to be 'false' from the one call site we have, as we break
out of the loop if it's not.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
fs/eventpoll.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 3061bdde6cba..64d7331353dd 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -396,12 +396,12 @@ static bool ep_busy_loop_end(void *p, unsigned long start_time)
*
* we must do our busy polling with irqs enabled
*/
-static bool ep_busy_loop(struct eventpoll *ep, int nonblock)
+static bool ep_busy_loop(struct eventpoll *ep)
{
unsigned int napi_id = READ_ONCE(ep->napi_id);
if ((napi_id >= MIN_NAPI_ID) && net_busy_loop_on()) {
- napi_busy_loop(napi_id, nonblock ? NULL : ep_busy_loop_end, ep, false,
+ napi_busy_loop(napi_id, ep_busy_loop_end, ep, false,
BUSY_POLL_BUDGET);
if (ep_events_available(ep))
return true;
@@ -453,7 +453,7 @@ static inline void ep_set_busy_poll_napi_id(struct epitem *epi)
#else
-static inline bool ep_busy_loop(struct eventpoll *ep, int nonblock)
+static inline bool ep_busy_loop(struct eventpoll *ep)
{
return false;
}
@@ -1826,7 +1826,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
if (timed_out)
return 0;
- eavail = ep_busy_loop(ep, timed_out);
+ eavail = ep_busy_loop(ep);
if (eavail)
continue;
--
2.35.1
next prev parent reply other threads:[~2022-10-30 22:02 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-30 22:01 [PATCHSET v3 0/5] Add support for epoll min_wait Jens Axboe
2022-10-30 22:01 ` [PATCH 1/6] eventpoll: cleanup branches around sleeping for events Jens Axboe
2022-10-30 22:01 ` Jens Axboe [this message]
2022-10-30 22:02 ` [PATCH 3/6] eventpoll: split out wait handling Jens Axboe
2022-10-30 22:02 ` [PATCH 4/6] eventpoll: move expires to epoll_wq Jens Axboe
2022-10-30 22:02 ` [PATCH 5/6] eventpoll: move file checking earlier for epoll_ctl() Jens Axboe
2022-10-30 22:02 ` [PATCH 6/6] eventpoll: add support for min-wait Jens Axboe
2022-11-08 22:14 ` Soheil Hassas Yeganeh
2022-11-08 22:20 ` Jens Axboe
2022-11-08 22:25 ` Willem de Bruijn
2022-11-08 22:29 ` Jens Axboe
2022-11-08 22:44 ` Willem de Bruijn
2022-11-08 22:41 ` Soheil Hassas Yeganeh
2022-12-01 18:00 ` Jens Axboe
2022-12-01 18:39 ` Soheil Hassas Yeganeh
2022-12-01 18:41 ` Jens Axboe
2022-11-02 17:46 ` [PATCHSET v3 0/5] Add support for epoll min_wait Willem de Bruijn
2022-11-02 17:54 ` Jens Axboe
2022-11-02 23:09 ` Willem de Bruijn
2022-11-02 23:37 ` Jens Axboe
2022-11-02 23:51 ` Willem de Bruijn
2022-11-02 23:57 ` Jens Axboe
2022-11-05 17:39 ` Jens Axboe
2022-11-05 18:05 ` Willem de Bruijn
2022-11-05 18:46 ` Jens Axboe
2022-11-07 13:25 ` Willem de Bruijn
2022-11-07 14:19 ` Jens Axboe
2022-11-07 10:10 ` David Laight
2022-11-07 20:56 ` Stefan Hajnoczi
2022-11-07 21:38 ` Jens Axboe
2022-11-08 14:00 ` Stefan Hajnoczi
2022-11-08 14:09 ` Jens Axboe
2022-11-08 16:10 ` Stefan Hajnoczi
2022-11-08 16:15 ` Jens Axboe
2022-11-08 17:24 ` Stefan Hajnoczi
2022-11-08 17:28 ` Jens Axboe
2022-11-08 20:29 ` Stefan Hajnoczi
2022-11-09 10:09 ` David Laight
2022-11-10 10:13 ` Willem de Bruijn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221030220203.31210-3-axboe@kernel.dk \
--to=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).