netdev - Re: [PATCH net-next v2] r8169: reset bus if NIC isn't accessible after tx timeout

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAKgT0UeHf4yzbzNrT5A0EYbVyHZQoaO9VpeCjeN6MkFMnMRU8Q@mail.gmail.com>
Date:   Fri, 13 Jan 2023 16:24:35 -0800
From:   Alexander Duyck <alexander.duyck@...il.com>
To:     Heiner Kallweit <hkallweit1@...il.com>
Cc:     Jakub Kicinski <kuba@...nel.org>,
        David Miller <davem@...emloft.net>,
        Realtek linux nic maintainers <nic_swsd@...ltek.com>,
        Eric Dumazet <edumazet@...gle.com>,
        Paolo Abeni <pabeni@...hat.com>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [PATCH net-next v2] r8169: reset bus if NIC isn't accessible
 after tx timeout

On Fri, Jan 13, 2023 at 2:46 PM Heiner Kallweit <hkallweit1@...il.com> wrote:
>
> ASPM issues may result in the NIC not being accessible any longer.
> In this case disabling ASPM may not work. Therefore detect this case
> by checking whether register reads return ~0, and try to make the
> NIC accessible again by resetting the secondary bus.
>
> v2:
> - add exception handling for the case that pci_reset_bus() fails
>
> Suggested-by: Alexander Duyck <alexander.duyck@...il.com>
> Signed-off-by: Heiner Kallweit <hkallweit1@...il.com>
> ---
>  drivers/net/ethernet/realtek/r8169_main.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
> index 49c124d8e..02ef98a95 100644
> --- a/drivers/net/ethernet/realtek/r8169_main.c
> +++ b/drivers/net/ethernet/realtek/r8169_main.c
> @@ -4535,6 +4535,16 @@ static void rtl_task(struct work_struct *work)
>                 goto out_unlock;
>
>         if (test_and_clear_bit(RTL_FLAG_TASK_TX_TIMEOUT, tp->wk.flags)) {
> +               /* if chip isn't accessible, reset bus to revive it */
> +               if (RTL_R32(tp, TxConfig) == ~0) {
> +                       ret = pci_reset_bus(tp->pci_dev);
> +                       if (ret < 0) {
> +                               netdev_err(tp->dev, "Can't reset secondary PCI bus, detach NIC\n");
> +                               netif_device_detach(tp->dev);
> +                               goto out_unlock;
> +                       }
> +               }
> +
>                 /* ASPM compatibility issues are a typical reason for tx timeouts */
>                 ret = pci_disable_link_state(tp->pci_dev, PCIE_LINK_STATE_L1 |
>                                                           PCIE_LINK_STATE_L0S);

Looks good to me.

Reviewed-by: Alexander Duyck <alexanderduyck@...com>