net: add hwtstamping helpers for stackable net devices

The stackable net devices with hwtstamping support (vlan, macvlan,
bonding) only pass the hwtstamping ops to the lower (real) device.

These drivers are the first that need to be converted to the new
timestamping API, because if they aren't prepared to handle that,
then no real device driver cannot be converted to the new API either.

After studying what vlan_dev_ioctl(), macvlan_eth_ioctl() and
bond_eth_ioctl() have in common, here we propose two generic
implementations of ndo_hwtstamp_get() and ndo_hwtstamp_set() which
can be called by those 3 drivers, with "dev" being their lower device.

These helpers cover both cases, when the lower driver is converted to
the new API or unconverted.

We need some hacks in case of an unconverted driver, namely to stuff
some pointers in struct kernel_hwtstamp_config which shouldn't have
been there (since the new API isn't supposed to need it). These will
be removed when all drivers will have been converted to the new API.

Signed-off-by: Maxim Georgiev <glipus@gmail.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20230801142824.1772134-3-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/linux/net_tstamp.h b/include/linux/net_tstamp.h
index 7c59824f43f5165bafb568a0469e7c132ace333b..03e922814851730503843415da8cbadc15aa0a27 100644 (file)
--- a/include/linux/net_tstamp.h
+++ b/include/linux/net_tstamp.h
@@ -11,6 +11,10 @@
  * @flags: see struct hwtstamp_config
  * @tx_type: see struct hwtstamp_config
  * @rx_filter: see struct hwtstamp_config
+ * @ifr: pointer to ifreq structure from the original ioctl request, to pass to
+ *     a legacy implementation of a lower driver
+ * @copied_to_user: request was passed to a legacy implementation which already
+ *     copied the ioctl request back to user space
  *
  * Prefer using this structure for in-kernel processing of hardware
  * timestamping configuration, over the inextensible struct hwtstamp_config
@@ -20,6 +24,8 @@ struct kernel_hwtstamp_config {
        int flags;
        int tx_type;
        int rx_filter;
+       struct ifreq *ifr;
+       bool copied_to_user;
 };
 
 static inline void hwtstamp_config_to_kernel(struct kernel_hwtstamp_config *kernel_cfg,

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 08a0b8d45dc9737b3c0d028df9e344d9b8f9e16a..23e335f245cf7cd9309015d9cdd1c5a1b20c0940 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3950,6 +3950,11 @@ int put_user_ifreq(struct ifreq *ifr, void __user *arg);
 int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr,
                void __user *data, bool *need_copyout);
 int dev_ifconf(struct net *net, struct ifconf __user *ifc);
+int generic_hwtstamp_get_lower(struct net_device *dev,
+                              struct kernel_hwtstamp_config *kernel_cfg);
+int generic_hwtstamp_set_lower(struct net_device *dev,
+                              struct kernel_hwtstamp_config *kernel_cfg,
+                              struct netlink_ext_ack *extack);
 int dev_ethtool(struct net *net, struct ifreq *ifr, void __user *userdata);
 unsigned int dev_get_flags(const struct net_device *);
 int __dev_change_flags(struct net_device *dev, unsigned int flags,

diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index 10c0e173b38be9864b574be8c7e07199e3a6aba1..d0223ecd6f6f4169c3dabcf921852818a763720f 100644 (file)
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
@@ -265,14 +265,20 @@ static int dev_get_hwtstamp(struct net_device *dev, struct ifreq *ifr)
        if (!netif_device_present(dev))
                return -ENODEV;
 
+       kernel_cfg.ifr = ifr;
        err = ops->ndo_hwtstamp_get(dev, &kernel_cfg);
        if (err)
                return err;
 
-       hwtstamp_config_from_kernel(&cfg, &kernel_cfg);
+       /* If the request was resolved through an unconverted driver, omit
+        * the copy_to_user(), since the implementation has already done that
+        */
+       if (!kernel_cfg.copied_to_user) {
+               hwtstamp_config_from_kernel(&cfg, &kernel_cfg);
 
-       if (copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)))
-               return -EFAULT;
+               if (copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)))
+                       return -EFAULT;
+       }
 
        return 0;
 }
