bonding: fix incorrect software timestamping report
authorHangbin Liu <liuhangbin@gmail.com>
Thu, 20 Jun 2024 08:56:26 +0000 (16:56 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Jun 2024 10:27:46 +0000 (11:27 +0100)
The __ethtool_get_ts_info function returns directly if the device has a
get_ts_info() method. For bonding with an active slave, this works correctly
as we simply return the real device's timestamping information. However,
when there is no active slave, we only check the slave's TX software
timestamp information. We still need to set the phc index and RX timestamp
information manually. Otherwise, the result will be look like:

  Time stamping parameters for bond0:
  Capabilities:
          software-transmit
  PTP Hardware Clock: 0
  Hardware Transmit Timestamp Modes: none
  Hardware Receive Filter Modes: none

This issue does not affect VLAN or MACVLAN devices, as they only have one
downlink and can directly use the downlink's timestamping information.

Fixes: b8768dc40777 ("net: ethtool: Refactor identical get_ts_info implementations.")
Reported-by: Liang Li <liali@redhat.com>
Closes: https://issues.redhat.com/browse/RHEL-42409
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Acked-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c

index 3c3fcce4acd48c4a30dc97108053606495cf2239..d19aabf5d4fba723bbf268a17ea08b5d5dc9549d 100644 (file)
@@ -5773,6 +5773,9 @@ static int bond_ethtool_get_ts_info(struct net_device *bond_dev,
        if (real_dev) {
                ret = ethtool_get_ts_info_by_layer(real_dev, info);
        } else {
+               info->phc_index = -1;
+               info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
+                                       SOF_TIMESTAMPING_SOFTWARE;
                /* Check if all slaves support software tx timestamping */
                rcu_read_lock();
                bond_for_each_slave_rcu(bond, slave, iter) {