diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-01-28 11:11:03 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-30 12:45:07 -0500 |
commit | 6f01fd6e6f6809061b56e78f1e8d143099716d70 (patch) | |
tree | bd6b09a01a5f1af65fc12c6ac533f2b1f4caa777 /include | |
parent | 5b35e1e6e9ca651e6b291c96d1106043c9af314a (diff) |
af_unix: fix EPOLLET regression for stream sockets
Commit 0884d7aa24 (AF_UNIX: Fix poll blocking problem when reading from
a stream socket) added a regression for epoll() in Edge Triggered mode
(EPOLLET)
Appropriate fix is to use skb_peek()/skb_unlink() instead of
skb_dequeue(), and only call skb_unlink() when skb is fully consumed.
This remove the need to requeue a partial skb into sk_receive_queue head
and the extra sk->sk_data_ready() calls that added the regression.
This is safe because once skb is given to sk_receive_queue, it is not
modified by a writer, and readers are serialized by u->readlock mutex.
This also reduce number of spinlock acquisition for small reads or
MSG_PEEK users so should improve overall performance.
Reported-by: Nick Mathewson <nickm@freehaven.net>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Alexey Moiseytsev <himeraster@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions