diff options
| author | Lin Feng <linf@wangsu.com> | 2025-02-27 11:34:12 +0800 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-02-27 09:40:56 +0100 |
| commit | d3a194d95fc8d53539d555119048694a40833844 (patch) | |
| tree | 68957e79ddd0719d2b6f5a1a14d314e9fe05a32b | |
| parent | 12851bd921d429c60578b90916fc220b60757c34 (diff) | |
| download | linux-d3a194d95fc8d53539d555119048694a40833844.tar.gz linux-d3a194d95fc8d53539d555119048694a40833844.tar.bz2 linux-d3a194d95fc8d53539d555119048694a40833844.zip | |
epoll: simplify ep_busy_loop by removing always 0 argument
Commit 00b27634bc471("epoll: replace gotos with a proper loop") refactored
ep_poll and always feeds ep_busy_loop with a time_out value of 0, nonblock
mode for ep_busy_loop has sunk since, IOW nonblock mode checking has been
taken over by ep_poll itself, codes snipped:
static int ep_poll(struct eventpoll *ep...
{
...
if (timed_out)
return 0;
eavail = ep_busy_loop(ep, timed_out);
...
}
Given this fact codes can be simplified a bit for ep_busy_loop.
Signed-off-by: Lin Feng <linf@wangsu.com>
Link: https://lore.kernel.org/r/20250227033412.5873-1-linf@wangsu.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | fs/eventpoll.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 7c0980db77b3..1fc770270ab8 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -438,7 +438,7 @@ 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); u16 budget = READ_ONCE(ep->busy_poll_budget); @@ -448,7 +448,7 @@ static bool ep_busy_loop(struct eventpoll *ep, int nonblock) 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, + napi_busy_loop(napi_id, ep_busy_loop_end, ep, prefer_busy_poll, budget); if (ep_events_available(ep)) return true; @@ -560,7 +560,7 @@ static void ep_resume_napi_irqs(struct eventpoll *ep) #else -static inline bool ep_busy_loop(struct eventpoll *ep, int nonblock) +static inline bool ep_busy_loop(struct eventpoll *ep) { return false; } @@ -2047,7 +2047,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; |