DEV-7315: add support for PTP statistics to marvell10g driver #34

adrian-nicolau · 2025-05-27T11:21:37Z

Add support for some of the PTP statistics per LinkCrypt PTP Functional Description section 1.3.2.23. Currently not presenting GRE, IP-in-IP, NTP, I-tag, SNAP, MPLS, MACsec parser counters.

PTPv2 over Ethernet packets are identified correctly with rx_ptp_v2+rx_ptp_ini_piggyback incrementing on ingress and tx_ptp_v2+tx_ptp_update_res on egress.
PTPv2 over UDP packets are also identified correctly with rx_ptp_v2+rx_udp+rx_ipv4+rx_ptp_ini_piggyback incrementing together with their tx counterpart.
Regular IPv4 (e.g. ICMP) and UDP (e.g. mDNS) packets are also counted, but without incrementing rx_ptp_v2|tx_ptp_v2 and action counters.

Additionally, this PR configures all the PAM registers according to the default values from the functional description, in order to be able to parse IPv4 packets and (not tested) MPLS, LLC/SNAP. All PAM registers are 0 by default in HW.

This PR also fixes the LUT entry to ignore the TransportSpecific field (because in 1588v2.1 it was replaced by majorSdoId field and we do not care about it) and also match Pdelay_Req, Pdelay_Resp event messages, which also require accurate timestamping.

These stats are clear-on-read (CFG_GEN::STAT_CFG_CLR_RD is 1 by default in HW).

Example statistics under ingress PTPv2-over-UDP traffic.

root@terragraph:~# ethtool --phy-statistics eth2
PHY statistics:
     tx_ptp_drop: 0
     tx_ptp_update_res: 0
     tx_ptp_v2: 0
     tx_ptp_v1: 0
     tx_ptp_parser_err: 0
     tx_udp: 3
     tx_ipv4: 3
     tx_ipv6: 0
     tx_dot1q: 0
     tx_stag: 0
     rx_ptp_drop: 0
     rx_ptp_ini_piggyback: 39
     rx_ptp_v2: 39
     rx_ptp_v1: 0
     rx_ptp_parser_err: 0
     rx_udp: 39
     rx_ipv4: 39
     rx_ipv6: 0
     rx_dot1q: 0
     rx_stag: 0

Copilot

Pull Request Overview

Adds support for PTP statistics to the Marvell 10G PHY driver and hooks them into ethtool.

Define PTP counter register offsets and labels in marvell10g_ptp.c
Implement get_sset_count, get_strings, and get_stats for ethtool in the PTP helper
Wire the new callbacks into the main driver (marvell10g.c) and register them in the phy_driver struct

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
drivers/net/phy/marvell10g_ptp.c	Added `mv3310_ptp_stats` array and ethtool support functions
drivers/net/phy/marvell10g.c	Added wrappers, prototypes, and registered the new ethtool hooks

Comments suppressed due to low confidence (3)

drivers/net/phy/marvell10g_ptp.c:315

New ethtool hooks (get_sset_count, get_strings, get_stats) are added but there are no tests covering these code paths. Consider adding unit or integration tests to validate correct behavior and edge cases.

int mv3310_ptp_get_sset_count(struct phy_device *dev)

drivers/net/phy/marvell10g.c:995

In a void function, using return with an expression is invalid C. Drop the return keyword and just call mv3310_ptp_get_strings(dev, data);.

return mv3310_ptp_get_strings(dev, data);

drivers/net/phy/marvell10g.c:1002

This function is declared void, so returning the result of another void function will not compile. Remove return and invoke mv3310_ptp_get_stats(...) directly.

return mv3310_ptp_get_stats(dev, stats, data, priv->ptp_priv);

Copilot

Pull Request Overview

This PR adds support for new PTP statistics counters in the marvell10g driver. It defines new hardware register base definitions and maps them to statistic labels, and updates the API to expose these counters via ethtool.

