From patchwork Mon Feb 22 01:35:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sieng-Piaw Liew X-Patchwork-Id: 12097825 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B834DC433E0 for ; Mon, 22 Feb 2021 01:36:59 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A75B64EC8 for ; Mon, 22 Feb 2021 01:36:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A75B64EC8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=P1Ek89eoP7ijQ7lg81Q8MAnmB+QiF7tzR1nEqKbYevs=; b=aIlCIWPRXh6Vk7l62YJWHVdxvN RzbQsrQJ6jsTRCMcjYDtBEbY7h8kEousTbrXvc/HdSzShIP+Szuprmz7lCsz1Zv31/gwfBHbDMwZY MgsViwlmmj7zQSZ6VpKiaPxapiIahhuUP06UBB3TxfPHa7ISLRrJKT2ELMXiSdm281VEl8tF0MCBK tZ4e8kr63q5fQoFu8etvV4c2136kV9slTD7alX9I42HZByzs1dr++ZgcUswPOZQPxBFa9nAQMOkAf dgX79IVOCNcp16+lk9uAVZvJtgFxUE7XOQYj2ubuwBsdEnodo62yQ4SzUEAmzXdh9Qv0GQZFr9X7r y5tPnVvQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lE08d-0006Kp-Os; Mon, 22 Feb 2021 01:35:51 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lE08b-0006Jq-Nf for linux-arm-kernel@lists.infradead.org; Mon, 22 Feb 2021 01:35:50 +0000 Received: by mail-pj1-x1036.google.com with SMTP id ds5so152225pjb.2 for ; Sun, 21 Feb 2021 17:35:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=qybJx7OQtUA+va9ad1ujiUGkl1rkwozY3pUZwjr/v7Y=; b=Sjqj6nTqms7lXnfx6l3En4TOUffwRiRoSrJCdch/tvaxIP7e3yGlx8TMuBamWNor+E yDzC4VvCMGOMe6m9aBvfSQJVUwRiA9PF57e0LpQrSJ1jnvasDv7iFb2JMqWEP15aqHdN 6fXyqXzkcWTPaL4z99jB2DHhAs+d0DwPuj93XDW2y8gPNyKg6LbA8ahpe0wF3B0MS+IE nkqkd4yVLFjhyyNfw+KzugjgsqYPMzj8nX8fUECz0DLSTNtY9riTEYxYmT6rQIMzKi7C LDTJBTE6hU2Clnmbze3jPCeVJEsJeojTIIBGAIm0xFqDMu7F1RCMMJ12lUvO6x4FzKif wSdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qybJx7OQtUA+va9ad1ujiUGkl1rkwozY3pUZwjr/v7Y=; b=apmberze6Ksh+6tPCfJCftADwrTsv6hAc2eyCiXV1pW/3Xb3Pt9P+unmgYa3Qh8gFx Ovr5Fw9p2m5ZdhGRXX++w7q8zro2a+69RJZ2S2j49jhZPX5Vpx/dvk8ggk6Ga+ky9VrP yWIBQqTjlHiXxJKhjgs1+TZfw6CWQO1j+Fj00Wcm848+2sd7J5vaDYdep133WRYRXidx RJQ6v+KFGCR7oCy4HrVoR4/mV3eOheXfgT9EABpSrIocz4+nJKWdZfH/eHFKsVsV4u+Y oxf3JP0ztrB2pBzykzPoaTSBHJ1nuF3SA8ztVQEdmUrLyPeC53zKNA2l3W2STfWDELJn ArLA== X-Gm-Message-State: AOAM5325C+HkdHeWZosztCnCck6vfCBc/zk+ZO3u1yeZIB9LyfsdDEiX 42Cwz/cDXvcD40EWmv81TvU= X-Google-Smtp-Source: ABdhPJy6X3PZ66NbVzloW52Kh4EuWjMyI5A8xpDX593ZdKEf5YhMZw9+9oEvGpdC+fTzV+4s0WgmEg== X-Received: by 2002:a17:90a:9484:: with SMTP id s4mr13999097pjo.170.1613957745546; Sun, 21 Feb 2021 17:35:45 -0800 (PST) Received: from DESKTOP-8REGVGF.localdomain ([211.25.125.254]) by smtp.gmail.com with ESMTPSA id t189sm13570196pgt.39.2021.02.21.17.35.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 17:35:45 -0800 (PST) From: Sieng Piaw Liew To: davem@davemloft.net, kuba@kernel.org, f.fainelli@gmail.com Subject: [PATCH net] bcm63xx_enet: fix sporadic kernel panic Date: Mon, 22 Feb 2021 09:35:30 +0800 Message-Id: <20210222013530.1356-1-liew.s.piaw@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210221_203549_785492_E9969C1A X-CRM114-Status: GOOD ( 12.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: netdev@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sieng Piaw Liew MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In ndo_stop functions, netdev_completed_queue() is called during forced tx reclaim, after netdev_reset_queue(). This may trigger kernel panic if there is any tx skb left. This patch moves netdev_reset_queue() to after tx reclaim, so BQL can complete successfully then reset. Signed-off-by: Sieng Piaw Liew Acked-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index fd8767213165..977f097fc7bf 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1192,7 +1192,6 @@ static int bcm_enet_stop(struct net_device *dev) kdev = &priv->pdev->dev; netif_stop_queue(dev); - netdev_reset_queue(dev); napi_disable(&priv->napi); if (priv->has_phy) phy_stop(dev->phydev); @@ -1231,6 +1230,9 @@ static int bcm_enet_stop(struct net_device *dev) if (priv->has_phy) phy_disconnect(dev->phydev); + /* reset BQL after forced tx reclaim to prevent kernel panic */ + netdev_reset_queue(dev); + return 0; } @@ -2343,7 +2345,6 @@ static int bcm_enetsw_stop(struct net_device *dev) del_timer_sync(&priv->swphy_poll); netif_stop_queue(dev); - netdev_reset_queue(dev); napi_disable(&priv->napi); del_timer_sync(&priv->rx_timeout); @@ -2371,6 +2372,9 @@ static int bcm_enetsw_stop(struct net_device *dev) free_irq(priv->irq_tx, dev); free_irq(priv->irq_rx, dev); + /* reset BQL after forced tx reclaim to prevent kernel panic */ + netdev_reset_queue(dev); + return 0; }