From patchwork Wed Nov 3 08:59:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 69956 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E5ACDB70DA for ; Wed, 3 Nov 2010 20:02:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753729Ab0KCI74 (ORCPT ); Wed, 3 Nov 2010 04:59:56 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:34309 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753627Ab0KCI7y (ORCPT ); Wed, 3 Nov 2010 04:59:54 -0400 Received: by fxm16 with SMTP id 16so240010fxm.19 for ; Wed, 03 Nov 2010 01:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=jZhQSp3xVYdQbGvgZc2qVNiRzQdNNvOc++O93Irb+JU=; b=U/jrwLQ/l1zVZLt4wO2ZpZIw1IGYfgNPHXoR9FdWLLfbMfdAEZs0HUX3UsIo9ByrfW SAaMDXCGDffwjyUQaDOUrDvsVj7Gqh8Z1nIHo4WhlI8ttvU4gAkj/gbSQ34pAXX9rOY9 XBzm3lyOufQrBtxDfQRIAvsSiES4GbNyOrAmE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=v+43sDcjlIRU/1TOdavnsGmYOPbalEgpJpCfjmD/rIRAK8zJMhiob3LqVKtd1oktDh q4KV4BE8WWC3k5KpqMHPrAV8KOvSRbSRwP2LRFrgxcrFM3SaeJaLt5PLC6o3HrU3lzrG OW7rIHeofNbxd9cYqKvLJdq0y/v/lUjmVruMg= Received: by 10.223.81.78 with SMTP id w14mr6538244fak.5.1288774793270; Wed, 03 Nov 2010 01:59:53 -0700 (PDT) Received: from ff.dom.local (bv170.internetdsl.tpnet.pl [80.53.205.170]) by mx.google.com with ESMTPS id k4sm3552017faa.8.2010.11.03.01.59.51 (version=SSLv3 cipher=RC4-MD5); Wed, 03 Nov 2010 01:59:52 -0700 (PDT) Date: Wed, 3 Nov 2010 08:59:48 +0000 From: Jarek Poplawski To: Denys Fedoryshchenko Cc: Thomas Gleixner , Paul Mackerras , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: Re: 2.6.35->2.6.36 regression, vanilla kernel panic, ppp or hrtimers crashing Message-ID: <20101103085948.GC7279@ff.dom.local> References: <20101028070550.GA7647@ff.dom.local> <201011030947.54464.nuclearcat@nuclearcat.com> <20101103080258.GB7279@ff.dom.local> <201011031018.21178.nuclearcat@nuclearcat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201011031018.21178.nuclearcat@nuclearcat.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Nov 03, 2010 at 10:18:20AM +0200, Denys Fedoryshchenko wrote: > > On Wednesday 03 November 2010 10:02:58 Jarek Poplawski wrote: > > On Wed, Nov 03, 2010 at 09:47:53AM +0200, Denys Fedoryshchenko wrote: > > > I try to reverse and got very weird lockups (no netconsole logs and no > > > watchdog triggered reboot on that remote machine). > > > I will try to cook something to reboot it, because it is very remote > > > machine > > > > OK, I only wanted to know if reverting could be a fast fix. Since it > > isn't, please stay with 2.6.35 until there is some new idea (patch). > > > Well, still i want to try (if i can) more debug, and maybe i'll catch > something, also i have around 145 NAS servers to go, to try 2.6.36 :-) I think the current debugging needs analyzing first. But here is a patch which probably could matter at least wrt your first oopses. (Please try this first on something you can easily reboot.) Jarek P. --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 09cf56d..1b98c4c 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c @@ -409,6 +409,8 @@ static ssize_t ppp_read(struct file *file, char __user *buf, if (!pf) return -ENXIO; + + atomic_inc(&pf->refcnt); add_wait_queue(&pf->rwait, &wait); for (;;) { set_current_state(TASK_INTERRUPTIBLE); @@ -440,6 +442,17 @@ static ssize_t ppp_read(struct file *file, char __user *buf, set_current_state(TASK_RUNNING); remove_wait_queue(&pf->rwait, &wait); + if (atomic_dec_and_test(&pf->refcnt)) { + switch (pf->kind) { + case INTERFACE: + ppp_destroy_interface(PF_TO_PPP(pf)); + break; + case CHANNEL: + ppp_destroy_channel(PF_TO_CHANNEL(pf)); + break; + } + } + if (!skb) goto out; @@ -504,6 +517,8 @@ static unsigned int ppp_poll(struct file *file, poll_table *wait) if (!pf) return 0; + + atomic_inc(&pf->refcnt); poll_wait(file, &pf->rwait, wait); mask = POLLOUT | POLLWRNORM; if (skb_peek(&pf->rq)) @@ -518,6 +533,17 @@ static unsigned int ppp_poll(struct file *file, poll_table *wait) mask |= POLLIN | POLLRDNORM; } + if (atomic_dec_and_test(&pf->refcnt)) { + switch (pf->kind) { + case INTERFACE: + ppp_destroy_interface(PF_TO_PPP(pf)); + break; + case CHANNEL: + ppp_destroy_channel(PF_TO_CHANNEL(pf)); + break; + } + } + return mask; }