Introduces new constants and a mapping structure for PTP counters in drivers/net/phy/marvell10g_ptp.c.
Implements additional functions to retrieve statistic strings and values.
Updates drivers/net/phy/marvell10g.c to wire the new PTP statistics API into the main driver interface.

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File	Description
drivers/net/phy/marvell10g_ptp.c	Adds new PTP counter mapping and functions to read and report stats.
drivers/net/phy/marvell10g.c	Updates driver interface to utilize the new PTP statistics API.

drivers/net/phy/marvell10g_ptp.c

Copilot

Pull Request Overview

This PR introduces support for additional PTP statistics in the Marvell10G driver by adding new register address constants, a counter mapping table, and new functions to expose PTP stats via ethtool.

Added new register constants and a counter array in marvell10g_ptp.c
Implemented and integrated functions for obtaining PTP statistics and strings
Updated marvell10g.c to wire up the new PTP stats API functions

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
drivers/net/phy/marvell10g_ptp.c	Added new register constants, counter structure, PTP stats collection functions, and PAM configuration.
drivers/net/phy/marvell10g.c	Integrated the new PTP stats functions into the PHY driver interface.

Comments suppressed due to low confidence (1)

drivers/net/phy/marvell10g_ptp.c:727

Consider handling error codes from each mv3310_write_ptp_reg call individually rather than using bitwise OR accumulation. This ensures that the specific error is accurately reported if one of the register writes fails.

ret |= mv3310_write_ptp_reg(phydev, MV_V2_PTP_PARSER_EG_PAM_BASE + (2 * 16), IPV4_LEN_MASK);

Copilot

Pull Request Overview

This PR implements support for additional PTP statistics in the marvell10g driver, enhancing the ethtool interface with new counter definitions and register accesses. Key changes include:

Addition of new register base definitions and the PAM_ADDR macro.
Introduction of a counter structure and associated arrays/functions for gathering PTP statistics.
Integration of the new stats interface in both the PTP-specific and common PHY driver files.

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File	Description
drivers/net/phy/marvell10g_ptp.c	New definitions, structures, and functions for PTP statistics with PAM configuration and LUT updates.
drivers/net/phy/marvell10g.c	Inline wrappers added to expose the new PTP stats functions via the ethtool interface.

Comments suppressed due to low confidence (2)

drivers/net/phy/marvell10g_ptp.c:742

Consider checking the return value of each mv3310_write_ptp_reg call individually rather than cumulatively OR'ing them; this will help in identifying and reporting specific errors.

ret |= mv3310_write_ptp_reg(dev, PAM_ADDR(MV_V2_PTP_PR_EG_PAM_BASE, 16), IPV4_LEN_MASK);

drivers/net/phy/marvell10g_ptp.c:100

[nitpick] Consider renaming the 'string' field to a more descriptive name like 'counter_name' to improve readability.

const char string[ETH_GSTRING_LEN];

drivers/net/phy/marvell10g_ptp.c

