backports: for v1.13.3#1564
Merged
Merged
Conversation
Update the three net-macb silent-TX-stall patches from RFC v1 to PATCH net-next v2. The v2 series is on lore at: https://lore.kernel.org/netdev/20260514215459.36109-1-lukasz@raczylo.com/T/ v2 changes from v1 (already merged in siderolabs#1526): * 0001 (PCIe posted-write flush after TSTART doorbell) - now gated behind a new MACB_CAPS_PCIE_POSTED_WRITES capability, set only on raspberrypi_rp1_config. v1 applied the readback to every macb variant; SoC-integrated parts (Atmel, Microchip, SiFive, Xilinx) have no fabric posted-write concern and were paying the non-posted-read latency for nothing. * 0002 (PCIe read barrier before TX completion descriptor check) - replaces the v1 form, which was a regression on read-clear ISR silicon. v1 read ISR with a TCOMP mask in macb_tx_poll(); on raspberrypi_rp1_config (where MACB_CAPS_ISR_CLEAR_ON_WRITE is not set) that read consumes every bit set in ISR, but the use-site masks down to TCOMP and discards the rest -- any RCOMP / ROVR / TXUBR bit at that instant is silently consumed. v2 replaces with (void)queue_readl(queue, IMR), the read-only mask mirror -- non-destructive, same PCIe-barrier effect. * 0003 (TX stall watchdog) - tracks tail movement via a bool flag set by macb_tx_complete() instead of a tx_tail snapshot (form suggested by Phil Elwell on raspberrypi/linux#7340). Adds a netif_carrier_ok() gate. Wraps netdev_warn in printk_ratelimit() so operators can count occurrences while bounding log noise. (An earlier draft used the macro netdev_warn_ratelimited(), which does not exist in this kernel -- caught by John Laur's build test on the v2 patches.) Production runtime so far: 24-node Pi 5 fleet on v2 patch-2 IMR-barrier form since 2026-05-14 14:00 UTC, ~190 cumulative node-hours, zero mid-runtime TX stalls. Pre-patch baseline (~0.5 stall/node-hour) would have predicted ~95 stalls; observed 0. Related: * netdev v1 RFC thread: https://lore.kernel.org/netdev/cover.1777064117.git.lukasz@raczylo.com/T/ * netdev v2 series: https://lore.kernel.org/netdev/20260514215459.36109-1-lukasz@raczylo.com/T/ * raspberrypi/linux merge: raspberrypi/linux#7340 * raspberrypi/linux v2 PR: raspberrypi/linux#7369 Signed-off-by: Lukasz Raczylo <lukasz@raczylo.com> Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit 02bcfce)
Latest LTS. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit 9fff943)
ZFS: 2.4.2 NVIDIA LTS: 580.159.04 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit 12ca698)
Bumping to the latest LTS. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit d616f6c)
Bump kernel 6.18.32 Signed-off-by: Noel Georgi <git@frezbo.dev> (cherry picked from commit eac5f86)
linux_firmware_version: `20260410` -> `20260519` Signed-off-by: Mateusz Urbanek <mateusz.urbanek@siderolabs.com> (cherry picked from commit 270f9f8)
Preserve System.map, so that we can use that to verify that module set and the kernel don't have unresolved symbols. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit adeaafc)
Fixes siderolabs/talos#13373 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit 4f7feb4)
There was a problem hiding this comment.
Pull request overview
Backport bundle for the v1.13.3 release line, primarily updating core system components (kernel, firmware, ZFS, NVIDIA) and aligning kernel build/config behavior with the referenced upstream/backported PR set (CRI-U enablement, additional kernel modules, and updated macb silent-TX-stall patch series).
Changes:
- Bump Linux to 6.18.32 and update linux-firmware, ZFS, and NVIDIA LTS driver versions/checksums in
Pkgfile. - Adjust kernel packaging to preserve
/boot/System.mapand rundepmodusing it (with unresolved-symbol reporting). - Refresh kernel patch set and kernel configs (PPP, diag options for CRI-U, bnxt_re module), plus update libarchive source URL to GitHub releases.
Reviewed changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
Pkgfile |
Updates pinned versions/checksums for Linux, linux-firmware, ZFS, and NVIDIA LTS driver. |
libarchive/pkg.yaml |
Switches libarchive source fetch URL to the GitHub releases asset path. |
kernel/kernel/pkg.yaml |
Preserves System.map in /boot and updates depmod invocation to use it with extra symbol checking. |
kernel/build/patches/README.md |
Updates documentation to match the macb v2 patch series filenames/status/links. |
kernel/build/patches/0001-net-macb-flush-PCIe-posted-write-after-TSTART-doorbe.patch |
Updates macb TSTART posted-write flush logic with a PCIe-only capability gate. |
kernel/build/patches/0002-net-macb-insert-PCIe-read-barrier-before-TX-completi.patch |
Replaces the prior ISR read approach with a non-destructive IMR read barrier. |
kernel/build/patches/0003-net-macb-add-TX-stall-watchdog-to-recover-from-lost-.patch |
Updates TX stall watchdog logic (tail-moved flag + carrier gate + rate limiting). |
kernel/build/config-arm64 |
Regenerated kernel config for 6.18.32 enabling PPP, diag options, and INFINIBAND_BNXT_RE=m. |
kernel/build/config-amd64 |
Regenerated kernel config for 6.18.32 enabling CRI-U-related options (e.g., SOFT_DIRTY, diag) plus PPP and INFINIBAND_BNXT_RE=m. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Member
Author
this is |
frezbo
approved these changes
May 22, 2026
shanduur
approved these changes
May 22, 2026
Fixes: * siderolabs#1557 * siderolabs/talos#13397 New modules: ``` kernel/drivers/infiniband/hw/bnxt_re/bnxt_re.ko ``` Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit c0ec8f3)
Member
Author
|
/m |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PRs backported: