Messages in this thread Patch in this message | | | Date | Mon, 06 Oct 2008 10:18:14 -0700 (PDT) | Subject | Re: Honoring SO_RCVLOWAT in proto_ops.poll methods | From | David Miller <> |
| |
From: lkml@pengaru.com Date: Mon, 6 Oct 2008 00:17:18 -0500
> Looks like the RCVLOWAT patch breaks the tcp poll logic in the normal > case.
Sorry, the condition was reversed, try this one instead:
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 1ab341e..7d81a1e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -384,13 +384,17 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait) /* Connected? */ if ((1 << sk->sk_state) & ~(TCPF_SYN_SENT | TCPF_SYN_RECV)) { + int target = sock_rcvlowat(sk, 0, INT_MAX); + + if (tp->urg_seq == tp->copied_seq && + !sock_flag(sk, SOCK_URGINLINE) && + tp->urg_data) + target--; + /* Potential race condition. If read of tp below will * escape above sk->sk_state, we can be illegally awaken * in SYN_* states. */ - if ((tp->rcv_nxt != tp->copied_seq) && - (tp->urg_seq != tp->copied_seq || - tp->rcv_nxt != tp->copied_seq + 1 || - sock_flag(sk, SOCK_URGINLINE) || !tp->urg_data)) + if (tp->rcv_nxt - tp->copied_seq >= target) mask |= POLLIN | POLLRDNORM; if (!(sk->sk_shutdown & SEND_SHUTDOWN)) {
| |