[ Upstream commit eedf3e3 ] ACPICA commit 1c28da2242783579d59767617121035dafba18c3 This was originally done in NetBSD: NetBSD/src@b69d1ac and is the correct alternative to the smattering of `memcpy`s I previously contributed to this repository. This also sidesteps the newly strict checks added in UBSAN: llvm/llvm-project@7926744 Before this change we see the following UBSAN stack trace in Fuchsia: #0 0x000021afcfdeca5e in acpi_rs_get_address_common(struct acpi_resource*, union aml_resource*) ../../third_party/acpica/source/components/resources/rsaddr.c:329 <platform-bus-x86.so>+0x6aca5e #1.2 0x000021982bc4af3c in ubsan_get_stack_trace() compiler-rt/lib/ubsan/ubsan_diag.cpp:41 <libclang_rt.asan.so>+0x41f3c #1.1 0x000021982bc4af3c in maybe_print_stack_trace() compiler-rt/lib/ubsan/ubsan_diag.cpp:51 <libclang_rt.asan.so>+0x41f3c #1 0x000021982bc4af3c in ~scoped_report() compiler-rt/lib/ubsan/ubsan_diag.cpp:395 <libclang_rt.asan.so>+0x41f3c #2 0x000021982bc4bb6f in handletype_mismatch_impl() compiler-rt/lib/ubsan/ubsan_handlers.cpp:137 <libclang_rt.asan.so>+0x42b6f #3 0x000021982bc4b723 in __ubsan_handle_type_mismatch_v1 compiler-rt/lib/ubsan/ubsan_handlers.cpp:142 <libclang_rt.asan.so>+0x42723 #4 0x000021afcfdeca5e in acpi_rs_get_address_common(struct acpi_resource*, union aml_resource*) ../../third_party/acpica/source/components/resources/rsaddr.c:329 <platform-bus-x86.so>+0x6aca5e #5 0x000021afcfdf2089 in acpi_rs_convert_aml_to_resource(struct acpi_resource*, union aml_resource*, struct acpi_rsconvert_info*) ../../third_party/acpica/source/components/resources/rsmisc.c:355 <platform-bus-x86.so>+0x6b2089 #6 0x000021afcfded169 in acpi_rs_convert_aml_to_resources(u8*, u32, u32, u8, void**) ../../third_party/acpica/source/components/resources/rslist.c:137 <platform-bus-x86.so>+0x6ad169 #7 0x000021afcfe2d24a in acpi_ut_walk_aml_resources(struct acpi_walk_state*, u8*, acpi_size, acpi_walk_aml_callback, void**) ../../third_party/acpica/source/components/utilities/utresrc.c:237 <platform-bus-x86.so>+0x6ed24a #8 0x000021afcfde66b7 in acpi_rs_create_resource_list(union acpi_operand_object*, struct acpi_buffer*) ../../third_party/acpica/source/components/resources/rscreate.c:199 <platform-bus-x86.so>+0x6a66b7 #9 0x000021afcfdf6979 in acpi_rs_get_method_data(acpi_handle, const char*, struct acpi_buffer*) ../../third_party/acpica/source/components/resources/rsutils.c:770 <platform-bus-x86.so>+0x6b6979 #10 0x000021afcfdf708f in acpi_walk_resources(acpi_handle, char*, acpi_walk_resource_callback, void*) ../../third_party/acpica/source/components/resources/rsxface.c:731 <platform-bus-x86.so>+0x6b708f #11 0x000021afcfa95dcf in acpi::acpi_impl::walk_resources(acpi::acpi_impl*, acpi_handle, const char*, acpi::Acpi::resources_callable) ../../src/devices/board/lib/acpi/acpi-impl.cc:41 <platform-bus-x86.so>+0x355dcf #12 0x000021afcfaa8278 in acpi::device_builder::gather_resources(acpi::device_builder*, acpi::Acpi*, fidl::any_arena&, acpi::Manager*, acpi::device_builder::gather_resources_callback) ../../src/devices/board/lib/acpi/device-builder.cc:84 <platform-bus-x86.so>+0x368278 #13 0x000021afcfbddb87 in acpi::Manager::configure_discovered_devices(acpi::Manager*) ../../src/devices/board/lib/acpi/manager.cc:75 <platform-bus-x86.so>+0x49db87 #14 0x000021afcf99091d in publish_acpi_devices(acpi::Manager*, zx_device_t*, zx_device_t*) ../../src/devices/board/drivers/x86/acpi-nswalk.cc:95 <platform-bus-x86.so>+0x25091d #15 0x000021afcf9c1d4e in x86::X86::do_init(x86::X86*) ../../src/devices/board/drivers/x86/x86.cc:60 <platform-bus-x86.so>+0x281d4e #16 0x000021afcf9e33ad in λ(x86::X86::ddk_init::(anon class)*) ../../src/devices/board/drivers/x86/x86.cc:77 <platform-bus-x86.so>+0x2a33ad #17 0x000021afcf9e313e in fit::internal::target<(lambda at../../src/devices/board/drivers/x86/x86.cc:76:19), false, false, std::__2::allocator<std::byte>, void>::invoke(void*) ../../sdk/lib/fit/include/lib/fit/internal/function.h:183 <platform-bus-x86.so>+0x2a313e #18 0x000021afcfbab4c7 in fit::internal::function_base<16UL, false, void(), std::__2::allocator<std::byte>>::invoke(const fit::internal::function_base<16UL, false, void (), std::__2::allocator<std::byte> >*) ../../sdk/lib/fit/include/lib/fit/internal/function.h:522 <platform-bus-x86.so>+0x46b4c7 #19 0x000021afcfbab342 in fit::function_impl<16UL, false, void(), std::__2::allocator<std::byte>>::operator()(const fit::function_impl<16UL, false, void (), std::__2::allocator<std::byte> >*) ../../sdk/lib/fit/include/lib/fit/function.h:315 <platform-bus-x86.so>+0x46b342 #20 0x000021afcfcd98c3 in async::internal::retained_task::Handler(async_dispatcher_t*, async_task_t*, zx_status_t) ../../sdk/lib/async/task.cc:24 <platform-bus-x86.so>+0x5998c3 #21 0x00002290f9924616 in λ(const driver_runtime::Dispatcher::post_task::(anon class)*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, zx_status_t) ../../src/devices/bin/driver_runtime/dispatcher.cc:789 <libdriver_runtime.so>+0x10a616 #22 0x00002290f9924323 in fit::internal::target<(lambda at../../src/devices/bin/driver_runtime/dispatcher.cc:788:7), true, false, std::__2::allocator<std::byte>, void, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request>>, int>::invoke(void*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, int) ../../sdk/lib/fit/include/lib/fit/internal/function.h:128 <libdriver_runtime.so>+0x10a323 #23 0x00002290f9904b76 in fit::internal::function_base<24UL, true, void(std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request>>, int), std::__2::allocator<std::byte>>::invoke(const fit::internal::function_base<24UL, true, void (std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, int), std::__2::allocator<std::byte> >*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, int) ../../sdk/lib/fit/include/lib/fit/internal/function.h:522 <libdriver_runtime.so>+0xeab76 #24 0x00002290f9904831 in fit::callback_impl<24UL, true, void(std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request>>, int), std::__2::allocator<std::byte>>::operator()(fit::callback_impl<24UL, true, void (std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, int), std::__2::allocator<std::byte> >*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, int) ../../sdk/lib/fit/include/lib/fit/function.h:471 <libdriver_runtime.so>+0xea831 #25 0x00002290f98d5adc in driver_runtime::callback_request::Call(driver_runtime::callback_request*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >, zx_status_t) ../../src/devices/bin/driver_runtime/callback_request.h:74 <libdriver_runtime.so>+0xbbadc #26 0x00002290f98e1e58 in driver_runtime::Dispatcher::dispatch_callback(driver_runtime::Dispatcher*, std::__2::unique_ptr<driver_runtime::callback_request, std::__2::default_delete<driver_runtime::callback_request> >) ../../src/devices/bin/driver_runtime/dispatcher.cc:1248 <libdriver_runtime.so>+0xc7e58 #27 0x00002290f98e4159 in driver_runtime::Dispatcher::dispatch_callbacks(driver_runtime::Dispatcher*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../src/devices/bin/driver_runtime/dispatcher.cc:1308 <libdriver_runtime.so>+0xca159 #28 0x00002290f9918414 in λ(const driver_runtime::Dispatcher::create_with_adder::(anon class)*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../src/devices/bin/driver_runtime/dispatcher.cc:353 <libdriver_runtime.so>+0xfe414 #29 0x00002290f991812d in fit::internal::target<(lambda at../../src/devices/bin/driver_runtime/dispatcher.cc:351:7), true, false, std::__2::allocator<std::byte>, void, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter>>, fbl::ref_ptr<driver_runtime::Dispatcher>>::invoke(void*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../sdk/lib/fit/include/lib/fit/internal/function.h:128 <libdriver_runtime.so>+0xfe12d #30 0x00002290f9906fc7 in fit::internal::function_base<8UL, true, void(std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter>>, fbl::ref_ptr<driver_runtime::Dispatcher>), std::__2::allocator<std::byte>>::invoke(const fit::internal::function_base<8UL, true, void (std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>), std::__2::allocator<std::byte> >*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../sdk/lib/fit/include/lib/fit/internal/function.h:522 <libdriver_runtime.so>+0xecfc7 #31 0x00002290f9906c66 in fit::function_impl<8UL, true, void(std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter>>, fbl::ref_ptr<driver_runtime::Dispatcher>), std::__2::allocator<std::byte>>::operator()(const fit::function_impl<8UL, true, void (std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>), std::__2::allocator<std::byte> >*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../sdk/lib/fit/include/lib/fit/function.h:315 <libdriver_runtime.so>+0xecc66 #32 0x00002290f98e73d9 in driver_runtime::Dispatcher::event_waiter::invoke_callback(driver_runtime::Dispatcher::event_waiter*, std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, fbl::ref_ptr<driver_runtime::Dispatcher>) ../../src/devices/bin/driver_runtime/dispatcher.h:543 <libdriver_runtime.so>+0xcd3d9 #33 0x00002290f98e700d in driver_runtime::Dispatcher::event_waiter::handle_event(std::__2::unique_ptr<driver_runtime::Dispatcher::event_waiter, std::__2::default_delete<driver_runtime::Dispatcher::event_waiter> >, async_dispatcher_t*, async::wait_base*, zx_status_t, zx_packet_signal_t const*) ../../src/devices/bin/driver_runtime/dispatcher.cc:1442 <libdriver_runtime.so>+0xcd00d #34 0x00002290f9918983 in async_loop_owned_event_handler<driver_runtime::Dispatcher::event_waiter>::handle_event(async_loop_owned_event_handler<driver_runtime::Dispatcher::event_waiter>*, async_dispatcher_t*, async::wait_base*, zx_status_t, zx_packet_signal_t const*) ../../src/devices/bin/driver_runtime/async_loop_owned_event_handler.h:59 <libdriver_runtime.so>+0xfe983 #35 0x00002290f9918b9e in async::wait_method<async_loop_owned_event_handler<driver_runtime::Dispatcher::event_waiter>, &async_loop_owned_event_handler<driver_runtime::Dispatcher::event_waiter>::handle_event>::call_handler(async_dispatcher_t*, async_wait_t*, zx_status_t, zx_packet_signal_t const*) ../../sdk/lib/async/include/lib/async/cpp/wait.h:201 <libdriver_runtime.so>+0xfeb9e #36 0x00002290f99bf509 in async_loop_dispatch_wait(async_loop_t*, async_wait_t*, zx_status_t, zx_packet_signal_t const*) ../../sdk/lib/async-loop/loop.c:394 <libdriver_runtime.so>+0x1a5509 #37 0x00002290f99b9958 in async_loop_run_once(async_loop_t*, zx_time_t) ../../sdk/lib/async-loop/loop.c:343 <libdriver_runtime.so>+0x19f958 #38 0x00002290f99b9247 in async_loop_run(async_loop_t*, zx_time_t, _Bool) ../../sdk/lib/async-loop/loop.c:301 <libdriver_runtime.so>+0x19f247 #39 0x00002290f99ba962 in async_loop_run_thread(void*) ../../sdk/lib/async-loop/loop.c:860 <libdriver_runtime.so>+0x1a0962 #40 0x000041afd176ef30 in start_c11(void*) ../../zircon/third_party/ulib/musl/pthread/pthread_create.c:63 <libc.so>+0x84f30 #41 0x000041afd18a448d in thread_trampoline(uintptr_t, uintptr_t) ../../zircon/system/ulib/runtime/thread.cc:100 <libc.so>+0x1ba48d Link: acpica/acpica@1c28da22 Signed-off-by: Rafael J. Wysocki <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Tamir Duberstein <[email protected]> [ rjw: Pick up the tag from Tamir ] Signed-off-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Sasha Levin <[email protected]>

