diff options
| author | Keller, Jacob E <jacob.e.keller@intel.com> | 2013-03-28 11:19:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-31 19:44:20 -0400 |
| commit | 7d4c04fc170087119727119074e72445f2bb192b (patch) | |
| tree | d76759bfe44399949f70cc344f3be76b8448cac2 /net/unix | |
| parent | 4eb06148250f92e1e58bf069c309dac173e8b5f7 (diff) | |
| download | linux-3.10-7d4c04fc170087119727119074e72445f2bb192b.tar.gz linux-3.10-7d4c04fc170087119727119074e72445f2bb192b.tar.bz2 linux-3.10-7d4c04fc170087119727119074e72445f2bb192b.zip | |
net: add option to enable error queue packets waking select
Currently, when a socket receives something on the error queue it only wakes up
the socket on select if it is in the "read" list, that is the socket has
something to read. It is useful also to wake the socket if it is in the error
list, which would enable software to wait on error queue packets without waking
up for regular data on the socket. The main use case is for receiving
timestamped transmit packets which return the timestamp to the socket via the
error queue. This enables an application to select on the socket for the error
queue only instead of for the regular traffic.
-v2-
* Added the SO_SELECT_ERR_QUEUE socket option to every architechture specific file
* Modified every socket poll function that checks error queue
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Cc: Jeffrey Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Matthew Vick <matthew.vick@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 971282b6f6a..fb7a63ff71a 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2196,7 +2196,9 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock, /* exceptional events? */ if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) - mask |= POLLERR; + mask |= POLLERR | + sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0; + if (sk->sk_shutdown & RCV_SHUTDOWN) mask |= POLLRDHUP | POLLIN | POLLRDNORM; if (sk->sk_shutdown == SHUTDOWN_MASK) |