net: netdevsim: use mock PHC driver

I'd like to make netdevsim offload tc-taprio, but currently, this Qdisc
emits a ETHTOOL_GET_TS_INFO call to the driver to make sure that it has
a PTP clock, so that it is reasonably capable of offloading the schedule.

By using the mock PHC driver, that becomes possible.

Hardware timestamping is not necessary, and netdevsim does not support
packet I/O anyway.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20230807193324.4128292-8-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 368c6f5..4953c14 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -592,6 +592,7 @@ config NETDEVSIM
        depends on INET
        depends on IPV6 || IPV6=n
        depends on PSAMPLE || PSAMPLE=n
+       depends on PTP_1588_CLOCK_MOCK || PTP_1588_CLOCK_MOCK=n
        select NET_DEVLINK
        help
          This driver is a developer testing tool and software model that can

diff --git a/drivers/net/netdevsim/ethtool.c b/drivers/net/netdevsim/ethtool.c
index ffd9f84..bd546d4 100644 (file)
--- a/drivers/net/netdevsim/ethtool.c
+++ b/drivers/net/netdevsim/ethtool.c
@@ -140,6 +140,16 @@ nsim_set_fecparam(struct net_device *dev, struct ethtool_fecparam *fecparam)
        return 0;
 }
 
+static int nsim_get_ts_info(struct net_device *dev,
+                           struct ethtool_ts_info *info)
+{
+       struct netdevsim *ns = netdev_priv(dev);
+
+       info->phc_index = mock_phc_index(ns->phc);
+
+       return 0;
+}
+
 static const struct ethtool_ops nsim_ethtool_ops = {
        .supported_coalesce_params      = ETHTOOL_COALESCE_ALL_PARAMS,
        .get_pause_stats                = nsim_get_pause_stats,
@@ -153,6 +163,7 @@ static const struct ethtool_ops nsim_ethtool_ops = {
        .set_channels                   = nsim_set_channels,
        .get_fecparam                   = nsim_get_fecparam,
        .set_fecparam                   = nsim_set_fecparam,
+       .get_ts_info                    = nsim_get_ts_info,
 };
 
 static void nsim_ethtool_ring_init(struct netdevsim *ns)

diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index 0c8daeb..2a4a0c4 100644 (file)
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -291,13 +291,19 @@ static void nsim_setup(struct net_device *dev)
 
 static int nsim_init_netdevsim(struct netdevsim *ns)
 {
+       struct mock_phc *phc;
        int err;
 
+       phc = mock_phc_create(&ns->nsim_bus_dev->dev);
+       if (IS_ERR(phc))
+               return PTR_ERR(phc);
+
+       ns->phc = phc;
        ns->netdev->netdev_ops = &nsim_netdev_ops;
 
        err = nsim_udp_tunnels_info_create(ns->nsim_dev, ns->netdev);
        if (err)
-               return err;
+               goto err_phc_destroy;
 
        rtnl_lock();
        err = nsim_bpf_init(ns);
@@ -320,6 +326,8 @@ err_ipsec_teardown:
 err_utn_destroy:
        rtnl_unlock();
        nsim_udp_tunnels_info_destroy(ns->netdev);
+err_phc_destroy:
+       mock_phc_destroy(ns->phc);
        return err;
 }
 
@@ -383,6 +391,7 @@ void nsim_destroy(struct netdevsim *ns)
        rtnl_unlock();
        if (nsim_dev_port_is_pf(ns->nsim_dev_port))
                nsim_udp_tunnels_info_destroy(dev);
+       mock_phc_destroy(ns->phc);
        free_netdev(dev);
 }
 

diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index 7be98b7..028c825 100644 (file)
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -19,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/netdevice.h>
+#include <linux/ptp_mock.h>
 #include <linux/u64_stats_sync.h>
 #include <net/devlink.h>
 #include <net/udp_tunnel.h>
@@ -93,6 +94,7 @@ struct netdevsim {
        struct net_device *netdev;
        struct nsim_dev *nsim_dev;
        struct nsim_dev_port *nsim_dev_port;
+       struct mock_phc *phc;
 
        u64 tx_packets;
        u64 tx_bytes;