Add support for some of the PTP statistics per LinkCrypt PTP Functional Description section 1.3.2.23. Currently not presenting GRE, IP-in-IP, NTP, I-tag, SNAP, MPLS, MACsec parser counters. - PTPv2 over Ethernet packets are identified correctly with `rx_ptp_v2+rx_ptp_ini_piggyback` incrementing on ingress and `tx_ptp_v2+tx_ptp_update_res` on egress. - PTPv2 over UDP packets are also identified correctly with `rx_ptp_v2+rx_udp+rx_ipv4+rx_ptp_ini_piggyback` incrementing together with their tx counterpart. - Regular IPv4 (e.g. ICMP) and UDP (e.g. mDNS) packets are also counted, but without incrementing `rx_ptp_v2|tx_ptp_v2` and action counters. Additionally, this PR configures all the PAM registers according to the default values from the functional description, in order to be able to parse IPv4 packets and (not tested) MPLS, LLC/SNAP. All PAM registers are 0 by default in HW. This PR also fixes the LUT entry to ignore the TransportSpecific field (because in 1588v2.1 it was replaced by majorSdoId field and we do not care about it) and also match Pdelay_Req, Pdelay_Resp event messages, which also require accurate timestamping. These stats are clear-on-read (`CFG_GEN::STAT_CFG_CLR_RD` is 1 by default in HW). Example statistics under ingress PTPv2-over-UDP traffic. ``` root@terragraph:~# ethtool --phy-statistics eth2 PHY statistics: tx_ptp_drop: 0 tx_ptp_update_res: 0 tx_ptp_v2: 0 tx_ptp_v1: 0 tx_ptp_parser_err: 0 tx_udp: 3 tx_ipv4: 3 tx_ipv6: 0 tx_dot1q: 0 tx_stag: 0 rx_ptp_drop: 0 rx_ptp_ini_piggyback: 39 rx_ptp_v2: 39 rx_ptp_v1: 0 rx_ptp_parser_err: 0 rx_udp: 39 rx_ipv4: 39 rx_ipv6: 0 rx_dot1q: 0 rx_stag: 0 ```

