From patchwork Tue Aug 30 20:56:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 112384 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 AAD7AB6F86 for ; Wed, 31 Aug 2011 06:57:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756739Ab1H3U5W (ORCPT ); Tue, 30 Aug 2011 16:57:22 -0400 Received: from mail.tpi.com ([70.99.223.143]:4447 "EHLO mail.tpi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756690Ab1H3U5U (ORCPT ); Tue, 30 Aug 2011 16:57:20 -0400 Received: from sepang.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id 2840F2E1806; Tue, 30 Aug 2011 13:56:36 -0700 (PDT) Received: from [127.0.0.1] (lochsa [127.0.0.1]) by sepang.rtg.net (Postfix) with ESMTP id A3CB0F8A00; Tue, 30 Aug 2011 14:56:49 -0600 (MDT) Message-ID: <4E5D4E91.3070503@canonical.com> Date: Tue, 30 Aug 2011 14:56:49 -0600 From: Tim Gardner User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.20) Gecko/20110805 Thunderbird/3.1.12 MIME-Version: 1.0 To: Wolfgang Walter CC: Greg KH , "gregkh@suse.de" , linux-kernel@vger.kernel.org, Alexey Dobriyan , David Miller , netdev@vger.kernel.org Subject: Re: linux 2.6.32.46 crashes References: <201108302231.47530.wolfgang.walter@stwm.de> In-Reply-To: <201108302231.47530.wolfgang.walter@stwm.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 08/30/2011 02:31 PM, Wolfgang Walter wrote: > Hello, > > I upgraded several machines from 2.6.32.43 to 2.6.32.46 and > they all crashed when the kernel boots. > > I bisected it to the following commit: > > > 35ed3d0fb62804090a3f21a7ce84c538a6ff852f is the first bad commit > commit 35ed3d0fb62804090a3f21a7ce84c538a6ff852f > Author: Alexey Dobriyan > Date: Tue Feb 16 09:05:04 2010 +0000 > > tunnels: fix netns vs proto registration ordering > > commit d5aa407f59f5b83d2c50ec88f5bf56d40f1f8978 upstream. > > Same stuff as in ip_gre patch: receive hook can be called before netns > setup is done, oopsing in net_generic(). > > Signed-off-by: Alexey Dobriyan > Signed-off-by: David S. Miller > Signed-off-by: Greg Kroah-Hartman > > :040000 040000 6338c45b1372e7e3c5a5ef466dc365cc47a2e152 cde6b92bab403d860cca90e8232cb9c03090fc7e M net > > > Reverting it on top of 2.6.32.46 fixes the problem for me. > Wolfgang - see if this patch fixes your problem. rtg From e52d45fe5518e8447b54b440f41d318db146a19e Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Tue, 30 Aug 2011 13:44:23 +0100 Subject: [PATCH] tunnels: fix netns vs proto registration ordering -- fix stable backport BugLink: http://bugs.launchpad.net/bugs/837421 As per Stratos Psomadakis the backport of the upstream commit below is flawed and introduces crashes when using this ipv6 tunnel type: commit a14a3f90745c4831a1437528706b38daa1db4885 Author: Alexey Dobriyan Date: Tue Feb 16 09:05:04 2010 +0000 tunnels: fix netns vs proto registration ordering Signed-off-by: Andy Whitcroft Acked-by: Stefan Bader Signed-off-by: Tim Gardner --- net/ipv6/ip6_tunnel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 7fb3e02..53e0d51 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1466,7 +1466,7 @@ static int __init ip6_tunnel_init(void) { int err; - err = register_pernet_device(&ip6_tnl_net_ops); + err = register_pernet_gen_device(&ip6_tnl_net_id, &ip6_tnl_net_ops); if (err < 0) goto out_pernet; -- 1.7.0.4