Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751241AbdFAOBB (ORCPT ); Thu, 1 Jun 2017 10:01:01 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:37476 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751215AbdFAOA5 (ORCPT ); Thu, 1 Jun 2017 10:00:57 -0400 Subject: Re: Oops with commit 6d18c73 bridge: start hello_timer when enabling KERNEL_STP in br_stp_start To: Sebastian Ott , Xin Long References: Cc: "David S. Miller" , Haidong Li , Ivan Vecera , Stephen Hemminger , network dev , LKML , Heiko Carstens , Martin Schwidefsky From: Nikolay Aleksandrov Message-ID: Date: Thu, 1 Jun 2017 17:00:53 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2513 Lines: 73 On 01/06/17 15:34, Sebastian Ott wrote: > On Thu, 1 Jun 2017, Xin Long wrote: >> On Thu, Jun 1, 2017 at 12:32 AM, Sebastian Ott >> wrote: >>> [...] >> I couldn't see any bridge-related thing here, and it couldn't be reproduced >> with virbr0 (stp=1) on my box (on both s390x and x86_64), I guess there >> is something else in you machine. >> >> With the latest upstream kernel, can you remove libvirt (virbr0) and boot your >> machine normally, then: >> # brctl addbr br0 >> # ip link set br0 up >> # brctl stp br0 on >> >> to check if it will still hang. > > Nope. That doesn't hang. > > >> If it can't be reproduced in this way, pls add this on your kernel: >> >> --- a/net/bridge/br_stp_if.c >> +++ b/net/bridge/br_stp_if.c >> @@ -178,9 +178,11 @@ static void br_stp_start(struct net_bridge *br) >> br->stp_enabled = BR_KERNEL_STP; >> br_debug(br, "using kernel STP\n"); >> >> + WARN_ON(1); >> /* To start timers on any ports left in blocking */ >> mod_timer(&br->hello_timer, jiffies + br->hello_time); >> br_port_state_selection(br); >> + pr_warn("hello timer start done\n"); >> } >> >> spin_unlock_bh(&br->lock); >> diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c >> index 60b6fe2..c98b3e5 100644 >> --- a/net/bridge/br_stp_timer.c >> +++ b/net/bridge/br_stp_timer.c >> @@ -40,7 +40,7 @@ static void br_hello_timer_expired(unsigned long arg) >> if (br->dev->flags & IFF_UP) { >> br_config_bpdu_generation(br); >> >> - if (br->stp_enabled == BR_KERNEL_STP) >> + if (br->stp_enabled != BR_USER_STP) >> mod_timer(&br->hello_timer, >> round_jiffies(jiffies + br->hello_time)); >> >> >> let's see if it hangs when starting the timer. Thanks. > > No hang either: > [snip] Could you please try the patch below ? --- diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 4efd5d54498a..89110319ef0f 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -173,7 +173,8 @@ static void br_stp_start(struct net_bridge *br) br_debug(br, "using kernel STP\n"); /* To start timers on any ports left in blocking */ - mod_timer(&br->hello_timer, jiffies + br->hello_time); + if (br->dev->flags & IFF_UP) + mod_timer(&br->hello_timer, jiffies + br->hello_time); br_port_state_selection(br); }