When simulating an nvme device on qemu with both logical_block_size and physical_block_size set to 8 KiB, an error trace appears during partition table reading at boot time. The issue is caused by inode->i_blkbits being larger than PAGE_SHIFT, which leads to a left shift of -1 and triggering a UBSAN warning. [ 2.697306] ------------[ cut here ]------------ [ 2.697309] UBSAN: shift-out-of-bounds in fs/crypto/inline_crypt.c:336:37 [ 2.697311] shift exponent -1 is negative [ 2.697315] CPU: 3 UID: 0 PID: 274 Comm: (udev-worker) Not tainted 6.18.0-rc2+ #34 PREEMPT(voluntary) [ 2.697317] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 [ 2.697320] Call Trace: [ 2.697324] <TASK> [ 2.697325] dump_stack_lvl+0x76/0xa0 [ 2.697340] dump_stack+0x10/0x20 [ 2.697342] __ubsan_handle_shift_out_of_bounds+0x1e3/0x390 [ 2.697351] bh_get_inode_and_lblk_num.cold+0x12/0x94 [ 2.697359] fscrypt_set_bio_crypt_ctx_bh+0x44/0x90 [ 2.697365] submit_bh_wbc+0xb6/0x190 [ 2.697370] block_read_full_folio+0x194/0x270 [ 2.697371] ? __pfx_blkdev_get_block+0x10/0x10 [ 2.697375] ? __pfx_blkdev_read_folio+0x10/0x10 [ 2.697377] blkdev_read_folio+0x18/0x30 [ 2.697379] filemap_read_folio+0x40/0xe0 [ 2.697382] filemap_get_pages+0x5ef/0x7a0 [ 2.697385] ? mmap_region+0x63/0xd0 [ 2.697389] filemap_read+0x11d/0x520 [ 2.697392] blkdev_read_iter+0x7c/0x180 [ 2.697393] vfs_read+0x261/0x390 [ 2.697397] ksys_read+0x71/0xf0 [ 2.697398] __x64_sys_read+0x19/0x30 [ 2.697399] x64_sys_call+0x1e88/0x26a0 [ 2.697405] do_syscall_64+0x80/0x670 [ 2.697410] ? __x64_sys_newfstat+0x15/0x20 [ 2.697414] ? x64_sys_call+0x204a/0x26a0 [ 2.697415] ? do_syscall_64+0xb8/0x670 [ 2.697417] ? irqentry_exit_to_user_mode+0x2e/0x2a0 [ 2.697420] ? irqentry_exit+0x43/0x50 [ 2.697421] ? exc_page_fault+0x90/0x1b0 [ 2.697422] entry_SYSCALL_64_after_hwframe+0x76/0x7e [ 2.697425] RIP: 0033:0x75054cba4a06 [ 2.697426] Code: 5d e8 41 8b 93 08 03 00 00 59 5e 48 83 f8 fc 75 19 83 e2 39 83 fa 08 75 11 e8 26 ff ff ff 66 0f 1f 44 00 00 48 8b 45 10 0f 05 <48> 8b 5d f8 c9 c3 0f 1f 40 00 f3 0f 1e fa 55 48 89 e5 48 83 ec 08 [ 2.697427] RSP: 002b:00007fff973723a0 EFLAGS: 00000202 ORIG_RAX: 0000000000000000 [ 2.697430] RAX: ffffffffffffffda RBX: 00005ea9a2c02760 RCX: 000075054cba4a06 [ 2.697432] RDX: 0000000000002000 RSI: 000075054c190000 RDI: 000000000000001b [ 2.697433] RBP: 00007fff973723c0 R08: 0000000000000000 R09: 0000000000000000 [ 2.697434] R10: 0000000000000000 R11: 0000000000000202 R12: 0000000000000000 [ 2.697434] R13: 00005ea9a2c027c0 R14: 00005ea9a2be5608 R15: 00005ea9a2be55f0 [ 2.697436] </TASK> [ 2.697436] ---[ end trace ]--- This situation can happen for block devices because when CONFIG_TRANSPARENT_HUGEPAGE is enabled, the maximum logical_block_size is 64 KiB. set_init_blocksize() then sets the block device inode->i_blkbits to 13, which is within this limit. File I/O does not trigger this problem because for filesystems that do not support the FS_LBS feature, sb_set_blocksize() prevents sb->s_blocksize_bits from being larger than PAGE_SHIFT. During inode allocation, alloc_inode()->inode_init_always() assigns inode->i_blkbits from sb->s_blocksize_bits. Currently, only xfs_fs_type has the FS_LBS flag, and since xfs I/O paths do not reach submit_bh_wbc(), it does not hit the left-shift underflow issue. Signed-off-by: Yongpeng Yang <[email protected]> Fixes: 47dd675 ("block/bdev: lift block size restrictions to 64k") Cc: [email protected] [EB: use folio_pos() and consolidate the two shifts by i_blkbits] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Eric Biggers <[email protected]>

