From patchwork Fri Jul 19 17:26:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 260310 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 A50F42C008E for ; Sat, 20 Jul 2013 03:26:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760543Ab3GSR00 (ORCPT ); Fri, 19 Jul 2013 13:26:26 -0400 Received: from mail-pb0-f53.google.com ([209.85.160.53]:46898 "EHLO mail-pb0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752562Ab3GSR0Y (ORCPT ); Fri, 19 Jul 2013 13:26:24 -0400 Received: by mail-pb0-f53.google.com with SMTP id xb12so4622032pbc.40 for ; Fri, 19 Jul 2013 10:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:in-reply-to:references :content-type:x-mailer:content-transfer-encoding:mime-version; bh=gZgzhNcoTB7WjheQblCWWHtaP+zZghptNjJ29LfwCgk=; b=hwUPeSuw0xoQj5GcY0mM5UIs8V5wRuWEQ3QxoOyfafS/9c7Hmu+Z8W3IUDB6XkYIJ4 vvBIOai6Qwko4vSWigLYIX8lLdABPq5vkwUrTJqRv884Ool8qBABFg2NqdsvLGsjAtBe q1rjEgGTVx5Qs2QnkRWuyRXTmgIsaWk73XoV3YbL6CoiLWUKGyQ0TiqpxhcXMRJz8gvi Rpk4eSkSheUdTkAo0KGX5bpYZjgOvSmOx6Ku9OscWDf14ZKqDDPuGLSno5b9Eiw0Aeo9 a+Y0Nj1zHpbe9dYdgcccLn3JvRRSj1sT5AhpruHqUtgD5z6SNFo8mRx3MmKx3CzzSh41 ARqg== X-Received: by 10.68.180.1 with SMTP id dk1mr18486863pbc.174.1374254784279; Fri, 19 Jul 2013 10:26:24 -0700 (PDT) Received: from ?IPv6:2620:0:1000:3304:6587:6597:8023:7bd3? ([2620:0:1000:3304:6587:6597:8023:7bd3]) by mx.google.com with ESMTPSA id jf4sm20670517pbb.19.2013.07.19.10.26.20 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Fri, 19 Jul 2013 10:26:21 -0700 (PDT) Message-ID: <1374254778.26476.18.camel@edumazet-glaptop> Subject: Re: mod_timer: list_add corruption: WARNING: CPU: 1 PID: 0 at lib/list_debug.c:33 __list_add+0xbe/0xd0() From: Eric Dumazet To: Thomas Gleixner Cc: Cong Wang , "Srivatsa S. Bhat" , "linux-kernel@vger.kernel.org" , Frederic Weisbecker , Ingo Molnar , "Paul E. McKenney" , netdev@vger.kernel.org Date: Fri, 19 Jul 2013 10:26:18 -0700 In-Reply-To: References: <51E557C0.2060602@linux.vnet.ibm.com> <51E92769.7090106@linux.vnet.ibm.com> <1374241882.26476.5.camel@edumazet-glaptop> X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Fri, 2013-07-19 at 18:38 +0200, Thomas Gleixner wrote: > On Fri, 19 Jul 2013, Eric Dumazet wrote: > > > > I guess following should help > > Applying the empty patch does not work very well. Could you try again > after the caffeine reached your brain, please ? :) hmm, right ;) Tested-by: Srivatsa S. Bhat --- 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/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 69af490..4b99c9a 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -619,6 +619,9 @@ rehash: mp->br = br; mp->addr = *group; + setup_timer(&mp->timer, br_multicast_group_expired, + (unsigned long)mp); + hlist_add_head_rcu(&mp->hlist[mdb->ver], &mdb->mhash[hash]); mdb->size++; @@ -1126,7 +1129,6 @@ static int br_ip4_multicast_query(struct net_bridge *br, if (!mp) goto out; - setup_timer(&mp->timer, br_multicast_group_expired, (unsigned long)mp); mod_timer(&mp->timer, now + br->multicast_membership_interval); mp->timer_armed = true; @@ -1204,7 +1206,6 @@ static int br_ip6_multicast_query(struct net_bridge *br, if (!mp) goto out; - setup_timer(&mp->timer, br_multicast_group_expired, (unsigned long)mp); mod_timer(&mp->timer, now + br->multicast_membership_interval); mp->timer_armed = true;