From: Neil Armstrong Subject: [PATCH 5/6] net: dsa: Do not reschedule polling if driver removed Date: Tue, 27 Oct 2015 15:49:15 +0100 Message-ID: <562F8EEB.8060606@baylibre.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: Andrew Lunn , Florian Fainelli , Guenter Roeck , vivien.didelot@savoirfairelinux.com, Fabian Frederick , Pavel Nakonechny , Joe Perches , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Frode Isaksen To: "David S. Miller" Return-path: Received: from mail-wi0-f172.google.com ([209.85.212.172]:33406 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964780AbbJ0OtT (ORCPT ); Tue, 27 Oct 2015 10:49:19 -0400 Received: by wijp11 with SMTP id p11so217540757wij.0 for ; Tue, 27 Oct 2015 07:49:18 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Do not reschedule the delayed work used for polling when the driver is removed, by testing the 'poll_link_needed' flag. Avoids this crash: dsa dsa ethmv2 (unregistering): Link is Down device eth1 left promiscuous mode Unable to handle kernel paging request at virtual address bacc5cf6 ... (run_timer_softirq) from [] (__do_softirq+0xcc/0x320) (__do_softirq) from [] (irq_exit+0xac/0x10c) (irq_exit) from [] (__handle_domain_irq+0x50/0xa8) Signed-off-by: Frode Isaksen Signed-off-by: Neil Armstrong --- net/dsa/dsa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 9240a46..9881b17 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -526,7 +526,8 @@ static void dsa_link_poll_work(struct work_struct *ugly) ds->drv->poll_link(ds); } - schedule_delayed_work(&dst->link_poll_work, round_jiffies_relative(HZ)); + if (dst->link_poll_needed) + schedule_delayed_work(&dst->link_poll_work, round_jiffies_relative(HZ)); } /* platform driver init and cleanup *****************************************/ @@ -949,6 +950,7 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst) int i; if (dst->link_poll_needed) { + dst->link_poll_needed = 0; cancel_delayed_work_sync(&dst->link_poll_work); flush_delayed_work(&dst->link_poll_work); } -- 1.9.1