Add support for some of the PTP statistics per LinkCrypt PTP Functional Description section 1.3.2.23. Currently not presenting GRE, IP-in-IP, NTP, I-tag, SNAP, MPLS, MACsec parser counters. - PTPv2 over Ethernet packets are identified correctly with `rx_ptp_v2+rx_ptp_ini_piggyback` incrementing on ingress and `tx_ptp_v2+tx_ptp_update_res` on egress. - PTPv2 over UDP packets are also identified correctly with `rx_ptp_v2+rx_udp+rx_ipv4+rx_ptp_ini_piggyback` incrementing together with their tx counterpart. - Regular IPv4 (e.g. ICMP) and UDP (e.g. mDNS) packets are also counted, but without incrementing `rx_ptp_v2|tx_ptp_v2` and action counters. Additionally, this PR configures all the PAM registers according to the default values from the functional description, in order to be able to parse IPv4 packets and (not tested) MPLS, LLC/SNAP. All PAM registers are 0 by default in HW. This PR also fixes the LUT entry to ignore the TransportSpecific field (because in 1588v2.1 it was replaced by majorSdoId field and we do not care about it) and also match Pdelay_Req, Pdelay_Resp event messages, which also require accurate timestamping. These stats are clear-on-read (`CFG_GEN::STAT_CFG_CLR_RD` is 1 by default in HW). Example statistics under ingress PTPv2-over-UDP traffic. ``` root@terragraph:~# ethtool --phy-statistics eth2 PHY statistics: tx_ptp_drop: 0 tx_ptp_update_res: 0 tx_ptp_v2: 0 tx_ptp_v1: 0 tx_ptp_parser_err: 0 tx_udp: 3 tx_ipv4: 3 tx_ipv6: 0 tx_dot1q: 0 tx_stag: 0 rx_ptp_drop: 0 rx_ptp_ini_piggyback: 39 rx_ptp_v2: 39 rx_ptp_v1: 0 rx_ptp_parser_err: 0 rx_udp: 39 rx_ipv4: 39 rx_ipv6: 0 rx_dot1q: 0 rx_stag: 0 ```

