Patch "rxrpc: Adjust the rxrpc_rtt_rx tracepoint" has been added to the 6.12-stable tree
gregkh at linuxfoundation.org
gregkh at linuxfoundation.org
Fri Aug 7 06:07:26 PDT 2026
This is a note to let you know that I've just added the patch titled
rxrpc: Adjust the rxrpc_rtt_rx tracepoint
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
rxrpc-adjust-the-rxrpc_rtt_rx-tracepoint.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable at vger.kernel.org> know about it.
>From stable+bounces-296835-greg=kroah.com at vger.kernel.org Thu Aug 6 15:55:57 2026
From: Sasha Levin <sashal at kernel.org>
Date: Thu, 6 Aug 2026 09:50:00 -0400
Subject: rxrpc: Adjust the rxrpc_rtt_rx tracepoint
To: stable at vger.kernel.org
Cc: David Howells <dhowells at redhat.com>, Marc Dionne <marc.dionne at auristor.com>, linux-afs at lists.infradead.org, Jakub Kicinski <kuba at kernel.org>, Sasha Levin <sashal at kernel.org>
Message-ID: <20260806135003.602726-2-sashal at kernel.org>
From: David Howells <dhowells at redhat.com>
[ Upstream commit 93dfca65a1df42a3c8b1094299dc42ab8f18e5c8 ]
Adjust the rxrpc_rtt_rx tracepoint in the following ways:
(1) Display the collected RTT sample in the rxrpc_rtt_rx trace.
(2) Move the division of srtt by 8 to the TP_printk() rather doing it
before invoking the trace point.
(3) Display the min_rtt value.
Signed-off-by: David Howells <dhowells at redhat.com>
cc: Marc Dionne <marc.dionne at auristor.com>
cc: linux-afs at lists.infradead.org
Signed-off-by: Jakub Kicinski <kuba at kernel.org>
Stable-dep-of: e4d2878369d5 ("rxrpc: Fix irq-disabled in local_bh_enable()")
Signed-off-by: Sasha Levin <sashal at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
include/trace/events/rxrpc.h | 14 ++++++++++----
net/rxrpc/input.c | 4 ++--
net/rxrpc/rtt.c | 2 +-
3 files changed, 13 insertions(+), 7 deletions(-)
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -1308,9 +1308,9 @@ TRACE_EVENT(rxrpc_rtt_rx,
TP_PROTO(struct rxrpc_call *call, enum rxrpc_rtt_rx_trace why,
int slot,
rxrpc_serial_t send_serial, rxrpc_serial_t resp_serial,
- u32 rtt, u32 rto),
+ u32 rtt, u32 srtt, u32 rto),
- TP_ARGS(call, why, slot, send_serial, resp_serial, rtt, rto),
+ TP_ARGS(call, why, slot, send_serial, resp_serial, rtt, srtt, rto),
TP_STRUCT__entry(
__field(unsigned int, call)
@@ -1319,7 +1319,9 @@ TRACE_EVENT(rxrpc_rtt_rx,
__field(rxrpc_serial_t, send_serial)
__field(rxrpc_serial_t, resp_serial)
__field(u32, rtt)
+ __field(u32, srtt)
__field(u32, rto)
+ __field(u32, min_rtt)
),
TP_fast_assign(
@@ -1329,17 +1331,21 @@ TRACE_EVENT(rxrpc_rtt_rx,
__entry->send_serial = send_serial;
__entry->resp_serial = resp_serial;
__entry->rtt = rtt;
+ __entry->srtt = srtt;
__entry->rto = rto;
+ __entry->min_rtt = minmax_get(&call->peer->min_rtt)
),
- TP_printk("c=%08x [%d] %s sr=%08x rr=%08x rtt=%u rto=%u",
+ TP_printk("c=%08x [%d] %s sr=%08x rr=%08x rtt=%u srtt=%u rto=%u min=%u",
__entry->call,
__entry->slot,
__print_symbolic(__entry->why, rxrpc_rtt_rx_traces),
__entry->send_serial,
__entry->resp_serial,
__entry->rtt,
- __entry->rto)
+ __entry->srtt / 8,
+ __entry->rto,
+ __entry->min_rtt)
);
TRACE_EVENT(rxrpc_timer_set,
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -674,7 +674,7 @@ static void rxrpc_complete_rtt_probe(str
*/
if (after(acked_serial, orig_serial)) {
trace_rxrpc_rtt_rx(call, rxrpc_rtt_rx_obsolete, i,
- orig_serial, acked_serial, 0, 0);
+ orig_serial, acked_serial, 0, 0, 0);
clear_bit(i + RXRPC_CALL_RTT_PEND_SHIFT, &call->rtt_avail);
smp_wmb();
set_bit(i, &call->rtt_avail);
@@ -682,7 +682,7 @@ static void rxrpc_complete_rtt_probe(str
}
if (!matched)
- trace_rxrpc_rtt_rx(call, rxrpc_rtt_rx_lost, 9, 0, acked_serial, 0, 0);
+ trace_rxrpc_rtt_rx(call, rxrpc_rtt_rx_lost, 9, 0, acked_serial, 0, 0, 0);
}
/*
--- a/net/rxrpc/rtt.c
+++ b/net/rxrpc/rtt.c
@@ -175,7 +175,7 @@ void rxrpc_peer_add_rtt(struct rxrpc_cal
spin_unlock(&peer->rtt_input_lock);
trace_rxrpc_rtt_rx(call, why, rtt_slot, send_serial, resp_serial,
- peer->srtt_us >> 3, peer->rto_us);
+ rtt_us, peer->srtt_us, peer->rto_us);
}
/*
Patches currently in stable-queue which might be from sashal at kernel.org are
queue-6.12/wifi-brcmfmac-set-f2-blocksize-to-256-for-bcm43752.patch
queue-6.12/net-dsa-mt7530-check-bus-read-errors-in-the-mdio-reg.patch
queue-6.12/um-set-parent-death-signal-for-userspace-process.patch
queue-6.12/usb-gadget-f_tcm-synchronize-delayed-set_alt-with-teardown.patch
queue-6.12/drm-xe-rtp-de-whitelist-oa-registers-for-all-hwe-s-f.patch
queue-6.12/media-uapi-rkisp-correct-name-version-enum.patch
queue-6.12/net-sxgbe-free-tx-rings-on-rx-allocation-failure.patch
queue-6.12/rtase-fix-double-free-of-multi-frag-skb-on-dma-map-f.patch
queue-6.12/usb-typec-ucsi-fix-race-condition-and-ordering-in-port-unregistration.patch
queue-6.12/drm-xe-introduce-xe_gt_dbg_printer.patch
queue-6.12/drm-fb-helper-allocate-and-release-fb_info-in-single-place.patch
queue-6.12/drm-xe-rtp-maintain-oa-whitelists-separately.patch
queue-6.12/pinctrl-qcom-sc8280xp-add-missing-wakeup-entries-for.patch
queue-6.12/forcedeth-fix-uaf-of-txrx_stats-in-nv_remove.patch
queue-6.12/alsa-hda-codecs-hdmi-disable-keep-alive-before-audio-format-change.patch
queue-6.12/hid-logitech-dj-standardise-hid_report_enum-variable.patch
queue-6.12/scsi-libsas-fix-ha-resume-deadlock-and-hisi_sas-disk.patch
queue-6.12/netfilter-nft_payload-fix-mask-build-for-partial-fie.patch
queue-6.12/bluetooth-iso-fix-timeout-vs-sync_timeout-typo-in-ch.patch
queue-6.12/um-set-parent-death-signal-for-ubd-io-thread-process.patch
queue-6.12/net-sxgbe-check-descriptor-ring-allocation-failures.patch
queue-6.12/ipvs-fix-the-checksum-validations.patch
queue-6.12/mptcp-pm-avoid-code-duplication-to-lookup-endp.patch
queue-6.12/hwmon-ina2xx-fix-various-overflow-issues.patch
queue-6.12/spi-spi-cadence-move-tx-fifo-full-busy-wait-into-fif.patch
queue-6.12/powerpc-boot-fix-simpleboot-cpu-node-lookup-check.patch
queue-6.12/ata-sata_mv-accept-1-or-2-resources-in-platform-prob.patch
queue-6.12/drm-xe-rtp-generalize-whitelist_apply_to_hwe.patch
queue-6.12/wifi-mac80211-validate-individual-twt-params-before-.patch
queue-6.12/mm-hugetlb-fix-swap-entry-corruption-when-clearing-u.patch
queue-6.12/dmaengine-idxd-fix-fdev-setup-failure-cleanup-in-idx.patch
queue-6.12/asoc-max98090-fix-missing-is_err-before-ptr_err-on-m.patch
queue-6.12/keys-trusted-dcp-fix-key_len-validation-and-calc_blo.patch
queue-6.12/drm-xe-oa-de-whitelist-oa-registers-on-oa-stream-ope.patch
queue-6.12/mptcp-pm-use-addr-entry-for-get_local_id.patch
queue-6.12/drm-xe-rtp-save-oa-nonpriv-registers-to-register-sav.patch
queue-6.12/bluetooth-hci_sync-remove-unnecessary-hci_conn_get-i.patch
queue-6.12/drm-mediatek-check-crtc-state-before-freeing.patch
queue-6.12/bluetooth-iso-clear-iso_data-always-when-detaching-c.patch
queue-6.12/bluetooth-iso-fix-leaking-sk-after-socket-release.patch
queue-6.12/hwmon-ina2xx-add-support-for-ina260.patch
queue-6.12/accel-qaic-use-sizeof-trans_hdr-for-transaction-leng.patch
queue-6.12/pinctrl-amd-don-t-clear-s4-wake-bits-at-probe.patch
queue-6.12/net-bridge-mrp-fix-option-tlv-length-in-mrp_test-fra.patch
queue-6.12/kmemleak-iommu-iova-fix-transient-kmemleak-false-positive.patch
queue-6.12/gpio-pch-use-raw_spinlock_t-for-the-register-lock.patch
queue-6.12/rxrpc-generate-rtt_min.patch
queue-6.12/drm-xe-rtp-refactor-oag-mmio-trigger-register-whitel.patch
queue-6.12/hwmon-ina2xx-add-support-for-ina234.patch
queue-6.12/drm-xe-apply-whitelist-to-engine-save-restore.patch
queue-6.12/powerpc-boot-fix-treeboot-currituck-cpu-node-lookup-.patch
queue-6.12/wifi-ath6kl-fix-use-after-free-in-aggr_reset_state.patch
queue-6.12/wifi-brcmfmac-fix-43752-sdio-fwvid-incorrectly-labelled-as-cypress-cyw.patch
queue-6.12/keys-make-keyring-key-chunk-byte-order-agree-with-ke.patch
queue-6.12/drm-xe-pt-reset-current_op-in-xe_pt_update_ops_init.patch
queue-6.12/drm-xe-rtp-toggle-deny-bit-to-de-whitelist-oa-regs.patch
queue-6.12/hwmon-adt7470-fix-fans-stuck-in-manual-mode-on-i2c-e.patch
queue-6.12/net-airoha-fix-register-index-for-tx-fwd-counter-con.patch
queue-6.12/ata-ahci_ceva-fix-error-paths-in-ceva_ahci_platform_.patch
queue-6.12/qede-sync-udp_tunnel-ports-outside-qede_lock-in-the-.patch
queue-6.12/rxrpc-fix-the-calculation-and-use-of-rto.patch
queue-6.12/tracing-mmiotrace-reset-dropped_count-in-mmio_reset_.patch
queue-6.12/netfilter-nf_conntrack_sip-widen-nat-rewrite-delta-t.patch
queue-6.12/drm-i915-hdcp-move-to-using-intel_display-in-intel_hdcp.patch
queue-6.12/usb-typec-ucsi-split-connector-lock-classes.patch
queue-6.12/ahci-introduce-ahci_ignore_port-helper.patch
queue-6.12/drm-i915-hdcp-require-monotonically-increasing-seq_num_v.patch
queue-6.12/net-udp_tunnel-fix-memory-leak-in-udp_tunnel_nic_unr.patch
queue-6.12/bluetooth-iso-validate-sockaddr_iso-first-in-iso_soc.patch
queue-6.12/net-libwx-fix-fdir-atr-queue-mismatch-for-software-v.patch
queue-6.12/riscv-mm-fix-out-of-bounds-page-table-walk-during-me.patch
queue-6.12/netfilter-nf_tables-make-nft_object-rhltable-per-tab.patch
queue-6.12/mm-huge_memory-unlock-i_mmap_rwsem-before-releasing-.patch
queue-6.12/bluetooth-l2cap-fix-uaf-in-l2cap_le_connect_rsp.patch
queue-6.12/hwmon-ina226-add-support-for-sy24655.patch
queue-6.12/scsi-zfcp-fix-memory-leak-during-adapter-release-by-.patch
queue-6.12/mptcp-pm-userspace-fix-use-after-free-in-get_local_id.patch
queue-6.12/hwmon-ina2xx-make-it-easier-to-add-more-devices.patch
queue-6.12/net-dsa-mt7530-error-out-on-failed-reads-in-mt7531-p.patch
queue-6.12/scsi-libiscsi_tcp-bound-scsi-response-data-segment-t.patch
queue-6.12/bluetooth-hci_conn-hold-conn-reference-in-abort_conn.patch
queue-6.12/ipvs-do-not-mangle-icmp-replies-for-non-first-fragme.patch
queue-6.12/drm-i915-hdcp-check-streams-bounds-before-overflow.patch
queue-6.12/phy-zynqmp-fix-clock-error-handling-in-xpsgtr_phy_in.patch
queue-6.12/asoc-max98095-fix-missing-is_err-before-ptr_err-on-m.patch
queue-6.12/hid-logitech-dj-fix-wrong-detection-of-bad-dj_short-.patch
queue-6.12/rds-tcp-hold-the-rcu-lock-across-ipv6_chk_addr-in-rd.patch
queue-6.12/drm-xe-rtp-ensure-locking-ref-counting-for-oa-whitel.patch
queue-6.12/um-add-os_set_pdeathsig-helper-function.patch
queue-6.12/hwmon-lm90-only-report-alarms-if-driver-is-ready.patch
queue-6.12/of-reserved_mem-add-code-to-dynamically-allocate-res.patch
queue-6.12/bpf-reset-register-bounds-before-narrowing-retval-ra.patch
queue-6.12/drm-xe-rtp-keep-track-of-non-oa-nonpriv-slots.patch
queue-6.12/net-ethernet-mtk_eth_soc-support-named-irqs.patch
queue-6.12/wifi-brcmfmac-drain-bus_reset-work-on-device-removal.patch
queue-6.12/hwmon-adt7470-fix-divide-by-zero-toctou-crash-in-fan.patch
queue-6.12/mptcp-add-mptcp_userspace_pm_lookup_addr-helper.patch
queue-6.12/drm-sched-store-the-drm-client_id-in-drm_sched_fence.patch
queue-6.12/of-reserved_mem-prevent-oob-when-too-many-dynamic-re.patch
queue-6.12/hwmon-adt7470-fix-temperature-alarm-logic-in-hwmon_t.patch
queue-6.12/ksmbd-return-success-for-deferred-final-close.patch
queue-6.12/hwmon-ina2xx-add-support-for-has_alerts-configuratio.patch
queue-6.12/drm-tegra-fbdev-remove-offset-into-framebuffer-memory.patch
queue-6.12/scsi-ufs-core-cancel-rtc-work-in-active-active-suspe.patch
queue-6.12/drm-exec-remove-the-index-parameter-from-drm_exec_for_each_locked_obj.patch
queue-6.12/hwmon-adt7470-fix-cache-updated-before-hardware-writ.patch
queue-6.12/assoc_array-trim-the-final-shortcut-word-using-the-c.patch
queue-6.12/mm-kmemleak-fix-checksum-computation-for-per-cpu-objects.patch
queue-6.12/ksmbd-fix-use-after-free-in-__close_file_table_ids.patch
queue-6.12/drm-xe-wait-on-external-bo-kernel-fences-in-exec-ioctl.patch
queue-6.12/drm-amdgpu-gfx-fix-cleaner-shader-ib-buffer-overflow.patch
queue-6.12/netfilter-xt_hashlimit-validate-hashtable-supports-x.patch
queue-6.12/scsi-target-iblock-fix-wrong-pr-ops-null-check-for-p.patch
queue-6.12/net-ethernet-mtk_eth_soc-add-consts-for-irq-index.patch
queue-6.12/hwmon-adt7470-fix-swapped-pwm3-and-pwm4-auto-mode-ma.patch
queue-6.12/media-chips-media-wave5-support-cbp-profile.patch
queue-6.12/um-use-os_set_pdeathsig-helper-in-winch-thread-proce.patch
queue-6.12/idpf-fix-mailbox-irq-name-leak-on-request-failure.patch
queue-6.12/drm-i915-vrr-check-has_vrr-first-in-intel_vrr_is_capable.patch
queue-6.12/btrfs-fix-leaking-btrfs_fs_state_remounting-flag.patch
queue-6.12/netfilter-br_netfilter-reallocate-headroom-if-necess.patch
queue-6.12/idpf-adjust-txq-ring-count-minimum.patch
queue-6.12/pinctrl-qcom-unconditionally-mark-gpio-as-wakeup-ena.patch
queue-6.12/gpio-sloppy-logic-analyzer-fix-memory-leak-in-gpio_l.patch
queue-6.12/keys-fix-out-of-bounds-read-in-keyring_get_key_chunk.patch
queue-6.12/drm-amdgpu-fix-context-pstate-override-handling.patch
queue-6.12/hwmon-sht3x-fix-unaligned-accesses.patch
queue-6.12/mm-slab-prevent-unbounded-recursion-in-free-path-wit.patch
queue-6.12/fs-proc-task_mmu-fix-pagemap_scan-written-state-for-.patch
queue-6.12/hwmon-adt7470-use-cached-pwm-frequency-value.patch
queue-6.12/hwmon-pmbus-fix-return-value-from-pmbus_update_byte_.patch
queue-6.12/phy-zynqmp-fix-runtime-pm-leak-on-probe-allocation-f.patch
queue-6.12/scsi-libiscsi-fix-stale-data-leak-into-the-scsi-sens.patch
queue-6.12/tracing-mmiotrace-add-null-check-for-mmio_trace_arra.patch
queue-6.12/drm-xe-rtp-add-ring_force_to_nonpriv_deny-to-oa-whit.patch
queue-6.12/spi-spi-cadence-supports-transmission-with-bits_per_.patch
queue-6.12/kunit-tool-skip-stty-when-stdin-is-not-a-tty.patch
queue-6.12/um-preserve-errno-within-signal-handler.patch
queue-6.12/ipvs-fix-places-with-wrong-packet-offsets.patch
queue-6.12/hwmon-adt7470-fix-pwm-auto-temp-state-array-and-boun.patch
queue-6.12/hwmon-ina2xx-shift-ina234-shunt-and-current-register.patch
queue-6.12/drm-amdgpu-give-each-kernel-job-a-unique-id.patch
queue-6.12/netconsole-avoid-oob-reads-msg-is-not-nul-terminated.patch
queue-6.12/bluetooth-hci_sync-make-hci_cmd_sync_run_once-return.patch
queue-6.12/hwmon-adt7470-fix-busy-loop-and-i2c-flooding-in-upda.patch
queue-6.12/bluetooth-iso-avoid-deadlocks-in-iso_sock_timeout.patch
queue-6.12/rxrpc-fix-irq-disabled-in-local_bh_enable.patch
queue-6.12/drm-i915-hdcp-skip-inactive-mst-connectors-when-building-stream-list.patch
queue-6.12/hwmon-nct6775-core-fix-number-of-temperature-registe.patch
queue-6.12/hwmon-nct6775-core-prevent-access-to-unsupported-wei.patch
queue-6.12/dmaengine-sun6i-dma-fix-reclaim-descriptors-while-te.patch
queue-6.12/drm-xe-hold-a-dma-buf-reference-for-imported-bos.patch
queue-6.12/sched-deadline-use-revised-wakeup-rule-only-for-runn.patch
queue-6.12/rds-fix-inet6_addr_lst-null-dereference-when-ipv6-is.patch
queue-6.12/rxrpc-adjust-the-rxrpc_rtt_rx-tracepoint.patch
queue-6.12/media-i2c-imx219-rename-vts-to-frm_length.patch
queue-6.12/smb-client-fix-buffer-leaks-in-smb1-read-and-write.patch
queue-6.12/scsi-target-clear-cmd_cnt-when-initial-counter-enrol.patch
queue-6.12/lib-alloc_tag-introduce-mem_alloc_profiling_permanen.patch
queue-6.12/rxrpc-manage-rtt-per-call-rather-than-per-peer.patch
queue-6.12/bluetooth-hci_sync-fix-hci_conn_del-use-in-hci_le_cr.patch
queue-6.12/net-phylink-put-link_gpio-if-phylink_create-fails.patch
queue-6.12/btrfs-zoned-fix-deadlock-between-metadata-writeback-.patch
queue-6.12/media-imx219-fix-maximum-frame-length-in-lines.patch
queue-6.12/tracing-remove-trace_event_fl_filtered-logic.patch
queue-6.12/drm-i915-vrr-require-valid-min-max-vfreq-for-vrr.patch
queue-6.12/um-set-parent-death-signal-for-write_sigio-thread-pr.patch
queue-6.12/hwmon-nzxt-smart2-dma-align-output-buffer.patch
queue-6.12/rhashtable-clear-stale-iter-p-on-table-restart.patch
queue-6.12/drm-amdgpu-respect-placement-requirements-in-amdgpu_gtt_mgr-functions.patch
queue-6.12/powerpc-boot-fix-treeboot-akebono-cpu-node-lookup-ch.patch
queue-6.12/hwmon-ltc4282-fix-reading-the-minimum-alarm-voltage.patch
queue-6.12/thunderbolt-prevent-xdomain-delayed-work-use-after-f.patch
queue-6.12/ata-libahci_platform-support-non-consecutive-port-nu.patch
queue-6.12/octeontx2-pf-set-correct-sequence-for-carrier-off-an.patch
queue-6.12/net-mpls-initialize-rtm_tos-in-mpls_getroute.patch
queue-6.12/um-set-parent-death-signal-for-winch-thread-process.patch
queue-6.12/netfilter-nf_conntrack_expect-restore-helper-propaga.patch
queue-6.12/drm-xe-stub-out-new-pagefault-layer.patch
queue-6.12/bluetooth-btintel-validate-length-before-parsing-dia.patch
queue-6.12/net-ethernet-mtk_eth_soc-pass-eth-to-mtk_handle_irq_.patch
queue-6.12/drivers-hv-vmbus-replace-lockdep_hardirq_threaded-wi.patch
queue-6.12/drm-xe-rename-___xe_bo_create_locked.patch
queue-6.12/hid-logitech-dj-prevent-report_id_dj_short-related-u.patch
queue-6.12/net-do-not-send-icmp-ndisc-redirects-when-peer-alloc.patch
queue-6.12/phy-zynqmp-postpone-getting-clock-rate-until-actuall.patch
queue-6.12/kunit-tool-terminate-kernel-under-test-on-sigint.patch
queue-6.12/can-isotp-check-register_netdevice_notifier-error-in.patch
More information about the linux-afs
mailing list