From nobody Sun Aug 16 10:13:55 2026 X-Original-To: dev-commits-src-main@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 4hNBdH2CbCz6nqq5 for ; Sun, 16 Aug 2026 10:13:55 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hNBdH1NMZz3XW8 for ; Sun, 16 Aug 2026 10:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786875235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vjvla8wPVG/TBykIALBh3265gXHLXzf4aEWvQYru5xw=; b=EAc5xVmgAROUjqvzW3/7A6YWfRDleg73DsiEr8otzCItibpPSLNLTuLZic/sXE2fG4u6Hr H76kPjdaJ5AjDaQpi/g1HJq/TWavbOv+oI1S/mPXVOXf6RrxloNBD2L40LlmOeqjdTdTeQ oAqa2oW2m+Ia78GzgY8gFCn0MmSvTbH8AEeXToQVzyr/Ma3EmXZ6MqgIeWvQuobZObu+10 8NjjVnXjO3F2O3Q4r6yGN++WCEJlDdvfrfWW2tc4jtjbmbZylLZkoeYtCUB+w2WOaV5IWR 5jbAEL4mDNHQvfFv0CdxB3uQSFa27XqlgNquSlD5evC2bb4QW13SFMR4BflWLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786875235; a=rsa-sha256; cv=none; b=fmiZo9e/nWh6IipQkcN41LyttxAPEAmwTIVGitjkncOUc9H1w+sdEqpM3R/PXf8zb5cyh7 Uwj2Lbfb8k2WR++iP5rKhk85eq3zeaatigEqNIjPqxqnvOlQlD2+Dvit7Te/HA9yF6GB8X RcDOdnF4Pm8PhPK+PypcRljsBF56Cx4icH2uIyQ2zHE1DTbdxJJ/qKuN0qSbzo+HiZmYaG wysvYJ6R75rH3qoscjKDhxikEco+E0+DFjckw+5c4DRUIlfTdzA+adZcXiXa1Ms/q4qUyO dVWPZMHv5DbhoQkZ9h4W/QTy4dGmg9ZfJ/lFebBFHf4sygw5bSagxI1cnMKXPA== 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=1786875235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vjvla8wPVG/TBykIALBh3265gXHLXzf4aEWvQYru5xw=; b=brmleh604D9HM+axsMcszGn9bnmIH3eKZQGCsKz4mvsZOOPTy67BlHHVhmUmYYnGyOHE6g bpVoEEOhV/2e4Y5VBKezx2cqqXHoptGLJiuvz8PwNIMl77eaqnC231iKXUK6pxXaiTZ6qI cr8OlPRZzi+DZ1XS8+GvXDqFqQF4I4qJ9cIeHM/qniseE0y4MJMEYhrhFizxMCjYCoe6sO G9sxdilJUfJSeLmhya3NrCeGNBXncuPrJ9Cbkad2vJuvVALBbAnNshyJxwV3ElgAoH+kbw 21UlZV0ifMPmrUOgr0gK1k+jvgaV7FzTnzsSjpyAFHbgdYfxCr8DXtF3tSsG6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hNBdH0H9bz7w4 for ; Sun, 16 Aug 2026 10:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 249b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 16 Aug 2026 10:13:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 7accd803e28c - main - e1000: Report 82575 memory ECC errors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7accd803e28cf6051cac69e614eec6f24d5c77cc Auto-Submitted: auto-generated Date: Sun, 16 Aug 2026 10:13:55 +0000 Message-Id: <6a818d63.249b6.5285ce11@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=7accd803e28cf6051cac69e614eec6f24d5c77cc commit 7accd803e28cf6051cac69e614eec6f24d5c77cc Author: Kevin Bowling AuthorDate: 2026-08-16 05:40:44 +0000 Commit: Kevin Bowling CommitDate: 2026-08-16 10:13:15 +0000 e1000: Report 82575 memory ECC errors 82575 exposes clear-on-read, saturating counters for corrected and uncorrected errors in the packet buffer and the receive and transmit descriptor handlers. Sample all three status registers together from the regular hardware statistics update. When an unrecoverable event interrupts first, count the values captured by the interrupt filter so the clear-on-read status is not lost before the admin task handles it. Expose packet buffer and descriptor handler counters under the existing memory_errors sysctl node. Hardware validation used an 82575EB revision 2 and the documented PBEEI, RDHEEI, and TDHEEI injectors. Correctable and uncorrectable TX/RX packet-buffer errors and receive/transmit descriptor-handler errors advanced the corresponding counters. The controls and accounting survived repeated recovery resets and an ordinary interface down/up. MFC after: 2 weeks Sponsored by: BBOX.io --- sys/dev/e1000/if_em.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 91c8eede1de1..05e64a9d5013 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -2339,6 +2339,26 @@ em_fatal_error_intr_mask(struct e1000_softc *sc) return (em_memory_error_intr_mask(&sc->hw)); } +static void +em_update_82575_ecc_stats(struct e1000_softc *sc, u32 pbeccsts, + u32 rdhests, u32 tdhests) +{ + + sc->corrected_error_packet_buffer_count += + pbeccsts & E1000_ECC_82575_CORR_CNT_MASK; + sc->uncorrected_error_packet_buffer_count += + (pbeccsts & E1000_ECC_82575_UNCORR_CNT_MASK) >> + E1000_ECC_82575_UNCORR_CNT_SHIFT; + sc->corrected_error_dma_count += + (rdhests & E1000_ECC_82575_CORR_CNT_MASK) + + (tdhests & E1000_ECC_82575_CORR_CNT_MASK); + sc->uncorrected_error_dma_count += + ((rdhests & E1000_ECC_82575_UNCORR_CNT_MASK) >> + E1000_ECC_82575_UNCORR_CNT_SHIFT) + + ((tdhests & E1000_ECC_82575_UNCORR_CNT_MASK) >> + E1000_ECC_82575_UNCORR_CNT_SHIFT); +} + static void em_update_82576_ecc_counter(struct e1000_softc *sc, u32 reg, u64 *corrected, u64 *uncorrected) @@ -2571,6 +2591,8 @@ em_handle_fatal_error_admin(struct e1000_softc *sc) "PBECCSTS %#x; requesting reset\n", sc->fatal_error_pbeccsts); } else if (em_has_82575_memory_errors(&sc->hw)) { + em_update_82575_ecc_stats(sc, sc->fatal_error_pbeccsts, + sc->fatal_error_dma_rx, sc->fatal_error_dma_tx); device_printf(sc->dev, "unrecoverable internal memory ECC error: ICR %#x, " "PBECCSTS %#x, RDHESTS %#x, TDHESTS %#x; " @@ -6319,6 +6341,11 @@ em_update_stats_counters(struct e1000_softc *sc) if (em_has_pch_ecc(&sc->hw)) em_update_pch_ecc_stats(sc, E1000_READ_REG(&sc->hw, E1000_PBECCSTS)); + else if (em_has_82575_memory_errors(&sc->hw)) + em_update_82575_ecc_stats(sc, + E1000_READ_REG(&sc->hw, E1000_PBECCSTS_82575), + E1000_READ_REG(&sc->hw, E1000_RDHESTS_82575), + E1000_READ_REG(&sc->hw, E1000_TDHESTS_82575)); else if (em_has_82576_memory_errors(&sc->hw)) em_update_82576_ecc_stats(sc); else if (em_has_i350_memory_errors(&sc->hw)) @@ -6737,9 +6764,7 @@ em_add_hw_stats(struct e1000_softc *sc) SYSCTL_ADD_UQUAD(ctx, eee_list, OID_AUTO, "rx_lpi_count", CTLFLAG_RD, &stats->rlpic, "RX LPI event count"); } - if (em_has_pch_ecc(&sc->hw) || - em_has_82576_memory_errors(&sc->hw) || - em_has_i210_i350_memory_errors(&sc->hw)) { + if (em_has_memory_errors(&sc->hw)) { struct sysctl_oid *memerr_node; struct sysctl_oid_list *memerr_list; @@ -6760,6 +6785,23 @@ em_add_hw_stats(struct e1000_softc *sc) "uncorrected_packet_buffer", CTLFLAG_RD, &sc->uncorrected_error_packet_buffer_count, "Uncorrected packet-buffer ECC errors"); + } else if (em_has_82575_memory_errors(&sc->hw)) { + SYSCTL_ADD_UQUAD(ctx, memerr_list, OID_AUTO, + "corrected_packet_buffer", CTLFLAG_RD, + &sc->corrected_error_packet_buffer_count, + "Corrected packet-buffer ECC errors"); + SYSCTL_ADD_UQUAD(ctx, memerr_list, OID_AUTO, + "uncorrected_packet_buffer", CTLFLAG_RD, + &sc->uncorrected_error_packet_buffer_count, + "Uncorrected packet-buffer ECC errors"); + SYSCTL_ADD_UQUAD(ctx, memerr_list, OID_AUTO, + "corrected_descriptor_handler", CTLFLAG_RD, + &sc->corrected_error_dma_count, + "Corrected descriptor-handler ECC errors"); + SYSCTL_ADD_UQUAD(ctx, memerr_list, OID_AUTO, + "uncorrected_descriptor_handler", CTLFLAG_RD, + &sc->uncorrected_error_dma_count, + "Uncorrected descriptor-handler ECC errors"); } else if (em_has_82576_memory_errors(&sc->hw)) { SYSCTL_ADD_UQUAD(ctx, memerr_list, OID_AUTO, "fatal_unknown", CTLFLAG_RD,