add PTP stats

d902452

adrian-nicolau requested a review from Copilot May 27, 2025 11:22

Copilot AI reviewed May 27, 2025

View reviewed changes

remove return for void

53cf4fc

adrian-nicolau requested a review from Copilot May 27, 2025 11:35

Copilot AI reviewed May 27, 2025

View reviewed changes

drivers/net/phy/marvell10g_ptp.c Show resolved Hide resolved

drivers/net/phy/marvell10g_ptp.c Show resolved Hide resolved

adrian-nicolau requested review from paul-sirin and shmuelhazan May 27, 2025 11:38

configure PAM (whatever that is)

0f82dd5

adrian-nicolau requested a review from Copilot May 27, 2025 12:59

Copilot AI reviewed May 27, 2025

View reviewed changes

adrian-nicolau added 3 commits May 28, 2025 09:36

fix LUT entry to ignore transportspecific and also match Pdelay events

81c9533

update strings

09d8f1f

configure all PAM registers (adding MPLS, LLC/SNAP, Y131)

7a55492

adrian-nicolau requested a review from Copilot May 29, 2025 12:09

Copilot AI reviewed May 29, 2025

View reviewed changes

drivers/net/phy/marvell10g_ptp.c Show resolved Hide resolved

paul-sirin approved these changes May 29, 2025

View reviewed changes

adrian-nicolau merged commit 9effa38 into tg-v5.10 May 29, 2025

adrian-nicolau deleted the DEV-7315-Add-infra-for-getting-TC-counters-from-the-PHY branch September 23, 2025 07:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

DEV-7315: add support for PTP statistics to marvell10g driver #34

DEV-7315: add support for PTP statistics to marvell10g driver #34

Uh oh!

adrian-nicolau commented May 27, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

DEV-7315: add support for PTP statistics to marvell10g driver #34

DEV-7315: add support for PTP statistics to marvell10g driver #34

Uh oh!

Conversation

adrian-nicolau commented May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

adrian-nicolau commented May 27, 2025 •

edited

Loading