@@ -280,7 +286,7 @@ static int dev_get_hwtstamp(struct net_device *dev, struct ifreq *ifr)
 static int dev_set_hwtstamp(struct net_device *dev, struct ifreq *ifr)
 {
        const struct net_device_ops *ops = dev->netdev_ops;
-       struct kernel_hwtstamp_config kernel_cfg;
+       struct kernel_hwtstamp_config kernel_cfg = {};
        struct netlink_ext_ack extack = {};
        struct hwtstamp_config cfg;
        int err;
@@ -289,6 +295,7 @@ static int dev_set_hwtstamp(struct net_device *dev, struct ifreq *ifr)
                return -EFAULT;
 
        hwtstamp_config_to_kernel(&kernel_cfg, &cfg);
+       kernel_cfg.ifr = ifr;
 
        err = net_hwtstamp_validate(&kernel_cfg);
        if (err)
@@ -317,14 +324,68 @@ static int dev_set_hwtstamp(struct net_device *dev, struct ifreq *ifr)
        /* The driver may have modified the configuration, so copy the
         * updated version of it back to user space
         */
-       hwtstamp_config_from_kernel(&cfg, &kernel_cfg);
+       if (!kernel_cfg.copied_to_user) {
+               hwtstamp_config_from_kernel(&cfg, &kernel_cfg);
 
-       if (copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)))
-               return -EFAULT;
+               if (copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)))
+                       return -EFAULT;
+       }
+
+       return 0;
+}
+
+static int generic_hwtstamp_ioctl_lower(struct net_device *dev, int cmd,
+                                       struct kernel_hwtstamp_config *kernel_cfg)
+{
+       struct ifreq ifrr;
+       int err;
+
+       strscpy_pad(ifrr.ifr_name, dev->name, IFNAMSIZ);
+       ifrr.ifr_ifru = kernel_cfg->ifr->ifr_ifru;
+
+       err = dev_eth_ioctl(dev, &ifrr, cmd);
+       if (err)
+               return err;
+
+       kernel_cfg->ifr->ifr_ifru = ifrr.ifr_ifru;
+       kernel_cfg->copied_to_user = true;
 
        return 0;
 }
 
+int generic_hwtstamp_get_lower(struct net_device *dev,
+                              struct kernel_hwtstamp_config *kernel_cfg)
+{
+       const struct net_device_ops *ops = dev->netdev_ops;
+
+       if (!netif_device_present(dev))
+               return -ENODEV;
+
+       if (ops->ndo_hwtstamp_get)
+               return ops->ndo_hwtstamp_get(dev, kernel_cfg);
+
+       /* Legacy path: unconverted lower driver */
+       return generic_hwtstamp_ioctl_lower(dev, SIOCGHWTSTAMP, kernel_cfg);
+}
+EXPORT_SYMBOL(generic_hwtstamp_get_lower);
+
+int generic_hwtstamp_set_lower(struct net_device *dev,
+                              struct kernel_hwtstamp_config *kernel_cfg,
+                              struct netlink_ext_ack *extack)
+{
+       const struct net_device_ops *ops = dev->netdev_ops;
+
+       if (!netif_device_present(dev))
+               return -ENODEV;
+
+       if (ops->ndo_hwtstamp_set)
+               return ops->ndo_hwtstamp_set(dev, kernel_cfg, extack);
+
+       /* Legacy path: unconverted lower driver */
+       return generic_hwtstamp_ioctl_lower(dev, SIOCSHWTSTAMP, kernel_cfg);
+}
+EXPORT_SYMBOL(generic_hwtstamp_set_lower);
+
 static int dev_siocbond(struct net_device *dev,
                        struct ifreq *ifr, unsigned int cmd)
 {