From: Fengguang Wu <fengguang.wu@intel.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>,
"H.K. Jerry Chu" <hkchu@google.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
networking <netdev@vger.kernel.org>,
linux-can@vger.kernel.org
Subject: Re: sctp_close/sk_free: kernel BUG at arch/x86/mm/physaddr.c:18!
Date: Thu, 6 Sep 2012 06:28:50 +0800 [thread overview]
Message-ID: <20120905222850.GA11230@localhost> (raw)
In-Reply-To: <1346864220.13121.157.camel@edumazet-glaptop>
On Wed, Sep 05, 2012 at 06:57:00PM +0200, Eric Dumazet wrote:
> On Wed, 2012-09-05 at 17:40 +0200, Eric Dumazet wrote:
>
> > Could you test the following patch please ?
It works - no single error for 1000 boots!
btw, the first bad commit has been bisected to
commit 8336886f786fdacbc19b719c1f7ea91eb70706d4
Author: Jerry Chu <hkchu@google.com>
Date: Fri Aug 31 12:29:12 2012 +0000
tcp: TCP Fast Open Server - support TFO listeners
> > (Not sure why sctp doesnt memset/bzero its whole socket by the way...)
> >
> > Thanks
>
> Here is a more complete patch, as there are three potential problems,
> not only one :
Great! I'll start tests for it.
Thanks,
Fengguang
> diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
> index 4f70ef0..845372b 100644
> --- a/net/ipv4/af_inet.c
> +++ b/net/ipv4/af_inet.c
> @@ -149,11 +149,8 @@ void inet_sock_destruct(struct sock *sk)
> pr_err("Attempt to release alive inet socket %p\n", sk);
> return;
> }
> - if (sk->sk_type == SOCK_STREAM) {
> - struct fastopen_queue *fastopenq =
> - inet_csk(sk)->icsk_accept_queue.fastopenq;
> - kfree(fastopenq);
> - }
> + if (sk->sk_protocol == IPPROTO_TCP)
> + kfree(inet_csk(sk)->icsk_accept_queue.fastopenq);
>
> WARN_ON(atomic_read(&sk->sk_rmem_alloc));
> WARN_ON(atomic_read(&sk->sk_wmem_alloc));
> diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
> index 8464b79..f0c5b9c 100644
> --- a/net/ipv4/inet_connection_sock.c
> +++ b/net/ipv4/inet_connection_sock.c
> @@ -314,7 +314,7 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err)
> newsk = req->sk;
>
> sk_acceptq_removed(sk);
> - if (sk->sk_type == SOCK_STREAM && queue->fastopenq != NULL) {
> + if (sk->sk_protocol == IPPROTO_TCP && queue->fastopenq != NULL) {
> spin_lock_bh(&queue->fastopenq->lock);
> if (tcp_rsk(req)->listener) {
> /* We are still waiting for the final ACK from 3WHS
> @@ -775,7 +775,7 @@ void inet_csk_listen_stop(struct sock *sk)
>
> percpu_counter_inc(sk->sk_prot->orphan_count);
>
> - if (sk->sk_type == SOCK_STREAM && tcp_rsk(req)->listener) {
> + if (sk->sk_protocol == IPPROTO_TCP && tcp_rsk(req)->listener) {
> BUG_ON(tcp_sk(child)->fastopen_rsk != req);
> BUG_ON(sk != tcp_rsk(req)->listener);
>
>
next prev parent reply other threads:[~2012-09-05 22:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-04 13:59 sctp_close/sk_free: kernel BUG at slab.c:3074! Fengguang Wu
2012-09-04 14:04 ` sctp_close/sk_free: kernel BUG at arch/x86/mm/physaddr.c:18! Fengguang Wu
2012-09-04 17:10 ` Marc Kleine-Budde
2012-09-04 20:32 ` Eric W. Biederman
2012-09-04 20:42 ` Marc Kleine-Budde
2012-09-05 14:55 ` Fengguang Wu
2012-09-05 15:01 ` Marc Kleine-Budde
2012-09-05 15:30 ` Eric Dumazet
2012-09-05 15:40 ` Eric Dumazet
2012-09-05 16:57 ` Eric Dumazet
2012-09-05 22:28 ` Fengguang Wu [this message]
2012-09-05 23:07 ` Jerry Chu
2012-09-06 4:54 ` Fengguang Wu
2012-09-06 18:07 ` [PATCH net-next] tcp: fix TFO regression Eric Dumazet
2012-09-06 18:15 ` Neal Cardwell
2012-09-06 18:23 ` David Miller
2012-09-06 18:18 ` Jerry Chu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120905222850.GA11230@localhost \
--to=fengguang.wu@intel.com \
--cc=ebiederm@xmission.com \
--cc=eric.dumazet@gmail.com \
--cc=hkchu@google.com \
--cc=linux-can@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).