bond: pass get_ts_info and SIOC[SG]HWTSTAMP ioctl to active device

We have VLAN PTP support(via get_ts_info) on kernel, and bond support(by
getting active interface via netlink message) on userspace tool linuxptp.
But there are always some users who want to use PTP with VLAN over bond,
which is not able to do with the current implementation.

This patch passed get_ts_info and SIOC[SG]HWTSTAMP ioctl to active device
with bond mode active-backup/tlb/alb. With this users could get kernel native
bond or VLAN over bond PTP support.

Test with ptp4l and it works with VLAN over bond after this patch:
]# ptp4l -m -i bond0.23
ptp4l[53377.141]: selected /dev/ptp4 as PTP clock
ptp4l[53377.142]: port 1: INITIALIZING to LISTENING on INIT_COMPLETE
ptp4l[53377.143]: port 0: INITIALIZING to LISTENING on INIT_COMPLETE
ptp4l[53377.143]: port 0: INITIALIZING to LISTENING on INIT_COMPLETE
ptp4l[53384.127]: port 1: LISTENING to MASTER on ANNOUNCE_RECEIPT_TIMEOUT_EXPIRES
ptp4l[53384.127]: selected local clock e41d2d.fffe.123db0 as best master
ptp4l[53384.127]: port 1: assuming the grand master role

Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index f3aa49b97f81e91b1e11a5462b820c90f56e70e4..0f39ad2af81c2e5717d2392eeb50a759ccfdbd97 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -71,6 +71,7 @@
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
 #include <linux/if_bonding.h>
+#include <linux/phy.h>
 #include <linux/jiffies.h>
 #include <linux/preempt.h>
 #include <net/route.h>
@@ -4091,7 +4092,10 @@ static int bond_eth_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cm
 {
        struct bonding *bond = netdev_priv(bond_dev);
        struct mii_ioctl_data *mii = NULL;
-       int res;
+       const struct net_device_ops *ops;
+       struct net_device *real_dev;
+       struct ifreq ifrr;
+       int res = 0;
 
        netdev_dbg(bond_dev, "bond_eth_ioctl: cmd=%d\n", cmd);
 
@@ -4117,7 +4121,24 @@ static int bond_eth_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cm
                                mii->val_out = BMSR_LSTATUS;
                }
 
-               return 0;
+               break;
+       case SIOCSHWTSTAMP:
+       case SIOCGHWTSTAMP:
+               rcu_read_lock();
+               real_dev = bond_option_active_slave_get_rcu(bond);
+               rcu_read_unlock();
+               if (real_dev) {
+                       strscpy_pad(ifrr.ifr_name, real_dev->name, IFNAMSIZ);
+                       ifrr.ifr_ifru = ifr->ifr_ifru;
+
+                       ops = real_dev->netdev_ops;
+                       if (netif_device_present(real_dev) && ops->ndo_eth_ioctl)
+                               res = ops->ndo_eth_ioctl(real_dev, &ifrr, cmd);
+
+                       if (!res)
+                               ifr->ifr_ifru = ifrr.ifr_ifru;
+               }
+               break;
        default:
                res = -EOPNOTSUPP;
        }
@@ -5319,10 +5340,40 @@ static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,
                 BOND_ABI_VERSION);
 }
 
+static int bond_ethtool_get_ts_info(struct net_device *bond_dev,
+                                   struct ethtool_ts_info *info)
+{
+       struct bonding *bond = netdev_priv(bond_dev);
+       const struct ethtool_ops *ops;
+       struct net_device *real_dev;
+       struct phy_device *phydev;
+
+       rcu_read_lock();
+       real_dev = bond_option_active_slave_get_rcu(bond);
+       rcu_read_unlock();
+       if (real_dev) {
+               ops = real_dev->ethtool_ops;
+               phydev = real_dev->phydev;
+
+               if (phy_has_tsinfo(phydev)) {
+                       return phy_ts_info(phydev, info);
+               } else if (ops->get_ts_info) {
+                       return ops->get_ts_info(real_dev, info);
+               }
+       }
+
+       info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
+                               SOF_TIMESTAMPING_SOFTWARE;
+       info->phc_index = -1;
+
+       return 0;
+}
+
 static const struct ethtool_ops bond_ethtool_ops = {
        .get_drvinfo            = bond_ethtool_get_drvinfo,
        .get_link               = ethtool_op_get_link,
        .get_link_ksettings     = bond_ethtool_get_link_ksettings,
+       .get_ts_info            = bond_ethtool_get_ts_info,
 };
 
 static const struct net_device_ops bond_netdev_ops = {