Messages in this thread Patch in this message | | | Date | Fri, 13 Jun 2008 23:10:33 +0200 | From | Ingo Molnar <> | Subject | Re: [TCP]: TCP_DEFER_ACCEPT causes leak sockets |
| |
* Ingo Molnar <mingo@elte.hu> wrote:
> > far, and updated it to yours. The delta between the two is the 3 lines > > patch below. > > > > A few testsystems already booted into your patch, so if i dont report > > a hung TCP connection in the next 6 hours consider it: > > > > Tested-by: Ingo Molnar <mingo@elte.hu> > > this threw the warning below - never saw that before in thousands of > bootups and this was the only networking change that happened. config > and bootlog attached. Might be unlucky coincidence.
hm, threw a second warning after 6 more hours of testing:
[ 362.170209] WARNING: at net/sched/sch_generic.c:222 dev_watchdog+0xde/0xf0()
that appears to be more than just coincidence. I've applied the patch below - which brings me back to the well-tested revert from Ilpo.
This is the only change i've done for the overnight -tip testruns, so if the warning from sch_generic.c goes away it's this change that has an impact on that warning.
Ingo
---------------------> commit 3019ae9652fe44c099669e5dba116acad583cfcb Author: Ingo Molnar <mingo@elte.hu> Date: Fri Jun 13 23:09:28 2008 +0200
tcp: revert again Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 045e799..ec83448 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -466,9 +466,9 @@ void inet_csk_reqsk_queue_prune(struct sock *parent, reqp=&lopt->syn_table[i]; while ((req = *reqp) != NULL) { if (time_after_eq(now, req->expires)) { - if ((req->retrans < (inet_rsk(req)->acked ? max_retries : thresh)) && - (inet_rsk(req)->acked || - !req->rsk_ops->rtx_syn_ack(parent, req))) { + if ((req->retrans < thresh || + (inet_rsk(req)->acked && req->retrans < max_retries)) + && !req->rsk_ops->rtx_syn_ack(parent, req)) { unsigned long timeo; if (req->retrans++ == 0)
| |