| Message ID | 20180629133725.17606-2-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jun 29, 2018 at 6:37 AM Christoph Hellwig <hch@lst.de> wrote: > > The big aio poll revert broke various network protocols that don't > implement ->poll as a patch in the aio poll serie removed sock_no_poll > and made the common code handle this case. Hmm. I just did the revert of commit 984652dd8b1f ("net: remove sock_no_poll") in my tree. But I haven't pushed it out, and your patch is certainly smaller/nicer than the revert. That said, the revert does have the advantage of avoiding a conditional in the network poll() function (at the cost of a more expensive indirect call for when sock_no_poll actually triggers, but only "odd" network protocols have that). Hmm. I'll have to think about it. Linus
On Fri, Jun 29, 2018 at 6:46 AM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > Hmm. I'll have to think about it. I took yours over the revert. It's just smaller and nicer, and the conditional should predict fine for any case where it might matter. Linus
diff --git a/net/socket.c b/net/socket.c index a564c6ed19d5..85633622c94d 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1133,6 +1133,8 @@ static __poll_t sock_poll(struct file *file, poll_table *wait) __poll_t events = poll_requested_events(wait); sock_poll_busy_loop(sock, events); + if (!sock->ops->poll) + return 0; return sock->ops->poll(file, sock, wait) | sock_poll_busy_flag(sock); }
The big aio poll revert broke various network protocols that don't implement ->poll as a patch in the aio poll serie removed sock_no_poll and made the common code handle this case. Fixes: a11e1d43 ("Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL") Signed-off-by: Christoph Hellwig <hch@lst.de> --- net/socket.c | 2 ++ 1 file changed, 2 insertions(+)