From nobody Fri Jun 12 11:35:25 2026 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E20E4779B3 for ; Fri, 15 May 2026 10:58:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=209.85.208.172 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778842727; cv=pass; b=PbhQk04HIu/KF05f/R/BxDbDV/eG4Y1BOEDEjV5C26h5xA2btMZz1a1PS/hcfWAV0gTevWb6uAtxnIx4kx7UsfPUjzCyDwUPpzkSbJR8TN1/OA/ESlQU2axiNLmSZNStICw6SE75CxuJDcmiId0yK1TdIn07CqJPmf0Av36Zjo8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778842727; c=relaxed/simple; bh=AAbUjliyAApEpHTyBu3KhdiYUWKCsEyoXejhYgUSv/M=; h=MIME-Version:From:Date:Message-ID:Subject:To:Cc:Content-Type; b=IwUzngc8L2sXrn5Pg81pQRyf4FA6OX9cLq1+1aozpkf80ApyHmislcgUXwYbYXDT8j88geRiN/slEsXacAsmKdOwDu8BU6z7RmS58an7Cm5Wm0On+0ztAu3oHcClLYRTE7gHkW2MGukk4bGDAQjebuQ8sKmPhRR261nVa0vEleA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=arista.com; spf=pass smtp.mailfrom=arista.com; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b=hlPx8Z8P; arc=pass smtp.client-ip=209.85.208.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=arista.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arista.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="hlPx8Z8P" Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-3942e9977a5so7351921fa.1 for ; Fri, 15 May 2026 03:58:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778842723; cv=none; d=google.com; s=arc-20240605; b=koCONH5igBwdky8sZu+bh3dsVmgGXID9AFLMm1k3oWlg3hA15ymycyRK13O+aJFFB1 XBsltzAn/B4iRsd0euMg8S9ZeLaHC4wmWwNmNNPaoRM9FmVeQD6wsbs/5XOageGxS31y i9B9gjA28jxMAGGeXvHcwuUScRv9vReJIMs5k5SZbSVSZdL5Gyb1BJBmEFhto43juUC9 RDSVRevfYogoncIR55U19Av7YikO0qYDzYzHiu2MX8T9nQ0sbu315Rj35bcqU9feioUP wtOgWaFxzRu7LOSw6yPMf1vbgf0w7nPFuRl6JHfWf5Mz2KXGgos6hyXaW8rqS4ChV0Hl hyNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:mime-version:dkim-signature; bh=AzDqfCr4N4AKnnxYYn6PoqjpxURuHA7u+KZ59qCQ7gI=; fh=GdxLpB4KxbEiO4eZOXNLyY/LMsAg5IjXGU0qXdJx858=; b=XAUITg9Wp+7JVnRzqRddEM+q5S230hAesyFpJY6SFDQ0DQbEdEHGjR4HhNcgPmA/Uf GSSW5s6o5VXRB3tU5xNf3k+H7eJ/j3wuxLT1TxekYl0sgZ7QPc7uVZNxtG0kJ6BimPZc WedbGYllp09+uKTXxJFz7JEZWs8slbVNFiF3cR94G8J4WNN4DtfdZRJ1/1a2I7Wfamnk dFErJNzVp2JuzK88nqgoYvR2wuvft3sm9a5ljXt6PS5JxyNE0E9SgOvd8l2hX5gaw8GH gATHXRd9QCI2orcI8sR5ta6vOWnXdmmacqSwAJMdmF/xCqRGE3sUn25Xr4+UBvRYHvot NQKQ==; darn=vger.kernel.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; t=1778842723; x=1779447523; darn=vger.kernel.org; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=AzDqfCr4N4AKnnxYYn6PoqjpxURuHA7u+KZ59qCQ7gI=; b=hlPx8Z8PFShiey6Unc6iEr7nubgvx9diIsraOCtkUeZ15ot/3YdhfHlb0oiAf+g2lI q+JJucomkqOyHUwDrHqGJ+lThIZ+el7QbwyCgisaloXrsMCgR2GpqUVPN/3mn7mkHVr4 xOM9vY274xXc8U6zOEzB3/c/NosPmF77HIBrHRqW2g/hNmcD/hO4jaJTwRwyUdSlRSS2 9yCBANWj0o8Q+H0I74UaxTpuu52FBby+ZtHamSbMNGTsksxx7e4S+eoUUauGEpD+kV4F ikIQs2uHdunW7e5CznsHR7Iqv/uwragkzMvYyxtuLQzfnsyjbtQudapJWpZ7084OYk3E q8qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778842723; x=1779447523; h=cc:to:subject:message-id:date:from:mime-version:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AzDqfCr4N4AKnnxYYn6PoqjpxURuHA7u+KZ59qCQ7gI=; b=pmSkCAOEN7EYmJf2IhplP67/lbheNWqWe30YCPzcd2xdPgMAbnwZuNWFxCMGcOG9gm BQsp8Mg5mw3Zrzjfqw8x8jL5vZkIfGtWsEce/qtxJVO+72iSw0Vzwh6P4Wk3N+AGw12W RdbZHwsFlF5g2rDHaeg8u8X5rRBVOAhOruk3w0Xo/hMPo80Cu61pTu0ysob7QeBnDIvu sIc+WNvgLbL9+XD2XinRwwuE6zNas1jXsHY2+fHGVbMzrT9J0H2ic0TtZCIVPW9Q1yFx 9p4K+11CS6EgdiZ6B2gJ3qA+xZAZbbtXfB17PFBt/FFxwI/mdGJxCKcLzK4QXz93CaBc LyCA== X-Forwarded-Encrypted: i=1; AFNElJ8awDE+N5NesB7L7PBYBHYpD+8tH5lRWJz/zmpH1ivdWZvfUX+x3B2wIfllwTsnBcmu9/kVePUNz0Q1kZU=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7RPDxPNj9sSqJMhAD7A8C2E5mmiDojfzeJaIiiNO3VAMIJhCG K2tdHLSOTmLPWILx491qtp3BKhdjqOHyNrAGg9TQ/sxFX1FuZ4VqfpWn6Hk+Bh1BLQ5sigQdMCH UYL9XJTW7Syy5E3n60DK+HITj98i67Sz1MQWBHFU9DBdzvHr8xIU= X-Gm-Gg: Acq92OHEGvYFoibzXsNfs2tZCEi+ElSWr3dLMZ+1Rc7Tio9gWgJQFoXtLT7RpK5JYq7 dkDHLEVexFS1aZNlUt0+/tQMyoKfwOuuIwMsgf8bC0F/mqFUpXxotfAPUuJtxTGHGp7COoit9os nqXRNDetx4QmHtSqAVIcgA8yo6ycaDAC4gb/xAWvSoKlZxUWfGqpLDwETrDPQ3smfEyhFOxWmYE Z8W/gIFqn4q+EZDdI5BcjwZn6UlnX8p9ul1++L9KhdGw4MWYRzYRC2YdLhdeznVuqT7QSqaG+22 NVUdMx+B X-Received: by 2002:a05:6512:1301:b0:5a8:6f3f:488b with SMTP id 2adb3069b0e04-5aa0de739b4mr1041985e87.3.1778842723193; Fri, 15 May 2026 03:58:43 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Yury Murashka Date: Fri, 15 May 2026 11:58:30 +0100 X-Gm-Features: AVHnY4L8iv7vaR2dfYqxJinabkOD4edHpu2nHTXkEJql9zdlch9HlGI-Kelz3lI Message-ID: Subject: [PATCH] tg3: guard napi_disable and pci_disable_device calls To: pavan.chebbi@broadcom.com, mchan@broadcom.com, netdev@vger.kernel.org Cc: andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-kernel@vger.kernel.org, Yury Murashka Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" During PCIe hot-plug events, uncorrectable errors can be reported and AER recovery for the tg3 device is initiated by the AER kernel driver. The tg3_io_error_detected function is the AER error recovery handler. From tg3_io_error_detected, we call tg3_netif_stop->tg3_napi_disable-> napi_disable and return PCI_ERS_RESULT_NEED_RESET on non-fatal error. We expect that during AER recovery tg3_io_slot_reset and tg3_io_resume will be called. But AER error recovery can fail. For example, when one of PCIe devices on the same bus reports PCI_ERS_RESULT_NO_AER_DRIVER. As a result, tg3_io_slot_reset and tg3_io_resume are not called, PCIe device is disabled and NAPI is disabled (pci_disable_device and napi_disable are called from tg3_io_error_detected). Then we can try to disable PCIe link and napi_disable will be called again: napi_disable+0x1b/0x1b0 tg3_napi_disable+0x89/0xa0 [tg3] tg3_netif_stop+0x37/0xe3 [tg3] tg3_stop+0x30/0x160 [tg3] tg3_close+0x2a/0x60 [tg3] __dev_close_many+0xad/0x130 dev_close_many+0xb2/0x190 unregister_netdevice_many_notify+0x19d/0xa00 unregister_netdevice_queue+0xf8/0x140 unregister_netdev+0x1c/0x30 tg3_remove_one+0xaa/0x150 [tg3] pci_device_remove+0x42/0xb0 device_release_driver_internal+0x19c/0x200 pci_stop_bus_device+0x85/0xb0 pci_stop_bus_device+0x2c/0xb0 pci_stop_bus_device+0x2c/0xb0 pci_stop_and_remove_bus_device+0x12/0x20 pciehp_unconfigure_device+0x9f/0x160 pciehp_disable_slot+0x67/0x100 pciehp_handle_presence_or_link_change+0x77/0x350 This is not expected by napi_disable and a thread can be locked in napi_disable forever. We have pcierr_recovery to cover a similar issue, but for fatal errors. We cannot reuse this flag because it is reset in tg3_io_resume, but it is not called when AER recovery fails. Similarly, if an AER error is reported and tg3_io_error_detected calls pci_disable_device, a subsequent device removal via tg3_remove_one or tg3_shutdown will call pci_disable_device again for the already-disabled device. Add a napi_enabled flag to struct tg3 to track whether napi_enable has been called. Guard tg3_napi_disable() against being called before tg3_napi_enable(), logging an error if that happens. Also guard pci_disable_device() calls in tg3_remove_one() and tg3_shutdown() with pci_is_enabled() to avoid disabling an already-disabled device. Signed-off-by: Yury Murashka --- drivers/net/ethernet/broadcom/tg3.c | 19 +++++++++++++++++-- drivers/net/ethernet/broadcom/tg3.h | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 73a4b569b..500b6f7fa 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -7396,8 +7396,18 @@ static void tg3_napi_disable(struct tg3 *tp) int txq_idx =3D tp->txq_cnt - 1; int rxq_idx =3D tp->rxq_cnt - 1; struct tg3_napi *tnapi; + struct net_device *netdev =3D tp->dev; int i; + if (!tp->napi_enabled) { + netdev_err(netdev, "%s() called when napi_enable wasn't called before, netif_running=3D%d, pci_enabled=3D%d\n", + __func__, netif_running(netdev), + pci_is_enabled(tp->pdev)); + return; + } + + tp->napi_enabled =3D false; + for (i =3D tp->irq_cnt - 1; i >=3D 0; i--) { tnapi =3D &tp->napi[i]; if (tnapi->tx_buffers) { @@ -7420,6 +7430,8 @@ static void tg3_napi_enable(struct tg3 *tp) struct tg3_napi *tnapi; int i; + tp->napi_enabled =3D true; + for (i =3D 0; i < tp->irq_cnt; i++) { tnapi =3D &tp->napi[i]; napi_enable_locked(&tnapi->napi); @@ -17718,6 +17730,7 @@ static int tg3_init_one(struct pci_dev *pdev, tp->tx_mode =3D TG3_DEF_TX_MODE; tp->irq_sync =3D 1; tp->pcierr_recovery =3D false; + tp->napi_enabled =3D false; if (tg3_debug > 0) tp->msg_enable =3D tg3_debug; @@ -18099,7 +18112,8 @@ static void tg3_remove_one(struct pci_dev *pdev) } free_netdev(dev); pci_release_regions(pdev); - pci_disable_device(pdev); + if (pci_is_enabled(pdev)) + pci_disable_device(pdev); } } @@ -18257,7 +18271,8 @@ static void tg3_shutdown(struct pci_dev *pdev) rtnl_unlock(); - pci_disable_device(pdev); + if (pci_is_enabled(pdev)) + pci_disable_device(pdev); } /** diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h index a9e7f88fa..34fb771e8 100644 --- a/drivers/net/ethernet/broadcom/tg3.h +++ b/drivers/net/ethernet/broadcom/tg3.h @@ -3429,6 +3429,7 @@ struct tg3 { struct device *hwmon_dev; bool link_up; bool pcierr_recovery; + bool napi_enabled; u32 ape_hb; unsigned long ape_hb_interval; -- 2.51.0