From nobody Sun Jul 19 18:50:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h3CQh4TnYz6lR07 for ; Sun, 19 Jul 2026 18:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h3CQh0Jppz3R7p for ; Sun, 19 Jul 2026 18:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784487052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AuStEueZ9+CtVtyMI1KYRTfZJplvfODlk1ASCbGR1UM=; b=OYRKL+GTKc90HpzcbpIjS7q7CGBgye9sj5cLIUXWtfXGgtF2TcVn2hJRMV/zjNhjLvgcdN xZuINEPRdQ3M2kv7M+PzkVeXia1Ao06RyYv0qJoDt9XBMh8M5pwFbRL7QQNMlOU2fd9X4h j2ddcJRADjQGIWDrexDc+5rI0A6VaV9AkupCGspLL3Uqx1g2NuTy2H6q5keFYL+AsQSCPb LMy8t75GG0DFz72BsVDaN+W5udIjeZdcF4u5dRX3GUzyacGIP9Ox5NJKhi4uI/hV3rwD6T HaAmmNBglLOAUlU4YqOn/bMrocfTIRYZnDA4/P8LySWUe1kYXIKGnh0R4C5UWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784487052; a=rsa-sha256; cv=none; b=nV94RiIXZ/0XD+mbqTSsV8mZxc4PVUHG5wxL3uYHvJhvjKE26cdv1Qyacy6z/4WZRf+4lO xIg0r6xAaCDQb61pxrQbZwArbtIo9Ruv1g3y8WW1+Ac4RN+Gq17MY3UONTdtvKKDbyrZxV kvqTml89jmlw/naJl7Gr3nCMsRCacrM5a5RRhmCQehUaAUBev9+OnM1GyMjV0uBHcbv7Cx aAZnhptaqTFlb6pf/eZs0l+uKGdTst2o59aXpKayrZRCRWRbEv2P2im/rYs59Xlp3095v8 1HnLCBFU3BqR0leUsPGSHB1cMfCAT+jEbw3vSUdOB0KOsJwn7aNy6500V7aMuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784487052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AuStEueZ9+CtVtyMI1KYRTfZJplvfODlk1ASCbGR1UM=; b=cmvWv8wiW7dVQJnvNSTWRJz0UTCBRyZ14mZ3aUgC3IV0L2PJ/JALog0PDKsTp8ZA/aKd+t DgTyv05GEb5K09I8tf+9E2ES29di4zNfoPNSjjfg8IDtv3839zeaFXzvBylZM87rtMASiy m/auSfB8hEHpYNg/qjQvDnd7OTda8AnyUXJlmmGSuDwFpfI2qDyP3QyBHJJlylJc/JX5nx ePGYMz5lhfJ54ibRaSOO/zqWU6s1WZIQJKl4qzvP7ES5MdfBOWsT1L81EcfD7SfVCzM673 XhBD4rs/5PKErnY1wgOisBoV2nc8dJ/2q5lzFD8lBfUWlqruZ7qwH0u6ZbCj+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3CQg54rtzC1V for ; Sun, 19 Jul 2026 18:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fc27 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 19 Jul 2026 18:50:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: =?utf-8?Q?J=C3=A9r=C3=A9mie?= Jourdin From: Adrian Chadd Subject: git: 42f3088bd980 - main - re(4): harden re_watchdog() recovery and log controller state List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42f3088bd980a469dbbc3e6b568edb7ce0ab2bc3 Auto-Submitted: auto-generated Date: Sun, 19 Jul 2026 18:50:51 +0000 Message-Id: <6a5d1c8b.3fc27.7b18b3@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=42f3088bd980a469dbbc3e6b568edb7ce0ab2bc3 commit 42f3088bd980a469dbbc3e6b568edb7ce0ab2bc3 Author: Jérémie Jourdin AuthorDate: 2026-07-19 18:47:17 +0000 Commit: Adrian Chadd CommitDate: 2026-07-19 18:47:21 +0000 re(4): harden re_watchdog() recovery and log controller state Distinguish the two failure classes from the PR in a single log line (ring indices, ISR/IMR, TXCFG, interrupt mode): lost interrupt vs genuine DMA stall. Bail out instead of re-initializing when the controller reads back all-ones (fallen off the bus; reinit cannot help). Re-assert the driver's existing ASPM-disabled policy before reinit, since firmware/power transitions re-arming L0s/L1 is a documented stall trigger. Diagnostics-only on the recovered path; no fast-path change. * Field diagnostics running on an RTL8168H production fleet; the log format distinguishes lost-doorbell / DMA-stall / dead-controller without a debug build. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D58279 PR: kern/166724 --- sys/dev/re/if_re.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index b04dc3cbaf4a..5a3e8e68d26f 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -3600,6 +3600,8 @@ re_watchdog(struct rl_softc *sc) { struct epoch_tracker et; if_t ifp; + const char *imode; + uint32_t isr, imr, txcfg; RL_LOCK_ASSERT(sc); @@ -3607,18 +3609,71 @@ re_watchdog(struct rl_softc *sc) return; ifp = sc->rl_ifp; + /* + * Snapshot the controller state before reclaim for the diagnostics + * below. Reading RL_ISR is side-effect free: the interrupt status + * is cleared by writing ones, not by reading. + */ + imode = (sc->rl_flags & RL_FLAG_MSIX) ? "MSI-X" : + (sc->rl_flags & RL_FLAG_MSI) ? "MSI" : "INTx"; + isr = CSR_READ_2(sc, RL_ISR); + imr = CSR_READ_2(sc, RL_IMR); re_txeof(sc); if (sc->rl_ldata.rl_tx_free == sc->rl_ldata.rl_tx_desc_cnt) { - if_printf(ifp, "watchdog timeout (missed Tx interrupts) " - "-- recovering\n"); + /* + * The retry reclaim drained the ring: a Tx completion interrupt + * was lost. Log the interrupt state so the lost-interrupt path + * can be diagnosed without a debug build. + */ + if_printf(ifp, "watchdog timeout (missed Tx interrupts) -- " + "recovering (ISR 0x%04x IMR 0x%04x %s)\n", + isr, imr, imode); if (!if_sendq_empty(ifp)) re_start_locked(ifp); return; } - if_printf(ifp, "watchdog timeout\n"); + txcfg = CSR_READ_4(sc, RL_TXCFG); + /* + * A genuine Tx stall. Log the Tx ring position and controller + * state in a single line -- enough to distinguish a lost doorbell, + * a DMA stall, and a controller that has fallen off the bus. + */ + if_printf(ifp, "watchdog timeout -- resetting (tx %d/%d cons %d " + "prod %d ISR 0x%04x IMR 0x%04x TXCFG 0x%08x %s)\n", + sc->rl_ldata.rl_tx_free, sc->rl_ldata.rl_tx_desc_cnt, + sc->rl_ldata.rl_tx_considx, sc->rl_ldata.rl_tx_prodidx, + isr, imr, txcfg, imode); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); + /* + * If the controller reads back all-ones it has fallen off the bus; + * re_init_locked() cannot recover it, so flag it and bail rather + * than spinning through reset after reset. + */ + if (txcfg == 0xFFFFFFFF) { + if_printf(ifp, + "controller not responding; not reinitializing\n"); + return; + } + + /* + * ASPM is a common cause of these Tx timeouts. Make sure L0s/L1 + * and CLKREQ are still disabled on the link before reinitializing; + * firmware or a power transition may have re-armed them. + */ + if (sc->rl_expcap != 0) { + uint16_t ctl; + + ctl = pci_read_config(sc->rl_dev, + sc->rl_expcap + PCIER_LINK_CTL, 2); + if ((ctl & (PCIEM_LINK_CTL_ECPM | PCIEM_LINK_CTL_ASPMC)) != 0) { + ctl &= ~(PCIEM_LINK_CTL_ECPM | PCIEM_LINK_CTL_ASPMC); + pci_write_config(sc->rl_dev, + sc->rl_expcap + PCIER_LINK_CTL, ctl, 2); + } + } + NET_EPOCH_ENTER(et); re_rxeof(sc, NULL); NET_EPOCH_EXIT(et);