fs/epoll: Remove unnecessary wakeups of nested epoll that in ET mode
PATCH RESEND v2 1/1 fs/epoll: Remove unnecessary wakeups of nested epoll that in ET mode
From: Heiher <[email protected]>
Take the case where we have:
t0
| (ew)
e0
| (et)
e1
| (lt)
s0t0: thread 0
e0: epoll fd 0
e1: epoll fd 1
s0: socket fd 0
ew: epoll_wait
et: edge-trigger
lt: level-trigger
When s0 fires an event, e1 catches the event, and then e0 catches an event from e1. After this, There is a thread t0 do epoll_wait() many times on e0, it should only get one event in total, because e1 is a dded to e0 in edge-triggered mode.
This patch only allows the wakeup(&ep->poll_wait) in ep_scan_ready_list under two conditions:
1. depth == 0.
2. There have event is added to ep->ovflist during processing.
Test code:
#include <unistd.h>
#include <sys/epoll.h>
#include <sys/socket.h>
int main(int argc, char *argv[])
{
int sfd[2];
int efd[2];
struct epoll_event e;
if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfd) < 0)
goto out;
efd[0] = epoll_create(1);
if (efd[0] < 0)
goto out;
efd[1] = epoll_create(1);
if (efd[1] < 0)
goto out;
e.events = EPOLLIN;
if (epoll_ctl(efd[1], EPOLL_CTL_ADD, sfd[0], &e) < 0)
goto out;
e.events = EPOLLIN | EPOLLET;
if (epoll_ctl(efd[0], EPOLL_CTL_ADD, efd[1], &e) < 0)
goto out;
if (write(sfd[1], "w", 1) != 1)
goto out;
if (epoll_wait(efd[0], &e, 1, 0) != 1)
goto out;
if (epoll_wait(efd[0], &e, 1, 0) != 0)
goto out;
close(efd[0]);
close(efd[1]);
close(sfd[0]);
close(sfd[1]);
return 0;
out:
return -1;
}
More tests:
https://github.com/heiher/epoll-wakeup
--- fs/eventpoll.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/eventpoll.c +4 -1
@@ -685,6 +685,9 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,if (!ep_locked)mutex_lock_nested (&ep->mtx, depth); +if (!depth ||list_empty_careful (&ep->rdllist)) + pwake++; +/* * Steal the ready list, and re-init the original one to the * empty list. Also, set ep->ovflist to NULL so that events
@@ -755,7 +758,7 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,mutex_unlock (&ep->mtx);/* We have to call this outside the lock */ -if (pwake) +if (pwake ==2 )ep_poll_safewake (&ep->poll_wait);return res;
Signature · 1 line
2.23.0
Quoted 116 lines · hev
From: Heiher <[email protected]>
Take the case where we have:
t0 | (ew) e0 | (et) e1 | (lt) s0t0: thread 0
e0: epoll fd 0
e1: epoll fd 1
s0: socket fd 0
ew:epoll_wait
et: edge-trigger
lt: level-triggerWhen s0 fires an event, e1 catches the event, and then e0 catches an event from e1. After this, There is a thread t0 do
epoll_wait()many times on e0, it should only get one event in total, because e1 is a dded to e0 in edge-triggered mode.This patch only allows the
wakeup(&ep->poll_wait)inep_scan_ready_listunder two conditions:1. depth == 0.
2. There have event is added toep->ovflistduring processing.Test code:
#include <unistd.h>
#include <sys/epoll.h>
#include <sys/socket.h>int
main(int argc, char *argv[])
{(quoted diff) +0
-0int sfd[2]; int efd[2]; struct epoll_event e; if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfd) < 0) goto out; efd[0] = epoll_create(1); if (efd[0] < 0) goto out; efd[1] = epoll_create(1); if (efd[1] < 0) goto out; e.events = EPOLLIN; if (epoll_ctl(efd[1], EPOLL_CTL_ADD, sfd[0], &e) < 0) goto out; e.events = EPOLLIN | EPOLLET; if (epoll_ctl(efd[0], EPOLL_CTL_ADD, efd[1], &e) < 0) goto out; if (write(sfd[1], "w", 1) != 1) goto out; if (epoll_wait(efd[0], &e, 1, 0) != 1) goto out; if (epoll_wait(efd[0], &e, 1, 0) != 0) goto out; close(efd[0]); close(efd[1]); close(sfd[0]); close(sfd[1]); return 0; out: return -1; }More tests:
https://github.com/heiher/epoll-wakeupCc Al Viro <[email protected]>Cc Andrew Morton <[email protected]>Cc Davide Libenzi <[email protected]>Cc Davidlohr Bueso <[email protected]>Cc Dominik Brodowski <[email protected]>Cc Eric Wong <[email protected]>Cc Jason Baron <[email protected]>Cc Linus Torvalds <[email protected]>Cc Roman Penyaev <[email protected]>Cc Sridhar Samudrala <[email protected]>Signed-off-by hev <[email protected]>--- fs/eventpoll.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)fs/eventpoll.c +3
-0@@ -685,6 +685,9 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,if (!ep_locked)mutex_lock_nested (&ep->mtx, depth); +if (!depth ||list_empty_careful (&ep->rdllist)) + pwake++; +/* * Steal the ready list, and re-init the original one to the * empty list. Also, set ep->ovflist to NULL so that events
fs/eventpoll.c static __poll_t ep_scan_ready_list(struct eventpoll *ep, · line 764
Quoted 8 lines
fs/eventpoll.c +1
-1@@ -755,7 +758,7 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,mutex_unlock (&ep->mtx);/* We have to call this outside the lock */ -if (pwake) +if (pwake ==2 )ep_poll_safewake (&ep->poll_wait);return res;
Hi,
I was thinking more like the following. I tried it using your test-suite and it seems to work. What do you think?
Thanks,
-Jason
fs/eventpoll.c +0 -0
@@ -712,6 +712,15 @@ static __poll_t ep_scan_ready_list(struct eventpoll
*ep,
for (nepi = READ_ONCE(ep->ovflist); (epi = nepi) != NULL;
nepi = epi->next, epi->next = EP_UNACTIVE_PTR) {
/*
+ * We only need to wakeup nested epoll fds if
+ * if something has been queued to the overflow list,
+ * since the ep_poll() traverses the rdllist during
+ * recursive poll and thus events on the overflow list
+ * may not be visible yet.
+ */+ if (!pwake)
+ pwake++;
+ /*
* We need to check if the item is already in the list.
* During the "sproc" callback execution time, items are
* queued into ->ovflist but the "txlist" might already
@@ -755,7 +764,7 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,
mutex_unlock(&ep->mtx);
/* We have to call this outside the lock */
- if (pwake)
+ if (pwake == 2)
ep_poll_safewake(&ep->poll_wait);
return res;Quoted 161 lines · Jason Baron
Quoted 116 lines · hev
From: Heiher <[email protected]>
Take the case where we have:
t0 | (ew) e0 | (et) e1 | (lt) s0t0: thread 0
e0: epoll fd 0
e1: epoll fd 1
s0: socket fd 0
ew:epoll_wait
et: edge-trigger
lt: level-triggerWhen s0 fires an event, e1 catches the event, and then e0 catches an event from e1. After this, There is a thread t0 do
epoll_wait()many times on e0, it should only get one event in total, because e1 is a dded to e0 in edge-triggered mode.This patch only allows the
wakeup(&ep->poll_wait)inep_scan_ready_listunder two conditions:1. depth == 0.
2. There have event is added toep->ovflistduring processing.Test code:
#include <unistd.h>
#include <sys/epoll.h>
#include <sys/socket.h>int
main(int argc, char *argv[])
{(quoted diff) +0
-0int sfd[2]; int efd[2]; struct epoll_event e; if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfd) < 0) goto out; efd[0] = epoll_create(1); if (efd[0] < 0) goto out; efd[1] = epoll_create(1); if (efd[1] < 0) goto out; e.events = EPOLLIN; if (epoll_ctl(efd[1], EPOLL_CTL_ADD, sfd[0], &e) < 0) goto out; e.events = EPOLLIN | EPOLLET; if (epoll_ctl(efd[0], EPOLL_CTL_ADD, efd[1], &e) < 0) goto out; if (write(sfd[1], "w", 1) != 1) goto out; if (epoll_wait(efd[0], &e, 1, 0) != 1) goto out; if (epoll_wait(efd[0], &e, 1, 0) != 0) goto out; close(efd[0]); close(efd[1]); close(sfd[0]); close(sfd[1]); return 0; out: return -1; }More tests:
https://github.com/heiher/epoll-wakeupCc Al Viro <[email protected]>Cc Andrew Morton <[email protected]>Cc Davide Libenzi <[email protected]>Cc Davidlohr Bueso <[email protected]>Cc Dominik Brodowski <[email protected]>Cc Eric Wong <[email protected]>Cc Jason Baron <[email protected]>Cc Linus Torvalds <[email protected]>Cc Roman Penyaev <[email protected]>Cc Sridhar Samudrala <[email protected]>Signed-off-by hev <[email protected]>--- fs/eventpoll.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)fs/eventpoll.c +3
-0@@ -685,6 +685,9 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,if (!ep_locked)mutex_lock_nested (&ep->mtx, depth); +if (!depth ||list_empty_careful (&ep->rdllist)) + pwake++; +/* * Steal the ready list, and re-init the original one to the * empty list. Also, set ep->ovflist to NULL so that events fs/eventpoll.c static __poll_t ep_scan_ready_list(struct eventpoll *ep, · line 764
Quoted 8 lines
fs/eventpoll.c +1
-1@@ -755,7 +758,7 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,mutex_unlock (&ep->mtx);/* We have to call this outside the lock */ -if (pwake) +if (pwake ==2 )ep_poll_safewake (&ep->poll_wait);return res;Hi,
I was thinking more like the following. I tried it using your test-suite and it seems to work. What do you think?
Thanks,
(quoted diff) +0
-1-Jasonfs/eventpoll.c +9
-0@@ -712,6 +712,15 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,for (nepi =READ_ONCE (ep->ovflist); (epi = nepi) !=NULL ; nepi = epi->next, epi->next =EP_UNACTIVE_PTR ) {/* +* We only need to wakeup nested epoll fds if +* if something has been queued to the overflow list, +* since the ep_poll() traverses the rdllist during +* recursive poll and thus events on the overflow list +* may not be visible yet. +*/ +if (!pwake) + pwake++; +/* * We need to check if the item is already in the list. * During the "sproc" callback execution time, items are * queued into ->ovflist but the "txlist" might already
fs/eventpoll.c static __poll_t ep_scan_ready_list(struct eventpoll *ep, · line 770
Quoted 8 lines
fs/eventpoll.c +1
-1@@ -755,7 +764,7 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,mutex_unlock (&ep->mtx);/* We have to call this outside the lock */ -if (pwake) +if (pwake ==2 )ep_poll_safewake (&ep->poll_wait);return res;
Also, probably better to not have that 'if' in the loop, so how about the following?
fs/eventpoll.c +0 -0
@@ -704,12 +704,21 @@ static __poll_t ep_scan_ready_list(struct
eventpoll *ep,
res = (*sproc)(ep, &txlist, priv);
write_lock_irq(&ep->lock);+ nepi = READ_ONCE(ep->ovflist);
+ /*
+ * We only need to wakeup nested epoll fds if something has been
queued
+ * to the overflow list, since the ep_poll() traverses the rdllist
+ * during recursive poll and thus events on the overflow list
may not be
+ * visible yet.
+ */
+ if (nepi != NULL)
+ pwake++;
/*
* During the time we spent inside the "sproc" callback, some
* other events might have been queued by the poll callback.
* We re-insert them inside the main ready-list here. */
- for (nepi = READ_ONCE(ep->ovflist); (epi = nepi) != NULL;
+ for (; (epi = nepi) != NULL;
nepi = epi->next, epi->next = EP_UNACTIVE_PTR) {
/*
* We need to check if the item is already in the list.
@@ -755,7 +764,7 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,
mutex_unlock(&ep->mtx);
/* We have to call this outside the lock */
- if (pwake)
+ if (pwake == 2)
ep_poll_safewake(&ep->poll_wait);
return res;Hi,
Quoted 170 lines · Jason Baron
Quoted 166 lines · Jason Baron
Quoted 116 lines · hev
From: Heiher <[email protected]>
Take the case where we have:
t0 | (ew) e0 | (et) e1 | (lt) s0t0: thread 0
e0: epoll fd 0
e1: epoll fd 1
s0: socket fd 0
ew:epoll_wait
et: edge-trigger
lt: level-triggerWhen s0 fires an event, e1 catches the event, and then e0 catches an event from e1. After this, There is a thread t0 do
epoll_wait()many times on e0, it should only get one event in total, because e1 is a dded to e0 in edge-triggered mode.This patch only allows the
wakeup(&ep->poll_wait)inep_scan_ready_listunder two conditions:1. depth == 0.
2. There have event is added toep->ovflistduring processing.Test code:
#include <unistd.h>
#include <sys/epoll.h>
#include <sys/socket.h>int
main(int argc, char *argv[]){ int sfd[2]; int efd[2]; struct epoll_event e; if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfd) < 0) goto out; efd[0] = epoll_create(1); if (efd[0] < 0) goto out; efd[1] = epoll_create(1); if (efd[1] < 0) goto out; e.events = EPOLLIN; if (epoll_ctl(efd[1], EPOLL_CTL_ADD, sfd[0], &e) < 0) goto out; e.events = EPOLLIN | EPOLLET; if (epoll_ctl(efd[0], EPOLL_CTL_ADD, efd[1], &e) < 0) goto out; if (write(sfd[1], "w", 1) != 1) goto out; if (epoll_wait(efd[0], &e, 1, 0) != 1) goto out; if (epoll_wait(efd[0], &e, 1, 0) != 0) goto out; close(efd[0]); close(efd[1]); close(sfd[0]); close(sfd[1]); return 0;out:
return -1;}
More tests:
https://github.com/heiher/epoll-wakeupCc Al Viro <[email protected]>Cc Andrew Morton <[email protected]>Cc Davide Libenzi <[email protected]>Cc Davidlohr Bueso <[email protected]>Cc Dominik Brodowski <[email protected]>Cc Eric Wong <[email protected]>Cc Jason Baron <[email protected]>Cc Linus Torvalds <[email protected]>Cc Roman Penyaev <[email protected]>Cc Sridhar Samudrala <[email protected]>Signed-off-by hev <[email protected]>--- fs/eventpoll.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)fs/eventpoll.c +3
-0@@ -685,6 +685,9 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,if (!ep_locked)mutex_lock_nested (&ep->mtx, depth); +if (!depth ||list_empty_careful (&ep->rdllist)) + pwake++; +/* * Steal the ready list, and re-init the original one to the * empty list. Also, set ep->ovflist to NULL so that events fs/eventpoll.c static __poll_t ep_scan_ready_list(struct eventpoll *ep, · line 764
Quoted 8 lines
fs/eventpoll.c +1
-1@@ -755,7 +758,7 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,mutex_unlock (&ep->mtx);/* We have to call this outside the lock */ -if (pwake) +if (pwake ==2 )ep_poll_safewake (&ep->poll_wait);return res;Hi,
I was thinking more like the following. I tried it using your test-suite and it seems to work. What do you think?
Thanks,
(quoted diff) +0
-1-Jasonfs/eventpoll.c +9
-0@@ -712,6 +712,15 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,for (nepi =READ_ONCE (ep->ovflist); (epi = nepi) !=NULL ; nepi = epi->next, epi->next =EP_UNACTIVE_PTR ) {/* +* We only need to wakeup nested epoll fds if +* if something has been queued to the overflow list, +* since the ep_poll() traverses the rdllist during +* recursive poll and thus events on the overflow list +* may not be visible yet. +*/ +if (!pwake) + pwake++; +/* * We need to check if the item is already in the list. * During the "sproc" callback execution time, items are * queued into ->ovflist but the "txlist" might already
fs/eventpoll.c +1
-1@@ -755,7 +764,7 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,mutex_unlock (&ep->mtx);/* We have to call this outside the lock */ -if (pwake) +if (pwake ==2 )ep_poll_safewake (&ep->poll_wait);
Quoted 7 lines
fs/eventpoll.c static __poll_t ep_scan_ready_list(struct eventpoll *ep, · line 770
Quoted 3 lines
fs/eventpoll.c +0
-0return res;Also, probably better to not have that 'if' in the loop, so how about the following?
Hmm. I think this is more accurate.
Thank you.
Quoted 42 lines
fs/eventpoll.c +3
-0@@ -704,12 +704,21 @@ static __poll_t ep_scan_ready_list(structeventpoll *ep, res = (*sproc)(ep, &txlist, priv);write_lock_irq (&ep->lock); + nepi =READ_ONCE (ep->ovflist); +/* +* We only need to wakeup nested epoll fds if something has been queued
fs/eventpoll.c +2
-0+* to the overflow list, since the ep_poll() traverses the rdllist +* during recursive poll and thus events on the overflow list may not be
fs/eventpoll.c +6
-2+* visible yet. +*/ +if (nepi !=NULL ) + pwake++;/* * During the time we spent inside the "sproc" callback, some * other events might have been queued by the poll callback. * We re-insert them inside the main ready-list here. */ -for (nepi =READ_ONCE (ep->ovflist); (epi = nepi) !=NULL ; +for (; (epi = nepi) !=NULL ; nepi = epi->next, epi->next =EP_UNACTIVE_PTR ) {/* * We need to check if the item is already in the list. @@ -755,7 +764,7 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,mutex_unlock (&ep->mtx);/* We have to call this outside the lock */ -if (pwake) +if (pwake ==2 )ep_poll_safewake (&ep->poll_wait);return res;
Signature · 3 lines
Best regards! Hev https://hev.cc
Quoted 36 lines · Heiher
Hi,
Quoted 33 lines · Jason Baron
Quoted 29 lines · Jason Baron
Quoted 28 lines · hev
From: Heiher <[email protected]>
Take the case where we have:
t0 | (ew) e0 | (et) e1 | (lt) s0t0: thread 0
e0: epoll fd 0
e1: epoll fd 1
s0: socket fd 0
ew:epoll_wait
et: edge-trigger
lt: level-triggerWhen s0 fires an event, e1 catches the event, and then e0 catches an event from e1. After this, There is a thread t0 do
epoll_wait()many times on e0, it should only get one event in total, because e1 is a dded to e0 in edge-triggered mode.This patch only allows the
wakeup(&ep->poll_wait)inep_scan_ready_listunder two conditions:1. depth == 0.
What is the point of this condition again? I was thinking we only need to do #2.
Quoted 80 lines
Quoted 80 lines
Quoted 80 lines
Quoted 80 lines
2. There have event is added to
ep->ovflistduring processing.Test code:
#include <unistd.h>
#include <sys/epoll.h>
#include <sys/socket.h>int
main(int argc, char *argv[]){ int sfd[2]; int efd[2]; struct epoll_event e; if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfd) < 0) goto out; efd[0] = epoll_create(1); if (efd[0] < 0) goto out; efd[1] = epoll_create(1); if (efd[1] < 0) goto out; e.events = EPOLLIN; if (epoll_ctl(efd[1], EPOLL_CTL_ADD, sfd[0], &e) < 0) goto out; e.events = EPOLLIN | EPOLLET; if (epoll_ctl(efd[0], EPOLL_CTL_ADD, efd[1], &e) < 0) goto out; if (write(sfd[1], "w", 1) != 1) goto out; if (epoll_wait(efd[0], &e, 1, 0) != 1) goto out; if (epoll_wait(efd[0], &e, 1, 0) != 0) goto out; close(efd[0]); close(efd[1]); close(sfd[0]); close(sfd[1]); return 0;out:
return -1;}
More tests:
https://github.com/heiher/epoll-wakeupCc Al Viro <[email protected]>Cc Andrew Morton <[email protected]>Cc Davide Libenzi <[email protected]>Cc Davidlohr Bueso <[email protected]>Cc Dominik Brodowski <[email protected]>Cc Eric Wong <[email protected]>Cc Jason Baron <[email protected]>Cc Linus Torvalds <[email protected]>Cc Roman Penyaev <[email protected]>Cc Sridhar Samudrala <[email protected]>Signed-off-by hev <[email protected]>--- fs/eventpoll.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)fs/eventpoll.c +0
-0@@ -685,6 +685,9 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,if (!ep_locked)mutex_lock_nested (&ep->mtx, depth);
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
fs/eventpoll.c static __poll_t ep_scan_ready_list(struct eventpoll *ep, · line 690
Quoted 3 lines
fs/eventpoll.c +3
-0+if (!depth ||list_empty_careful (&ep->rdllist)) + pwake++; +
This is the check I'm wondering why it's needed?
Thanks,
-Jason
Hi,
Quoted 125 lines · Jason Baron
Quoted 36 lines · Heiher
Hi,
Quoted 33 lines · Jason Baron
Quoted 29 lines · Jason Baron
Quoted 28 lines · hev
From: Heiher <[email protected]>
Take the case where we have:
t0 | (ew) e0 | (et) e1 | (lt) s0t0: thread 0
e0: epoll fd 0
e1: epoll fd 1
s0: socket fd 0
ew:epoll_wait
et: edge-trigger
lt: level-triggerWhen s0 fires an event, e1 catches the event, and then e0 catches an event from e1. After this, There is a thread t0 do
epoll_wait()many times on e0, it should only get one event in total, because e1 is a dded to e0 in edge-triggered mode.This patch only allows the
wakeup(&ep->poll_wait)inep_scan_ready_listunder two conditions:1. depth == 0.
What is the point of this condition again? I was thinking we only need to do #2.
Quoted 80 lines
Quoted 80 lines
Quoted 80 lines
Quoted 80 lines
2. There have event is added to
ep->ovflistduring processing.Test code:
#include <unistd.h>
#include <sys/epoll.h>
#include <sys/socket.h>int
main(int argc, char *argv[]){ int sfd[2]; int efd[2]; struct epoll_event e; if (socketpair(AF_UNIX, SOCK_STREAM, 0, sfd) < 0) goto out; efd[0] = epoll_create(1); if (efd[0] < 0) goto out; efd[1] = epoll_create(1); if (efd[1] < 0) goto out; e.events = EPOLLIN; if (epoll_ctl(efd[1], EPOLL_CTL_ADD, sfd[0], &e) < 0) goto out; e.events = EPOLLIN | EPOLLET; if (epoll_ctl(efd[0], EPOLL_CTL_ADD, efd[1], &e) < 0) goto out; if (write(sfd[1], "w", 1) != 1) goto out; if (epoll_wait(efd[0], &e, 1, 0) != 1) goto out; if (epoll_wait(efd[0], &e, 1, 0) != 0) goto out; close(efd[0]); close(efd[1]); close(sfd[0]); close(sfd[1]); return 0;out:
return -1;}
More tests:
https://github.com/heiher/epoll-wakeupCc Al Viro <[email protected]>Cc Andrew Morton <[email protected]>Cc Davide Libenzi <[email protected]>Cc Davidlohr Bueso <[email protected]>Cc Dominik Brodowski <[email protected]>Cc Eric Wong <[email protected]>Cc Jason Baron <[email protected]>Cc Linus Torvalds <[email protected]>Cc Roman Penyaev <[email protected]>Cc Sridhar Samudrala <[email protected]>Signed-off-by hev <[email protected]>--- fs/eventpoll.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)fs/eventpoll.c +0
-0@@ -685,6 +685,9 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,if (!ep_locked)mutex_lock_nested (&ep->mtx, depth);
Quoted 5 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
fs/eventpoll.c static __poll_t ep_scan_ready_list(struct eventpoll *ep, · line 690
Quoted 3 lines
fs/eventpoll.c +3
-0+if (!depth ||list_empty_careful (&ep->rdllist)) + pwake++; +This is the check I'm wondering why it's needed?
You are right. This is not needed. Initially, I want to keep the original behavior of depth 0 for direct poll() in multi-threads.
Quoted 6 lines
Thanks,
-Jason
Signature · 3 lines
Best regards! Hev https://hev.cc