Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756354AbYFCX5Z (ORCPT ); Tue, 3 Jun 2008 19:57:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752846AbYFCX5P (ORCPT ); Tue, 3 Jun 2008 19:57:15 -0400 Received: from 136-022.dsl.labridge.com ([206.117.136.22]:2085 "EHLO mail.perches.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752807AbYFCX5O (ORCPT ); Tue, 3 Jun 2008 19:57:14 -0400 Subject: Re: [fixed] [patch] Re: [bug] stuck localhost TCP connections, v2.6.26-rc3+ From: Joe Perches To: Ilpo =?ISO-8859-1?Q?J=E4rvinen?= Cc: David Miller , mingo@elte.hu, mcmanus@ducksong.com, peterz@infradead.org, LKML , Netdev , rjw@sisk.pl, Andrew Morton , johnpol@2ka.mipt.ru In-Reply-To: References: <20080603094057.GA29480@elte.hu> <20080603.150344.145518113.davem@davemloft.net> Content-Type: text/plain; charset=utf-8 Date: Tue, 03 Jun 2008 16:54:01 -0700 Message-Id: <1212537241.6980.12.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3-1.2mdv2008.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3267 Lines: 94 On Wed, 2008-06-04 at 02:22 +0300, Ilpo Järvinen wrote: > But here's somewhat more likely explanation... Only compile tested... > It probably needs some commenting from people who understand locking > variants & details (I don't). > Signed-off-by: Ilpo Järvinen > diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c > index c9454f0..d21d2b9 100644 > --- a/net/ipv4/tcp_input.c > +++ b/net/ipv4/tcp_input.c > @@ -4562,6 +4562,7 @@ static int tcp_defer_accept_check(struct sock *sk) > struct tcp_sock *tp = tcp_sk(sk); > > if (tp->defer_tcp_accept.request) { > + struct sock *listen_sk = tp->defer_tcp_accept.listen_sk; Not commenting on the locking, but I think the code would be clearer if tp->defer_tcp_accept was used in a temporary instead. Perhaps: net/ipv4/tcp_input.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index b54d9d3..f846e11 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4535,18 +4535,18 @@ static void tcp_urg(struct sock *sk, struct sk_buff *skb, struct tcphdr *th) static int tcp_defer_accept_check(struct sock *sk) { struct tcp_sock *tp = tcp_sk(sk); - - if (tp->defer_tcp_accept.request) { - int queued_data = tp->rcv_nxt - tp->copied_seq; - int hasfin = !skb_queue_empty(&sk->sk_receive_queue) ? + struct tcp_deferred_accept_info *tdai = &tp->defer_tcp_accept; + if (tdai->request) { + int queued_data = tp->rcv_nxt - tp->copied_seq; + int hasfin = !skb_queue_empty(&sk->sk_receive_queue) ? tcp_hdr((struct sk_buff *) sk->sk_receive_queue.prev)->fin : 0; if (queued_data && hasfin) queued_data--; - if (queued_data && - tp->defer_tcp_accept.listen_sk->sk_state == TCP_LISTEN) { + bh_lock_sock(tdai->listen_sk); + if (queued_data && tdai->listen_sk->sk_state == TCP_LISTEN) { if (sock_flag(sk, SOCK_KEEPOPEN)) { inet_csk_reset_keepalive_timer(sk, keepalive_time_when(tp)); @@ -4554,23 +4554,22 @@ static int tcp_defer_accept_check(struct sock *sk) inet_csk_delete_keepalive_timer(sk); } - inet_csk_reqsk_queue_add( - tp->defer_tcp_accept.listen_sk, - tp->defer_tcp_accept.request, - sk); + inet_csk_reqsk_queue_add(tdai->listen_sk, + tdai->request, + sk); - tp->defer_tcp_accept.listen_sk->sk_data_ready( - tp->defer_tcp_accept.listen_sk, 0); + tdai->listen_sk->sk_data_ready(tdai->listen_sk, 0); - sock_put(tp->defer_tcp_accept.listen_sk); + sock_put(tdai->listen_sk); sock_put(sk); - tp->defer_tcp_accept.listen_sk = NULL; - tp->defer_tcp_accept.request = NULL; - } else if (hasfin || - tp->defer_tcp_accept.listen_sk->sk_state != TCP_LISTEN) { + tdai->listen_sk = NULL; + tdai->request = NULL; + } else if (hasfin || tdai->listen_sk->sk_state != TCP_LISTEN) { + bh_unlock_sock(tdai->listen_sk); tcp_reset(sk); return -1; } + bh_unlock_sock(tdai->listen_sk); } return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/