From patchwork Wed May 30 09:06:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nazzareno Trimarchi X-Patchwork-Id: 10437931 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DD7F7602CC for ; Wed, 30 May 2018 09:07:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB22D28565 for ; Wed, 30 May 2018 09:07:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDEDC288D4; Wed, 30 May 2018 09:07:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F39828565 for ; Wed, 30 May 2018 09:07:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968801AbeE3JGn (ORCPT ); Wed, 30 May 2018 05:06:43 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:52753 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964984AbeE3JGj (ORCPT ); Wed, 30 May 2018 05:06:39 -0400 Received: by mail-wm0-f66.google.com with SMTP id 18-v6so40851349wml.2 for ; Wed, 30 May 2018 02:06:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=GQdAGUgbl9U5Wk6lpMq3F7W9L08B099VqoL94JxZbCw=; b=rJHPXiw1JUm8DNn+O7wbdtjr0JJRkVZJWQ50ff7/43S9SZPYgTVmrahmuGODy7iF+w 3oLHJRW2XYzfgirdXfvp6dsl9GGVGKWUJhzp/Nad+/jojAVOxd0jmF7HyoMoZ0qElppd d9qPI1cUV3ALoIjnaNJYKE8jzQkhDrkVhPBVE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=GQdAGUgbl9U5Wk6lpMq3F7W9L08B099VqoL94JxZbCw=; b=A8IQlcjHAQOHlvXzzrByXFi54WMsBHL5nROgq0i+ocZVraFZlBXyjUqqeV7r7GVvkC D+YlaU50+maggZSlhrGMU9AWiCFftKFyfowCyTx9QLGltUVfX6L8Kcud2oRSu0WIhzjd wQ+L2H6JbYR7g/dnA+W0gtI4btO0rE04hcvXnjuwI9PgCqs10fHF5h1pPWWzav/BTbPG ayCNHJsXW+j9JsPPnuV76usmSctik6Hpf1REpt2tQtze4vLfsq7jsRQyq5pWUvEHR57N 5p9TVt8M1ej8LrMtmMxZuzM3W1A2vsMFde7j0sN5Tw/XjBBT5XBrfjU0SlI4Y4arHhtl L1kw== X-Gm-Message-State: ALKqPwetcYim95zRdlYzVx9rxFjpGHNM0BCzvRZL5YglQdWIhWWGHu9/ GECY3MHpUhL/43QFbGXOcR+7Sg== X-Google-Smtp-Source: ADUXVKJO43+uzgQE0bAHe+bOZaecSKmg6rxCYlqSBitJU9/EtGIWJIAi7jIK89hpaYZdPro3W1FFIA== X-Received: by 2002:a1c:a104:: with SMTP id k4-v6mr833512wme.106.1527671198218; Wed, 30 May 2018 02:06:38 -0700 (PDT) Received: from panicking (ip-163-227.sn-213-198.clouditalia.com. [213.198.163.227]) by smtp.gmail.com with ESMTPSA id x63-v6sm28305765wma.25.2018.05.30.02.06.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 02:06:37 -0700 (PDT) Date: Wed, 30 May 2018 11:06:34 +0200 From: Michael Trimarchi To: Arend van Spriel Cc: Franky Lin , Hante Meuleman , Chi-Hsien Lin , Wright Feng , Kalle Valo , "David S. Miller" , Pieter-Paul Giesberts , Ian Molton , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2] brcmfmac: stop watchdog before detach and free everything Message-ID: <20180530090633.GA15390@panicking> References: <1527493857-2220-1-git-send-email-michael@amarulasolutions.com> <5B0D1C9E.4000800@broadcom.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5B0D1C9E.4000800@broadcom.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Using built-in in kernel image without a firmware in filesystem or in the kernel image can lead to a kernel NULL pointer deference. Watchdog need to be stopped in brcmf_sdio_remove The system is going down NOW! [ 1348.110759] Unable to handle kernel NULL pointer dereference at virtual address 000002f8 Sent SIGTERM to all processes [ 1348.121412] Mem abort info: [ 1348.126962] ESR = 0x96000004 [ 1348.130023] Exception class = DABT (current EL), IL = 32 bits [ 1348.135948] SET = 0, FnV = 0 [ 1348.138997] EA = 0, S1PTW = 0 [ 1348.142154] Data abort info: [ 1348.145045] ISV = 0, ISS = 0x00000004 [ 1348.148884] CM = 0, WnR = 0 [ 1348.151861] user pgtable: 4k pages, 48-bit VAs, pgdp = (____ptrval____) [ 1348.158475] [00000000000002f8] pgd=0000000000000000 [ 1348.163364] Internal error: Oops: 96000004 [#1] PREEMPT SMP [ 1348.168927] Modules linked in: ipv6 [ 1348.172421] CPU: 3 PID: 1421 Comm: brcmf_wdog/mmc0 Not tainted 4.17.0-rc5-next-20180517 #18 [ 1348.180757] Hardware name: Amarula A64-Relic (DT) [ 1348.185455] pstate: 60000005 (nZCv daif -PAN -UAO) [ 1348.190251] pc : brcmf_sdiod_freezer_count+0x0/0x20 [ 1348.195124] lr : brcmf_sdio_watchdog_thread+0x64/0x290 [ 1348.200253] sp : ffff00000b85be30 [ 1348.203561] x29: ffff00000b85be30 x28: 0000000000000000 [ 1348.208868] x27: ffff00000b6cb918 x26: ffff80003b990638 [ 1348.214176] x25: ffff0000087b1a20 x24: ffff80003b94f800 [ 1348.219483] x23: ffff000008e620c8 x22: ffff000008f0b660 [ 1348.224790] x21: ffff000008c6a858 x20: 00000000fffffe00 [ 1348.230097] x19: ffff80003b94f800 x18: 0000000000000001 [ 1348.235404] x17: 0000ffffab2e8a74 x16: ffff0000080d7de8 [ 1348.240711] x15: 0000000000000000 x14: 0000000000000400 [ 1348.246018] x13: 0000000000000400 x12: 0000000000000001 [ 1348.251324] x11: 00000000000002c4 x10: 0000000000000a10 [ 1348.256631] x9 : ffff00000b85bc40 x8 : ffff80003be11870 [ 1348.261937] x7 : ffff80003dfc7308 x6 : 000000078ff08b55 [ 1348.267243] x5 : 00000139e1058400 x4 : 0000000000000000 [ 1348.272550] x3 : dead000000000100 x2 : 958f2788d6618100 [ 1348.277856] x1 : 00000000fffffe00 x0 : 0000000000000000 Signed-off-by: Michael Trimarchi Acked-by: Arend van Spriel Tested-by: Andy Shevchenko --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 412a05b..061f69d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -4294,6 +4294,13 @@ void brcmf_sdio_remove(struct brcmf_sdio *bus) brcmf_dbg(TRACE, "Enter\n"); if (bus) { + /* Stop watchdog task */ + if (bus->watchdog_tsk) { + send_sig(SIGTERM, bus->watchdog_tsk, 1); + kthread_stop(bus->watchdog_tsk); + bus->watchdog_tsk = NULL; + } + /* De-register interrupt handler */ brcmf_sdiod_intr_unregister(bus->sdiodev);