From patchwork Thu Sep 10 15:56:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 516327 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 C84CB1400A0 for ; Fri, 11 Sep 2015 01:57:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752365AbbIJP5B (ORCPT ); Thu, 10 Sep 2015 11:57:01 -0400 Received: from zimbra.alphalink.fr ([217.15.80.77]:41515 "EHLO mail-2-cbv2.admin.alphalink.fr" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751489AbbIJP5A (ORCPT ); Thu, 10 Sep 2015 11:57:00 -0400 Received: from localhost (localhost [127.0.0.1]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id 505842B52070; Thu, 10 Sep 2015 17:56:58 +0200 (CEST) Received: from mail-2-cbv2.admin.alphalink.fr ([127.0.0.1]) by localhost (mail-2-cbv2.admin.alphalink.fr [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id L8Nbmi1brm9V; Thu, 10 Sep 2015 17:56:57 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id A323F2B52181; Thu, 10 Sep 2015 17:56:57 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail-2-cbv2.admin.alphalink.fr Received: from mail-2-cbv2.admin.alphalink.fr ([127.0.0.1]) by localhost (mail-2-cbv2.admin.alphalink.fr [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id fvNNGyRmhT-Q; Thu, 10 Sep 2015 17:56:57 +0200 (CEST) Received: from dev-10-pornic.admin.alphalink.fr (94-84-15-217.reverse.alphalink.fr [217.15.84.94]) by mail-2-cbv2.admin.alphalink.fr (Postfix) with ESMTP id 64BEF2B52070; Thu, 10 Sep 2015 17:56:57 +0200 (CEST) Received: by dev-10-pornic.admin.alphalink.fr (Postfix, from userid 2073) id 50AB7105EF40; Thu, 10 Sep 2015 17:56:57 +0200 (CEST) Date: Thu, 10 Sep 2015 17:56:57 +0200 From: Guillaume Nault To: Denys Fedoryshchenko Cc: Dan Williams , Netdev , ebiederm@xmission.com, davem@davemloft.net, simon@farnz.org.uk, develop@kristov.de Subject: Re: 4.1.0, kernel panic, pppoe_release Message-ID: <20150910155657.GC3661@alphalink.fr> References: <677da51dbac367fcb7a456de2789334b@visp.net.lb> <1437147400.5437.4.camel@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Fri, Jul 17, 2015 at 09:16:14PM +0300, Denys Fedoryshchenko wrote: > Probably my knowledge of kernel is not sufficient, but i will try few > approaches. > One of them to add to pppoe_unbind_sock_work: > > pppox_unbind_sock(sk); > +/* Signal the death of the socket. */ > +sk->sk_state = PPPOX_DEAD; > I don't believe this will fix anything. pppox_unbind_sock() already sets sk->sk_state when necessary. > I will wait first, to make sure this patch was causing kernel panic (it > needs 24h testing cycle), then i will try this fix. > I suspect the problem goes with actions performed on the underlying interface (MAC address, MTU or link state update). This triggers pppoe_flush_dev(), which cleans up the device without announcing it in sk->sk_state. Can you pleas try the following patch? --- -- 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/pppoe.c b/drivers/net/ppp/pppoe.c index 3837ae3..2ed7506 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -313,7 +313,6 @@ static void pppoe_flush_dev(struct net_device *dev) if (po->pppoe_dev == dev && sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) { pppox_unbind_sock(sk); - sk->sk_state = PPPOX_ZOMBIE; sk->sk_state_change(sk); po->pppoe_dev = NULL; dev_put(dev);